Fix Bug 2121: NG-UI uses unmaintained Chokidar version
- Upgraded Angular from 11 to 14 version to remove chokidar
unmaintained version.
- Changed linting tool tslint to eslint for angular 14 as tslint
is depreacted after angular 12
- Resolved linting issues from code
Change-Id: I00e908ab651db0f080e0d18a9d1c9711f4e36b91
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/angular.json b/angular.json
index a8eb6a6..60abb89 100644
--- a/angular.json
+++ b/angular.json
@@ -10,7 +10,6 @@
"prefix": "app",
"schematics": {
"@schematics/angular:component": {
- "styleext": "scss",
"style": "scss"
}
},
@@ -23,6 +22,20 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
+ "allowedCommonJsDependencies": [
+ "chart.js",
+ "ng-sidebar",
+ "@ctrl/ngx-codemirror",
+ "rbush",
+ "lodash",
+ "jsonpath",
+ "codemirror",
+ "pako",
+ "js-untar",
+ "util",
+ "http-status-codes",
+ "js-yaml"
+ ],
"assets": [
"src/favicon.ico",
"src/assets"
@@ -34,7 +47,12 @@
],
"scripts": [
"src/assets/js/tar.js"
- ]
+ ],
+ "stylePreprocessorOptions": {
+ "includePaths": [
+ "node_modules/"
+ ]
+ }
},
"configurations": {
"production": {
@@ -97,15 +115,26 @@
]
}
},
- "lint": {
- "builder": "@angular-devkit/build-angular:tslint",
+ "e2e": {
+ "builder": "@cypress/schematic:cypress",
"options": {
- "tsConfig": [
- "src/tsconfig.app.json",
- "src/tsconfig.spec.json"
- ],
- "exclude": [
- "**/node_modules/**"
+ "devServerTarget": "osm:serve",
+ "watch": true,
+ "headless": false,
+ "configFile": "e2e//cypress.config.js"
+ },
+ "configurations": {
+ "production": {
+ "devServerTarget": "osm:serve:production"
+ }
+ }
+ },
+ "lint": {
+ "builder": "@angular-eslint/builder:lint",
+ "options": {
+ "lintFilePatterns": [
+ "src/**/*.ts",
+ "src/**/*.html"
]
}
}
@@ -117,28 +146,25 @@
"prefix": "",
"architect": {
"e2e": {
- "builder": "@angular-devkit/build-angular:protractor",
+ "builder": "@cypress/schematic:cypress",
"options": {
- "protractorConfig": "e2e/protractor.conf.js",
- "devServerTarget": "osm:serve"
+ "devServerTarget": "osm-e2e:serve",
+ "watch": true,
+ "headless": false,
+ "configFile": "e2e//cypress.config.js"
},
"configurations": {
"production": {
- "devServerTarget": "osm:serve:production"
+ "devServerTarget": "osm-e2e:serve:production"
}
}
- },
- "lint": {
- "builder": "@angular-devkit/build-angular:tslint",
- "options": {
- "tsConfig": "e2e/tsconfig.e2e.json",
- "exclude": [
- "**/node_modules/**"
- ]
- }
}
}
}
},
- "defaultProject": "osm"
+ "cli": {
+ "schematicCollections": [
+ "@angular-eslint/schematics"
+ ]
+ }
}
\ No newline at end of file