From a17e86574dd68ee2a7914c68a8c2a0c006942860 Mon Sep 17 00:00:00 2001 From: Rick Strahl Date: Mon, 23 Nov 2020 18:36:42 -1000 Subject: [PATCH] Update to Angular 11 --- src/AlbumViewerAngular/angular.json | 22 +++-- src/AlbumViewerAngular/package.json | 52 +++++----- .../src/app/app-routing.module.ts | 2 +- .../src/app/artists/artistDisplay.html | 4 +- .../src/app/artists/artistService.ts | 4 +- .../src/app/business/appConfiguration.ts | 5 +- .../src/app/options/options.ts | 2 + src/AlbumViewerAngular/src/tsconfig.app.json | 2 +- src/AlbumViewerAngular/src/tsconfig.spec.json | 2 +- src/AlbumViewerAngular/tsconfig.json | 2 +- src/AlbumViewerAngular/tslint.json | 4 +- .../Properties/launchSettings.json | 3 +- src/AlbumViewerNetCore/albums.js | 31 +++--- .../wwwroot/3rdpartylicenses.txt | 96 ++++++++----------- src/AlbumViewerNetCore/wwwroot/index.html | 16 ++-- .../wwwroot/main.d3ebaed1b5362c331e6f.js | 1 + .../wwwroot/main.e5721628134d0ae6a58a.js | 1 - .../polyfills-es5.b040c71bf4458cff3468.js | 1 + .../polyfills-es5.e9d750754f15857586fb.js | 1 - .../wwwroot/polyfills.3685da637ddd85b7da95.js | 1 - .../wwwroot/polyfills.c224da501d2cc725dd2a.js | 1 + ...dc1.js => runtime.359d5ee4682f20e936e9.js} | 0 .../wwwroot/scripts.db8057d9cf2a8af13658.js | 2 +- .../wwwroot/styles.7d3935df4f3e6938be33.css | 10 ++ .../wwwroot/styles.f47ed14eeff9fa245dd2.css | 10 -- 25 files changed, 135 insertions(+), 140 deletions(-) create mode 100644 src/AlbumViewerNetCore/wwwroot/main.d3ebaed1b5362c331e6f.js delete mode 100644 src/AlbumViewerNetCore/wwwroot/main.e5721628134d0ae6a58a.js create mode 100644 src/AlbumViewerNetCore/wwwroot/polyfills-es5.b040c71bf4458cff3468.js delete mode 100644 src/AlbumViewerNetCore/wwwroot/polyfills-es5.e9d750754f15857586fb.js delete mode 100644 src/AlbumViewerNetCore/wwwroot/polyfills.3685da637ddd85b7da95.js create mode 100644 src/AlbumViewerNetCore/wwwroot/polyfills.c224da501d2cc725dd2a.js rename src/AlbumViewerNetCore/wwwroot/{runtime.c51bd5b1c616d9ffddc1.js => runtime.359d5ee4682f20e936e9.js} (100%) create mode 100644 src/AlbumViewerNetCore/wwwroot/styles.7d3935df4f3e6938be33.css delete mode 100644 src/AlbumViewerNetCore/wwwroot/styles.f47ed14eeff9fa245dd2.css diff --git a/src/AlbumViewerAngular/angular.json b/src/AlbumViewerAngular/angular.json index 7b21479..96b72b3 100644 --- a/src/AlbumViewerAngular/angular.json +++ b/src/AlbumViewerAngular/angular.json @@ -41,24 +41,30 @@ ], "styles": [ { - "input": "node_modules/bootstrap/dist/css/bootstrap.css" + "input": "node_modules/bootstrap/dist/css/bootstrap.css", + "inject": true }, { - "input": "node_modules/font-awesome/css/font-awesome.css" + "input": "node_modules/font-awesome/css/font-awesome.css", + "inject": true }, { - "input": "node_modules/toastr/build/toastr.css" + "input": "node_modules/toastr/build/toastr.css", + "inject": true }, { - "input": "src/css/albumviewer.css" + "input": "src/css/albumviewer.css", + "inject": true } ], "scripts": [ { - "input": "node_modules/jquery/dist/jquery.js" + "input": "node_modules/jquery/dist/jquery.js", + "inject": true }, { - "input": "node_modules/toastr/toastr.js" + "input": "node_modules/toastr/toastr.js", + "inject": true } ] }, @@ -79,7 +85,6 @@ "optimization": true, "outputHashing": "all", "sourceMap": false, - "extractCss": true, "namedChunks": false, "aot": true, "extractLicenses": true, @@ -116,7 +121,8 @@ "karmaConfig": "src/karma.conf.js", "styles": [ { - "input": "styles.css" + "input": "styles.css", + "inject": true } ], "scripts": [], diff --git a/src/AlbumViewerAngular/package.json b/src/AlbumViewerAngular/package.json index 462375b..f391c9d 100644 --- a/src/AlbumViewerAngular/package.json +++ b/src/AlbumViewerAngular/package.json @@ -16,15 +16,15 @@ }, "private": true, "dependencies": { - "@angular/animations": "^9.1.11", - "@angular/common": "^9.1.11", - "@angular/compiler": "^9.1.11", - "@angular/core": "^9.1.11", - "@angular/forms": "^9.1.11", - "@angular/localize": "^9.1.11", - "@angular/platform-browser": "^9.1.11", - "@angular/platform-browser-dynamic": "^9.1.11", - "@angular/router": "^9.1.11", + "@angular/animations": "^11.0.0", + "@angular/common": "^11.0.0", + "@angular/compiler": "^11.0.0", + "@angular/core": "^11.0.0", + "@angular/forms": "^11.0.0", + "@angular/localize": "^11.0.0", + "@angular/platform-browser": "^11.0.0", + "@angular/platform-browser-dynamic": "^11.0.0", + "@angular/router": "^11.0.0", "@ng-bootstrap/ng-bootstrap": "^6.1.0", "bootstrap": "^4.4.1", "core-js": "^2.5.4", @@ -33,28 +33,28 @@ "rxjs": "^6.5.3", "toastr": "^2.1.4", "ngx-toastr": "^12.1.0", - "tslib": "^1.10.0", + "tslib": "^2.0.0", "zone.js": "~0.10.2" }, "devDependencies": { - "@angular/compiler-cli": "^9.1.11", - "@angular/language-service": "^9.1.11", - "@angular-devkit/build-angular": "~0.901.9", - "@angular/cli": "~9.1.9", + "@angular/compiler-cli": "^11.0.0", + "@angular/language-service": "^11.0.0", + "@angular-devkit/build-angular": "~0.1100.1", + "@angular/cli": "~11.0.1", "@types/node": "^12.11.1", - "@types/jasmine": "~2.8.8", + "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", - "codelyzer": "^5.1.2", - "jasmine-core": "~2.99.1", - "jasmine-spec-reporter": "~4.2.1", - "karma": "~4.0.0", - "karma-chrome-launcher": "~2.2.0", - "karma-coverage-istanbul-reporter": "~2.0.1", - "karma-jasmine": "~1.1.2", - "karma-jasmine-html-reporter": "^0.2.2", - "protractor": "~5.4.0", + "codelyzer": "^6.0.0", + "jasmine-core": "~3.6.0", + "jasmine-spec-reporter": "~5.0.0", + "karma": "~5.0.0", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage-istanbul-reporter": "~3.0.2", + "karma-jasmine": "~4.0.0", + "karma-jasmine-html-reporter": "^1.5.0", + "protractor": "~7.0.0", "ts-node": "~7.0.0", - "tslint": "~5.16.0", - "typescript": "~3.8.3" + "tslint": "~6.1.0", + "typescript": "~4.0.5" } } diff --git a/src/AlbumViewerAngular/src/app/app-routing.module.ts b/src/AlbumViewerAngular/src/app/app-routing.module.ts index 160eef9..daf9cc7 100644 --- a/src/AlbumViewerAngular/src/app/app-routing.module.ts +++ b/src/AlbumViewerAngular/src/app/app-routing.module.ts @@ -24,7 +24,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [RouterModule.forRoot(routes)], + imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })], exports: [RouterModule], providers: [] }) diff --git a/src/AlbumViewerAngular/src/app/artists/artistDisplay.html b/src/AlbumViewerAngular/src/app/artists/artistDisplay.html index 296ef9c..7af81dd 100644 --- a/src/AlbumViewerAngular/src/app/artists/artistDisplay.html +++ b/src/AlbumViewerAngular/src/app/artists/artistDisplay.html @@ -11,7 +11,7 @@ Edit -