From 73352401bca5f852b6258adecd96dd0ae1ed9942 Mon Sep 17 00:00:00 2001 From: Sean Perkins Date: Fri, 10 Nov 2023 12:49:25 -0500 Subject: [PATCH 1/5] chore(ci): bump workflows to run on node v20 --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f455d0d8a..07e931154 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 - name: Build run: | @@ -56,7 +56,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 cache: npm cache-dependency-path: | build/${{ matrix.framework }}/ionic.starter.json @@ -140,7 +140,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 - uses: actions/download-artifact@v3 with: From 75699e62d68551502c636dfb57225b5ce3418989 Mon Sep 17 00:00:00 2001 From: Sean Perkins Date: Thu, 9 Nov 2023 19:48:11 -0500 Subject: [PATCH 2/5] chore: updates angular starters to v17 --- angular-standalone/base/package.json | 46 +++++++++++++--------------- angular/base/package.json | 46 +++++++++++++--------------- 2 files changed, 44 insertions(+), 48 deletions(-) diff --git a/angular-standalone/base/package.json b/angular-standalone/base/package.json index 176fe2109..c592d6e18 100644 --- a/angular-standalone/base/package.json +++ b/angular-standalone/base/package.json @@ -13,48 +13,46 @@ }, "private": true, "dependencies": { - "@angular/animations": "^16.0.0", - "@angular/common": "^16.0.0", - "@angular/compiler": "^16.0.0", - "@angular/core": "^16.0.0", - "@angular/forms": "^16.0.0", - "@angular/platform-browser": "^16.0.0", - "@angular/platform-browser-dynamic": "^16.0.0", - "@angular/router": "^16.0.0", + "@angular/animations": "^17.0.2", + "@angular/common": "^17.0.2", + "@angular/compiler": "^17.0.2", + "@angular/core": "^17.0.2", + "@angular/forms": "^17.0.2", + "@angular/platform-browser": "^17.0.2", + "@angular/platform-browser-dynamic": "^17.0.2", + "@angular/router": "^17.0.2", "@ionic/angular": "^7.5.0", "ionicons": "^7.2.1", "rxjs": "~7.8.0", "tslib": "^2.3.0", - "zone.js": "~0.13.0" + "zone.js": "~0.14.2" }, "devDependencies": { - "@angular-devkit/build-angular": "^16.0.0", - "@angular-eslint/builder": "^16.0.0", - "@angular-eslint/eslint-plugin": "^16.0.0", - "@angular-eslint/eslint-plugin-template": "^16.0.0", - "@angular-eslint/template-parser": "^16.0.0", - "@angular-eslint/schematics": "^16.0.0", - "@angular/cli": "^16.0.0", - "@angular/compiler-cli": "^16.0.0", - "@angular/language-service": "^16.0.0", + "@angular-devkit/build-angular": "^17.0.0", + "@angular-eslint/builder": "^17.0.0", + "@angular-eslint/eslint-plugin": "^17.0.0", + "@angular-eslint/eslint-plugin-template": "^17.0.0", + "@angular-eslint/schematics": "^17.0.0", + "@angular-eslint/template-parser": "^17.0.0", + "@angular/cli": "^17.0.0", + "@angular/compiler-cli": "^17.0.2", + "@angular/language-service": "^17.0.2", "@ionic/angular-toolkit": "^9.0.0", - "@types/jasmine": "~4.3.0", - "@types/node": "^12.11.1", + "@types/jasmine": "~5.1.0", "@typescript-eslint/eslint-plugin": "5.3.0", "@typescript-eslint/parser": "5.3.0", "eslint": "^7.26.0", "eslint-plugin-import": "2.22.1", "eslint-plugin-jsdoc": "30.7.6", "eslint-plugin-prefer-arrow": "1.2.2", - "jasmine-core": "~4.6.0", + "jasmine-core": "~5.1.0", "jasmine-spec-reporter": "~5.0.0", "karma": "~6.4.0", "karma-chrome-launcher": "~3.2.0", "karma-coverage": "~2.2.0", - "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "~5.1.0", - "karma-jasmine-html-reporter": "~2.0.0", + "karma-jasmine-html-reporter": "~2.1.0", "ts-node": "^8.3.0", - "typescript": "~5.0.2" + "typescript": "~5.2.2" } } diff --git a/angular/base/package.json b/angular/base/package.json index 66a7185d6..4899c47c0 100644 --- a/angular/base/package.json +++ b/angular/base/package.json @@ -13,48 +13,46 @@ }, "private": true, "dependencies": { - "@angular/animations": "^16.0.0", - "@angular/common": "^16.0.0", - "@angular/compiler": "^16.0.0", - "@angular/core": "^16.0.0", - "@angular/forms": "^16.0.0", - "@angular/platform-browser": "^16.0.0", - "@angular/platform-browser-dynamic": "^16.0.0", - "@angular/router": "^16.0.0", + "@angular/animations": "^17.0.2", + "@angular/common": "^17.0.2", + "@angular/compiler": "^17.0.2", + "@angular/core": "^17.0.2", + "@angular/forms": "^17.0.2", + "@angular/platform-browser": "^17.0.2", + "@angular/platform-browser-dynamic": "^17.0.2", + "@angular/router": "^17.0.2", "@ionic/angular": "^7.0.0", "ionicons": "^7.0.0", "rxjs": "~7.8.0", "tslib": "^2.3.0", - "zone.js": "~0.13.0" + "zone.js": "~0.14.2" }, "devDependencies": { - "@angular-devkit/build-angular": "^16.0.0", - "@angular-eslint/builder": "^16.0.0", - "@angular-eslint/eslint-plugin": "^16.0.0", - "@angular-eslint/eslint-plugin-template": "^16.0.0", - "@angular-eslint/template-parser": "^16.0.0", - "@angular-eslint/schematics": "^16.0.0", - "@angular/cli": "^16.0.0", - "@angular/compiler-cli": "^16.0.0", - "@angular/language-service": "^16.0.0", + "@angular-devkit/build-angular": "^17.0.0", + "@angular-eslint/builder": "^17.0.0", + "@angular-eslint/eslint-plugin": "^17.0.0", + "@angular-eslint/eslint-plugin-template": "^17.0.0", + "@angular-eslint/schematics": "^17.0.0", + "@angular-eslint/template-parser": "^17.0.0", + "@angular/cli": "^17.0.0", + "@angular/compiler-cli": "^17.0.2", + "@angular/language-service": "^17.0.2", "@ionic/angular-toolkit": "^9.0.0", - "@types/jasmine": "~4.3.0", - "@types/node": "^12.11.1", + "@types/jasmine": "~5.1.0", "@typescript-eslint/eslint-plugin": "5.3.0", "@typescript-eslint/parser": "5.3.0", "eslint": "^7.26.0", "eslint-plugin-import": "2.22.1", "eslint-plugin-jsdoc": "30.7.6", "eslint-plugin-prefer-arrow": "1.2.2", - "jasmine-core": "~4.6.0", + "jasmine-core": "~5.1.0", "jasmine-spec-reporter": "~5.0.0", "karma": "~6.4.0", "karma-chrome-launcher": "~3.2.0", "karma-coverage": "~2.2.0", - "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "~5.1.0", - "karma-jasmine-html-reporter": "~2.0.0", + "karma-jasmine-html-reporter": "~2.1.0", "ts-node": "^8.3.0", - "typescript": "~5.0.2" + "typescript": "~5.2.2" } } From b38c8dc464a495a8e1b878aa72149a8020f21886 Mon Sep 17 00:00:00 2001 From: Sean Perkins Date: Fri, 10 Nov 2023 14:43:39 -0500 Subject: [PATCH 3/5] fix: lint operation for angular starters --- .../official/sidemenu/src/app/app.component.html | 2 +- angular/base/package.json | 4 ++-- angular/official/sidemenu/src/app/app.component.html | 2 +- package.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/angular-standalone/official/sidemenu/src/app/app.component.html b/angular-standalone/official/sidemenu/src/app/app.component.html index 3fd9ace4e..cd12488d5 100644 --- a/angular-standalone/official/sidemenu/src/app/app.component.html +++ b/angular-standalone/official/sidemenu/src/app/app.component.html @@ -4,7 +4,7 @@ Inbox - hi@ionicframework.com + hi@ionicframework.com diff --git a/angular/base/package.json b/angular/base/package.json index 4899c47c0..177f29c11 100644 --- a/angular/base/package.json +++ b/angular/base/package.json @@ -39,8 +39,8 @@ "@angular/language-service": "^17.0.2", "@ionic/angular-toolkit": "^9.0.0", "@types/jasmine": "~5.1.0", - "@typescript-eslint/eslint-plugin": "5.3.0", - "@typescript-eslint/parser": "5.3.0", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", "eslint": "^7.26.0", "eslint-plugin-import": "2.22.1", "eslint-plugin-jsdoc": "30.7.6", diff --git a/angular/official/sidemenu/src/app/app.component.html b/angular/official/sidemenu/src/app/app.component.html index 3fd9ace4e..cd12488d5 100644 --- a/angular/official/sidemenu/src/app/app.component.html +++ b/angular/official/sidemenu/src/app/app.component.html @@ -4,7 +4,7 @@ Inbox - hi@ionicframework.com + hi@ionicframework.com diff --git a/package.json b/package.json index 80b82e29c..a8661dc4e 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "@types/minimist": "^1.2.2", "@types/node": "^18.7.6", "@types/tar": "^6.1.2", - "@typescript-eslint/eslint-plugin": "^5.33.1", - "@typescript-eslint/parser": "^5.33.1", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", "aws-sdk": "^2.1197.0", "colorette": "^2.0.19", "cross-spawn": "^7.0.3", From 612e708c0508b1f213f7846bbbf9ed2f8e7780d7 Mon Sep 17 00:00:00 2001 From: Sean Perkins Date: Fri, 10 Nov 2023 14:54:02 -0500 Subject: [PATCH 4/5] fix: apply same fix to standalone base --- angular-standalone/base/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angular-standalone/base/package.json b/angular-standalone/base/package.json index c592d6e18..30b378346 100644 --- a/angular-standalone/base/package.json +++ b/angular-standalone/base/package.json @@ -39,8 +39,8 @@ "@angular/language-service": "^17.0.2", "@ionic/angular-toolkit": "^9.0.0", "@types/jasmine": "~5.1.0", - "@typescript-eslint/eslint-plugin": "5.3.0", - "@typescript-eslint/parser": "5.3.0", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", "eslint": "^7.26.0", "eslint-plugin-import": "2.22.1", "eslint-plugin-jsdoc": "30.7.6", From 109ebde87f97dd57996613a295ee9e3d786037aa Mon Sep 17 00:00:00 2001 From: Sean Perkins Date: Mon, 13 Nov 2023 10:25:40 -0500 Subject: [PATCH 5/5] chore: migrate angular.json --- angular-standalone/base/angular.json | 6 +++--- angular/base/angular.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/angular-standalone/base/angular.json b/angular-standalone/base/angular.json index 0740e6c7f..951452f36 100644 --- a/angular-standalone/base/angular.json +++ b/angular-standalone/base/angular.json @@ -74,10 +74,10 @@ "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "browserTarget": "app:build:production" + "buildTarget": "app:build:production" }, "development": { - "browserTarget": "app:build:development" + "buildTarget": "app:build:development" }, "ci": { "progress": false @@ -88,7 +88,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "app:build" + "buildTarget": "app:build" } }, "test": { diff --git a/angular/base/angular.json b/angular/base/angular.json index 31a878150..7f7a503f1 100644 --- a/angular/base/angular.json +++ b/angular/base/angular.json @@ -74,10 +74,10 @@ "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "browserTarget": "app:build:production" + "buildTarget": "app:build:production" }, "development": { - "browserTarget": "app:build:development" + "buildTarget": "app:build:development" }, "ci": { "progress": false @@ -88,7 +88,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "app:build" + "buildTarget": "app:build" } }, "test": {