miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(schematics): update devDependencies (#637)

Browse Source 
* Move @ngrx/store-devtools and ngrx-store-freeze' to devDependencies
This commit is contained in:
swseverance 2018-07-22 13:30:31 -04:00 committed by Thomas Burleson
parent 04e99b06ae
commit e1984fa40e
5 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
e2e/schematics/ng-add.test.ts
View File

@ -26,7 +26,9 @@ describe('Nrwl Convert to Nx Workspace', () => {
expect(packageJson.dependencies['@ngrx/store']).not.toBeDefined();
expect(packageJson.dependencies['@ngrx/effects']).not.toBeDefined();
expect(packageJson.dependencies['@ngrx/router-store']).not.toBeDefined();
expect(packageJson.dependencies['@ngrx/store-devtools']).not.toBeDefined();
expect(
packageJson.devDependencies['@ngrx/store-devtools']
).not.toBeDefined();
// update tsconfig.json
const tsconfigJson = readJson('tsconfig.json');
@ -94,7 +96,7 @@ describe('Nrwl Convert to Nx Workspace', () => {
expect(updatedPackageJson.dependencies['@ngrx/effects']).toBeDefined();
expect(updatedPackageJson.dependencies['@ngrx/router-store']).toBeDefined();
expect(
updatedPackageJson.dependencies['@ngrx/store-devtools']
updatedPackageJson.devDependencies['@ngrx/store-devtools']
).toBeDefined();
expect(updatedPackageJson.dependencies['rxjs-compat']).toBeDefined();
expect(updatedPackageJson.devDependencies['@angular/cli']).toBeDefined();
@ -241,7 +243,7 @@ describe('Nrwl Convert to Nx Workspace', () => {
existingPackageJson.dependencies['@ngrx/store'] = ngrxVersion;
existingPackageJson.dependencies['@ngrx/effects'] = ngrxVersion;
existingPackageJson.dependencies['@ngrx/router-store'] = ngrxVersion;
existingPackageJson.dependencies['@ngrx/store-devtools'] = ngrxVersion;
existingPackageJson.devDependencies['@ngrx/store-devtools'] = ngrxVersion;
updateFile('package.json', JSON.stringify(existingPackageJson, null, 2));
// run the command
runCLI('add @nrwl/schematics --npmScope projscope --skip-install');
@ -254,7 +256,7 @@ describe('Nrwl Convert to Nx Workspace', () => {
expect(packageJson.dependencies['@ngrx/store']).toEqual(ngrxVersion);
expect(packageJson.dependencies['@ngrx/effects']).toEqual(ngrxVersion);
expect(packageJson.dependencies['@ngrx/router-store']).toEqual(ngrxVersion);
expect(packageJson.dependencies['@ngrx/store-devtools']).toEqual(
expect(packageJson.devDependencies['@ngrx/store-devtools']).toEqual(
ngrxVersion
);
});

8
packages/schematics/src/collection/ng-add/index.ts
View File

@ -90,11 +90,11 @@ function updatePackageJson() {
if (!packageJson.dependencies['@ngrx/effects']) {
packageJson.dependencies['@ngrx/effects'] = ngrxVersion;
}
if (!packageJson.dependencies['@ngrx/store-devtools']) {
packageJson.dependencies['@ngrx/store-devtools'] = ngrxVersion;
if (!packageJson.devDependencies['@ngrx/store-devtools']) {
packageJson.devDependencies['@ngrx/store-devtools'] = ngrxVersion;
}
if (!packageJson.dependencies['ngrx-store-freeze']) {
packageJson.dependencies['ngrx-store-freeze'] = ngrxStoreFreezeVersion;
if (!packageJson.devDependencies['ngrx-store-freeze']) {
packageJson.devDependencies['ngrx-store-freeze'] = ngrxStoreFreezeVersion;
}
if (!packageJson.dependencies['rxjs-compat']) {
packageJson.dependencies['rxjs-compat'] = rxjsVersion;

6
packages/schematics/src/collection/ng-new/files/__directory__/package.json
View File

@ -42,15 +42,15 @@
"@nrwl/nx": "<%= nxVersion %>",
"@ngrx/effects": "<%= ngrxVersion %>",
"@ngrx/router-store": "<%= routerStoreVersion %>",
"@ngrx/store": "<%= ngrxVersion %>",
"@ngrx/store-devtools": "<%= ngrxVersion %>",
"ngrx-store-freeze": "<%= ngrxStoreFreezeVersion %>"
"@ngrx/store": "<%= ngrxVersion %>"
},
"devDependencies": {
"@angular/cli": "<%= angularCliVersion %>",
"@angular/compiler-cli": "<%= angularVersion %>",
"@angular/language-service": "<%= angularVersion %>",
"@angular-devkit/build-angular": "~0.6.1",
"@ngrx/store-devtools": "<%= ngrxVersion %>",
"ngrx-store-freeze": "<%= ngrxStoreFreezeVersion %>",
"@nrwl/schematics": "<%= schematicsVersion %>",
"jasmine-marbles": "<%= jasmineMarblesVersion %>",
"@types/jasmine": "~2.8.6",

3
packages/schematics/src/collection/ngrx/ngrx.spec.ts
View File

@ -192,7 +192,8 @@ describe('ngrx', () => {
expect(packageJson.dependencies['@ngrx/store']).toBeDefined();
expect(packageJson.dependencies['@ngrx/router-store']).toBeDefined();
expect(packageJson.dependencies['@ngrx/effects']).toBeDefined();
expect(packageJson.dependencies['ngrx-store-freeze']).toBeDefined();
expect(packageJson.devDependencies['@ngrx/store-devtools']).toBeDefined();
expect(packageJson.devDependencies['ngrx-store-freeze']).toBeDefined();
});
it('should error when no module is provided', () => {

13
packages/schematics/src/collection/ngrx/rules/add-ngrx-to-package-json.ts
View File

@ -11,6 +11,9 @@ export function addNgRxToPackageJson(): Rule {
if (!packageJson['dependencies']) {
packageJson['dependencies'] = {};
}
if (!packageJson['devDependencies']) {
packageJson['devDependencies'] = {};
}
if (!packageJson['dependencies']['@ngrx/store']) {
packageJson['dependencies']['@ngrx/store'] = ngrxVersion;
@ -21,14 +24,16 @@ export function addNgRxToPackageJson(): Rule {
if (!packageJson['dependencies']['@ngrx/entity']) {
packageJson['dependencies']['@ngrx/entity'] = ngrxVersion;
}
if (!packageJson['dependencies']['@ngrx/store-devtools']) {
packageJson['dependencies']['@ngrx/store-devtools'] = ngrxVersion;
if (!packageJson['devDependencies']['@ngrx/store-devtools']) {
packageJson['devDependencies']['@ngrx/store-devtools'] = ngrxVersion;
}
if (!packageJson['dependencies']['@ngrx/router-store']) {
packageJson['dependencies']['@ngrx/router-store'] = routerStoreVersion;
}
if (!packageJson['dependencies']['ngrx-store-freeze']) {
packageJson['dependencies']['ngrx-store-freeze'] = ngrxStoreFreezeVersion;
if (!packageJson['devDependencies']['ngrx-store-freeze']) {
packageJson['devDependencies'][
'ngrx-store-freeze'
] = ngrxStoreFreezeVersion;
}
return packageJson;