From 80368d31c5cb4b7c27d0d19fb0a7823d464e7402 Mon Sep 17 00:00:00 2001 From: sdessai Date: Wed, 26 May 2021 08:23:03 -0400 Subject: [PATCH 1/8] Upgrading angular version 12 --- angular.json | 16 +++++++--------- package.json | 30 +++++++++++++++--------------- src/polyfills.ts | 2 +- tsconfig.json | 1 - 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/angular.json b/angular.json index de5ac2e70..0eda19290 100644 --- a/angular.json +++ b/angular.json @@ -11,7 +11,6 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "aot": true, "outputPath": "docs", "index": "src/index.html", "main": "src/main.ts", @@ -62,7 +61,13 @@ "node_modules/slickgrid/lib/jquery.event.drag-2.3.0.js", "node_modules/bootstrap/dist/js/bootstrap.js", "src/assets/lib/multiple-select/multiple-select.js" - ] + ], + "vendorChunk": true, + "extractLicenses": false, + "buildOptimizer": false, + "sourceMap": true, + "optimization": false, + "namedChunks": true }, "configurations": { "development": { @@ -72,14 +77,8 @@ "maximumWarning": "150kb" } ], - "optimization": false, "outputHashing": "all", - "sourceMap": true, - "namedChunks": true, - "aot": true, "extractLicenses": true, - "vendorChunk": true, - "buildOptimizer": false, "fileReplacements": [ { "replace": "src/environments/environment.ts", @@ -101,7 +100,6 @@ "aot": false, "extractLicenses": true, "vendorChunk": false, - "buildOptimizer": false, "fileReplacements": [ { "replace": "src/environments/environment.ts", diff --git a/package.json b/package.json index 3726952a1..a6223e0db 100644 --- a/package.json +++ b/package.json @@ -122,18 +122,18 @@ }, "devDependencies": { "@angular-builders/jest": "^7.4.4", - "@angular-devkit/build-angular": "~0.1102.7", - "@angular/animations": "^11.2.8", - "@angular/cli": "^11.2.7", - "@angular/common": "^11.2.8", - "@angular/compiler": "^11.2.8", - "@angular/compiler-cli": "^11.2.8", - "@angular/core": "^11.2.8", - "@angular/forms": "^11.2.8", - "@angular/language-service": "^11.2.8", - "@angular/platform-browser": "^11.2.8", - "@angular/platform-browser-dynamic": "^11.2.8", - "@angular/router": "^11.2.8", + "@angular-devkit/build-angular": "~12.0.1", + "@angular/animations": "^12.0.1", + "@angular/cli": "^12.0.1", + "@angular/common": "^12.0.1", + "@angular/compiler": "^12.0.1", + "@angular/compiler-cli": "^12.0.1", + "@angular/core": "^12.0.1", + "@angular/forms": "^12.0.1", + "@angular/language-service": "^12.0.1", + "@angular/platform-browser": "^12.0.1", + "@angular/platform-browser-dynamic": "^12.0.1", + "@angular/router": "^12.0.1", "@ng-select/ng-select": "^6.1.0", "@ngx-translate/core": "^13.0.0", "@ngx-translate/http-loader": "^6.0.0", @@ -159,7 +159,7 @@ "jest-extended": "^0.11.5", "jest-junit": "^6.4.0", "jest-preset-angular": "^6.0.1", - "ng-packagr": "^11.2.4", + "ng-packagr": "^12.0.2", "ngx-bootstrap": "^6.2.0", "npm-run-all": "^4.1.5", "postcss": "^8.2.15", @@ -172,8 +172,8 @@ "ts-node": "^9.1.1", "tslib": "^2.2.0", "tslint": "~6.1.3", - "typescript": "4.0.7", + "typescript": "4.2.4", "yargs": "^17.0.1", - "zone.js": "~0.10.2" + "zone.js": "~0.11.4" } } diff --git a/src/polyfills.ts b/src/polyfills.ts index b274f45c2..71c74e185 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -43,7 +43,7 @@ import 'custom-event-polyfill'; // npm install custom-event-polyfill /*************************************************************************************************** * Zone JS is required by Angular itself. */ -import 'zone.js/dist/zone'; // Included with Angular CLI. +import 'zone.js'; // Included with Angular CLI. diff --git a/tsconfig.json b/tsconfig.json index 1f5f115d9..b6aaf1240 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,6 @@ "noUnusedParameters": false, "noUnusedLocals": false, "noImplicitReturns": true, - "emitDecoratorMetadata": true, "experimentalDecorators": true, "target": "es2015", "typeRoots": [ From 08b28255925a230be7ae7702966ed6c3d1398761 Mon Sep 17 00:00:00 2001 From: sapnildessai Date: Wed, 26 May 2021 20:35:25 +0530 Subject: [PATCH 2/8] Update tsconfig.json Update tsconfig with "emitDecoratorMetadata": true property --- tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index b6aaf1240..6e2803c28 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,6 +12,7 @@ "noUnusedParameters": false, "noUnusedLocals": false, "noImplicitReturns": true, + "emitDecoratorMetadata": true, "experimentalDecorators": true, "target": "es2015", "typeRoots": [ @@ -35,4 +36,4 @@ "preserveWhitespaces": true, "strictMetadataEmit": true } -} \ No newline at end of file +} From 457060231f39a6da754fec036da27267e3309531 Mon Sep 17 00:00:00 2001 From: sapnildessai Date: Wed, 26 May 2021 20:54:20 +0530 Subject: [PATCH 3/8] Update dateRangeFilter.ts Removed flatpickr variable since it is always defined --- src/app/modules/angular-slickgrid/filters/dateRangeFilter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/angular-slickgrid/filters/dateRangeFilter.ts b/src/app/modules/angular-slickgrid/filters/dateRangeFilter.ts index 716b1eca8..0a2cc9f20 100644 --- a/src/app/modules/angular-slickgrid/filters/dateRangeFilter.ts +++ b/src/app/modules/angular-slickgrid/filters/dateRangeFilter.ts @@ -243,7 +243,7 @@ export class DateRangeFilter implements Filter { placeholder = this.columnFilter.placeholder; } const $filterInputElm: any = $(`
`); - this.flatInstance = (flatpickr && $filterInputElm[0] && typeof $filterInputElm[0].flatpickr === 'function') ? $filterInputElm[0].flatpickr(this._flatpickrOptions) : flatpickr($filterInputElm, this._flatpickrOptions as unknown as Partial); + this.flatInstance = ($filterInputElm[0] && typeof $filterInputElm[0].flatpickr === 'function') ? $filterInputElm[0].flatpickr(this._flatpickrOptions) : flatpickr($filterInputElm, this._flatpickrOptions as unknown as Partial); return $filterInputElm; } From 65a5416ac52c0e1be0d31844c1746274db49576a Mon Sep 17 00:00:00 2001 From: sapnildessai Date: Wed, 26 May 2021 20:56:00 +0530 Subject: [PATCH 4/8] Update compoundDateFilter.ts Removed flatpickr variable since it's always defined --- src/app/modules/angular-slickgrid/filters/compoundDateFilter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/angular-slickgrid/filters/compoundDateFilter.ts b/src/app/modules/angular-slickgrid/filters/compoundDateFilter.ts index ef9f5d232..083528f26 100644 --- a/src/app/modules/angular-slickgrid/filters/compoundDateFilter.ts +++ b/src/app/modules/angular-slickgrid/filters/compoundDateFilter.ts @@ -240,7 +240,7 @@ export class CompoundDateFilter implements Filter { placeholder = this.columnFilter.placeholder; } const $filterInputElm: any = $(`
`); - this.flatInstance = (flatpickr && $filterInputElm[0] && typeof $filterInputElm[0].flatpickr === 'function') ? $filterInputElm[0].flatpickr(this._flatpickrOptions) : flatpickr($filterInputElm, this._flatpickrOptions as unknown as Partial); + this.flatInstance = ($filterInputElm[0] && typeof $filterInputElm[0].flatpickr === 'function') ? $filterInputElm[0].flatpickr(this._flatpickrOptions) : flatpickr($filterInputElm, this._flatpickrOptions as unknown as Partial); return $filterInputElm; } From 4fa1a16d900bd1c7988fd60a37197bef93550e3f Mon Sep 17 00:00:00 2001 From: sapnildessai Date: Wed, 26 May 2021 21:13:34 +0530 Subject: [PATCH 5/8] Update tsconfig.json Removing "emitDecoratorMetadata": true --- tsconfig.json | 1 - 1 file changed, 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 6e2803c28..62df511cc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,6 @@ "noUnusedParameters": false, "noUnusedLocals": false, "noImplicitReturns": true, - "emitDecoratorMetadata": true, "experimentalDecorators": true, "target": "es2015", "typeRoots": [ From d2b1c4f85c96b43318b902660d4b9c5be17c5abb Mon Sep 17 00:00:00 2001 From: sapnildessai Date: Wed, 26 May 2021 21:14:34 +0530 Subject: [PATCH 6/8] Update tsconfig.spec.json Added "emitDecoratorMetadata": true property --- test/tsconfig.spec.json | 1 + 1 file changed, 1 insertion(+) diff --git a/test/tsconfig.spec.json b/test/tsconfig.spec.json index 8b0eeeed2..bc5ac01d4 100644 --- a/test/tsconfig.spec.json +++ b/test/tsconfig.spec.json @@ -2,6 +2,7 @@ "compilerOptions": { "outDir": "../out-tsc/spec", "baseUrl": "./", + "emitDecoratorMetadata": true, "types": [ "cypress", "jest", From 71841b19c5fa25f9b93235b2ac811c7aed7fd76c Mon Sep 17 00:00:00 2001 From: sapnildessai Date: Wed, 26 May 2021 21:23:47 +0530 Subject: [PATCH 7/8] Update tsconfig.json --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.json b/tsconfig.json index 62df511cc..6e2803c28 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,6 +12,7 @@ "noUnusedParameters": false, "noUnusedLocals": false, "noImplicitReturns": true, + "emitDecoratorMetadata": true, "experimentalDecorators": true, "target": "es2015", "typeRoots": [ From 70561a13b9e4901f96b386108e945a1892919a5f Mon Sep 17 00:00:00 2001 From: sapnildessai Date: Wed, 26 May 2021 21:24:35 +0530 Subject: [PATCH 8/8] Update tsconfig.spec.json --- test/tsconfig.spec.json | 1 - 1 file changed, 1 deletion(-) diff --git a/test/tsconfig.spec.json b/test/tsconfig.spec.json index bc5ac01d4..8b0eeeed2 100644 --- a/test/tsconfig.spec.json +++ b/test/tsconfig.spec.json @@ -2,7 +2,6 @@ "compilerOptions": { "outDir": "../out-tsc/spec", "baseUrl": "./", - "emitDecoratorMetadata": true, "types": [ "cypress", "jest",