Skip to content

Commit 29982e6

Browse files
committed
Upgrade to Angular 6.
1 parent 28d1b9c commit 29982e6

File tree

9 files changed

+11737
-104
lines changed

9 files changed

+11737
-104
lines changed

.angular-cli.json

-67
This file was deleted.

angular.json

+135
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"angular-app-starterkit": {
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+
"preserveSymlinks": true,
19+
"polyfills": "src/polyfills.ts",
20+
"assets": [
21+
"src/assets",
22+
"src/favicon.ico"
23+
],
24+
"styles": [
25+
"src/styles.scss",
26+
"node_modules/font-awesome/scss/font-awesome.scss"
27+
],
28+
"scripts": []
29+
},
30+
"configurations": {
31+
"production": {
32+
"optimization": true,
33+
"outputHashing": "all",
34+
"sourceMap": false,
35+
"extractCss": true,
36+
"namedChunks": false,
37+
"aot": true,
38+
"extractLicenses": true,
39+
"vendorChunk": false,
40+
"buildOptimizer": true,
41+
"fileReplacements": [
42+
{
43+
"replace": "src/environments/environment.ts",
44+
"with": "src/environments/environment.prod.ts"
45+
}
46+
]
47+
}
48+
}
49+
},
50+
"serve": {
51+
"builder": "@angular-devkit/build-angular:dev-server",
52+
"options": {
53+
"browserTarget": "angular-app-starterkit:build"
54+
},
55+
"configurations": {
56+
"production": {
57+
"browserTarget": "angular-app-starterkit:build:production"
58+
}
59+
}
60+
},
61+
"extract-i18n": {
62+
"builder": "@angular-devkit/build-angular:extract-i18n",
63+
"options": {
64+
"browserTarget": "angular-app-starterkit:build"
65+
}
66+
},
67+
"test": {
68+
"builder": "@angular-devkit/build-angular:karma",
69+
"options": {
70+
"main": "src/test.ts",
71+
"karmaConfig": "./karma.conf.js",
72+
"polyfills": "src/polyfills.ts",
73+
"tsConfig": "src/tsconfig.spec.json",
74+
"scripts": [],
75+
"styles": [
76+
"src/styles.scss",
77+
"node_modules/font-awesome/scss/font-awesome.scss"
78+
],
79+
"assets": [
80+
"src/assets",
81+
"src/favicon.ico"
82+
]
83+
}
84+
},
85+
"lint": {
86+
"builder": "@angular-devkit/build-angular:tslint",
87+
"options": {
88+
"tsConfig": [
89+
"src/tsconfig.app.json",
90+
"src/tsconfig.spec.json"
91+
],
92+
"exclude": [
93+
"**/node_modules/**"
94+
]
95+
}
96+
}
97+
}
98+
},
99+
"angular-app-starterkit-e2e": {
100+
"root": "",
101+
"sourceRoot": "",
102+
"projectType": "application",
103+
"architect": {
104+
"e2e": {
105+
"builder": "@angular-devkit/build-angular:protractor",
106+
"options": {
107+
"protractorConfig": "./protractor.conf.js",
108+
"devServerTarget": "angular-app-starterkit:serve"
109+
}
110+
},
111+
"lint": {
112+
"builder": "@angular-devkit/build-angular:tslint",
113+
"options": {
114+
"tsConfig": [
115+
"e2e/tsconfig.e2e.json"
116+
],
117+
"exclude": [
118+
"**/node_modules/**"
119+
]
120+
}
121+
}
122+
}
123+
}
124+
},
125+
"defaultProject": "angular-app-starterkit",
126+
"schematics": {
127+
"@schematics/angular:component": {
128+
"prefix": "app",
129+
"styleext": "scss"
130+
},
131+
"@schematics/angular:directive": {
132+
"prefix": "app"
133+
}
134+
}
135+
}

karma.conf.js

+3-3
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)