Skip to content

Commit 64d6ddc

Browse files
committed
feat(angular): upgrade to angular 6
1 parent 09545a9 commit 64d6ddc

File tree

9 files changed

+3449
-4118
lines changed

9 files changed

+3449
-4118
lines changed

.angular-cli.json

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

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Angular Skeleton App
2-
Angular 5.x navigation skeleton project with styling which get you started faster.
2+
Angular 6.x navigation skeleton project with styling which get you started faster.
33

44
## What does it have?
5-
- Angular CLI 1.6 template
5+
- Angular CLI 6.0 template
66
- SCSS for styling
77
- Font Awesome and Bootstrap 4.x (no javascript, just styles)
88
- Navigation/layout
@@ -29,7 +29,7 @@ Run `npm run start:prod` build and run for production.
2929

3030
# Angular CLI
3131

32-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.6.0.
32+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.0.
3333

3434
## Development server
3535

angular.json

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

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: {
File renamed without changes.

0 commit comments

Comments
 (0)