Skip to content

Commit

Permalink
Merge pull request #33 from cloudnc/feat/upgrade-ng-13
Browse files Browse the repository at this point in the history
feat: upgrade to Angular 13
  • Loading branch information
maxime1992 authored Jan 19, 2022
2 parents e7639a1 + f12e996 commit 77e2c0d
Show file tree
Hide file tree
Showing 10 changed files with 1,232 additions and 2,429 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ speed-measure-plugin.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
24 changes: 0 additions & 24 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,6 @@
"scripts": [],
"assets": ["src/favicon.ico", "src/assets"]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
"exclude": ["**/node_modules/**"]
}
}
}
},
Expand All @@ -119,13 +112,6 @@
"devServerTarget": "ngx-favicon-demo:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": ["**/node_modules/**"]
}
}
}
},
Expand Down Expand Up @@ -154,16 +140,6 @@
"tsConfig": "projects/ngx-favicon/tsconfig.spec.json",
"karmaConfig": "projects/ngx-favicon/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/ngx-favicon/tsconfig.lib.json",
"projects/ngx-favicon/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**"]
}
}
}
}
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@
},
"private": true,
"dependencies": {
"@angular/animations": "12.2.15",
"@angular/common": "12.2.15",
"@angular/compiler": "12.2.15",
"@angular/core": "12.2.15",
"@angular/forms": "12.2.15",
"@angular/platform-browser": "12.2.15",
"@angular/platform-browser-dynamic": "12.2.15",
"@angular/router": "12.2.15",
"@angular/animations": "13.1.2",
"@angular/common": "13.1.2",
"@angular/compiler": "13.1.2",
"@angular/core": "13.1.2",
"@angular/forms": "13.1.2",
"@angular/platform-browser": "13.1.2",
"@angular/platform-browser-dynamic": "13.1.2",
"@angular/router": "13.1.2",
"core-js": "3.6.5",
"rxjs": "6.6.3",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "12.2.15",
"@angular/cli": "12.2.15",
"@angular/compiler-cli": "12.2.15",
"@angular/language-service": "12.2.15",
"@angular-devkit/build-angular": "13.1.3",
"@angular/cli": "13.1.3",
"@angular/compiler-cli": "13.1.2",
"@angular/language-service": "13.1.2",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "2.0.8",
"@types/node": "14.6.4",
Expand All @@ -53,16 +53,16 @@
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "12.2.6",
"prettier": "2.1.1",
"ng-packagr": "13.1.3",
"prettier": "2.5.1",
"protractor": "7.0.0",
"semantic-release": "17.1.1",
"ts-node": "9.0.0",
"tsickle": "^0.39.1",
"tslib": "^2.3.1",
"tslint": "6.1.3",
"tslint-config-prettier": "1.18.0",
"typescript": "4.3.5"
"typescript": "4.5.4"
},
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions projects/ngx-favicon/src/lib/ngx-favicon.tokens.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { InjectionToken } from '@angular/core';
import { NgxFaviconConfig, Dictionary } from './ngx-favicon.interface';

export const NGX_FAVICON_CONFIG: InjectionToken<NgxFaviconConfig<
Dictionary<string>
>> = new InjectionToken<NgxFaviconConfig<Dictionary<string>>>(
export const NGX_FAVICON_CONFIG: InjectionToken<
NgxFaviconConfig<Dictionary<string>>
> = new InjectionToken<NgxFaviconConfig<Dictionary<string>>>(
'NGX_FAVICON_CONFIG',
);
3 changes: 3 additions & 0 deletions projects/ngx-favicon/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ declare const require: any;
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
{
teardown: { destroyAfterEach: false },
},
);
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
Expand Down
2 changes: 1 addition & 1 deletion projects/ngx-favicon/tsconfig.lib.prod.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "./tsconfig.lib.json",
"angularCompilerOptions": {
"enableIvy": false
"compilationMode": "partial"
}
}
10 changes: 0 additions & 10 deletions src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@
* BROWSER POLYFILLS
*/

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags
Expand Down
3 changes: 3 additions & 0 deletions src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ declare const require: any;
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
{
teardown: { destroyAfterEach: false },
},
);
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
Expand Down
2 changes: 1 addition & 1 deletion src/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"types": []
},
"angularCompilerOptions": {
"enableIvy": false
"enableIvy": true
},
"files": ["main.ts", "polyfills.ts"],
"exclude": ["test.ts", "**/*.spec.ts"]
Expand Down
Loading

0 comments on commit 77e2c0d

Please sign in to comment.