Skip to content

Commit 1096b03

Browse files
authored
Merge pull request #9 from pradeep0601/feature
fix for CI build
2 parents 9e95f3d + dc0e7b4 commit 1096b03

File tree

7 files changed

+13726
-69
lines changed

7 files changed

+13726
-69
lines changed

.angular-cli.json

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

angular.json

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
{
2+
"$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"angular5-router-app": {
7+
"root": "",
8+
"projectType": "application",
9+
"architect": {
10+
"build": {
11+
"builder": "@angular-devkit/build-angular:browser",
12+
"options": {
13+
"outputPath": "dist",
14+
"index": "src/index.html",
15+
"main": "src/main.ts",
16+
"tsConfig": "src/tsconfig.app.json",
17+
"polyfills": "src/polyfills.ts",
18+
"assets": [
19+
{
20+
"glob": "**/*",
21+
"input": "src/assets",
22+
"output": "/assets"
23+
},
24+
{
25+
"glob": "favicon.ico",
26+
"input": "src",
27+
"output": "/"
28+
}
29+
],
30+
"styles": [
31+
"src/styles.css"
32+
],
33+
"scripts": []
34+
},
35+
"configurations": {
36+
"production": {
37+
"optimization": true,
38+
"outputHashing": "all",
39+
"sourceMap": false,
40+
"extractCss": true,
41+
"namedChunks": false,
42+
"aot": true,
43+
"extractLicenses": true,
44+
"vendorChunk": false,
45+
"buildOptimizer": true,
46+
"fileReplacements": [
47+
{
48+
"replace": "src/environments/environment.ts",
49+
"with": "src/environments/environment.prod.ts"
50+
}
51+
]
52+
}
53+
}
54+
},
55+
"serve": {
56+
"builder": "@angular-devkit/build-angular:dev-server",
57+
"options": {
58+
"browserTarget": "angular5-router-app:build"
59+
},
60+
"configurations": {
61+
"production": {
62+
"browserTarget": "angular5-router-app:build:production"
63+
}
64+
}
65+
},
66+
"extract-i18n": {
67+
"builder": "@angular-devkit/build-angular:extract-i18n",
68+
"options": {
69+
"browserTarget": "angular5-router-app:build"
70+
}
71+
},
72+
"test": {
73+
"builder": "@angular-devkit/build-angular:karma",
74+
"options": {
75+
"main": "src/test.ts",
76+
"karmaConfig": "./karma.conf.js",
77+
"polyfills": "src/polyfills.ts",
78+
"tsConfig": "src/tsconfig.spec.json",
79+
"scripts": [],
80+
"styles": [
81+
"src/styles.css"
82+
],
83+
"assets": [
84+
{
85+
"glob": "**/*",
86+
"input": "src/assets",
87+
"output": "/assets"
88+
},
89+
{
90+
"glob": "favicon.ico",
91+
"input": "src",
92+
"output": "/"
93+
}
94+
]
95+
}
96+
},
97+
"lint": {
98+
"builder": "@angular-devkit/build-angular:tslint",
99+
"options": {
100+
"tsConfig": [
101+
"src/tsconfig.app.json",
102+
"src/tsconfig.spec.json"
103+
],
104+
"exclude": [
105+
"**/node_modules/**"
106+
]
107+
}
108+
}
109+
}
110+
},
111+
"angular5-router-app-e2e": {
112+
"root": "",
113+
"projectType": "application",
114+
"cli": {},
115+
"schematics": {},
116+
"architect": {
117+
"e2e": {
118+
"builder": "@angular-devkit/build-angular:protractor",
119+
"options": {
120+
"protractorConfig": "./protractor.conf.js",
121+
"devServerTarget": "angular5-router-app:serve"
122+
}
123+
},
124+
"lint": {
125+
"builder": "@angular-devkit/build-angular:tslint",
126+
"options": {
127+
"tsConfig": [
128+
"e2e/tsconfig.e2e.json"
129+
],
130+
"exclude": [
131+
"**/node_modules/**"
132+
]
133+
}
134+
}
135+
}
136+
}
137+
},
138+
"cli": {},
139+
"schematics": {
140+
"@schematics/angular:component": {
141+
"prefix": "app",
142+
"styleext": "css"
143+
},
144+
"@schematics/angular:directive": {
145+
"prefix": "app"
146+
}
147+
}
148+
}

karma.conf.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
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
},
2222
angularCli: {

0 commit comments

Comments
 (0)