From aa32beda48c1c9dab9f646d2db7961a19477c68c Mon Sep 17 00:00:00 2001 From: danielwiehl Date: Tue, 17 Nov 2020 18:16:15 +0100 Subject: [PATCH] chore(workbench): update @scion/workbench to Angular 11 closes #234 BREAKING CHANGE: Added support for Angular 11. To migrate: Migrate your app to Angular 11 as following: - Run `ng update @angular/cli @angular/core @angular/cdk`. - Refer to the Angular Update Guide for detailed instructions on how to update Angular: https://update.angular.io/ --- README.md | 1 + angular.json | 3 +- apps/workbench-testing-app/.browserslistrc | 2 - .../view-navigation.component.html | 16 +- apps/workbench-testing-app/src/polyfills.ts | 5 +- apps/workbench-testing-app/tsconfig.app.json | 5 +- package-lock.json | 5660 +++++++++-------- package.json | 60 +- .../scion/workbench.e2e/protractor.conf.js | 5 +- .../workbench.e2e/src/page-object/app.po.ts | 70 +- .../src/page-object/sci-params-enter.po.ts | 3 +- projects/scion/workbench.e2e/tsconfig.json | 3 +- projects/scion/workbench/karma.conf.js | 13 +- projects/scion/workbench/package.json | 14 +- .../src/lib/activity-part/activity.ts | 9 +- .../src/lib/layout/parts-layout.spec.ts | 4 +- .../lib/message-box/message-box.component.ts | 11 +- .../src/lib/message-box/message-box.ts | 16 +- .../notification/notification.component.ts | 10 +- .../src/lib/notification/notification.ts | 16 +- .../workbench/src/lib/popup/popup.service.ts | 9 +- ...ctivities-from-lazy-loaded-modules.spec.ts | 4 +- .../src/lib/spec/activity-action.spec.ts | 4 +- .../src/lib/spec/activity-guard.spec.ts | 4 +- .../workbench/src/lib/spec/activity.spec.ts | 4 +- .../spec/lazy-loaded-view-injection.spec.ts | 4 +- .../src/lib/spec/route-resolve.spec.ts | 4 +- .../src/lib/spec/router-navigate.spec.ts | 28 +- .../src/lib/spec/view.component.spec.ts | 4 +- .../views-from-lazy-loaded-modules.spec.ts | 4 +- .../lib/spec/wb-route-reuse-strategy.spec.ts | 4 +- .../view-tab-drag-image-renderer.service.ts | 18 +- .../view-context-menu/view-menu.service.ts | 211 +- .../view-list-button.component.ts | 7 +- .../view-part-action-bar.component.ts | 8 +- .../view-part/view-tab/view-tab.component.ts | 15 +- .../view-part/workbench-view-part.model.ts | 2 +- .../src/lib/view/workbench-view.model.ts | 2 +- .../lib/view/workbench-view.registry.spec.ts | 4 +- .../workbench/src/lib/workbench.config.ts | 6 +- .../workbench/src/lib/workbench.service.ts | 4 +- projects/scion/workbench/tsconfig.lib.json | 5 +- .../scion/workbench/tsconfig.lib.prod.json | 3 + projects/scion/workbench/tsconfig.spec.json | 2 +- tsconfig.base.json | 67 - tsconfig.json | 89 +- tslint.json | 193 +- 47 files changed, 3542 insertions(+), 3093 deletions(-) delete mode 100644 tsconfig.base.json diff --git a/README.md b/README.md index 20339e868..c34696add 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ While the SCION Workbench can be used in regular Angular applications, it is par *** ### Versions +- `v11.0.0-beta.1` and newer are only compatible with Angular version 11.x. (no microfrontend support yet) - `v0.0.0-beta.35` and newer are only compatible with Angular version 10.x. - `v0.0.0-beta.33` and newer are only compatible with Angular version 9.x. - `v0.0.0-beta.23` to `v0.0.0-beta.32` is only compatible with Angular version 8.x. diff --git a/angular.json b/angular.json index 76cf75b91..92d09600d 100644 --- a/angular.json +++ b/angular.json @@ -10,7 +10,7 @@ "prefix": "wb", "architect": { "build": { - "builder": "@angular-devkit/build-ng-packagr:build", + "builder": "@angular-devkit/build-angular:ng-packagr", "options": { "tsConfig": "projects/scion/workbench/tsconfig.lib.json", "project": "projects/scion/workbench/ng-package.json" @@ -114,7 +114,6 @@ "optimization": true, "outputHashing": "all", "sourceMap": false, - "extractCss": true, "namedChunks": false, "extractLicenses": true, "vendorChunk": false, diff --git a/apps/workbench-testing-app/.browserslistrc b/apps/workbench-testing-app/.browserslistrc index bcd20f90d..bf5f2b928 100644 --- a/apps/workbench-testing-app/.browserslistrc +++ b/apps/workbench-testing-app/.browserslistrc @@ -24,6 +24,4 @@ last 2 Edge major versions last 2 Safari major versions last 2 iOS major versions Firefox ESR -not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line. not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line. - diff --git a/apps/workbench-testing-app/src/app/view-navigation/view-navigation.component.html b/apps/workbench-testing-app/src/app/view-navigation/view-navigation.component.html index afa43d744..d6418655b 100644 --- a/apps/workbench-testing-app/src/app/view-navigation/view-navigation.component.html +++ b/apps/workbench-testing-app/src/app/view-navigation/view-navigation.component.html @@ -1,22 +1,22 @@ - - - + + + -
+ - + - + - - +