X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=angular.json;h=60abb899c881b0feebf61120db1ade6f1bcbdac7;hb=0a34dfa32165036b380ec6ac493469b34007df0a;hp=a8eb6a6630b60ed5583bea8917e2376a68139d90;hpb=40cc37ef2bbc4aac5debc9dea0baeb6dbd87a2d7;p=osm%2FNG-UI.git 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 @@ ] } }, + "e2e": { + "builder": "@cypress/schematic:cypress", + "options": { + "devServerTarget": "osm:serve", + "watch": true, + "headless": false, + "configFile": "e2e//cypress.config.js" + }, + "configurations": { + "production": { + "devServerTarget": "osm:serve:production" + } + } + }, "lint": { - "builder": "@angular-devkit/build-angular:tslint", + "builder": "@angular-eslint/builder:lint", "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**" + "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