Skip to content

Commit

Permalink
Feature/angular v13 (#1437)
Browse files Browse the repository at this point in the history 
* feat: angular upgrade v12 to v13 for admin web angular #1427

* fix: updated yarn.lock

* feat: angular upgrade v12 to v13 for carrier mobile ionic #1427

* feat: feat: angular upgrade v12 to v13 for common angular #1427

* feat: feat: angular upgrade v12 to v13 for merchant tablet ionic #1427

* feat: angular upgrade v12 to v13 for shop mobile ionic #1427

* feat: angular upgrade v12 to v13 for root package #1427

* fix: updated `yarn.lock` for root packages

* fix: shop mobile ionic build issue

* fix: updated typescript v4.4.4 everywhere

* fix: .gitignore angular cache directory

Co-authored-by: RAHUL RATHORE <[email protected]>
  • Loading branch information
@evereq @rahul-rocket
evereq and rahul-rocket authored Dec 9, 2021
1 parent 0cde8d2 commit 0ce4d48
Show file tree
Hide file tree
Showing 29 changed files with 704 additions and 957 deletions.
42 changes: 21 additions & 21 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,36 +52,36 @@
"snyk-protect": "snyk protect"
},
"resolutions": {
"@angular-devkit/build-angular": "~12.2.7",
"@angular-devkit/architect": "^0.1202.7",
"@angular-devkit/core": "^12.2.7",
"@angular-devkit/build-angular": "~13.0.4",
"@angular-devkit/architect": "^0.1300.4",
"@angular-devkit/core": "^13.0.4",
"rxjs": "^7.4.0"
},
"dependencies": {
"@angular/animations": "^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/platform-browser": "^12.2.10",
"@angular/platform-browser-dynamic": "^12.2.10",
"@angular/router": "^12.2.10",
"@angular/service-worker": "^12.2.10",
"@angular/animations": "^13.0.3",
"@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/platform-browser": "^13.0.3",
"@angular/platform-browser-dynamic": "^13.0.3",
"@angular/router": "^13.0.3",
"@angular/service-worker": "^13.0.3",
"rxjs": "^7.4.0",
"ng2-smart-table": "^1.7.2",
"ng2-completer": "^9.0.1",
"unleash": "^2.0.2"
},
"devDependencies": {
"@angular-devkit/architect": "^0.1202.7",
"@angular-devkit/build-angular": "~12.2.7",
"@angular-devkit/core": "^12.2.7",
"@angular-devkit/schematics": "^12.2.7",
"@angular-devkit/architect": "^0.1300.4",
"@angular-devkit/build-angular": "~13.0.4",
"@angular-devkit/core": "^13.0.4",
"@angular-devkit/schematics": "^13.0.4",
"@angular-eslint/eslint-plugin": "~1.0.0",
"@angular-eslint/eslint-plugin-template": "~1.0.0",
"@angular/cli": "^12.2.10",
"@angular/compiler-cli": "~12.2.10",
"@angular/cli": "^13.0.4",
"@angular/compiler-cli": "~13.0.3",
"@commitlint/cli": "^13.2.1",
"@commitlint/config-conventional": "^13.2.0",
"@commitlint/config-lerna-scopes": "^13.2.0",
Expand Down Expand Up @@ -204,7 +204,7 @@
"tslint-loader": "^3.6.0",
"typedoc": "^0.22.5",
"typemoq": "^2.1.0",
"typescript": "~4.2.4",
"typescript": "~4.4.4",
"yargs": "^17.2.1",
"typescript-tslint-plugin": "^1.0.1",
"uglifyjs-webpack-plugin": "^2.2.0",
Expand Down Expand Up @@ -284,4 +284,4 @@
"prefix": "ever",
"framework": "angular"
}
}
}
1 change: 1 addition & 0 deletions packages/admin-web-angular/.gitignore
View file
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
View file
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
44 changes: 21 additions & 23 deletions packages/admin-web-angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,18 @@
},
"dependencies": {
"@agm/core": "^1.1.0",
"@angular/animations": "^12.2.10",
"@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/animations": "^13.0.3",
"@angular/cdk": "^13.1.0",
"@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",
"@apollo/client": "^3.5.5",
"@asymmetrik/ngx-leaflet": "^8.1.0",
"@ever-co/angular2-wizard": "^0.6.2",
"@ever-platform/common": "^0.4.3",
Expand All @@ -83,13 +84,11 @@
"angular2-toaster": "^11.0.1",
"angular2-uuid": "^1.1.1",
"apollo-angular": "^2.6.0",
"@apollo/client": "^3.5.5",
"apollo-upload-client": "^16.0.0",
"bootstrap": "^4.6.0",
"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 All @@ -99,7 +98,6 @@
"global": "^4.4.0",
"graphql": "15.7.2",
"graphql-tag": "^2.12.6",
"subscriptions-transport-ws": "^0.11.0",
"highlight.js": "^11.2.0",
"intl": "^1.2.5",
"ionicons": "^5.5.3",
Expand Down Expand Up @@ -134,26 +132,26 @@
"socicon": "^3.0.5",
"socket.io-client": "^4.3.0",
"stripe": "^8.183.0",
"subscriptions-transport-ws": "^0.11.0",
"tinymce": "^5.10.0",
"tslib": "^2.3.1",
"typeface-exo": "^1.1.13",
"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,7 +174,7 @@
"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",
Expand Down
11 changes: 1 addition & 10 deletions packages/admin-web-angular/src/polyfills.ts
View file
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
View file
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
1 change: 1 addition & 0 deletions packages/carrier-mobile-ionic/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.angular/cache
*~
*.sw[mnpcod]
*.log
Expand Down
17 changes: 0 additions & 17 deletions packages/carrier-mobile-ionic/angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,6 @@
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**"]
}
},
"ionic-cordova-build": {
"builder": "@ionic/angular-toolkit:cordova-build",
"options": {
Expand Down Expand Up @@ -165,13 +155,6 @@
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "app:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": ["**/node_modules/**"]
}
}
}
}
Expand Down
44 changes: 22 additions & 22 deletions packages/carrier-mobile-ionic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,17 @@
"cordova:run:prod:device": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ionic cordova run android --prod --release --device"
},
"dependencies": {
"@angular/animations": "^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/platform-browser": "^12.2.10",
"@angular/platform-browser-dynamic": "^12.2.10",
"@angular/router": "^12.2.10",
"@angular/service-worker": "^12.2.10",
"@angular/animations": "^13.0.3",
"@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/platform-browser": "^13.0.3",
"@angular/platform-browser-dynamic": "^13.0.3",
"@angular/router": "^13.0.3",
"@angular/service-worker": "^13.0.3",
"@apollo/client": "^3.5.5",
"@ever-platform/common": "^0.4.3",
"@ever-platform/common-angular": "^0.4.3",
"@ionic-native/barcode-scanner": "^5.36.0",
Expand All @@ -78,11 +79,9 @@
"@ionic/angular": "^5.8.4",
"@ionic/pro": "^2.0.4",
"@ionic/storage": "^3.0.6",
"ngx-progressbar": "^6.1.1",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"apollo-angular": "^2.6.0",
"@apollo/client": "^3.5.5",
"call-number": "^1.0.1",
"connect": "^3.7.0",
"cordova-android": "^10.1.1",
Expand Down Expand Up @@ -131,6 +130,7 @@
"mquery": "^4.0.0",
"mx.ferreyra.callnumber": "0.0.2",
"neo-async": "^2.6.2",
"ngx-progressbar": "^6.1.1",
"phonegap-plugin-barcodescanner": "^8.0.1",
"pm2": "^5.1.2",
"qrcode": "^1.4.4",
Expand All @@ -150,15 +150,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/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-builders/custom-webpack": "^13.0.0",
"@angular-devkit/architect": "^0.1300.4",
"@angular-devkit/build-angular": "^13.0.4",
"@angular-devkit/build-optimizer": "^0.1300.4",
"@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",
"@ionic/angular-toolkit": "^4.0.0",
"@ionic/lab": "^3.2.10",
"@types/jasmine": "~3.9.1",
Expand All @@ -176,7 +176,7 @@
"protractor": "~7.0.0",
"ts-node": "~10.3.0",
"tslint": "~5.20.1",
"typescript": "~4.2.4"
"typescript": "~4.4.4"
},
"config": {
"ionic_webpack": "./config/webpack.config.js"
Expand Down
9 changes: 0 additions & 9 deletions packages/carrier-mobile-ionic/src/polyfills.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,13 @@ import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js';
// import 'core-js/es6/weak-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 for the Reflect API. */
// import 'core-js/es6/reflect';

/** Evergreen browsers require these. **/
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
import 'core-js/es7/reflect';

/**
* Required to support Web Animations `@angular/platform-browser/animations`.
* Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-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/carrier-mobile-ionic/src/test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ declare const require: any;
// 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
Loading

0 comments on commit 0ce4d48

Please sign in to comment.