Skip to content

Commit f9cad3f

Browse files
kdinevkdinev
authored
Merge pull request #9503 from IgniteUI/12.0.x
chore(*): updating to Angular 12
2 parents 07b7423 + ebdebf1 commit f9cad3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4186
-4711
lines changed

‎.browserslistrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
last 2 versions
1010
Firefox ESR
1111
not dead
12-
IE 9-11 # For IE 9-11 support, remove 'not'.
12+
IE 11 # For IE 9-11 support, remove 'not'.

‎angular.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"build": {
1818
"builder": "@angular-devkit/build-angular:browser",
1919
"options": {
20-
"aot": true,
2120
"outputPath": "dist/igniteui-dev-demos",
2221
"index": "src/index.html",
2322
"main": "src/main.ts",
@@ -31,7 +30,14 @@
3130
"styles": [
3231
"src/styles/styles.scss"
3332
],
34-
"scripts": []
33+
"scripts": [],
34+
"vendorChunk": true,
35+
"extractLicenses": false,
36+
"buildOptimizer": false,
37+
"sourceMap": true,
38+
"optimization": false,
39+
"namedChunks": true,
40+
"aot": false
3541
},
3642
"configurations": {
3743
"production": {

‎package-lock.json‎

Lines changed: 3821 additions & 4513 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
"test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
1717
"test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
1818
"test:lib:others": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.non-grid.conf.js",
19-
"test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
20-
"test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
21-
"test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
22-
"test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js --tsConfig=./projects/igniteui-angular/tsconfig.ivy.false.spec.json",
19+
"test:lib:azure:grid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.grid.conf.js",
20+
"test:lib:azure:tgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.tree-grid.conf.js",
21+
"test:lib:azure:hgrid": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.hierarchical-grid.conf.js",
22+
"test:lib:azure:others": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.azure.non-grid.conf.js",
2323
"test:lib:watch": "ng test igniteui-angular",
2424
"test:schematics": "ts-node --project projects/igniteui-angular/migrations/tsconfig.json ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/migrations/**/*.spec.ts ./projects/igniteui-angular/schematics/**/*.spec.ts",
2525
"test:styles": "ts-node --skip-project ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/src/lib/core/styles/spec/tests.ts",
26-
"build:lib": "ng build igniteui-angular --prod && gulp buildStyle",
26+
"build:lib": "ng build igniteui-angular --configuration production && gulp buildStyle",
2727
"build:style": "gulp buildStyle",
2828
"build:migration": "gulp copyMigrations && tsc --listEmittedFiles --project ./projects/igniteui-angular/migrations/tsconfig.json",
2929
"build:schematics": "gulp copySchematics && tsc --listEmittedFiles --project ./projects/igniteui-angular/schematics/tsconfig.json",
@@ -46,16 +46,17 @@
4646
},
4747
"private": true,
4848
"dependencies": {
49-
"@angular/animations": "^11.2.5",
50-
"@angular/common": "^11.2.5",
51-
"@angular/compiler": "^11.2.5",
52-
"@angular/core": "^11.2.5",
53-
"@angular/forms": "^11.2.5",
54-
"@angular/platform-browser": "^11.2.5",
55-
"@angular/platform-browser-dynamic": "^11.2.5",
56-
"@angular/router": "^11.2.5",
57-
"@igniteui/material-icons-extended": "^2.4.0",
58-
"@types/hammerjs": "^2.0.36",
49+
"@angular/animations": "^12.0.0",
50+
"@angular/common": "^12.0.0",
51+
"@angular/compiler": "^12.0.0",
52+
"@angular/core": "^12.0.0",
53+
"@angular/forms": "^12.0.0",
54+
"@angular/platform-browser": "^12.0.0",
55+
"@angular/platform-browser-dynamic": "^12.0.0",
56+
"@angular/router": "^12.0.0",
57+
"@igniteui/material-icons-extended": "^2.7.0",
58+
"@juggle/resize-observer": "^3.3.1",
59+
"@types/hammerjs": "^2.0.39",
5960
"@types/source-map": "0.5.2",
6061
"classlist.js": "^1.1.20150312",
6162
"core-js": "^2.6.11",
@@ -64,36 +65,35 @@
6465
"jszip": "^3.6.0",
6566
"karma-parallel": "^0.3.1",
6667
"lodash.mergewith": "^4.6.2",
67-
"resize-observer-polyfill": "^1.5.1",
68-
"rxjs": "^6.6.6",
68+
"rxjs": "^6.6.7",
6969
"setimmediate": "^1.0.5",
70-
"tslib": "^2.0.0",
70+
"tslib": "^2.2.0",
7171
"uuid": "^8.3.0",
7272
"web-animations-js": "^2.3.2",
73-
"zone.js": "~0.10.3"
73+
"zone.js": "~0.11.4"
7474
},
7575
"devDependencies": {
76-
"@angular-devkit/build-angular": "~0.1102.4",
77-
"@angular-devkit/schematics": "^11.2.4",
78-
"@angular-eslint/builder": "^2.0.0",
79-
"@angular-eslint/eslint-plugin": "^2.0.0",
80-
"@angular-eslint/eslint-plugin-template": "^2.0.0",
81-
"@angular-eslint/schematics": "^2.0.1",
82-
"@angular-eslint/template-parser": "^2.0.0",
83-
"@angular/cli": "~11.2.4",
84-
"@angular/compiler-cli": "^11.2.5",
85-
"@angular/language-service": "^11.2.5",
76+
"@angular-devkit/build-angular": "~12.0.0",
77+
"@angular-devkit/schematics": "^12.0.0",
78+
"@angular-eslint/builder": "^4.0.0",
79+
"@angular-eslint/eslint-plugin": "^4.0.0",
80+
"@angular-eslint/eslint-plugin-template": "^4.0.0",
81+
"@angular-eslint/schematics": "^4.3.0",
82+
"@angular-eslint/template-parser": "^4.0.0",
83+
"@angular/cli": "~12.0.0",
84+
"@angular/compiler-cli": "^12.0.0",
85+
"@angular/language-service": "^12.0.0",
8686
"@angularclass/hmr": "^2.1.3",
87-
"@types/jasmine": "~3.6.0",
88-
"@types/jasminewd2": "^2.0.8",
89-
"@types/node": "^12.20.0",
87+
"@types/jasmine": "^3.7.2",
88+
"@types/jasminewd2": "^2.0.9",
89+
"@types/node": "^12.20.13",
9090
"@types/webpack-env": "^1.15.2",
9191
"@typescript-eslint/eslint-plugin": "4.16.1",
9292
"@typescript-eslint/parser": "4.16.1",
9393
"browser-sync": "^2.26.12",
94-
"codelyzer": "^6.0.0",
94+
"codelyzer": "^6.0.2",
9595
"coveralls": "^3.1.0",
96-
"eslint": "^7.20.0",
96+
"eslint": "^7.26.0",
9797
"eslint-plugin-import": "2.22.1",
9898
"eslint-plugin-jsdoc": "30.7.6",
9999
"eslint-plugin-prefer-arrow": "1.2.2",
@@ -113,7 +113,7 @@
113113
"jasmine": "~3.6.0",
114114
"jasmine-core": "~3.6.0",
115115
"jasmine-spec-reporter": "~5.0.2",
116-
"karma": "^5.2.3",
116+
"karma": "^6.3.2",
117117
"karma-chrome-launcher": "~3.1.0",
118118
"karma-coverage": "^2.0.3",
119119
"karma-jasmine": "~3.3.0",
@@ -122,20 +122,20 @@
122122
"karma-junit-reporter": "~2.0.1",
123123
"karma-spec-reporter": "~0.0.32",
124124
"lunr": "^2.3.8",
125-
"ng-packagr": "^11.2.1",
125+
"ng-packagr": "^12.0.0",
126126
"pngcrush": "^2.0.1",
127127
"protractor": "~7.0.0",
128128
"sass-true": "^5.0.0",
129129
"sassdoc": "^2.7.3",
130130
"sassdoc-plugin-localization": "^1.4.3",
131-
"stylelint": "^13.10.0",
131+
"stylelint": "^13.13.1",
132132
"stylelint-scss": "^3.19.0",
133133
"themeleon": "^3.0.2",
134134
"ts-node": "~7.0.1",
135135
"tslint": "~6.1.0",
136136
"typedoc": "^0.17.7",
137137
"typedoc-plugin-localization": "^2.2.3",
138-
"typescript": "^4.0.7",
138+
"typescript": "^4.2.4",
139139
"webpack-sources": "1.3.0"
140140
}
141141
}

‎projects/igniteui-angular/migrations/common/ServerHost.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import * as ts from 'typescript/lib/tsserverlibrary';
33
import { CUSTOM_TS_PLUGIN_NAME, CUSTOM_TS_PLUGIN_PATH } from './tsUtils';
44

55
export class ServerHost implements ts.server.ServerHost {
6-
readonly args: string[];
7-
readonly newLine: string;
8-
readonly useCaseSensitiveFileNames: boolean;
6+
public readonly args: string[];
7+
public readonly newLine: string;
8+
public readonly useCaseSensitiveFileNames: boolean;
99

1010
constructor(private host: Tree) {
1111
this.args = ts.sys.args;

‎projects/igniteui-angular/migrations/common/filterSourceDirs.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { filter, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
22
import { getWorkspace, getWorkspacePath, getProjectPaths } from './util';
3-
import { WorkspaceSchema } from '@schematics/angular/utility/workspace-models';
43

54
/**
65
* Filter tree to project source dirs

‎projects/igniteui-angular/ng-package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"lib": {
66
"entryFile": "src/public_api.ts"
77
},
8-
"whitelistedNonPeerDependencies": [
8+
"allowedNonPeerDependencies": [
99
"@types/hammerjs",
1010
"hammerjs",
1111
"jszip",
12-
"resize-observer-polyfill",
12+
"@juggle/resize-observer",
1313
"igniteui-trial-watermark",
1414
"lodash.mergewith",
1515
"uuid",

‎projects/igniteui-angular/ng-package.prod.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"lib": {
55
"entryFile": "src/public_api.ts",
66
"umdModuleIds": {
7-
"resize-observer-polyfill": "ResizeObserver"
7+
"@juggle/resize-observer": "ResizeObserver"
88
}
99
},
10-
"whitelistedNonPeerDependencies": [
10+
"allowedNonPeerDependencies": [
1111
"@types/hammerjs",
1212
"hammerjs",
1313
"jszip",
14-
"resize-observer-polyfill",
14+
"@juggle/resize-observer",
1515
"igniteui-trial-watermark",
1616
"lodash.mergewith",
1717
"uuid",

‎projects/igniteui-angular/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@
7070
"hammerjs": "^2.0.8",
7171
"jszip": "^3.6.0",
7272
"tslib": "^2.0.0",
73-
"resize-observer-polyfill": "^1.5.1",
73+
"@juggle/resize-observer": "^3.3.0",
7474
"igniteui-trial-watermark": "^1.0.3",
7575
"lodash.mergewith": "^4.6.2",
7676
"uuid": "^8.3.0",
77-
"@igniteui/material-icons-extended": "^2.4.0"
77+
"@igniteui/material-icons-extended": "^2.7.0"
7878
},
7979
"peerDependencies": {
80-
"@angular/common": "^11.2.0",
81-
"@angular/core": "^11.2.0",
82-
"@angular/animations": "^11.2.0",
83-
"@angular/forms": "^11.2.0",
80+
"@angular/common": "^12.0.0",
81+
"@angular/core": "^12.0.0",
82+
"@angular/animations": "^12.0.0",
83+
"@angular/forms": "^12.0.0",
8484
"web-animations-js": "^2.3.2"
8585
},
8686
"igxDevDependencies": {
87-
"@igniteui/angular-schematics": "~11.1.710"
87+
"@igniteui/angular-schematics": "~12.0.800-rc.0"
8888
},
8989
"ng-update": {
9090
"migrations": "./migrations/migration-collection.json"

‎projects/igniteui-angular/schematics/utils/dependency-handler.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const DEPENDENCIES_MAP: PackageEntry[] = [
2323
{ name: 'hammerjs', target: PackageTarget.REGULAR },
2424
{ name: 'jszip', target: PackageTarget.REGULAR },
2525
{ name: 'tslib', target: PackageTarget.NONE },
26-
{ name: 'resize-observer-polyfill', target: PackageTarget.REGULAR },
26+
{ name: '@juggle/resize-observer', target: PackageTarget.REGULAR },
2727
{ name: '@types/hammerjs', target: PackageTarget.DEV },
2828
{ name: 'igniteui-trial-watermark', target: PackageTarget.NONE },
2929
{ name: 'lodash.mergewith', target: PackageTarget.NONE },

0 commit comments

Comments
 (0)