build: use yarn workspaces

.appveyor.yml

@@ -8,7 +8,7 @@ matrix:
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm install
+  - yarn install --frozen-lockfile
   # Appveyor (via chocolatey) cannot use older versions of Chrome:
   # https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/googlechrome
   - npm run webdriver-update-appveyor
@@ -23,4 +23,4 @@ build: off
 deploy: off
 
 cache:
-  - node_modules -> package-lock.json
+  - node_modules -> yarn.lock

.circleci/config.yml

@@ -3,13 +3,13 @@ version: 2
 _defaults: &defaults
   working_directory: ~/ng
   docker:
-    - image: angular/ngcontainer:0.3.0
+    - image: angular/ngcontainer:0.3.3
 
 _post_checkout: &post_checkout
   post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
 
 _root_package_lock_key: &_root_package_lock_key
-  key: angular_devkit-{{ checksum "package-lock.json" }}-0.3.0
+  key: angular_devkit-{{ checksum "yarn.lock" }}-0.3.3
 
 jobs:
   install:
@@ -17,7 +17,7 @@ jobs:
     steps:
       - checkout: *post_checkout
       - restore_cache: *_root_package_lock_key
-      - run: npm install --no-save
+      - run: yarn install --frozen-lockfile
       - save_cache:
           <<: *_root_package_lock_key
           paths:
@@ -64,7 +64,7 @@ jobs:
       - checkout: *post_checkout
       - restore_cache: *_root_package_lock_key
       - run: npm install --global npm@6.1
-      - run: xvfb-run -a npm run test-cli-e2e -- --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   build:
     <<: *defaults
@@ -79,7 +79,6 @@ jobs:
     steps:
       - checkout: *post_checkout
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - run: bazel run @nodejs//:npm install
       - run: bazel build //packages/...
 
   snapshot_publish:

lib/packages.ts

@@ -91,6 +91,9 @@ function loadPackageJson(p: string) {
       case 'optionalDependencies':
       case 'typings':
       case 'version':
+      case 'private':
+      case 'workspaces':
+      case 'resolutions':
         continue;
 
       // Remove the following keys from the package.json.
@@ -129,6 +132,8 @@ function _findAllPackageJson(dir: string, exclude: RegExp): string[] {
 
       if (exclude.test(p)) {
         return;
+      } else if (/[\/\\]node_modules[\/\\]/.test(p)) {
+        return;
       } else if (fileName == 'package.json') {
         result.push(p);
       } else if (fs.statSync(p).isDirectory()) {

package.json

@@ -1,6 +1,5 @@
 {
-  "name": "@angular-devkit/devkit",
+  "private": true,
-  "version": "0.0.0",
   "description": "Software Development Kit for Angular",
   "bin": {
     "architect": "./bin/architect",
@@ -50,99 +49,20 @@
     "url": "https://github.com/angular/angular-cli/issues"
   },
   "homepage": "https://github.com/angular/angular-cli",
+  "workspaces": [
+    "packages/angular/*",
+    "packages/angular_devkit/*",
+    "packages/ngtools/*",
+    "packages/schematics/*"
+  ],
   "dependencies": {
-    "@angular/animations": "^6.1.0",
-    "@angular/cdk": "^6.1.0",
-    "@angular/common": "^6.1.0",
-    "@angular/compiler": "^6.1.0",
-    "@angular/compiler-cli": "^6.1.0",
-    "@angular/core": "^6.1.0",
-    "@angular/http": "^6.1.0",
-    "@angular/material": "^6.1.0",
-    "@angular/platform-browser": "^6.1.0",
-    "@angular/platform-browser-dynamic": "^6.1.0",
-    "@angular/platform-server": "^6.1.0",
-    "@angular/router": "^6.1.0",
-    "@angular/service-worker": "^6.1.0",
-    "@ngtools/json-schema": "^1.0.9",
-    "ajv": "~6.4.0",
-    "autoprefixer": "^8.4.1",
-    "bootstrap": "^4.0.0",
-    "chokidar": "^2.0.3",
-    "circular-dependency-plugin": "^5.0.2",
-    "clean-css": "^4.1.11",
-    "codelyzer": "^4.2.1",
-    "conventional-changelog": "^1.1.0",
-    "copy-webpack-plugin": "^4.5.2",
-    "express": "^4.16.2",
-    "file-loader": "^1.1.11",
-    "font-awesome": "^4.7.0",
     "glob": "^7.0.3",
-    "html-webpack-plugin": "^3.0.6",
-    "husky": "^0.14.3",
-    "istanbul": "^0.4.5",
-    "istanbul-instrumenter-loader": "^3.0.1",
-    "jasmine": "^2.6.0",
-    "jasmine-spec-reporter": "^3.2.0",
-    "jquery": "^3.3.1",
-    "karma": "~1.7.1",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^2.0.0",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-source-map-support": "^1.2.0",
-    "less": "^3.0.4",
-    "less-loader": "^4.1.0",
-    "license-webpack-plugin": "^1.3.1",
-    "loader-utils": "^1.1.0",
-    "material-design-icons": "^3.0.1",
-    "mini-css-extract-plugin": "~0.4.0",
-    "minimatch": "^3.0.4",
-    "minimist": "^1.2.0",
-    "ng-packagr": "^4.0.0",
-    "node-sass": "^4.9.1",
-    "npm-registry-client": "^8.5.1",
-    "opn": "^5.1.0",
-    "parse5": "^4.0.0",
-    "popper.js": "^1.14.1",
-    "portfinder": "^1.0.13",
-    "postcss": "^6.0.22",
-    "postcss-import": "^11.1.0",
-    "postcss-loader": "^2.1.5",
-    "postcss-url": "^7.3.2",
-    "protractor": "~5.4.0",
-    "raw-loader": "^0.5.1",
-    "rxjs": "^6.0.0",
-    "sass-loader": "~6.0.7",
-    "semver": "^5.3.0",
-    "semver-intersect": "^1.1.2",
-    "source-map": "^0.5.6",
-    "source-map-loader": "^0.2.3",
-    "source-map-support": "^0.5.0",
-    "stats-webpack-plugin": "^0.6.2",
-    "style-loader": "^0.21.0",
-    "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.2",
-    "symbol-observable": "^1.2.0",
     "temp": "^0.8.3",
-    "tree-kill": "^1.2.0",
+    "tslint": "^5.11.0",
-    "ts-node": "^5.0.0",
+    "typescript": "~2.9.2"
-    "tslint": "^5.9.1",
-    "tslint-sonarts": "^1.7.0",
-    "tsutils": "~2.22.2",
-    "typescript": "~2.9.2",
-    "uglifyjs-webpack-plugin": "^1.2.5",
-    "url-loader": "^1.0.1",
-    "webpack": "^4.15.1",
-    "webpack-dev-middleware": "^3.1.3",
-    "webpack-dev-server": "^3.1.4",
-    "webpack-merge": "^4.1.2",
-    "webpack-sources": "^1.1.0",
-    "webpack-subresource-integrity": "^1.1.0-rc.4",
-    "zone.js": "^0.8.19"
   },
   "devDependencies": {
+    "@ngtools/json-schema": "^1.1.0",
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
     "@types/glob": "^5.0.35",
@@ -150,7 +70,7 @@
     "@types/jasmine": "^2.8.8",
     "@types/loader-utils": "^1.1.3",
     "@types/minimist": "^1.2.0",
-    "@types/node": "^8.9.4",
+    "@types/node": "8.10.10",
     "@types/request": "^2.47.1",
     "@types/semver": "^5.5.0",
     "@types/source-map": "0.5.2",
@@ -158,11 +78,30 @@
     "@types/webpack-dev-server": "^2.9.4",
     "@types/webpack-sources": "^0.1.4",
     "common-tags": "^1.8.0",
+    "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
     "gh-got": "^7.0.0",
     "git-raw-commits": "^2.0.0",
+    "husky": "^0.14.3",
+    "istanbul": "^0.4.5",
+    "jasmine": "^2.6.0",
+    "jasmine-spec-reporter": "^3.2.0",
     "license-checker": "^20.1.0",
+    "minimatch": "^3.0.4",
+    "minimist": "^1.2.0",
+    "semver": "^5.3.0",
+    "source-map": "^0.5.6",
+    "source-map-support": "^0.5.0",
+    "spdx-satisfies": "^4.0.0",
+    "through2": "^2.0.3",
+    "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.5.0",
+    "tslint-sonarts": "^1.7.0",
     "tar": "^4.4.4"
+  },
+  "resolutions": {
+    "@types/webpack": "4.4.0",
+    "@types/webpack-dev-server": "2.9.4",
+    "rxjs": "6.0.0"
   }
 }

packages/angular/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "6.1.0-beta.0",
+  "version": "0.0.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "trackingCode": "UA-8594346-19",

packages/angular/pwa/package.json

@@ -7,9 +7,6 @@
     "code generation",
     "schematics"
   ],
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "schematics": "./collection.json",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",

packages/angular_devkit/architect/package.json

@@ -4,9 +4,6 @@
   "description": "Angular Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "rxjs": "^6.0.0"

packages/angular_devkit/architect_cli/package.json

@@ -5,9 +5,6 @@
   "bin": {
     "architect": "./bin/architect.js"
   },
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "keywords": [
     "build system",
     "build facade",

packages/angular_devkit/build_angular/package.json

@@ -5,9 +5,6 @@
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/build-optimizer": "0.0.0",
@@ -60,5 +57,37 @@
   },
   "optionalDependencies": {
     "node-sass": "^4.9.1"
+  },
+  "devDependencies": {
+    "@angular/animations": "^6.1.0",
+    "@angular/cdk": "^6.1.0",
+    "@angular/common": "^6.1.0",
+    "@angular/compiler": "^6.1.0",
+    "@angular/compiler-cli": "^6.1.0",
+    "@angular/core": "^6.1.0",
+    "@angular/http": "^6.1.0",
+    "@angular/material": "^6.1.0",
+    "@angular/platform-browser": "^6.1.0",
+    "@angular/platform-browser-dynamic": "^6.1.0",
+    "@angular/platform-server": "^6.1.0",
+    "@angular/router": "^6.1.0",
+    "@angular/service-worker": "^6.1.0",
+    "codelyzer": "^4.2.1",
+    "core-js": "^2.4.1",
+    "bootstrap": "^4.0.0",
+    "font-awesome": "^4.7.0",
+    "jquery": "^3.3.1",
+    "jasmine-core": "~2.8.0",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~2.0.0",
+    "karma-chrome-launcher": "~2.2.0",
+    "karma-cli": "~1.0.1",
+    "karma-coverage-istanbul-reporter": "~2.0.0",
+    "karma-jasmine": "~1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "material-design-icons": "^3.0.1",
+    "popper.js": "^1.14.1",
+    "protractor": "~5.4.0",
+    "zone.js": "^0.8.19"
   }
 }

packages/angular_devkit/build_ng_packagr/package.json

@@ -5,9 +5,6 @@
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
@@ -16,5 +13,12 @@
   },
   "peerDependencies": {
     "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
+  },
+  "devDependencies": {
+    "@angular/compiler": "^6.1.0",
+    "@angular/compiler-cli": "^6.1.0",
+    "ng-packagr": "^4.0.0",
+    "tsickle": ">=0.27.3",
+    "tslib": "^1.9.0"
   }
 }

packages/angular_devkit/build_optimizer/package.json

@@ -8,13 +8,10 @@
     "build-optimizer": "./src/build-optimizer/cli.js",
     "purify": "./src/purify/cli.js"
   },
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "dependencies": {
     "loader-utils": "^1.1.0",
     "source-map": "^0.5.6",
-    "typescript": "~2.9.1",
+    "typescript": "~2.9.2",
     "webpack-sources": "^1.1.0"
   }
 }

packages/angular_devkit/build_webpack/package.json

@@ -5,9 +5,6 @@
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
@@ -16,5 +13,9 @@
   "peerDependencies": {
     "webpack": "^4.6.0",
     "webpack-dev-server": "^3.1.4"
+  },
+  "devDependencies": {
+    "webpack": "^4.6.0",
+    "webpack-dev-server": "^3.1.4"
   }
 }

packages/angular_devkit/core/package.json

@@ -4,9 +4,6 @@
   "description": "Angular DevKit - Core Utility Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "keywords": [
     "core"
   ],

packages/angular_devkit/schematics/package.json

@@ -2,9 +2,6 @@
   "name": "@angular-devkit/schematics",
   "version": "0.0.0",
   "description": "Angular Schematics - Library",
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "keywords": [

packages/angular_devkit/schematics_cli/package.json

@@ -5,9 +5,6 @@
   "bin": {
     "schematics": "./bin/schematics.js"
   },
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "keywords": [
     "blueprints",
     "scaffolding",

packages/ngtools/webpack/package.json

@@ -33,5 +33,9 @@
   "peerDependencies": {
     "typescript": "~2.4.0 || ~2.5.0 || ~2.6.0 || ~2.7.0 || ~2.8.0 || ~2.9.0",
     "webpack": "^4.0.0"
+  },
+  "devDependencies": {
+    "typescript": "~2.9.2",
+    "webpack": "^4.0.0"
   }
 }

packages/schematics/angular/package.json

@@ -7,9 +7,6 @@
     "code generation",
     "schematics"
   ],
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "schematics": "./collection.json",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",

packages/schematics/schematics/package.json

@@ -8,9 +8,6 @@
     "schematics",
     "schematic"
   ],
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "schematics": "./collection.json",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",

packages/schematics/update/package.json

@@ -8,9 +8,6 @@
     "schematics",
     "schematic"
   ],
-  "scripts": {
-    "preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
-  },
   "schematics": "./collection.json",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",

scripts/build.ts

@@ -186,6 +186,10 @@ export default function(argv: { local?: boolean, snapshot?: boolean }, logger: l
     const resources = files
       .map((fileName) => path.relative(pkg.root, fileName))
       .filter(fileName => {
+        if (/(?:^|[\/\\])node_modules[\/\\]/.test(fileName)) {
+          return false;
+        }
+
         // Schematics template files.
         if (pkgJson['schematics'] &&
          (fileName.match(/(\/|\\)files(\/|\\)/) || fileName.match(/(\/|\\)\w+-files(\/|\\)/))) {