Skip to content

Commit 4528c96

Browse files
tobiasengelhardttobiasengelhardt
authored
feat: update to angular 11 (CirclonGroup#888)
1 parent f639c98 commit 4528c96

38 files changed

+5573
-7123
lines changed

‎angular.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"optimization": true,
4242
"outputHashing": "all",
4343
"sourceMap": false,
44-
"extractCss": true,
4544
"namedChunks": false,
4645
"aot": true,
4746
"extractLicenses": true,
@@ -122,7 +121,7 @@
122121
"prefix": "lib",
123122
"architect": {
124123
"build": {
125-
"builder": "@angular-devkit/build-ng-packagr:build",
124+
"builder": "@angular-devkit/build-angular:ng-packagr",
126125
"options": {
127126
"tsConfig": "projects/angular-tree-component/tsconfig.lib.json",
128127
"project": "projects/angular-tree-component/ng-package.json"
@@ -186,7 +185,6 @@
186185
"optimization": true,
187186
"outputHashing": "all",
188187
"sourceMap": false,
189-
"extractCss": true,
190188
"namedChunks": false,
191189
"extractLicenses": true,
192190
"vendorChunk": false,

‎package-lock.json

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

‎package.json

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,27 @@
6161
"Adam Klein <adam@500tech.com>"
6262
],
6363
"dependencies": {
64-
"@angular/animations": "^10.0.0 || ^11.0.0-0",
65-
"@angular/cdk": "^10.1.3",
66-
"@angular/forms": "^10.0.0 || ^11.0.0-0",
67-
"@angular/material": "^10.1.3",
64+
"@angular/animations": "^11.2.0",
65+
"@angular/cdk": "^11.2.0",
66+
"@angular/forms": "^11.2.0",
67+
"@angular/material": "^11.2.0",
6868
"mobx": "~4.14.1"
6969
},
7070
"devDependencies": {
71-
"@angular-devkit/build-angular": "^0.1000.3",
72-
"@angular-devkit/build-ng-packagr": "~0.1000.3",
73-
"@angular/animations": "^10.0.3",
74-
"@angular/cli": "^10.0.3",
75-
"@angular/common": "^10.0.4",
76-
"@angular/compiler": "^10.0.4",
77-
"@angular/compiler-cli": "^10.0.4",
78-
"@angular/core": "^10.0.4",
79-
"@angular/elements": "^10.0.4",
80-
"@angular/forms": "^10.0.4",
81-
"@angular/platform-browser": "^10.0.4",
82-
"@angular/platform-browser-dynamic": "^10.0.4",
83-
"@angular/platform-server": "^10.0.4",
84-
"@angular/router": "^10.0.4",
85-
"@types/jasmine": "2.5.38",
71+
"@angular-devkit/build-angular": "^0.1102.0",
72+
"@angular-devkit/build-ng-packagr": "~0.1002.0",
73+
"@angular-devkit/core": "^11.2.0",
74+
"@angular/cli": "^11.2.0",
75+
"@angular/common": "^11.2.0",
76+
"@angular/compiler": "^11.2.0",
77+
"@angular/compiler-cli": "^11.2.0",
78+
"@angular/core": "^11.2.0",
79+
"@angular/elements": "^11.2.0",
80+
"@angular/platform-browser": "^11.2.0",
81+
"@angular/platform-browser-dynamic": "^11.2.0",
82+
"@angular/platform-server": "^11.2.0",
83+
"@angular/router": "^11.2.0",
84+
"@types/jasmine": "~3.6.0",
8685
"@types/jasminewd2": "~2.0.3",
8786
"@types/node": "^12.11.7",
8887
"@types/rx": "2.5.34",
@@ -92,15 +91,15 @@
9291
"http-server": "0.9.0",
9392
"husky": "^4.2.3",
9493
"lint-staged": "^10.0.7",
95-
"ng-packagr": "^10.0.0",
94+
"ng-packagr": "^11.2.1",
9695
"nightwatch": "0.9.12",
9796
"prettier": "^1.19.1",
98-
"jasmine-core": "~3.5.0",
97+
"jasmine-core": "~3.6.0",
9998
"jasmine-spec-reporter": "~5.0.0",
100-
"karma": "~5.0.0",
99+
"karma": "~6.1.1",
101100
"karma-chrome-launcher": "~3.1.0",
102101
"karma-coverage-istanbul-reporter": "~3.0.2",
103-
"karma-jasmine": "~3.3.0",
102+
"karma-jasmine": "~4.0.0",
104103
"karma-jasmine-html-reporter": "^1.5.0",
105104
"rimraf": "^2.5.1",
106105
"rxjs": "^6.5.3",
@@ -109,7 +108,7 @@
109108
"tslib": "^2.0.0",
110109
"tslint": "~6.1.0",
111110
"typedoc": "^0.3.12",
112-
"typescript": "~3.9.7",
111+
"typescript": "~4.1.5",
113112
"uuid": "^8.2.0",
114113
"zone.js": "^0.10.2"
115114
},

‎projects/angular-tree-component/package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,43 +35,43 @@
3535
"angular2 tree component"
3636
],
3737
"peerDependencies": {
38-
"@angular/common": ">=10.0.0 <11.0.0",
39-
"@angular/core": ">=10.0.0 <11.0.0"
38+
"@angular/common": ">=11.0.0",
39+
"@angular/core": ">=11.0.0"
4040
},
4141
"dependencies": {
4242
"mobx": "~4.14.1",
4343
"tslib": "^2.0.0"
4444
},
4545
"devDependencies": {
46-
"@angular-devkit/build-angular": "^0.1000.3",
47-
"@angular-devkit/build-ng-packagr": "~0.1000.3",
48-
"@angular/cli": "^10.0.3",
49-
"@angular/common": "^10.0.4",
50-
"@angular/compiler": "^10.0.4",
51-
"@angular/compiler-cli": "^10.0.4",
52-
"@angular/core": "^10.0.4",
53-
"@angular/forms": "^10.0.4",
54-
"@angular/platform-browser": "^10.0.4",
55-
"@angular/platform-browser-dynamic": "^10.0.4",
56-
"@angular/platform-server": "^10.0.4",
57-
"@angular/router": "^10.0.4",
58-
"@types/jasmine": "2.5.38",
46+
"@angular-devkit/build-angular": "^0.1102.0",
47+
"@angular-devkit/build-ng-packagr": "~0.1002.0",
48+
"@angular/cli": "^11.2.0",
49+
"@angular/common": "^11.2.0",
50+
"@angular/compiler": "^11.2.0",
51+
"@angular/compiler-cli": "^11.2.0",
52+
"@angular/core": "^11.2.0",
53+
"@angular/forms": "^11.2.0",
54+
"@angular/platform-browser": "^11.2.0",
55+
"@angular/platform-browser-dynamic": "^11.2.0",
56+
"@angular/platform-server": "^11.2.0",
57+
"@angular/router": "^11.2.0",
58+
"@types/jasmine": "~3.6.0",
5959
"@types/jasminewd2": "~2.0.3",
6060
"@types/node": "^12.11.7",
6161
"@types/webpack": "^1.12.29",
6262
"codelyzer": "^6.0.0",
63-
"ng-packagr": "^10.0.0",
64-
"jasmine-core": "~3.5.0",
63+
"ng-packagr": "^11.2.1",
64+
"jasmine-core": "~3.6.0",
6565
"jasmine-spec-reporter": "~5.0.0",
66-
"karma": "~5.0.0",
66+
"karma": "~6.1.1",
6767
"karma-chrome-launcher": "~3.1.0",
6868
"karma-coverage-istanbul-reporter": "~3.0.2",
69-
"karma-jasmine": "~3.3.0",
69+
"karma-jasmine": "~4.0.0",
7070
"karma-jasmine-html-reporter": "^1.5.0",
7171
"rxjs": "^6.5.3",
7272
"tsickle": "^0.38.1",
7373
"tslint": "~6.1.0",
74-
"typescript": "~3.9.7",
74+
"typescript": "~4.1.5",
7575
"zone.js": "^0.10.2"
7676
}
7777
}

‎projects/angular-tree-component/tsconfig.lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/lib",
55
"target": "es2015",

‎projects/angular-tree-component/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": [

‎projects/docs-app/src/app/app-routing.module.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ const routes: Routes = [
4747
RouterModule.forRoot(
4848
routes,
4949
{
50-
scrollPositionRestoration: 'enabled'
51-
}
50+
scrollPositionRestoration: 'enabled',
51+
relativeLinkResolution: 'legacy'
52+
}
5253
),
5354
],
5455
exports: [

‎projects/docs-app/src/app/app.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { TestBed, async } from '@angular/core/testing';
1+
import { TestBed, waitForAsync } from '@angular/core/testing';
22
import { AppComponent } from './app.component';
33

44
describe('AppComponent', () => {
5-
beforeEach(async(() => {
5+
beforeEach(waitForAsync(() => {
66
TestBed.configureTestingModule({
77
declarations: [AppComponent]
88
}).compileComponents();

‎projects/docs-app/src/app/examples/basic-usage/basic-usage.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { BasicUsageComponent } from './basic-usage.component';
44

55
describe('BasicUsageComponent', () => {
66
let component: BasicUsageComponent;
77
let fixture: ComponentFixture<BasicUsageComponent>;
88

9-
beforeEach(async(() => {
9+
beforeEach(waitForAsync(() => {
1010
TestBed.configureTestingModule({
1111
declarations: [ BasicUsageComponent ]
1212
})

‎projects/docs-app/src/app/fundamentals/actions/actions-demo/actions-demo.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { ActionsDemoComponent } from './actions-demo.component';
44

55
describe('ActionsDemoComponent', () => {
66
let component: ActionsDemoComponent;
77
let fixture: ComponentFixture<ActionsDemoComponent>;
88

9-
beforeEach(async(() => {
9+
beforeEach(waitForAsync(() => {
1010
TestBed.configureTestingModule({
1111
declarations: [ ActionsDemoComponent ]
1212
})

0 commit comments

Comments
 (0)