Skip to content

Commit de34f26

Browse files
alisaduncanalisaduncan
authored
Merge pull request #3 from alisaduncan/upgrade
update to Angular 6
2 parents d3687df + 9701081 commit de34f26

27 files changed

+4738
-6549
lines changed

‎.angular-cli.json

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

‎angular.json

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

‎e2e/app.e2e-spec.ts renamed to ‎e2e/src/app.e2e-spec.ts

File renamed without changes.

‎e2e/app.po.ts renamed to ‎e2e/src/app.po.ts

File renamed without changes.

0 commit comments

Comments
 (0)