Skip to content

Commit 707a90e

Browse files
authored
Merge pull request #79 from coreui/v2.0.0
V2.0.0
2 parents 995b091 + 19c4a91 commit 707a90e

18 files changed

+3268
-4336
lines changed

.angular-cli.json

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

angular.json

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

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)