fix(nx): remove jasmine-marbles peer dependency to simplify migration

This commit is contained in:
Victor Savkin 2019-05-31 11:44:10 -04:00
parent 82898f7d21
commit 7ea5405ee9
6 changed files with 11 additions and 10 deletions

View File

@ -5,8 +5,14 @@
"umdModuleIds": {
"@ngrx/effects": "ngrx.effects",
"@ngrx/router-store": "ngrx.routerStore",
"@ngrx/store": "ngrx.store"
"@ngrx/store": "ngrx.store",
"jasmine-marbles": "jasmine-marbles"
}
},
"whitelistedNonPeerDependencies": ["@nrwl/", "@angular-devkit", "@schematics"]
"whitelistedNonPeerDependencies": [
"@nrwl/",
"@angular-devkit",
"@schematics",
"jasmine-marbles"
]
}

View File

@ -30,13 +30,13 @@
"migrations": "./migrations.json"
},
"peerDependencies": {
"@nrwl/workspace": "*",
"jasmine-marbles": "~0.4.0"
"@nrwl/workspace": "*"
},
"dependencies": {
"@nrwl/cypress": "*",
"@nrwl/jest": "*",
"@angular-devkit/schematics": "8.0.1",
"@schematics/angular": "8.0.1"
"@schematics/angular": "8.0.1",
"jasmine-marbles": "~0.4.0"
}
}

View File

@ -1,6 +1,5 @@
import { Tree, noop, chain, mergeWith, url } from '@angular-devkit/schematics';
import { readJsonInTree, addDepsToPackageJson } from '@nrwl/workspace';
import { jasmineMarblesVersion } from '../../utils/versions';
export default function() {
return (host: Tree) => {
@ -20,7 +19,6 @@ export default function() {
'karma-jasmine-html-reporter': '^0.2.2',
'jasmine-core': '~2.99.1',
'jasmine-spec-reporter': '~4.2.1',
'jasmine-marbles': jasmineMarblesVersion,
'@types/jasmine': '~2.8.8'
}
)

View File

@ -5,5 +5,4 @@ export const angularJsVersion = '1.6.6';
export const ngrxVersion = '7.2.0';
export const ngrxStoreFreezeVersion = '0.2.4';
export const rxjsVersion = '~6.4.0';
export const jasmineMarblesVersion = '^0.4.0';
export const jestPresetAngularVersion = '7.0.0';

View File

@ -13,7 +13,6 @@ import * as path from 'path';
import { join } from 'path';
import {
angularCliVersion,
jasmineMarblesVersion,
nxVersion,
prettierVersion
} from '../../utils/versions';

View File

@ -3,4 +3,3 @@ export const nxVersion = '*';
export const angularCliVersion = '8.0.0';
export const typescriptVersion = '~3.4.5';
export const prettierVersion = '1.16.4';
export const jasmineMarblesVersion = '^0.4.0';