Unverified Commit 0ce4d480 authored by Ruslan Konviser's avatar Ruslan Konviser Committed by GitHub
Browse files

Feature/angular v13 (#1437) 



* 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: default avatarRAHUL RATHORE <rahulrathore576@gmail.com>
parent 0cde8d2f

package.json

+21 −21
Original line number Diff line number Diff line
@@ -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",
@@ -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",

packages/admin-web-angular/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
!.vscode/extensions.json



# misc

/.angular/cache

/.sass-cache

/connect.lock

/coverage

packages/admin-web-angular/angular.json

+0 −16
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ 
							"optimization": true,

							"outputHashing": "all",

							"sourceMap": false,

							"extractCss": true,

							"namedChunks": false,

							"aot": true,

							"extractLicenses": true,
@@ -163,14 +162,6 @@ 
							}

						]

					}

				},

				"lint": {

					"builder": "@angular-devkit/build-angular:tslint",

					"options": {

						"tsConfig": ["tsconfig.json", "tsconfig.spec.json"],

						"typeCheck": true,

						"exclude": ["**/node_modules/**/*"]

					}

				}

			}

		},
@@ -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/**/*"]

					}

				}

			}

		}

packages/admin-web-angular/package.json

+21 −23
Original line number Diff line number Diff line
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",

packages/admin-web-angular/src/polyfills.ts

+1 −10
Original line number Diff line number Diff line
@@ -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.

 */