Skip to content

Commit

Permalink
feat: Upgrade to Angular 15
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Libraries that depend on them now require Angular 15 and Jasmine 4.5
  • Loading branch information
ersimont committed Nov 20, 2022
1 parent 682c53d commit 81e664a
Show file tree
Hide file tree
Showing 83 changed files with 3,000 additions and 3,762 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 18.x

- uses: actions/cache@v2
with:
Expand All @@ -18,7 +18,7 @@ jobs:

- run: yarn build-libs

- run: yarn test --no-watch --no-progress --browsers=ChromeHeadlessCI
- run: yarn test --no-watch --no-progress

# build this to make sure no template compile errors crop up that tests don't catch
- run: yarn build integration
Expand All @@ -27,10 +27,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 18.x

- uses: actions/cache@v2
with:
Expand Down
46 changes: 13 additions & 33 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/app-state/src/test.ts",
"tsConfig": "projects/app-state/tsconfig.spec.json",
"karmaConfig": "projects/app-state/karma.conf.js"
"polyfills": ["zone.js", "zone.js/testing"]
}
},
"lint": {
Expand Down Expand Up @@ -66,7 +65,7 @@
"outputPath": "dist/integration",
"index": "projects/integration/src/index.html",
"main": "projects/integration/src/main.ts",
"polyfills": "projects/integration/src/polyfills.ts",
"polyfills": ["zone.js"],
"tsConfig": "projects/integration/tsconfig.app.json",
"assets": [
"projects/integration/src/favicon.ico",
Expand Down Expand Up @@ -95,12 +94,6 @@
"maximumError": "4kb"
}
],
"fileReplacements": [
{
"replace": "projects/integration/src/environments/environment.ts",
"with": "projects/integration/src/environments/environment.prod.ts"
}
],
"outputHashing": "all"
},
"development": {
Expand Down Expand Up @@ -135,15 +128,14 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/integration/src/test.ts",
"polyfills": "projects/integration/src/polyfills.ts",
"polyfills": ["zone.js", "zone.js/testing"],
"tsConfig": "projects/integration/tsconfig.spec.json",
"karmaConfig": "projects/integration/karma.conf.js",
"assets": [
"projects/integration/src/favicon.ico",
"projects/integration/src/assets"
],
"styles": ["projects/integration/src/styles.scss"]
"styles": ["projects/integration/src/styles.scss"],
"scripts": []
}
},
"lint": {
Expand Down Expand Up @@ -181,9 +173,8 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/js-core/src/test.ts",
"tsConfig": "projects/js-core/tsconfig.spec.json",
"karmaConfig": "projects/js-core/karma.conf.js"
"polyfills": ["zone.js", "zone.js/testing"]
}
},
"lint": {
Expand Down Expand Up @@ -221,9 +212,8 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/micro-dash/src/test.ts",
"tsConfig": "projects/micro-dash/tsconfig.spec.json",
"karmaConfig": "projects/micro-dash/karma.conf.js"
"polyfills": ["zone.js", "zone.js/testing"]
}
},
"lint": {
Expand All @@ -250,6 +240,7 @@
"outputPath": "dist/micro-dash-sizes",
"index": "projects/micro-dash-sizes/src/index.html",
"main": "projects/micro-dash-sizes/src/main.ts",
"polyfills": ["zone.js"],
"tsConfig": "projects/micro-dash-sizes/tsconfig.app.json",
"assets": [
"projects/micro-dash-sizes/src/favicon.ico",
Expand All @@ -272,7 +263,6 @@
"maximumError": "4kb"
}
],
"fileReplacements": [],
"outputHashing": "all"
}
},
Expand Down Expand Up @@ -327,10 +317,8 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ng-app-state/src/test.ts",
"tsConfig": "projects/ng-app-state/tsconfig.spec.json",
"karmaConfig": "projects/ng-app-state/karma.conf.js",
"polyfills": "projects/ng-app-state/src/test-polyfills.ts"
"polyfills": ["zone.js", "zone.js/testing"]
}
},
"lint": {
Expand Down Expand Up @@ -368,10 +356,8 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ng-core/src/test.ts",
"tsConfig": "projects/ng-core/tsconfig.spec.json",
"karmaConfig": "projects/ng-core/karma.conf.js",
"polyfills": "projects/ng-core/src/test-polyfills.ts"
"polyfills": ["zone.js", "zone.js/testing"]
}
},
"lint": {
Expand Down Expand Up @@ -409,10 +395,8 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ng-dev/src/test.ts",
"tsConfig": "projects/ng-dev/tsconfig.spec.json",
"karmaConfig": "projects/ng-dev/karma.conf.js",
"polyfills": "projects/ng-dev/src/test-polyfills.ts"
"polyfills": ["zone.js", "zone.js/testing"]
}
},
"lint": {
Expand Down Expand Up @@ -450,10 +434,8 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ng-mat-core/src/test.ts",
"tsConfig": "projects/ng-mat-core/tsconfig.spec.json",
"karmaConfig": "projects/ng-mat-core/karma.conf.js",
"polyfills": "projects/ng-mat-core/src/test-polyfills.ts"
"polyfills": ["zone.js", "zone.js/testing"]
}
},
"lint": {
Expand Down Expand Up @@ -491,10 +473,8 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/rxjs-core/src/test.ts",
"tsConfig": "projects/rxjs-core/tsconfig.spec.json",
"karmaConfig": "projects/rxjs-core/karma.conf.js",
"polyfills": "projects/rxjs-core/src/test-polyfills.ts"
"polyfills": ["zone.js", "zone.js/testing"]
}
},
"lint": {
Expand Down
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,32 @@
"ts-node": "ts-node --project scripts/tsconfig.json"
},
"dependencies": {
"@angular/animations": "^14.0.3",
"@angular/cdk": "^14.0.0",
"@angular/common": "^14.0.3",
"@angular/compiler": "^14.0.3",
"@angular/core": "^14.0.3",
"@angular/forms": "^14.0.3",
"@angular/material": "^14.0.0",
"@angular/platform-browser": "^14.0.3",
"@angular/platform-browser-dynamic": "^14.0.3",
"@angular/router": "^14.0.3",
"@angular/animations": "^15.0.0",
"@angular/cdk": "^15.0.0",
"@angular/common": "^15.0.0",
"@angular/compiler": "^15.0.0",
"@angular/core": "^15.0.0",
"@angular/forms": "^15.0.0",
"@angular/material": "^15.0.0",
"@angular/platform-browser": "^15.0.0",
"@angular/platform-browser-dynamic": "^15.0.0",
"@angular/router": "^15.0.0",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
"utility-types": "~3.10.0",
"zone.js": "~0.11.4"
"zone.js": "~0.12.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^14.0.3",
"@angular-devkit/build-angular": "^15.0.0",
"@angular-eslint/builder": "14.0.0",
"@angular-eslint/eslint-plugin": "14.0.0",
"@angular-eslint/eslint-plugin-template": "14.0.0",
"@angular-eslint/schematics": "14.0.0",
"@angular-eslint/template-parser": "14.0.0",
"@angular/cli": "~14.0.3",
"@angular/compiler-cli": "^14.0.0",
"@angular/cli": "~15.0.0",
"@angular/compiler-cli": "^15.0.0",
"@types/glob": "^7.2.0",
"@types/jasmine": "~4.0.0",
"@types/jasmine": "~4.3.0",
"@types/lodash-es": "^4.17.3",
"@types/node": "^14.0.0",
"@types/prettier": "^2.0.1",
Expand All @@ -52,20 +52,20 @@
"eslint": "^8.18.0",
"expect-type": "^0.13.0",
"glob": "^8.0.3",
"jasmine-core": "~4.1.0",
"karma": "~6.3.0",
"jasmine-core": "~4.5.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"lodash-es": "^4.17.10",
"ng-packagr": "^14.0.0",
"ng-packagr": "^15.0.0",
"prettier": "^2.0.5",
"source-map-explorer": "^2.0.1",
"standard-version": "^9.0.0",
"ts-node": "^10.3.0",
"typedoc": "^0.22.5",
"typescript": "~4.7.2"
"typescript": "~4.8.2"
},
"prettier": {
"trailingComma": "all"
Expand Down
16 changes: 0 additions & 16 deletions projects/app-state/.browserslistrc

This file was deleted.

44 changes: 0 additions & 44 deletions projects/app-state/karma.conf.js

This file was deleted.

31 changes: 0 additions & 31 deletions projects/app-state/src/test.ts

This file was deleted.

2 changes: 1 addition & 1 deletion projects/app-state/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"inlineSources": true,
"types": []
},
"exclude": ["src/test.ts", "**/*.spec.ts"]
"exclude": ["**/*.spec.ts"]
}
1 change: 0 additions & 1 deletion projects/app-state/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
"outDir": "../../out-tsc/spec",
"types": ["jasmine"]
},
"files": ["src/test.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
}
16 changes: 0 additions & 16 deletions projects/integration/.browserslistrc

This file was deleted.

Loading

0 comments on commit 81e664a

Please sign in to comment.