Skip to content

Commit f701930

Browse files
authoredNov 18, 2020
Merge pull request #13141 from ThibaudAV/update-angular-ex
Build: Update example and app to Angular 11
2 parents c8a819d + daec8f9 commit f701930

File tree

6 files changed

+693
-678
lines changed

6 files changed

+693
-678
lines changed
 

‎addons/docs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"util-deprecate": "^1.0.2"
8282
},
8383
"devDependencies": {
84-
"@angular/core": "^10.2.2",
84+
"@angular/core": "^11.0.0",
8585
"@babel/core": "^7.12.3",
8686
"@emotion/core": "^10.1.1",
8787
"@emotion/styled": "^10.0.23",
@@ -112,7 +112,7 @@
112112
"tslib": "^2.0.0",
113113
"web-component-analyzer": "^1.0.3",
114114
"webpack": "^4.44.2",
115-
"zone.js": "^0.10.2"
115+
"zone.js": "^0.11.3"
116116
},
117117
"peerDependencies": {
118118
"@babel/core": "^7.11.5",

‎app/angular/package.json

+11-9
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,31 @@
5454
"webpack": "^4.44.2"
5555
},
5656
"devDependencies": {
57-
"@angular-devkit/build-angular": "~0.1002.0",
58-
"@angular-devkit/core": "^10.2.0",
59-
"@angular/common": "^10.2.2",
60-
"@angular/compiler": "^10.2.2",
61-
"@angular/core": "^10.2.2",
62-
"@angular/forms": "^10.2.2",
63-
"@angular/platform-browser": "^10.2.2",
64-
"@angular/platform-browser-dynamic": "^10.2.2",
57+
"@angular-devkit/build-angular": "~0.1100.1",
58+
"@angular-devkit/core": "^11.0.1",
59+
"@angular/common": "^11.0.0",
60+
"@angular/compiler": "^11.0.0",
61+
"@angular/compiler-cli": "^11.0.0",
62+
"@angular/core": "^11.0.0",
63+
"@angular/forms": "^11.0.0",
64+
"@angular/platform-browser": "^11.0.0",
65+
"@angular/platform-browser-dynamic": "^11.0.0",
6566
"@types/autoprefixer": "^9.4.0"
6667
},
6768
"peerDependencies": {
6869
"@angular-devkit/build-angular": ">=0.8.9",
6970
"@angular-devkit/core": "^0.6.1 || >=7.0.0",
7071
"@angular/common": ">=6.0.0",
7172
"@angular/compiler": ">=6.0.0",
73+
"@angular/compiler-cli": ">=6.0.0",
7274
"@angular/core": ">=6.0.0",
7375
"@angular/forms": ">=6.0.0",
7476
"@angular/platform-browser": ">=6.0.0",
7577
"@angular/platform-browser-dynamic": ">=6.0.0",
7678
"@babel/core": "*",
7779
"rxjs": "^6.0.0",
7880
"typescript": "^3.4.0 || >=4.0.0",
79-
"zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0"
81+
"zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0 || ^0.11.0"
8082
},
8183
"engines": {
8284
"node": ">=8.0.0"

‎examples/angular-cli/angular.json

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"optimization": true,
3939
"outputHashing": "all",
4040
"sourceMap": false,
41-
"extractCss": true,
4241
"namedChunks": false,
4342
"aot": true,
4443
"extractLicenses": true,

‎examples/angular-cli/jest.config.js

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ module.exports = {
99
'ts-jest': {
1010
tsConfig: path.join(__dirname, 'src/tsconfig.spec.json'),
1111
stringifyContentPathRegex: '\\.html$',
12+
astTransformers: {
13+
before: [
14+
'jest-preset-angular/build/InlineFilesTransformer',
15+
'jest-preset-angular/build/StripStylesTransformer',
16+
],
17+
},
1218
},
1319
},
1420
roots: [__dirname],

‎examples/angular-cli/package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919
"test:watch": "jest --watch"
2020
},
2121
"dependencies": {
22-
"@angular/common": "^10.2.2",
23-
"@angular/compiler": "^10.2.2",
24-
"@angular/core": "^10.2.2",
25-
"@angular/forms": "^10.2.2",
26-
"@angular/platform-browser": "^10.2.2",
27-
"@angular/platform-browser-dynamic": "^10.2.2",
22+
"@angular/common": "^11.0.0",
23+
"@angular/compiler": "^11.0.0",
24+
"@angular/core": "^11.0.0",
25+
"@angular/forms": "^11.0.0",
26+
"@angular/platform-browser": "^11.0.0",
27+
"@angular/platform-browser-dynamic": "^11.0.0",
2828
"@ngrx/store": "^10.0.1",
2929
"core-js": "^3.7.0",
3030
"node-sass": "^4.14.0",
3131
"rxjs": "^6.6.3",
32-
"zone.js": "^0.10.2"
32+
"zone.js": "^0.11.3"
3333
},
3434
"devDependencies": {
35-
"@angular-devkit/build-angular": "~0.1002.0",
36-
"@angular-devkit/core": "^10.2.0",
37-
"@angular/cli": "^10.2.0",
38-
"@angular/compiler-cli": "^10.2.2",
35+
"@angular-devkit/build-angular": "~0.1100.1",
36+
"@angular-devkit/core": "^11.0.1",
37+
"@angular/cli": "^11.0.1",
38+
"@angular/compiler-cli": "^11.0.0",
3939
"@compodoc/compodoc": "^1.1.11",
4040
"@storybook/addon-a11y": "6.1.0-rc.4",
4141
"@storybook/addon-actions": "6.1.0-rc.4",
@@ -56,14 +56,14 @@
5656
"@types/webpack-env": "^1.15.3",
5757
"babel-plugin-require-context-hook": "^1.0.0",
5858
"global": "^4.3.2",
59-
"jasmine-core": "~3.5.0",
60-
"jasmine-spec-reporter": "~5.0.2",
59+
"jasmine-core": "~3.6.0",
60+
"jasmine-spec-reporter": "~5.0.0",
6161
"jest": "^26.0.0",
6262
"jest-preset-angular": "^8.3.2",
6363
"protractor": "~7.0.0",
6464
"ts-jest": "^26.4.4",
6565
"ts-node": "^8.10.2",
66-
"typescript": "^3.9.3"
66+
"typescript": "^4.0.5"
6767
},
6868
"storybook": {
6969
"chromatic": {

‎yarn.lock

+660-652
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.