Skip to content

Commit 1209a3f

Browse files
author
hari
committed
upgrade
1 parent 71108cc commit 1209a3f

File tree

7 files changed

+14915
-12175
lines changed

7 files changed

+14915
-12175
lines changed

‎.angular-cli.json

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎angular.json

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"cd-admin-v2": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"architect": {
11+
"build": {
12+
"builder": "@angular-devkit/build-angular:browser",
13+
"options": {
14+
"outputPath": "dist",
15+
"index": "src/index.html",
16+
"main": "src/main.ts",
17+
"tsConfig": "src/tsconfig.app.json",
18+
"polyfills": "src/polyfills.ts",
19+
"assets": [
20+
"src/assets",
21+
"src/favicon.ico"
22+
],
23+
"styles": [
24+
"src/theme/theme.scss",
25+
"src/theme/typography.scss"
26+
],
27+
"scripts": []
28+
},
29+
"configurations": {
30+
"prod": {
31+
"fileReplacements": [
32+
{
33+
"replace": "src/environments/environment.ts",
34+
"with": "src/environments/environment.prod.ts"
35+
}
36+
]
37+
}
38+
}
39+
},
40+
"serve": {
41+
"builder": "@angular-devkit/build-angular:dev-server",
42+
"options": {
43+
"browserTarget": "cd-admin-v2:build"
44+
},
45+
"configurations": {
46+
"prod": {
47+
"browserTarget": "cd-admin-v2:build:prod"
48+
}
49+
}
50+
},
51+
"extract-i18n": {
52+
"builder": "@angular-devkit/build-angular:extract-i18n",
53+
"options": {
54+
"browserTarget": "cd-admin-v2:build"
55+
}
56+
},
57+
"test": {
58+
"builder": "@angular-devkit/build-angular:karma",
59+
"options": {
60+
"main": "src/test.ts",
61+
"karmaConfig": "./karma.conf.js",
62+
"polyfills": "src/polyfills.ts",
63+
"tsConfig": "src/tsconfig.spec.json",
64+
"scripts": [],
65+
"styles": [
66+
"src/theme/theme.scss",
67+
"src/theme/typography.scss"
68+
],
69+
"assets": [
70+
"src/assets",
71+
"src/favicon.ico"
72+
]
73+
}
74+
},
75+
"lint": {
76+
"builder": "@angular-devkit/build-angular:tslint",
77+
"options": {
78+
"tsConfig": [
79+
"src/tsconfig.app.json",
80+
"src/tsconfig.spec.json"
81+
],
82+
"exclude": [
83+
"**/node_modules/**"
84+
]
85+
}
86+
}
87+
}
88+
},
89+
"cd-admin-v2-e2e": {
90+
"root": "",
91+
"sourceRoot": "e2e",
92+
"projectType": "application",
93+
"architect": {
94+
"e2e": {
95+
"builder": "@angular-devkit/build-angular:protractor",
96+
"options": {
97+
"protractorConfig": "./protractor.conf.js",
98+
"devServerTarget": "cd-admin-v2:serve"
99+
}
100+
},
101+
"lint": {
102+
"builder": "@angular-devkit/build-angular:tslint",
103+
"options": {
104+
"tsConfig": [
105+
"e2e/tsconfig.e2e.json"
106+
],
107+
"exclude": [
108+
"**/node_modules/**"
109+
]
110+
}
111+
}
112+
}
113+
}
114+
},
115+
"defaultProject": "cd-admin-v2",
116+
"schematics": {
117+
"@schematics/angular:component": {
118+
"prefix": "app",
119+
"styleext": "scss"
120+
},
121+
"@schematics/angular:directive": {
122+
"prefix": "app"
123+
}
124+
}
125+
}

‎karma.conf.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,22 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular/cli'],
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular/cli/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
19-
reports: [ 'html', 'lcovonly' ],
19+
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
2020
fixWebpackSourcePaths: true
2121
},
22-
angularCli: {
23-
environment: 'dev'
24-
},
22+
2523
reporters: ['progress', 'kjhtml'],
2624
port: 9876,
2725
colors: true,

0 commit comments

Comments
 (0)