Skip to content

Commit 77e2c0d

Browse files
authored
Merge pull request #33 from cloudnc/feat/upgrade-ng-13
feat: upgrade to Angular 13
2 parents e7639a1 + f12e996 commit 77e2c0d

File tree

10 files changed

+1232
-2429
lines changed

10 files changed

+1232
-2429
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ speed-measure-plugin.json
3030
.history/*
3131

3232
# misc
33+
/.angular/cache
3334
/.sass-cache
3435
/connect.lock
3536
/coverage

angular.json

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@
9393
"scripts": [],
9494
"assets": ["src/favicon.ico", "src/assets"]
9595
}
96-
},
97-
"lint": {
98-
"builder": "@angular-devkit/build-angular:tslint",
99-
"options": {
100-
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
101-
"exclude": ["**/node_modules/**"]
102-
}
10396
}
10497
}
10598
},
@@ -119,13 +112,6 @@
119112
"devServerTarget": "ngx-favicon-demo:serve:production"
120113
}
121114
}
122-
},
123-
"lint": {
124-
"builder": "@angular-devkit/build-angular:tslint",
125-
"options": {
126-
"tsConfig": "e2e/tsconfig.e2e.json",
127-
"exclude": ["**/node_modules/**"]
128-
}
129115
}
130116
}
131117
},
@@ -154,16 +140,6 @@
154140
"tsConfig": "projects/ngx-favicon/tsconfig.spec.json",
155141
"karmaConfig": "projects/ngx-favicon/karma.conf.js"
156142
}
157-
},
158-
"lint": {
159-
"builder": "@angular-devkit/build-angular:tslint",
160-
"options": {
161-
"tsConfig": [
162-
"projects/ngx-favicon/tsconfig.lib.json",
163-
"projects/ngx-favicon/tsconfig.spec.json"
164-
],
165-
"exclude": ["**/node_modules/**"]
166-
}
167143
}
168144
}
169145
}

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@
2525
},
2626
"private": true,
2727
"dependencies": {
28-
"@angular/animations": "12.2.15",
29-
"@angular/common": "12.2.15",
30-
"@angular/compiler": "12.2.15",
31-
"@angular/core": "12.2.15",
32-
"@angular/forms": "12.2.15",
33-
"@angular/platform-browser": "12.2.15",
34-
"@angular/platform-browser-dynamic": "12.2.15",
35-
"@angular/router": "12.2.15",
28+
"@angular/animations": "13.1.2",
29+
"@angular/common": "13.1.2",
30+
"@angular/compiler": "13.1.2",
31+
"@angular/core": "13.1.2",
32+
"@angular/forms": "13.1.2",
33+
"@angular/platform-browser": "13.1.2",
34+
"@angular/platform-browser-dynamic": "13.1.2",
35+
"@angular/router": "13.1.2",
3636
"core-js": "3.6.5",
3737
"rxjs": "6.6.3",
3838
"zone.js": "~0.11.4"
3939
},
4040
"devDependencies": {
41-
"@angular-devkit/build-angular": "12.2.15",
42-
"@angular/cli": "12.2.15",
43-
"@angular/compiler-cli": "12.2.15",
44-
"@angular/language-service": "12.2.15",
41+
"@angular-devkit/build-angular": "13.1.3",
42+
"@angular/cli": "13.1.3",
43+
"@angular/compiler-cli": "13.1.2",
44+
"@angular/language-service": "13.1.2",
4545
"@types/jasmine": "~3.6.0",
4646
"@types/jasminewd2": "2.0.8",
4747
"@types/node": "14.6.4",
@@ -53,16 +53,16 @@
5353
"karma-coverage-istanbul-reporter": "3.0.3",
5454
"karma-jasmine": "~4.0.0",
5555
"karma-jasmine-html-reporter": "^1.5.0",
56-
"ng-packagr": "12.2.6",
57-
"prettier": "2.1.1",
56+
"ng-packagr": "13.1.3",
57+
"prettier": "2.5.1",
5858
"protractor": "7.0.0",
5959
"semantic-release": "17.1.1",
6060
"ts-node": "9.0.0",
6161
"tsickle": "^0.39.1",
6262
"tslib": "^2.3.1",
6363
"tslint": "6.1.3",
6464
"tslint-config-prettier": "1.18.0",
65-
"typescript": "4.3.5"
65+
"typescript": "4.5.4"
6666
},
6767
"repository": {
6868
"type": "git",
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { InjectionToken } from '@angular/core';
22
import { NgxFaviconConfig, Dictionary } from './ngx-favicon.interface';
33

4-
export const NGX_FAVICON_CONFIG: InjectionToken<NgxFaviconConfig<
5-
Dictionary<string>
6-
>> = new InjectionToken<NgxFaviconConfig<Dictionary<string>>>(
4+
export const NGX_FAVICON_CONFIG: InjectionToken<
5+
NgxFaviconConfig<Dictionary<string>>
6+
> = new InjectionToken<NgxFaviconConfig<Dictionary<string>>>(
77
'NGX_FAVICON_CONFIG',
88
);

projects/ngx-favicon/src/test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ declare const require: any;
1515
getTestBed().initTestEnvironment(
1616
BrowserDynamicTestingModule,
1717
platformBrowserDynamicTesting(),
18+
{
19+
teardown: { destroyAfterEach: false },
20+
},
1821
);
1922
// Then we find all the tests.
2023
const context = require.context('./', true, /\.spec\.ts$/);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "./tsconfig.lib.json",
33
"angularCompilerOptions": {
4-
"enableIvy": false
4+
"compilationMode": "partial"
55
}
66
}

src/polyfills.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@
1818
* BROWSER POLYFILLS
1919
*/
2020

21-
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
22-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
23-
24-
/**
25-
* Web Animations `@angular/platform-browser/animations`
26-
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
27-
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
28-
*/
29-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
30-
3121
/**
3222
* By default, zone.js will patch all possible macroTask and DomEvents
3323
* user can disable parts of macroTask/DomEvents patch by setting following flags

src/test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ declare const require: any;
1313
getTestBed().initTestEnvironment(
1414
BrowserDynamicTestingModule,
1515
platformBrowserDynamicTesting(),
16+
{
17+
teardown: { destroyAfterEach: false },
18+
},
1619
);
1720
// Then we find all the tests.
1821
const context = require.context('./', true, /\.spec\.ts$/);

src/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"types": []
66
},
77
"angularCompilerOptions": {
8-
"enableIvy": false
8+
"enableIvy": true
99
},
1010
"files": ["main.ts", "polyfills.ts"],
1111
"exclude": ["test.ts", "**/*.spec.ts"]

0 commit comments

Comments
 (0)