From ecde5c6a1c57a3f58590a2e6640e884aadd5635a Mon Sep 17 00:00:00 2001 From: RAHUL RATHORE Date: Thu, 9 Dec 2021 13:18:06 +0530 Subject: [PATCH] feat: feat: angular upgrade v12 to v13 for merchant tablet ionic #1427 --- packages/merchant-tablet-ionic/.gitignore | 1 + packages/merchant-tablet-ionic/angular.json | 17 ------- packages/merchant-tablet-ionic/package.json | 44 +++++++++---------- .../merchant-tablet-ionic/src/polyfills.ts | 9 ---- packages/merchant-tablet-ionic/src/test.ts | 4 +- 5 files changed, 26 insertions(+), 49 deletions(-) diff --git a/packages/merchant-tablet-ionic/.gitignore b/packages/merchant-tablet-ionic/.gitignore index 602470ad8..ddc297569 100644 --- a/packages/merchant-tablet-ionic/.gitignore +++ b/packages/merchant-tablet-ionic/.gitignore @@ -1,3 +1,4 @@ +/.angular/cache **/*.js **/*.js.map **/*.d.ts diff --git a/packages/merchant-tablet-ionic/angular.json b/packages/merchant-tablet-ionic/angular.json index fdb64f8ff..b909fd715 100644 --- a/packages/merchant-tablet-ionic/angular.json +++ b/packages/merchant-tablet-ionic/angular.json @@ -126,16 +126,6 @@ ] } }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "exclude": ["**/node_modules/**"] - } - }, "ionic-cordova-build": { "builder": "@ionic/angular-toolkit:cordova-build", "options": { @@ -173,13 +163,6 @@ "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "app:serve" } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": ["**/node_modules/**"] - } } } } diff --git a/packages/merchant-tablet-ionic/package.json b/packages/merchant-tablet-ionic/package.json index 862cc1f48..d562d7b58 100644 --- a/packages/merchant-tablet-ionic/package.json +++ b/packages/merchant-tablet-ionic/package.json @@ -44,16 +44,17 @@ "cordova:run:prod:device": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ionic cordova run android --prod --release --device" }, "dependencies": { - "@angular/animations": "^12.2.10", - "@angular/common": "^12.2.10", - "@angular/compiler": "^12.2.10", - "@angular/core": "^12.2.10", - "@angular/forms": "^12.2.10", - "@angular/language-service": "^12.2.10", - "@angular/platform-browser": "^12.2.10", - "@angular/platform-browser-dynamic": "^12.2.10", - "@angular/router": "^12.2.10", - "@angular/service-worker": "^12.2.10", + "@angular/animations": "^13.0.3", + "@angular/common": "^13.0.3", + "@angular/compiler": "^13.0.3", + "@angular/core": "^13.0.3", + "@angular/forms": "^13.0.3", + "@angular/language-service": "^13.0.3", + "@angular/platform-browser": "^13.0.3", + "@angular/platform-browser-dynamic": "^13.0.3", + "@angular/router": "^13.0.3", + "@angular/service-worker": "^13.0.3", + "@apollo/client": "^3.5.5", "@ever-co/angular2-wizard": "^0.6.2", "@ever-platform/common": "^0.4.3", "@ever-platform/common-angular": "^0.4.3", @@ -88,7 +89,6 @@ "@ngx-translate/core": "^13.0.0", "@ngx-translate/http-loader": "^6.0.0", "apollo-angular": "^2.6.0", - "@apollo/client": "^3.5.5", "bootstrap": "^4.6.0", "call-number": "^1.0.1", "connect": "^3.7.0", @@ -129,7 +129,6 @@ "fstream": "^1.0.12", "graphql": "15.7.2", "graphql-tag": "^2.12.6", - "subscriptions-transport-ws": "^0.11.0", "handlebars": "^4.7.7", "imagesloaded": "^4.1.4", "ionic-selectable": "^4.9.0", @@ -155,6 +154,7 @@ "rxjs-compat": "^6.6.7", "socket.io-client": "^4.3.0", "stripe": "^8.183.0", + "subscriptions-transport-ws": "^0.11.0", "sw-toolbox": "^3.6.0", "symbol-observable": "^4.0.0", "tslib": "^2.3.1", @@ -163,15 +163,15 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-builders/custom-webpack": "^12.1.3", - "@angular-devkit/architect": "^0.1202.10", - "@angular-devkit/build-angular": "~12.2.10", - "@angular-devkit/build-optimizer": "^0.1202.10", - "@angular-devkit/build-webpack": "^0.1202.10", - "@angular-devkit/core": "^12.2.10", - "@angular-devkit/schematics": "^12.2.10", - "@angular/cli": "^12.2.10", - "@angular/compiler-cli": "^12.2.10", + "@angular-builders/custom-webpack": "^13.0.0", + "@angular-devkit/architect": "^0.1300.4", + "@angular-devkit/build-angular": "~13.0.4", + "@angular-devkit/build-optimizer": "^0.1300.4", + "@angular-devkit/build-webpack": "^0.1300.4", + "@angular-devkit/core": "^13.0.4", + "@angular-devkit/schematics": "^13.0.4", + "@angular/cli": "^13.0.4", + "@angular/compiler-cli": "^13.0.3", "@ionic/angular-toolkit": "^4.0.0", "@ionic/lab": "^3.2.10", "@types/jasmine": "~3.9.1", @@ -190,7 +190,7 @@ "rimraf": "^3.0.2", "ts-node": "~10.3.0", "tslint": "~5.20.1", - "typescript": "~4.2.4" + "typescript": "~4.4.4" }, "config": { "ionic_webpack": "./config/webpack.config.js" diff --git a/packages/merchant-tablet-ionic/src/polyfills.ts b/packages/merchant-tablet-ionic/src/polyfills.ts index f5d3868b4..b6fadaf18 100644 --- a/packages/merchant-tablet-ionic/src/polyfills.ts +++ b/packages/merchant-tablet-ionic/src/polyfills.ts @@ -41,9 +41,6 @@ import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js'; // 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`. - /** IE10 and IE11 requires the following for the Reflect API. */ // import 'core-js/es6/reflect'; @@ -51,12 +48,6 @@ import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js'; // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. import 'core-js/es7/reflect'; -/** - * Required to support Web Animations `@angular/platform-browser/animations`. - * 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/packages/merchant-tablet-ionic/src/test.ts b/packages/merchant-tablet-ionic/src/test.ts index fd00b5c2e..fc741695f 100644 --- a/packages/merchant-tablet-ionic/src/test.ts +++ b/packages/merchant-tablet-ionic/src/test.ts @@ -12,7 +12,9 @@ declare const require: any; // 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$/);