From 9c93a7b5d3676820fba4be3e06515283b340477d Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:57:33 +0300 Subject: [PATCH] Update angular core and cli to version 13 --- .../.gitignore | 1 + .../angular.json | 23 -------------- .../package.json | 30 +++++++++---------- .../src/polyfills.ts | 10 ------- .../src/test.ts | 4 ++- 5 files changed, 19 insertions(+), 49 deletions(-) diff --git a/interactive-mining-angular-frontend/.gitignore b/interactive-mining-angular-frontend/.gitignore index 4a5df17..69c958b 100755 --- a/interactive-mining-angular-frontend/.gitignore +++ b/interactive-mining-angular-frontend/.gitignore @@ -26,6 +26,7 @@ package-lock.json !.vscode/extensions.json # misc +/.angular/cache /.sass-cache /connect.lock /coverage diff --git a/interactive-mining-angular-frontend/angular.json b/interactive-mining-angular-frontend/angular.json index 5aaa453..574ef81 100644 --- a/interactive-mining-angular-frontend/angular.json +++ b/interactive-mining-angular-frontend/angular.json @@ -103,18 +103,6 @@ "src/assets" ] } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**" - ] - } } } }, @@ -129,17 +117,6 @@ "protractorConfig": "./protractor.conf.js", "devServerTarget": "interactivemining:serve" } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "e2e/tsconfig.e2e.json" - ], - "exclude": [ - "**/node_modules/**" - ] - } } } } diff --git a/interactive-mining-angular-frontend/package.json b/interactive-mining-angular-frontend/package.json index 1c74b6a..23df670 100755 --- a/interactive-mining-angular-frontend/package.json +++ b/interactive-mining-angular-frontend/package.json @@ -13,15 +13,15 @@ }, "private": true, "dependencies": { - "@angular/animations": "^12.2.16", - "@angular/common": "^12.2.16", - "@angular/compiler": "^12.2.16", - "@angular/core": "^12.2.16", - "@angular/forms": "^12.2.16", - "@angular/localize": "^12.2.16", - "@angular/platform-browser": "^12.2.16", - "@angular/platform-browser-dynamic": "^12.2.16", - "@angular/router": "^12.2.16", + "@angular/animations": "^13.3.11", + "@angular/common": "^13.3.11", + "@angular/compiler": "^13.3.11", + "@angular/core": "^13.3.11", + "@angular/forms": "^13.3.11", + "@angular/localize": "^13.3.11", + "@angular/platform-browser": "^13.3.11", + "@angular/platform-browser-dynamic": "^13.3.11", + "@angular/router": "^13.3.11", "core-js": "^2.4.1", "file-saver": "^2.0.2", "jquery": "^3.4.1", @@ -34,10 +34,10 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~12.2.18", - "@angular/cli": "^12.2.18", - "@angular/compiler-cli": "^12.2.16", - "@angular/language-service": "^12.2.16", + "@angular-devkit/build-angular": "~13.3.9", + "@angular/cli": "^13.3.9", + "@angular/compiler-cli": "^13.3.11", + "@angular/language-service": "^13.3.11", "@types/file-saver": "^2.0.1", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.6", @@ -51,9 +51,9 @@ "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.6.0", - "ng-packagr": "^12.2.7", + "ng-packagr": "^13.3.1", "protractor": "~7.0.0", "ts-node": "~8.2.0", - "typescript": "~4.3.5" + "typescript": "~4.6.4" } } \ No newline at end of file diff --git a/interactive-mining-angular-frontend/src/polyfills.ts b/interactive-mining-angular-frontend/src/polyfills.ts index 951668b..db41ca8 100755 --- a/interactive-mining-angular-frontend/src/polyfills.ts +++ b/interactive-mining-angular-frontend/src/polyfills.ts @@ -38,20 +38,10 @@ import '@angular/localize/init'; // import 'core-js/es6/weak-map'; // import 'core-js/es6/set'; -/** IE10 and IE11 requires the following for NgClass support on SVG elements */ -// import 'classlist.js'; // Run `npm install --save classlist.js`. - /** Evergreen browsers require these. **/ import 'core-js/es6/reflect'; -/** - * Required to support Web Animations `@angular/animation`. - * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation - **/ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. - - /*************************************************************************************************** * Zone JS is required by Angular itself. diff --git a/interactive-mining-angular-frontend/src/test.ts b/interactive-mining-angular-frontend/src/test.ts index cd612ee..4738de2 100755 --- a/interactive-mining-angular-frontend/src/test.ts +++ b/interactive-mining-angular-frontend/src/test.ts @@ -22,7 +22,9 @@ __karma__.loaded = function () {}; // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, - platformBrowserDynamicTesting() + platformBrowserDynamicTesting(), { + teardown: { destroyAfterEach: false } +} ); // Then we find all the tests. const context = require.context('./', true, /\.spec\.ts$/);