Skip to content

Commit 06d2197

Browse files
nnixaannixaa
authored
feat: update to Angular 6 (#1684)
1 parent fa3cdf7 commit 06d2197

18 files changed

+5390
-3981
lines changed

‎.angular-cli.json

-80
This file was deleted.

‎angular.json

+174
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"ngx-admin-demo": {
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+
"src/favicon.png",
23+
{
24+
"glob": "**/*",
25+
"input": "node_modules/leaflet/dist/images",
26+
"output": "/assets/img/markers"
27+
}
28+
],
29+
"styles": [
30+
"node_modules/bootstrap/dist/css/bootstrap.css",
31+
"node_modules/typeface-exo/index.css",
32+
"node_modules/roboto-fontface/css/roboto/roboto-fontface.css",
33+
"node_modules/ionicons/scss/ionicons.scss",
34+
"node_modules/font-awesome/scss/font-awesome.scss",
35+
"node_modules/socicon/css/socicon.css",
36+
"node_modules/nebular-icons/scss/nebular-icons.scss",
37+
"node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
38+
"src/app/@theme/styles/styles.scss"
39+
],
40+
"scripts": [
41+
"node_modules/pace-js/pace.min.js",
42+
"node_modules/tinymce/tinymce.min.js",
43+
"node_modules/tinymce/themes/modern/theme.min.js",
44+
"node_modules/tinymce/plugins/link/plugin.min.js",
45+
"node_modules/tinymce/plugins/paste/plugin.min.js",
46+
"node_modules/tinymce/plugins/table/plugin.min.js",
47+
"node_modules/echarts/dist/echarts.min.js",
48+
"node_modules/echarts/dist/extension/bmap.min.js",
49+
"node_modules/chart.js/dist/Chart.min.js"
50+
]
51+
},
52+
"configurations": {
53+
"production": {
54+
"optimization": true,
55+
"outputHashing": "all",
56+
"sourceMap": false,
57+
"extractCss": true,
58+
"namedChunks": false,
59+
"aot": true,
60+
"extractLicenses": true,
61+
"vendorChunk": false,
62+
"buildOptimizer": true,
63+
"fileReplacements": [
64+
{
65+
"replace": "src/environments/environment.ts",
66+
"with": "src/environments/environment.prod.ts"
67+
}
68+
]
69+
}
70+
}
71+
},
72+
"serve": {
73+
"builder": "@angular-devkit/build-angular:dev-server",
74+
"options": {
75+
"browserTarget": "ngx-admin-demo:build"
76+
},
77+
"configurations": {
78+
"production": {
79+
"browserTarget": "ngx-admin-demo:build:production"
80+
}
81+
}
82+
},
83+
"extract-i18n": {
84+
"builder": "@angular-devkit/build-angular:extract-i18n",
85+
"options": {
86+
"browserTarget": "ngx-admin-demo:build"
87+
}
88+
},
89+
"test": {
90+
"builder": "@angular-devkit/build-angular:karma",
91+
"options": {
92+
"main": "src/test.ts",
93+
"karmaConfig": "./karma.conf.js",
94+
"polyfills": "src/polyfills.ts",
95+
"tsConfig": "src/tsconfig.spec.json",
96+
"scripts": [
97+
"node_modules/pace-js/pace.min.js",
98+
"node_modules/tinymce/tinymce.min.js",
99+
"node_modules/tinymce/themes/modern/theme.min.js",
100+
"node_modules/tinymce/plugins/link/plugin.min.js",
101+
"node_modules/tinymce/plugins/paste/plugin.min.js",
102+
"node_modules/tinymce/plugins/table/plugin.min.js",
103+
"node_modules/echarts/dist/echarts.min.js",
104+
"node_modules/echarts/dist/extension/bmap.min.js",
105+
"node_modules/chart.js/dist/Chart.min.js"
106+
],
107+
"styles": [
108+
"node_modules/bootstrap/dist/css/bootstrap.css",
109+
"node_modules/typeface-exo/index.css",
110+
"node_modules/roboto-fontface/css/roboto/roboto-fontface.css",
111+
"node_modules/ionicons/scss/ionicons.scss",
112+
"node_modules/font-awesome/scss/font-awesome.scss",
113+
"node_modules/socicon/css/socicon.css",
114+
"node_modules/nebular-icons/scss/nebular-icons.scss",
115+
"node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
116+
"src/app/@theme/styles/styles.scss"
117+
],
118+
"assets": [
119+
"src/assets",
120+
"src/favicon.ico",
121+
"src/favicon.png",
122+
{
123+
"glob": "**/*",
124+
"input": "node_modules/leaflet/dist/images",
125+
"output": "/assets/img/markers"
126+
}
127+
]
128+
}
129+
},
130+
"lint": {
131+
"builder": "@angular-devkit/build-angular:tslint",
132+
"options": {
133+
"tsConfig": [
134+
"src/tsconfig.app.json",
135+
"src/tsconfig.spec.json"
136+
],
137+
"typeCheck": true,
138+
"exclude": []
139+
}
140+
}
141+
}
142+
},
143+
"ngx-admin-demo-e2e": {
144+
"root": "",
145+
"sourceRoot": "",
146+
"projectType": "application",
147+
"architect": {
148+
"e2e": {
149+
"builder": "@angular-devkit/build-angular:protractor",
150+
"options": {
151+
"protractorConfig": "./protractor.conf.js",
152+
"devServerTarget": "ngx-admin-demo:serve"
153+
}
154+
},
155+
"lint": {
156+
"builder": "@angular-devkit/build-angular:tslint",
157+
"options": {
158+
"tsConfig": [
159+
"e2e/tsconfig.e2e.json"
160+
],
161+
"exclude": []
162+
}
163+
}
164+
}
165+
}
166+
},
167+
"defaultProject": "ngx-admin-demo",
168+
"schematics": {
169+
"@schematics/angular:component": {
170+
"styleext": "scss"
171+
},
172+
"@schematics/angular:directive": {}
173+
}
174+
}

‎karma.conf.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
module.exports = function (config) {
55
const configuration = {
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)