Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Commit 35cdbe5

Browse files
authored
Merge branch 'master' into webpack-define_plugin-support
2 parents 47dcf2c + cffb225 commit 35cdbe5

File tree

47 files changed

+1025
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1025
-218
lines changed

.appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
environment:
2-
matrix:
3-
- nodejs_version: "8"
2+
nodejs_version: "10"
43

54
matrix:
65
fast_finish: true
76

87
install:
98
- ps: Install-Product node $env:nodejs_version
10-
- npm install -g npm@~5.6.0
119
- npm install
1210
# Appveyor (via chocolatey) cannot use older versions of Chrome:
1311
# https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/googlechrome
@@ -20,6 +18,7 @@ test_script:
2018
- npm run test-large
2119

2220
build: off
21+
deploy: off
2322

2423
cache:
2524
- node_modules -> package-lock.json

.monorepo.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@
4242
},
4343
"packages": {
4444
"@_/benchmark": {
45-
"version": "0.6.1",
46-
"hash": "37ed7e417435c92dbf301e7b26ea37ca"
45+
"version": "0.6.3",
46+
"hash": "195d853a0c3edbfbe572d39539a82f9e"
4747
},
4848
"devkit": {
49-
"version": "0.6.1",
50-
"hash": "18d55af567c3461aee6c0b94ecf81878"
49+
"version": "0.6.3",
50+
"hash": "85a4710057dd50aa7d0d54d266358c5c"
5151
},
5252
"@angular/pwa": {
5353
"name": "Angular PWA Schematics",
5454
"section": "Schematics",
55-
"version": "0.6.1",
56-
"hash": "439e05ee179b0f0e63baefcba68dff55",
55+
"version": "0.6.3",
56+
"hash": "9808150cc9c9d68ac8f68ef3662773b6",
5757
"snapshotRepo": "angular/angular-pwa-builds"
5858
},
5959
"@angular-devkit/architect": {
@@ -64,14 +64,14 @@
6464
"url": "https://github.com/angular/devkit/blob/master/packages/angular_devkit/architect/README.md"
6565
}
6666
],
67-
"version": "0.6.1",
68-
"hash": "a2fe73fb9e09cf60e998a7f8892fb465",
67+
"version": "0.6.3",
68+
"hash": "d6e4e5a1b2979f169377fde83bb10c81",
6969
"snapshotRepo": "angular/angular-devkit-architect-builds"
7070
},
7171
"@angular-devkit/architect-cli": {
7272
"name": "Architect CLI",
73-
"version": "0.6.1",
74-
"hash": "29dff2bc7c6fa40d3b015577da4093c3",
73+
"version": "0.6.3",
74+
"hash": "ab944fad093ff4ca8aabbd05e13d90ea",
7575
"snapshotRepo": "angular/angular-devkit-architect-cli-builds"
7676
},
7777
"@angular-devkit/build-optimizer": {
@@ -82,8 +82,8 @@
8282
"url": "https://github.com/angular/devkit/blob/master/packages/angular_devkit/build_optimizer/README.md"
8383
}
8484
],
85-
"version": "0.6.1",
86-
"hash": "fd4d836b3fb974620df922459b2328fa",
85+
"version": "0.6.3",
86+
"hash": "be1d628217e787afd2d354a5d333a452",
8787
"snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
8888
},
8989
"@angular-devkit/build-ng-packagr": {
@@ -94,8 +94,8 @@
9494
"url": "https://github.com/angular/devkit/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
9595
}
9696
],
97-
"version": "0.6.1",
98-
"hash": "b0768e12ade77f034265570808ef95e8",
97+
"version": "0.6.3",
98+
"hash": "0efd712119b51af484ea81b38283eaa4",
9999
"snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
100100
},
101101
"@angular-devkit/build-angular": {
@@ -106,8 +106,8 @@
106106
"url": "https://github.com/angular/devkit/blob/master/packages/angular_devkit/build_angular/README.md"
107107
}
108108
],
109-
"version": "0.6.1",
110-
"hash": "eb9424df0ac555c4a66061dda1f72a10",
109+
"version": "0.6.3",
110+
"hash": "5d33c1706ab096941e491d9faaed8485",
111111
"snapshotRepo": "angular/angular-devkit-build-angular-builds"
112112
},
113113
"@angular-devkit/core": {
@@ -118,8 +118,8 @@
118118
"url": "https://github.com/angular/devkit/blob/master/packages/angular_devkit/core/README.md"
119119
}
120120
],
121-
"version": "0.6.1",
122-
"hash": "b78aa2710b2e9408e535490068ee9b7a",
121+
"version": "0.6.3",
122+
"hash": "7ff1e423d057b8e5b2758804a30fa8f9",
123123
"snapshotRepo": "angular/angular-devkit-core-builds"
124124
},
125125
"@angular-devkit/schematics": {
@@ -130,49 +130,49 @@
130130
"url": "https://github.com/angular/devkit/blob/master/packages/angular_devkit/schematics/README.md"
131131
}
132132
],
133-
"version": "0.6.1",
134-
"hash": "c7229eed530647c85df80c4c650f9f02",
133+
"version": "0.6.3",
134+
"hash": "9f83e8b9fb3b6064fc97ffd7349db486",
135135
"snapshotRepo": "angular/angular-devkit-schematics-builds"
136136
},
137137
"@angular-devkit/schematics-cli": {
138138
"name": "Schematics CLI",
139-
"version": "0.6.1",
140-
"hash": "fb9e6312c7f535096e6dbad3cb22d3f1",
139+
"version": "0.6.3",
140+
"hash": "9b4b991fda1a484ae44562297687549b",
141141
"snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
142142
},
143143
"@ngtools/webpack": {
144144
"name": "Webpack Angular Plugin",
145-
"version": "6.0.1",
145+
"version": "6.0.3",
146146
"section": "Misc",
147-
"hash": "983166b58b674611530c804f01e42f69",
147+
"hash": "27060cb95b1fe46372a001af67ed59d9",
148148
"snapshotRepo": "angular/ngtools-webpack-builds"
149149
},
150150
"@schematics/angular": {
151151
"name": "Angular Schematics",
152152
"section": "Schematics",
153-
"version": "0.6.1",
154-
"hash": "29ffdd1cbdd7761b7566b6e829b3a6b2",
153+
"version": "0.6.3",
154+
"hash": "823149b7910d4b30c976a445cedb650d",
155155
"snapshotRepo": "angular/schematics-angular-builds"
156156
},
157157
"@schematics/schematics": {
158158
"name": "Schematics Schematics",
159-
"version": "0.6.1",
159+
"version": "0.6.3",
160160
"section": "Schematics",
161-
"hash": "cdbcf1590bc06fb0b7d2a78256553fc7",
161+
"hash": "538abe124e644ed61087b7205e862a88",
162162
"snapshotRepo": "angular/schematics-schematics-builds"
163163
},
164164
"@schematics/package-update": {
165165
"name": "Package JSON Update Schematics",
166-
"version": "0.6.1",
166+
"version": "0.6.3",
167167
"section": "Schematics",
168-
"hash": "6d733ede048305b97646deaeda3ffc28",
168+
"hash": "99e9e8ff20d0b3dd710861c4912b59c9",
169169
"snapshotRepo": "angular/schematics-package-update-builds"
170170
},
171171
"@schematics/update": {
172172
"name": "Package Update Schematics",
173-
"version": "0.6.1",
173+
"version": "0.6.3",
174174
"section": "Schematics",
175-
"hash": "c8828f05bd165b63b9d074b45dcafc23",
175+
"hash": "02acb20b18b25170e54e2cf263b807d1",
176176
"snapshotRepo": "angular/schematics-update-builds"
177177
}
178178
}

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,29 @@ This is a monorepo which contains many packages:
5050

5151
| Project | Package | Version | Links |
5252
|---|---|---|---|
53-
**Architect** | [`@angular-devkit/architect`](https://npmjs.com/package/@angular-devkit/architect) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect/latest.svg)](https://npmjs.com/package/@angular-devkit/architect) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/architect/README.md)
54-
**Architect CLI** | [`@angular-devkit/architect-cli`](https://npmjs.com/package/@angular-devkit/architect-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/architect-cli) |
55-
**Build Angular** | [`@angular-devkit/build-angular`](https://npmjs.com/package/@angular-devkit/build-angular) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-angular/latest.svg)](https://npmjs.com/package/@angular-devkit/build-angular) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/build_angular/README.md)
56-
**Build NgPackagr** | [`@angular-devkit/build-ng-packagr`](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-ng-packagr/latest.svg)](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/build_ng_packagr/README.md)
57-
**Build Optimizer** | [`@angular-devkit/build-optimizer`](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-optimizer/latest.svg)](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/build_optimizer/README.md)
58-
**Core** | [`@angular-devkit/core`](https://npmjs.com/package/@angular-devkit/core) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fcore/latest.svg)](https://npmjs.com/package/@angular-devkit/core) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/core/README.md)
59-
**Schematics** | [`@angular-devkit/schematics`](https://npmjs.com/package/@angular-devkit/schematics) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/schematics/README.md)
60-
**Schematics CLI** | [`@angular-devkit/schematics-cli`](https://npmjs.com/package/@angular-devkit/schematics-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics-cli) |
53+
**Architect** | [`@angular-devkit/architect`](https://npmjs.com/package/@angular-devkit/architect) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect/latest.svg)](https://npmjs.com/package/@angular-devkit/architect) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/architect/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-builds)
54+
**Architect CLI** | [`@angular-devkit/architect-cli`](https://npmjs.com/package/@angular-devkit/architect-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/architect-cli) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-cli-builds)
55+
**Build Angular** | [`@angular-devkit/build-angular`](https://npmjs.com/package/@angular-devkit/build-angular) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-angular/latest.svg)](https://npmjs.com/package/@angular-devkit/build-angular) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/build_angular/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-angular-builds)
56+
**Build NgPackagr** | [`@angular-devkit/build-ng-packagr`](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-ng-packagr/latest.svg)](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/build_ng_packagr/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-ng-packagr-builds)
57+
**Build Optimizer** | [`@angular-devkit/build-optimizer`](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-optimizer/latest.svg)](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/build_optimizer/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-optimizer-builds)
58+
**Core** | [`@angular-devkit/core`](https://npmjs.com/package/@angular-devkit/core) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fcore/latest.svg)](https://npmjs.com/package/@angular-devkit/core) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/core/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-core-builds)
59+
**Schematics** | [`@angular-devkit/schematics`](https://npmjs.com/package/@angular-devkit/schematics) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/devkit/blob/master/packages/angular_devkit/schematics/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-builds)
60+
**Schematics CLI** | [`@angular-devkit/schematics-cli`](https://npmjs.com/package/@angular-devkit/schematics-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics-cli) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-cli-builds)
6161

6262
#### Schematics
6363

6464
| Project | Package | Version | Links |
6565
|---|---|---|---|
66-
**Angular PWA Schematics** | [`@angular/pwa`](https://npmjs.com/package/@angular/pwa) | [![latest](https://img.shields.io/npm/v/%40angular%2Fpwa/latest.svg)](https://npmjs.com/package/@angular/pwa) |
67-
**Angular Schematics** | [`@schematics/angular`](https://npmjs.com/package/@schematics/angular) | [![latest](https://img.shields.io/npm/v/%40schematics%2Fangular/latest.svg)](https://npmjs.com/package/@schematics/angular) |
68-
**Package JSON Update Schematics** | [`@schematics/package-update`](https://npmjs.com/package/@schematics/package-update) | [![latest](https://img.shields.io/npm/v/%40schematics%2Fpackage-update/latest.svg)](https://npmjs.com/package/@schematics/package-update) |
69-
**Schematics Schematics** | [`@schematics/schematics`](https://npmjs.com/package/@schematics/schematics) | [![latest](https://img.shields.io/npm/v/%40schematics%2Fschematics/latest.svg)](https://npmjs.com/package/@schematics/schematics) |
70-
**Package Update Schematics** | [`@schematics/update`](https://npmjs.com/package/@schematics/update) | [![latest](https://img.shields.io/npm/v/%40schematics%2Fupdate/latest.svg)](https://npmjs.com/package/@schematics/update) |
66+
**Angular PWA Schematics** | [`@angular/pwa`](https://npmjs.com/package/@angular/pwa) | [![latest](https://img.shields.io/npm/v/%40angular%2Fpwa/latest.svg)](https://npmjs.com/package/@angular/pwa) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-pwa-builds)
67+
**Angular Schematics** | [`@schematics/angular`](https://npmjs.com/package/@schematics/angular) | [![latest](https://img.shields.io/npm/v/%40schematics%2Fangular/latest.svg)](https://npmjs.com/package/@schematics/angular) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/schematics-angular-builds)
68+
**Package JSON Update Schematics** | [`@schematics/package-update`](https://npmjs.com/package/@schematics/package-update) | [![latest](https://img.shields.io/npm/v/%40schematics%2Fpackage-update/latest.svg)](https://npmjs.com/package/@schematics/package-update) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/schematics-package-update-builds)
69+
**Schematics Schematics** | [`@schematics/schematics`](https://npmjs.com/package/@schematics/schematics) | [![latest](https://img.shields.io/npm/v/%40schematics%2Fschematics/latest.svg)](https://npmjs.com/package/@schematics/schematics) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/schematics-schematics-builds)
70+
**Package Update Schematics** | [`@schematics/update`](https://npmjs.com/package/@schematics/update) | [![latest](https://img.shields.io/npm/v/%40schematics%2Fupdate/latest.svg)](https://npmjs.com/package/@schematics/update) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/schematics-update-builds)
7171

7272
#### Misc
7373

7474
| Project | Package | Version | Links |
7575
|---|---|---|---|
76-
**Webpack Angular Plugin** | [`@ngtools/webpack`](https://npmjs.com/package/@ngtools/webpack) | [![latest](https://img.shields.io/npm/v/%40ngtools%2Fwebpack/latest.svg)](https://npmjs.com/package/@ngtools/webpack) |
76+
**Webpack Angular Plugin** | [`@ngtools/webpack`](https://npmjs.com/package/@ngtools/webpack) | [![latest](https://img.shields.io/npm/v/%40ngtools%2Fwebpack/latest.svg)](https://npmjs.com/package/@ngtools/webpack) | [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/ngtools-webpack-builds)
7777

7878

0 commit comments

Comments
 (0)