Skip to content

Commit d414810

Browse files
committed
feat(angular): migrate to v13
1 parent 0b4a927 commit d414810

File tree

9 files changed

+1051
-1799
lines changed

9 files changed

+1051
-1799
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
!.vscode/extensions.json
2727

2828
# misc
29+
/.angular/cache
2930
/.sass-cache
3031
/connect.lock
3132
/coverage

angular.json

-33
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,6 @@
9090
"src/demo/assets"
9191
]
9292
}
93-
},
94-
"lint": {
95-
"builder": "@angular-devkit/build-angular:tslint",
96-
"options": {
97-
"tsConfig": [
98-
"src/demo/tsconfig.app.json",
99-
"src/demo/tsconfig.spec.json"
100-
],
101-
"exclude": [
102-
"**/node_modules/**"
103-
]
104-
}
10593
}
10694
}
10795
},
@@ -120,15 +108,6 @@
120108
"devServerTarget": "demo:serve:production"
121109
}
122110
}
123-
},
124-
"lint": {
125-
"builder": "@angular-devkit/build-angular:tslint",
126-
"options": {
127-
"tsConfig": "e2e/tsconfig.e2e.json",
128-
"exclude": [
129-
"**/node_modules/**"
130-
]
131-
}
132111
}
133112
}
134113
},
@@ -158,18 +137,6 @@
158137
"tsConfig": "src/ngx-monaco-editor/tsconfig.spec.json",
159138
"karmaConfig": "src/ngx-monaco-editor/karma.conf.js"
160139
}
161-
},
162-
"lint": {
163-
"builder": "@angular-devkit/build-angular:tslint",
164-
"options": {
165-
"tsConfig": [
166-
"src/ngx-monaco-editor/tsconfig.lib.json",
167-
"src/ngx-monaco-editor/tsconfig.spec.json"
168-
],
169-
"exclude": [
170-
"**/node_modules/**"
171-
]
172-
}
173140
}
174141
}
175142
}

package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@
1919
},
2020
"private": true,
2121
"dependencies": {
22-
"@angular/animations": "~12.2.13",
23-
"@angular/cdk": "^12.2.13",
24-
"@angular/common": "~12.2.13",
25-
"@angular/compiler": "~12.2.13",
26-
"@angular/core": "~12.2.13",
27-
"@angular/flex-layout": "9.0.0-beta.30",
28-
"@angular/forms": "~12.2.13",
29-
"@angular/material": "^12.2.13",
30-
"@angular/platform-browser": "~12.2.13",
31-
"@angular/platform-browser-dynamic": "~12.2.13",
32-
"@angular/router": "~12.2.13",
22+
"@angular/animations": "~13.0.2",
23+
"@angular/cdk": "^13.0.2",
24+
"@angular/common": "~13.0.2",
25+
"@angular/compiler": "~13.0.2",
26+
"@angular/core": "~13.0.2",
27+
"@angular/flex-layout": "12.0.0-beta.35",
28+
"@angular/forms": "~13.0.2",
29+
"@angular/material": "^13.0.2",
30+
"@angular/platform-browser": "~13.0.2",
31+
"@angular/platform-browser-dynamic": "~13.0.2",
32+
"@angular/router": "~13.0.2",
3333
"monaco-editor": "^0.24.0",
3434
"rxjs": "6.5.3",
3535
"tslib": "^2.3.1",
3636
"zone.js": "~0.11.4"
3737
},
3838
"devDependencies": {
39-
"@angular-devkit/build-angular": "~12.2.13",
40-
"@angular/cli": "^12.2.13",
41-
"@angular/compiler-cli": "^12.2.13",
42-
"@angular/language-service": "~12.2.13",
39+
"@angular-devkit/build-angular": "~13.0.3",
40+
"@angular/cli": "^13.0.3",
41+
"@angular/compiler-cli": "^13.0.2",
42+
"@angular/language-service": "~13.0.2",
4343
"@compodoc/compodoc": "^1.1.11",
4444
"@types/jasmine": "~3.6.0",
4545
"@types/jasminewd2": "~2.0.3",
@@ -53,11 +53,11 @@
5353
"karma-jasmine": "~4.0.0",
5454
"karma-jasmine-html-reporter": "^1.5.0",
5555
"ncp": "^2.0.0",
56-
"ng-packagr": "^12.2.5",
56+
"ng-packagr": "^13.0.6",
5757
"protractor": "~7.0.0",
5858
"rimraf": "^3.0.0",
5959
"ts-node": "~7.0.0",
6060
"tslint": "~6.1.0",
61-
"typescript": "~4.3.5"
61+
"typescript": "~4.4.4"
6262
}
63-
}
63+
}

src/demo/polyfills.ts

-11
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
// import 'core-js/es6/weak-map';
3535
// import 'core-js/es6/set';
3636

37-
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
38-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
39-
4037
/** IE10 and IE11 requires the following for the Reflect API. */
4138
// import 'core-js/es6/reflect';
4239

@@ -45,14 +42,6 @@
4542
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
4643
import 'core-js/es7/reflect';
4744

48-
49-
/**
50-
* Web Animations `@angular/platform-browser/animations`
51-
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
52-
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
53-
**/
54-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
55-
5645
/**
5746
* By default, zone.js will patch all possible macroTask and DomEvents
5847
* user can disable parts of macroTask/DomEvents patch by setting following flags

src/demo/styles.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* You can add global styles to this file, and also import other style files */
2-
@use '~@angular/material' as mat;
3-
@import '~@angular/material/prebuilt-themes/deeppurple-amber.css';
2+
@use '@angular/material' as mat;
3+
@import '@angular/material/prebuilt-themes/deeppurple-amber.css';
44
// Plus imports for other components in your app.
55

66
// Include the common styles for Angular Material. We include this here so that you only

src/demo/test.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ declare const require: any;
1212
// First, initialize the Angular testing environment.
1313
getTestBed().initTestEnvironment(
1414
BrowserDynamicTestingModule,
15-
platformBrowserDynamicTesting()
15+
platformBrowserDynamicTesting(), {
16+
teardown: { destroyAfterEach: false }
17+
}
1618
);
1719
// Then we find all the tests.
1820
const context = require.context('./', true, /\.spec\.ts$/);

src/ngx-monaco-editor/src/test.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ declare const require: any;
1414
// First, initialize the Angular testing environment.
1515
getTestBed().initTestEnvironment(
1616
BrowserDynamicTestingModule,
17-
platformBrowserDynamicTesting()
17+
platformBrowserDynamicTesting(), {
18+
teardown: { destroyAfterEach: false }
19+
}
1820
);
1921
// Then we find all the tests.
2022
const context = require.context('./', true, /\.spec\.ts$/);

src/ngx-monaco-editor/tsconfig.lib.prod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"declarationMap": false
55
},
66
"angularCompilerOptions": {
7-
"enableIvy": false
7+
"compilationMode": "partial"
88
}
99
}

0 commit comments

Comments
 (0)