Skip to content

Commit c729b0e

Browse files
clydinhansl
clydin
authored and
hansl
committed
build: use yarn workspaces
1 parent 7b9cd20 commit c729b0e

File tree

21 files changed

+8439
-139
lines changed

21 files changed

+8439
-139
lines changed

‎.appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ matrix:
88

99
install:
1010
- ps: Install-Product node $env:nodejs_version
11-
- npm install
11+
- yarn install --frozen-lockfile
1212
# Appveyor (via chocolatey) cannot use older versions of Chrome:
1313
# https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/googlechrome
1414
- npm run webdriver-update-appveyor
@@ -23,4 +23,4 @@ build: off
2323
deploy: off
2424

2525
cache:
26-
- node_modules -> package-lock.json
26+
- node_modules -> yarn.lock

‎.circleci/config.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ version: 2
33
_defaults: &defaults
44
working_directory: ~/ng
55
docker:
6-
- image: angular/ngcontainer:0.3.0
6+
- image: angular/ngcontainer:0.3.3
77

88
_post_checkout: &post_checkout
99
post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
1010

1111
_root_package_lock_key: &_root_package_lock_key
12-
key: angular_devkit-{{ checksum "package-lock.json" }}-0.3.0
12+
key: angular_devkit-{{ checksum "yarn.lock" }}-0.3.3
1313

1414
jobs:
1515
install:
1616
<<: *defaults
1717
steps:
1818
- checkout: *post_checkout
1919
- restore_cache: *_root_package_lock_key
20-
- run: npm install --no-save
20+
- run: yarn install --frozen-lockfile
2121
- save_cache:
2222
<<: *_root_package_lock_key
2323
paths:
@@ -64,7 +64,7 @@ jobs:
6464
- checkout: *post_checkout
6565
- restore_cache: *_root_package_lock_key
6666
- run: npm install --global [email protected]
67-
- run: xvfb-run -a npm run test-cli-e2e -- --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
67+
- run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
6868

6969
build:
7070
<<: *defaults
@@ -79,7 +79,6 @@ jobs:
7979
steps:
8080
- checkout: *post_checkout
8181
- run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
82-
- run: bazel run @nodejs//:npm install
8382
- run: bazel build //packages/...
8483

8584
snapshot_publish:

‎lib/packages.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ function loadPackageJson(p: string) {
9191
case 'optionalDependencies':
9292
case 'typings':
9393
case 'version':
94+
case 'private':
95+
case 'workspaces':
96+
case 'resolutions':
9497
continue;
9598

9699
// Remove the following keys from the package.json.
@@ -129,6 +132,8 @@ function _findAllPackageJson(dir: string, exclude: RegExp): string[] {
129132

130133
if (exclude.test(p)) {
131134
return;
135+
} else if (/[\/\\]node_modules[\/\\]/.test(p)) {
136+
return;
132137
} else if (fileName == 'package.json') {
133138
result.push(p);
134139
} else if (fs.statSync(p).isDirectory()) {

‎package.json‎

Lines changed: 30 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
2-
"name": "@angular-devkit/devkit",
3-
"version": "0.0.0",
2+
"private": true,
43
"description": "Software Development Kit for Angular",
54
"bin": {
65
"architect": "./bin/architect",
@@ -50,119 +49,59 @@
5049
"url": "https://github.com/angular/angular-cli/issues"
5150
},
5251
"homepage": "https://github.com/angular/angular-cli",
52+
"workspaces": [
53+
"packages/angular/*",
54+
"packages/angular_devkit/*",
55+
"packages/ngtools/*",
56+
"packages/schematics/*"
57+
],
5358
"dependencies": {
54-
"@angular/animations": "^6.1.0",
55-
"@angular/cdk": "^6.1.0",
56-
"@angular/common": "^6.1.0",
57-
"@angular/compiler": "^6.1.0",
58-
"@angular/compiler-cli": "^6.1.0",
59-
"@angular/core": "^6.1.0",
60-
"@angular/http": "^6.1.0",
61-
"@angular/material": "^6.1.0",
62-
"@angular/platform-browser": "^6.1.0",
63-
"@angular/platform-browser-dynamic": "^6.1.0",
64-
"@angular/platform-server": "^6.1.0",
65-
"@angular/router": "^6.1.0",
66-
"@angular/service-worker": "^6.1.0",
67-
"@ngtools/json-schema": "^1.0.9",
68-
"ajv": "~6.4.0",
69-
"autoprefixer": "^8.4.1",
70-
"bootstrap": "^4.0.0",
71-
"chokidar": "^2.0.3",
72-
"circular-dependency-plugin": "^5.0.2",
73-
"clean-css": "^4.1.11",
74-
"codelyzer": "^4.2.1",
75-
"conventional-changelog": "^1.1.0",
76-
"copy-webpack-plugin": "^4.5.2",
77-
"express": "^4.16.2",
78-
"file-loader": "^1.1.11",
79-
"font-awesome": "^4.7.0",
8059
"glob": "^7.0.3",
81-
"html-webpack-plugin": "^3.0.6",
82-
"husky": "^0.14.3",
83-
"istanbul": "^0.4.5",
84-
"istanbul-instrumenter-loader": "^3.0.1",
85-
"jasmine": "^2.6.0",
86-
"jasmine-spec-reporter": "^3.2.0",
87-
"jquery": "^3.3.1",
88-
"karma": "~1.7.1",
89-
"karma-chrome-launcher": "~2.2.0",
90-
"karma-cli": "~1.0.1",
91-
"karma-coverage-istanbul-reporter": "^2.0.0",
92-
"karma-jasmine": "~1.1.0",
93-
"karma-jasmine-html-reporter": "^0.2.2",
94-
"karma-source-map-support": "^1.2.0",
95-
"less": "^3.0.4",
96-
"less-loader": "^4.1.0",
97-
"license-webpack-plugin": "^1.3.1",
98-
"loader-utils": "^1.1.0",
99-
"material-design-icons": "^3.0.1",
100-
"mini-css-extract-plugin": "~0.4.0",
101-
"minimatch": "^3.0.4",
102-
"minimist": "^1.2.0",
103-
"ng-packagr": "^4.0.0",
104-
"node-sass": "^4.9.1",
105-
"npm-registry-client": "^8.5.1",
106-
"opn": "^5.1.0",
107-
"parse5": "^4.0.0",
108-
"popper.js": "^1.14.1",
109-
"portfinder": "^1.0.13",
110-
"postcss": "^6.0.22",
111-
"postcss-import": "^11.1.0",
112-
"postcss-loader": "^2.1.5",
113-
"postcss-url": "^7.3.2",
114-
"protractor": "~5.4.0",
115-
"raw-loader": "^0.5.1",
116-
"rxjs": "^6.0.0",
117-
"sass-loader": "~6.0.7",
118-
"semver": "^5.3.0",
119-
"semver-intersect": "^1.1.2",
120-
"source-map": "^0.5.6",
121-
"source-map-loader": "^0.2.3",
122-
"source-map-support": "^0.5.0",
123-
"stats-webpack-plugin": "^0.6.2",
124-
"style-loader": "^0.21.0",
125-
"stylus": "^0.54.5",
126-
"stylus-loader": "^3.0.2",
127-
"symbol-observable": "^1.2.0",
12860
"temp": "^0.8.3",
129-
"tree-kill": "^1.2.0",
130-
"ts-node": "^5.0.0",
131-
"tslint": "^5.9.1",
132-
"tslint-sonarts": "^1.7.0",
133-
"tsutils": "~2.22.2",
134-
"typescript": "~2.9.2",
135-
"uglifyjs-webpack-plugin": "^1.2.5",
136-
"url-loader": "^1.0.1",
137-
"webpack": "^4.15.1",
138-
"webpack-dev-middleware": "^3.1.3",
139-
"webpack-dev-server": "^3.1.4",
140-
"webpack-merge": "^4.1.2",
141-
"webpack-sources": "^1.1.0",
142-
"webpack-subresource-integrity": "^1.1.0-rc.4",
143-
"zone.js": "^0.8.19"
61+
"tslint": "^5.11.0",
62+
"typescript": "~2.9.2"
14463
},
14564
"devDependencies": {
65+
"@ngtools/json-schema": "^1.1.0",
14666
"@types/copy-webpack-plugin": "^4.4.1",
14767
"@types/express": "^4.16.0",
14868
"@types/glob": "^5.0.35",
14969
"@types/istanbul": "^0.4.30",
15070
"@types/jasmine": "^2.8.8",
15171
"@types/loader-utils": "^1.1.3",
15272
"@types/minimist": "^1.2.0",
153-
"@types/node": "^8.9.4",
73+
"@types/node": "8.10.10",
15474
"@types/request": "^2.47.1",
15575
"@types/semver": "^5.5.0",
15676
"@types/source-map": "0.5.2",
15777
"@types/webpack": "^4.4.0",
15878
"@types/webpack-dev-server": "^2.9.4",
15979
"@types/webpack-sources": "^0.1.4",
16080
"common-tags": "^1.8.0",
81+
"conventional-changelog": "^1.1.0",
16182
"conventional-commits-parser": "^3.0.0",
16283
"gh-got": "^7.0.0",
16384
"git-raw-commits": "^2.0.0",
85+
"husky": "^0.14.3",
86+
"istanbul": "^0.4.5",
87+
"jasmine": "^2.6.0",
88+
"jasmine-spec-reporter": "^3.2.0",
16489
"license-checker": "^20.1.0",
90+
"minimatch": "^3.0.4",
91+
"minimist": "^1.2.0",
92+
"semver": "^5.3.0",
93+
"source-map": "^0.5.6",
94+
"source-map-support": "^0.5.0",
95+
"spdx-satisfies": "^4.0.0",
96+
"through2": "^2.0.3",
97+
"ts-node": "^5.0.0",
16598
"tslint-no-circular-imports": "^0.5.0",
99+
"tslint-sonarts": "^1.7.0",
166100
"tar": "^4.4.4"
101+
},
102+
"resolutions": {
103+
"@types/webpack": "4.4.0",
104+
"@types/webpack-dev-server": "2.9.4",
105+
"rxjs": "6.0.0"
167106
}
168107
}

‎packages/angular/cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular/cli",
3-
"version": "6.1.0-beta.0",
3+
"version": "0.0.0",
44
"description": "CLI tool for Angular",
55
"main": "lib/cli/index.js",
66
"trackingCode": "UA-8594346-19",

‎packages/angular/pwa/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
"code generation",
88
"schematics"
99
],
10-
"scripts": {
11-
"preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
12-
},
1310
"schematics": "./collection.json",
1411
"dependencies": {
1512
"@angular-devkit/core": "0.0.0",

‎packages/angular_devkit/architect/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
"description": "Angular Build Facade",
55
"main": "src/index.js",
66
"typings": "src/index.d.ts",
7-
"scripts": {
8-
"preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
9-
},
107
"dependencies": {
118
"@angular-devkit/core": "0.0.0",
129
"rxjs": "^6.0.0"

‎packages/angular_devkit/architect_cli/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
"bin": {
66
"architect": "./bin/architect.js"
77
},
8-
"scripts": {
9-
"preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
10-
},
118
"keywords": [
129
"build system",
1310
"build facade",

‎packages/angular_devkit/build_angular/package.json‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
"main": "src/index.js",
66
"typings": "src/index.d.ts",
77
"builders": "builders.json",
8-
"scripts": {
9-
"preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
10-
},
118
"dependencies": {
129
"@angular-devkit/architect": "0.0.0",
1310
"@angular-devkit/build-optimizer": "0.0.0",
@@ -60,5 +57,37 @@
6057
},
6158
"optionalDependencies": {
6259
"node-sass": "^4.9.1"
60+
},
61+
"devDependencies": {
62+
"@angular/animations": "^6.1.0",
63+
"@angular/cdk": "^6.1.0",
64+
"@angular/common": "^6.1.0",
65+
"@angular/compiler": "^6.1.0",
66+
"@angular/compiler-cli": "^6.1.0",
67+
"@angular/core": "^6.1.0",
68+
"@angular/http": "^6.1.0",
69+
"@angular/material": "^6.1.0",
70+
"@angular/platform-browser": "^6.1.0",
71+
"@angular/platform-browser-dynamic": "^6.1.0",
72+
"@angular/platform-server": "^6.1.0",
73+
"@angular/router": "^6.1.0",
74+
"@angular/service-worker": "^6.1.0",
75+
"codelyzer": "^4.2.1",
76+
"core-js": "^2.4.1",
77+
"bootstrap": "^4.0.0",
78+
"font-awesome": "^4.7.0",
79+
"jquery": "^3.3.1",
80+
"jasmine-core": "~2.8.0",
81+
"jasmine-spec-reporter": "~4.2.1",
82+
"karma": "~2.0.0",
83+
"karma-chrome-launcher": "~2.2.0",
84+
"karma-cli": "~1.0.1",
85+
"karma-coverage-istanbul-reporter": "~2.0.0",
86+
"karma-jasmine": "~1.1.0",
87+
"karma-jasmine-html-reporter": "^0.2.2",
88+
"material-design-icons": "^3.0.1",
89+
"popper.js": "^1.14.1",
90+
"protractor": "~5.4.0",
91+
"zone.js": "^0.8.19"
6392
}
6493
}

‎packages/angular_devkit/build_ng_packagr/package.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
"main": "src/index.js",
66
"typings": "src/index.d.ts",
77
"builders": "builders.json",
8-
"scripts": {
9-
"preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
10-
},
118
"dependencies": {
129
"@angular-devkit/architect": "0.0.0",
1310
"@angular-devkit/core": "0.0.0",
@@ -16,5 +13,12 @@
1613
},
1714
"peerDependencies": {
1815
"ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
16+
},
17+
"devDependencies": {
18+
"@angular/compiler": "^6.1.0",
19+
"@angular/compiler-cli": "^6.1.0",
20+
"ng-packagr": "^4.0.0",
21+
"tsickle": ">=0.27.3",
22+
"tslib": "^1.9.0"
1923
}
2024
}

0 commit comments

Comments
 (0)