Skip to content

Commit

Permalink
feat: angular upgrade v12 to v13 for admin web angular #1427
Browse files Browse the repository at this point in the history
  • Loading branch information
rahul-rocket committed Dec 8, 2021
1 parent 0fb2233 commit 46671f9
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 48 deletions.
1 change: 1 addition & 0 deletions packages/admin-web-angular/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
!.vscode/extensions.json

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
16 changes: 0 additions & 16 deletions packages/admin-web-angular/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand Down Expand Up @@ -163,14 +162,6 @@
}
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["tsconfig.json", "tsconfig.spec.json"],
"typeCheck": true,
"exclude": ["**/node_modules/**/*"]
}
}
}
},
Expand All @@ -185,13 +176,6 @@
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "ever-admin:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["tsconfig.e2e.json"],
"exclude": ["**/node_modules/**/*"]
}
}
}
}
Expand Down
40 changes: 19 additions & 21 deletions packages/admin-web-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@
},
"dependencies": {
"@agm/core": "^1.1.0",
"@angular/animations": "^12.2.10",
"@angular/animations": "^13.0.3",
"@angular/cdk": "^12.2.10",
"@angular/common": "^12.2.10",
"@angular/compiler": "^12.2.10",
"@angular/core": "^12.2.10",
"@angular/forms": "^12.2.10",
"@angular/language-service": "^12.2.10",
"@angular/localize": "^12.2.11",
"@angular/platform-browser": "^12.2.10",
"@angular/platform-browser-dynamic": "^12.2.10",
"@angular/router": "^12.2.10",
"@angular/common": "^13.0.3",
"@angular/compiler": "^13.0.3",
"@angular/core": "^13.0.3",
"@angular/forms": "^13.0.3",
"@angular/language-service": "^13.0.3",
"@angular/localize": "^13.0.3",
"@angular/platform-browser": "^13.0.3",
"@angular/platform-browser-dynamic": "^13.0.3",
"@angular/router": "^13.0.3",
"@asymmetrik/ngx-leaflet": "^8.1.0",
"@ever-co/angular2-wizard": "^0.6.2",
"@ever-platform/common": "^0.4.3",
Expand Down Expand Up @@ -89,7 +89,6 @@
"buffer": "^6.0.3",
"chart.js": "^3.6.0",
"ckeditor": "^4.11.4",
"classlist.js": "1.1.20150312",
"core-js": "^3.18.3",
"cryptiles": "^4.1.3",
"echarts": "^5.2.1",
Expand Down Expand Up @@ -140,20 +139,19 @@
"underscore": "^1.13.1",
"underscore.string": "^3.3.5",
"uuid": "^8.3.2",
"web-animations-js": "^2.3.2",
"zen-observable": "^0.8.15",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^12.1.3",
"@angular-devkit/architect": "^0.1202.10",
"@angular-devkit/build-angular": "^12.2.10",
"@angular-devkit/architect": "^0.1300.4",
"@angular-devkit/build-angular": "^13.0.4",
"@angular-devkit/build-optimizer": "^0.1202.10",
"@angular-devkit/build-webpack": "^0.1202.10",
"@angular-devkit/core": "^12.2.10",
"@angular-devkit/schematics": "^12.2.10",
"@angular/cli": "^12.2.10",
"@angular/compiler-cli": "~12.2.10",
"@angular-devkit/build-webpack": "^0.1300.4",
"@angular-devkit/core": "^13.0.4",
"@angular-devkit/schematics": "^13.0.4",
"@angular/cli": "^13.0.4",
"@angular/compiler-cli": "~13.0.3",
"@storybook/addon-actions": "^6.3.12",
"@storybook/addon-knobs": "^6.3.1",
"@storybook/addon-links": "^6.3.12",
Expand All @@ -176,11 +174,11 @@
"swiper": "6.4.15",
"ts-node": "~10.3.0",
"tslint": "~5.20.1",
"typescript": "~4.2.4"
"typescript": "~4.4.4"
},
"engines": {
"node": ">=14.4.0",
"yarn": ">=1.13.0"
},
"snyk": false
}
}
11 changes: 1 addition & 10 deletions packages/admin-web-angular/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,12 @@ import 'core-js/es6/date';
import 'core-js/es6/array';
import 'core-js/es6/regexp';
import 'core-js/es6/map';
import 'core-js/es6/set';

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

/** IE10 and IE11 requires the following to support `@angular/animation`. */
import 'web-animations-js'; // Run `npm install --save web-animations-js`.
import 'core-js/es6/set'; // Run `npm install --save classlist.js`. // Run `npm install --save web-animations-js`.

/** Evergreen browsers require these. */
import 'core-js/es6/reflect';
import 'core-js/es7/reflect';

/** ALL Firefox browsers require the following to support `@angular/animation`. */
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/***************************************************************************************************
* Zone JS is required by Angular itself.
*/
Expand Down
4 changes: 3 additions & 1 deletion packages/admin-web-angular/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ __karma__.loaded = function () {};
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
);
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
Expand Down

0 comments on commit 46671f9

Please sign in to comment.