fix(build): add missing webpack deps to node and web

e2e/utils.ts

@@ -44,6 +44,22 @@ export function newProject(): void {
   if (!directoryExists('./tmp/proj_backup')) {
     runNgNew('--collection=@nrwl/workspace --npmScope=proj', true);
     copyMissingPackages();
+
+    writeFileSync(
+      './tmp/proj/node_modules/@angular/cli/node_modules/@angular-devkit/schematics/tasks/node-package/executor.js',
+      `
+      "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const rxjs_1 = require("rxjs");
+function default_1(factoryOptions = {}) {
+    return (options) => {
+        return new rxjs_1.Observable(obs => {
+          obs.complete();
+        });
+    };
+}
+exports.default = default_1;`
+    );
     runCLI('add @nrwl/jest');
     runCLI('add @nrwl/cypress');
     runCLI('add @nrwl/web');
@@ -87,14 +103,15 @@ export function copyMissingPackages(): void {
     '@ngrx',
     '@nrwl',
     'angular',
-    '@angular/upgrade',
-    '@angular-devkit/build-ng-packagr',
+    '@angular',
+    '@angular-devkit',
     'codelyzer',
     'ngrx-store-freeze',
     'npm-run-all',
     'yargs',
     'yargs-parser',
 
+    'ng-packagr',
     'cypress',
     '@types/jquery',
     'jest',

package.json

@@ -22,21 +22,21 @@
     "documentation": "./scripts/documentation/documentation.sh && yarn format && ./scripts/documentation/check-documentation.sh"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.13.1",
-    "@angular-devkit/build-angular": "0.13.1",
-    "@angular-devkit/build-ng-packagr": "0.13.1",
-    "@angular-devkit/build-webpack": "0.13.1",
-    "@angular-devkit/core": "~7.3.1",
-    "@angular-devkit/schematics": "~7.3.1",
+    "@angular-devkit/architect": "0.13.8",
+    "@angular-devkit/build-angular": "0.13.8",
+    "@angular-devkit/build-ng-packagr": "0.13.8",
+    "@angular-devkit/build-webpack": "0.13.8",
+    "@angular-devkit/core": "7.3.8",
+    "@angular-devkit/schematics": "7.3.8",
     "@angular/cli": "7.3.1",
-    "@angular/common": "^7.2.1",
-    "@angular/compiler": "^7.2.1",
-    "@angular/compiler-cli": "^7.2.1",
-    "@angular/core": "^7.2.1",
-    "@angular/platform-browser": "^7.2.1",
-    "@angular/platform-browser-dynamic": "^7.2.1",
-    "@angular/router": "^7.2.1",
-    "@angular/upgrade": "^7.2.1",
+    "@angular/common": "7.2.13",
+    "@angular/compiler": "7.2.13",
+    "@angular/compiler-cli": "7.2.13",
+    "@angular/core": "7.2.13",
+    "@angular/platform-browser": "7.2.13",
+    "@angular/platform-browser-dynamic": "7.2.13",
+    "@angular/router": "7.2.13",
+    "@angular/upgrade": "7.2.13",
     "@nestjs/common": "5.5.0",
     "@nestjs/core": "5.5.0",
     "@nestjs/schematics": "5.11.2",
@@ -107,7 +107,7 @@
     "tsickle": "^0.33.0",
     "tslib": "^1.9.3",
     "tslint": "5.11.0",
-    "typescript": "3.2.2",
+    "typescript": "3.2.4",
     "viz.js": "^1.8.1",
     "webpack": "4.29.0",
     "webpack-dev-server": "3.1.14",

packages/angular/package.json

@@ -31,8 +31,6 @@
     "@nrwl/workspace": "*"
   },
   "dependencies": {
-    "@angular-devkit/core": "~7.3.1",
-    "@angular-devkit/schematics": "~7.3.1",
     "@schematics/angular": "~7.3.1",
     "@nrwl/cypress": "*",
     "@nrwl/jest": "*"

packages/angular/src/schematics/downgrade-module/downgrade-module.spec.ts

@@ -1,5 +1,3 @@
-import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
-import * as path from 'path';
 import { Tree, VirtualTree } from '@angular-devkit/schematics';
 import { createApp, createEmptyWorkspace } from '@nrwl/workspace/testing';
 import { runSchematic } from '../../utils/testing';

packages/angular/src/utils/versions.ts

@@ -1,6 +1,6 @@
 export const nxVersion = '*';
 export const angularVersion = '^7.0.0';
-export const angularDevkitVersion = '0.13.1';
+export const angularDevkitVersion = '^0.13.8';
 export const angularJsVersion = '1.6.6';
 export const ngrxVersion = '7.2.0';
 export const ngrxStoreFreezeVersion = '0.2.4';

packages/node/package.json

@@ -32,6 +32,16 @@
     "@nrwl/workspace": "*"
   },
   "dependencies": {
-    "@nrwl/jest": "*"
+    "@nrwl/jest": "*",
+    "@angular-devkit/build-webpack": "~0.13.1",
+    "copy-webpack-plugin": "4.6.0",
+    "fork-ts-checker-webpack-plugin": "0.4.9",
+    "identity-obj-proxy": "3.0.0",
+    "license-webpack-plugin": "^1.4.0",
+    "source-map-support": "0.5.11",
+    "ts-loader": "5.3.1",
+    "webpack": "4.29.0",
+    "webpack-dev-server": "3.1.14",
+    "webpack-node-externals": "1.7.2"
   }
 }

packages/web/package.json

@@ -33,6 +33,16 @@
   },
   "dependencies": {
     "@nrwl/cypress": "*",
-    "@nrwl/jest": "*"
+    "@nrwl/jest": "*",
+    "@angular-devkit/build-webpack": "~0.13.1",
+    "copy-webpack-plugin": "4.6.0",
+    "fork-ts-checker-webpack-plugin": "0.4.9",
+    "identity-obj-proxy": "3.0.0",
+    "license-webpack-plugin": "^1.4.0",
+    "source-map-support": "0.5.11",
+    "ts-loader": "5.3.1",
+    "webpack": "4.29.0",
+    "webpack-dev-server": "3.1.14",
+    "webpack-node-externals": "1.7.2"
   }
 }

packages/workspace/src/schematics/workspace/files/package.json → packages/workspace/src/schematics/workspace/files/package.json__tmpl__

@@ -30,12 +30,16 @@
   "dependencies": {},
   "devDependencies": {
     "@nrwl/workspace": "<%= nxVersion %>",
-    "@angular/cli": "<%= angularCliVersion %>",
     "@types/node": "~8.9.4",
     "dotenv": "6.2.0",
     "ts-node": "~7.0.0",
     "tslint": "~5.11.0",
     "typescript": "<%= typescriptVersion %>",
-    "prettier": "<%= prettierVersion %>"
+    "prettier": "<%= prettierVersion %>" <% if(!nxCli) { %>
+    , "@angular/cli": "<%= angularCliVersion %>",
+     "@angular/core": "<%= angularVersion %>",
+    "@angular/compiler": "<%= angularVersion %>",
+    "@angular/compiler-cli": "<%= angularVersion %>"
+    <% } %>
   }
 }

packages/workspace/src/schematics/workspace/workspace.ts

@@ -15,7 +15,8 @@ import {
   angularCliVersion,
   prettierVersion,
   typescriptVersion,
-  nxVersion
+  nxVersion,
+  angularVersion
 } from '../../utils/versions';
 
 export const DEFAULT_NRWL_PRETTIER_CONFIG = {
@@ -34,11 +35,14 @@ export default function(options: Schema): Rule {
         utils: strings,
         dot: '.',
         tmpl: '',
+        nxCli: false,
         typescriptVersion,
         prettierVersion,
+        // angular cli and angular version are used only when workspace schematics is added to angular cli
         angularCliVersion,
-        nxVersion,
+        angularVersion,
         ...(options as object),
+        nxVersion,
         npmScope,
         defaultNrwlPrettierConfig: JSON.stringify(
           DEFAULT_NRWL_PRETTIER_CONFIG,

packages/workspace/src/utils/versions.ts

@@ -1,6 +1,7 @@
 export const nxVersion = '*';
 
 export const angularCliVersion = '7.3.1';
-export const typescriptVersion = '3.2.2';
+export const typescriptVersion = '~3.2.2';
 export const prettierVersion = '1.16.4';
 export const jasmineMarblesVersion = '^0.4.0';
+export const angularVersion = '^7.0.0';