Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Update example and app to Angular 11 #13141

Merged
merged 1 commit into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions addons/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@angular/core": "^10.2.2",
"@angular/core": "^11.0.0",
"@babel/core": "^7.12.3",
"@emotion/core": "^10.1.1",
"@emotion/styled": "^10.0.23",
Expand Down Expand Up @@ -112,7 +112,7 @@
"tslib": "^2.0.0",
"web-component-analyzer": "^1.0.3",
"webpack": "^4.44.2",
"zone.js": "^0.10.2"
"zone.js": "^0.11.3"
},
"peerDependencies": {
"@babel/core": "^7.11.5",
Expand Down
20 changes: 11 additions & 9 deletions app/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,31 @@
"webpack": "^4.44.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1002.0",
"@angular-devkit/core": "^10.2.0",
"@angular/common": "^10.2.2",
"@angular/compiler": "^10.2.2",
"@angular/core": "^10.2.2",
"@angular/forms": "^10.2.2",
"@angular/platform-browser": "^10.2.2",
"@angular/platform-browser-dynamic": "^10.2.2",
"@angular-devkit/build-angular": "~0.1100.1",
"@angular-devkit/core": "^11.0.1",
"@angular/common": "^11.0.0",
"@angular/compiler": "^11.0.0",
"@angular/compiler-cli": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/forms": "^11.0.0",
"@angular/platform-browser": "^11.0.0",
"@angular/platform-browser-dynamic": "^11.0.0",
"@types/autoprefixer": "^9.4.0"
},
"peerDependencies": {
"@angular-devkit/build-angular": ">=0.8.9",
"@angular-devkit/core": "^0.6.1 || >=7.0.0",
"@angular/common": ">=6.0.0",
"@angular/compiler": ">=6.0.0",
"@angular/compiler-cli": ">=6.0.0",
"@angular/core": ">=6.0.0",
"@angular/forms": ">=6.0.0",
"@angular/platform-browser": ">=6.0.0",
"@angular/platform-browser-dynamic": ">=6.0.0",
"@babel/core": "*",
"rxjs": "^6.0.0",
"typescript": "^3.4.0 || >=4.0.0",
"zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0"
"zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0 || ^0.11.0"
},
"engines": {
"node": ">=8.0.0"
Expand Down
1 change: 0 additions & 1 deletion examples/angular-cli/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand Down
6 changes: 6 additions & 0 deletions examples/angular-cli/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ module.exports = {
'ts-jest': {
tsConfig: path.join(__dirname, 'src/tsconfig.spec.json'),
stringifyContentPathRegex: '\\.html$',
astTransformers: {
before: [
'jest-preset-angular/build/InlineFilesTransformer',
'jest-preset-angular/build/StripStylesTransformer',
],
},
},
},
roots: [__dirname],
Expand Down
28 changes: 14 additions & 14 deletions examples/angular-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@angular/common": "^10.2.2",
"@angular/compiler": "^10.2.2",
"@angular/core": "^10.2.2",
"@angular/forms": "^10.2.2",
"@angular/platform-browser": "^10.2.2",
"@angular/platform-browser-dynamic": "^10.2.2",
"@angular/common": "^11.0.0",
"@angular/compiler": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/forms": "^11.0.0",
"@angular/platform-browser": "^11.0.0",
"@angular/platform-browser-dynamic": "^11.0.0",
"@ngrx/store": "^10.0.1",
"core-js": "^3.7.0",
"node-sass": "^4.14.0",
"rxjs": "^6.6.3",
"zone.js": "^0.10.2"
"zone.js": "^0.11.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1002.0",
"@angular-devkit/core": "^10.2.0",
"@angular/cli": "^10.2.0",
"@angular/compiler-cli": "^10.2.2",
"@angular-devkit/build-angular": "~0.1100.1",
"@angular-devkit/core": "^11.0.1",
"@angular/cli": "^11.0.1",
"@angular/compiler-cli": "^11.0.0",
"@compodoc/compodoc": "^1.1.11",
"@storybook/addon-a11y": "6.1.0-rc.4",
"@storybook/addon-actions": "6.1.0-rc.4",
Expand All @@ -56,14 +56,14 @@
"@types/webpack-env": "^1.15.3",
"babel-plugin-require-context-hook": "^1.0.0",
"global": "^4.3.2",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~5.0.2",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"jest": "^26.0.0",
"jest-preset-angular": "^8.3.2",
"protractor": "~7.0.0",
"ts-jest": "^26.4.4",
"ts-node": "^8.10.2",
"typescript": "^3.9.3"
"typescript": "^4.0.5"
},
"storybook": {
"chromatic": {
Expand Down
Loading