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

nrwl · Jun 4, 2019 · 7ea5405 · 7ea5405
1 parent 82898f7
commit 7ea5405
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/packages/angular/ng-package.json b/packages/angular/ng-package.json
@@ -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"
+  ]
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -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"
   }
 }
diff --git a/packages/angular/src/schematics/karma/karma.ts b/packages/angular/src/schematics/karma/karma.ts
@@ -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'
         }
       )

diff --git a/packages/angular/src/utils/versions.ts b/packages/angular/src/utils/versions.ts
@@ -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';
diff --git a/packages/workspace/src/schematics/ng-add/ng-add.ts b/packages/workspace/src/schematics/ng-add/ng-add.ts
@@ -13,7 +13,6 @@ import * as path from 'path';
 import { join } from 'path';
 import {
   angularCliVersion,
-  jasmineMarblesVersion,
   nxVersion,
   prettierVersion
 } from '../../utils/versions';

diff --git a/packages/workspace/src/utils/versions.ts b/packages/workspace/src/utils/versions.ts
@@ -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';