From d7b06cfdb483cf74c3c5bc4d999efeb180e9e465 Mon Sep 17 00:00:00 2001 From: tanshu Date: Sun, 17 Apr 2022 13:00:18 +0530 Subject: [PATCH] Chore: Upgrade angular 12->13 --- otis/.eslintrc.json | 8 ++++-- otis/.gitignore | 1 + otis/package.json | 62 +++++++++++++++++++++---------------------- otis/src/polyfills.ts | 10 ------- otis/src/test.ts | 4 ++- 5 files changed, 41 insertions(+), 44 deletions(-) diff --git a/otis/.eslintrc.json b/otis/.eslintrc.json index 354a261..13a7750 100644 --- a/otis/.eslintrc.json +++ b/otis/.eslintrc.json @@ -17,7 +17,8 @@ }, "extends": [ "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" + "plugin:@angular-eslint/template/process-inline-templates", + "plugin:@angular-eslint/recommended--extra" ], "plugins": [ "import" @@ -49,7 +50,10 @@ "import/order": [ "error", { - "alphabetize": {"order": "asc", "caseInsensitive": true}, + "alphabetize": { + "order": "asc", + "caseInsensitive": true + }, "newlines-between": "always" } ], diff --git a/otis/.gitignore b/otis/.gitignore index 86d943a..53a8849 100644 --- a/otis/.gitignore +++ b/otis/.gitignore @@ -32,6 +32,7 @@ speed-measure-plugin*.json .history/* # misc +/.angular/cache /.sass-cache /connect.lock /coverage diff --git a/otis/package.json b/otis/package.json index 5425984..930b06c 100644 --- a/otis/package.json +++ b/otis/package.json @@ -14,18 +14,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "^12.2.16", - "@angular/cdk": "^12.2.13", - "@angular/common": "^12.2.16", - "@angular/compiler": "^12.2.16", - "@angular/core": "^12.2.16", - "@angular/flex-layout": "^12.0.0-beta.35", - "@angular/forms": "^12.2.16", - "@angular/material": "^12.2.13", - "@angular/material-moment-adapter": "^12.2.13", - "@angular/platform-browser": "^12.2.16", - "@angular/platform-browser-dynamic": "^12.2.16", - "@angular/router": "^12.2.16", + "@angular/animations": "^13.3.3", + "@angular/cdk": "^13.3.3", + "@angular/common": "^13.3.3", + "@angular/compiler": "^13.3.3", + "@angular/core": "^13.3.3", + "@angular/flex-layout": "^13.0.0-beta.38", + "@angular/forms": "^13.3.3", + "@angular/material": "^13.3.3", + "@angular/material-moment-adapter": "^13.3.3", + "@angular/platform-browser": "^13.3.3", + "@angular/platform-browser-dynamic": "^13.3.3", + "@angular/router": "^13.3.3", "jspdf": "^2.3.0", "jspdf-autotable": "^3.5.13", "moment": "^2.29.1", @@ -34,24 +34,24 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~12.2.17", - "@angular-eslint/builder": "^1.1.0", - "@angular-eslint/eslint-plugin": "^1.1.0", - "@angular-eslint/eslint-plugin-template": "^1.1.0", - "@angular-eslint/schematics": "^1.1.0", - "@angular-eslint/template-parser": "^1.1.0", - "@angular/cli": "^12.2.17", - "@angular/compiler-cli": "^12.2.16", - "@angular/language-service": "^12.2.16", + "@angular-devkit/build-angular": "~13.3.3", + "@angular-eslint/builder": "^13.2.1", + "@angular-eslint/eslint-plugin": "^13.2.1", + "@angular-eslint/eslint-plugin-template": "^13.2.1", + "@angular-eslint/schematics": "^13.2.1", + "@angular-eslint/template-parser": "^13.2.1", + "@angular/cli": "^13.3.3", + "@angular/compiler-cli": "^13.3.3", + "@angular/language-service": "^13.3.3", "@types/jasmine": "~3.6.3", "@types/node": "^14.14.22", - "@typescript-eslint/eslint-plugin": "^4.14.0", - "@typescript-eslint/parser": "^4.14.0", - "eslint": "^7.18.0", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^31.2.2", - "eslint-plugin-prefer-arrow": "1.2.2", - "husky": "^4.3.8", + "@typescript-eslint/eslint-plugin": "5.19.0", + "@typescript-eslint/parser": "5.19.0", + "eslint": "^8.2.0", + "eslint-plugin-import": "2.26.0", + "eslint-plugin-jsdoc": "^39.2.2", + "eslint-plugin-prefer-arrow": "1.2.3", + "husky": "^7.0.4", "jasmine-core": "^3.6.0", "jasmine-spec-reporter": "^6.0.0", "karma": "^6.3.18", @@ -59,11 +59,11 @@ "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "^4.0.0", "karma-jasmine-html-reporter": "^1.5.0", - "lint-staged": "^10.5.3", + "lint-staged": "^12.3.8", "prettier": "^2.2.1", "standard-version": "^9.1.0", "ts-node": "^9.1.1", - "typescript": "^4.3.5" + "typescript": "^4.6.3" }, "husky": { "hooks": { @@ -78,4 +78,4 @@ "npx eslint --cache --fix" ] } -} \ No newline at end of file +} diff --git a/otis/src/polyfills.ts b/otis/src/polyfills.ts index 0cdffa7..b40974e 100644 --- a/otis/src/polyfills.ts +++ b/otis/src/polyfills.ts @@ -18,16 +18,6 @@ * BROWSER POLYFILLS */ -/** IE11 requires the following for NgClass support on SVG elements */ -// import 'classlist.js'; // Run `npm install --save classlist.js`. - -/** - * Web Animations `@angular/platform-browser/animations` - * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari. - * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0). - */ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. - /** * By default, zone.js will patch all possible macroTask and DomEvents * user can disable parts of macroTask/DomEvents patch by setting following flags diff --git a/otis/src/test.ts b/otis/src/test.ts index a0e80c3..0f9c9bb 100644 --- a/otis/src/test.ts +++ b/otis/src/test.ts @@ -19,7 +19,9 @@ declare const require: { }; // First, initialize the Angular testing environment. -getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting()); +getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), { + teardown: { destroyAfterEach: false }, +}); // Then we find all the tests. const context = require.context('./', true, /\.spec\.ts$/); // And load the modules.