Skip to content

Commit e3a4560

Browse files
committed
angular material 6 update
1 parent 37e4251 commit e3a4560

7 files changed

Lines changed: 7067 additions & 4979 deletions

File tree

.angular-cli.json

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

angular.json

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

karma.conf.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@
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
files: [
19-
{ pattern: './src/test.ts', watched: false }
19+
2020
],
2121
preprocessors: {
22-
'./src/test.ts': ['@angular/cli']
22+
2323
},
2424
mime: {
2525
'text/x-typescript': ['ts','tsx']
2626
},
2727
coverageIstanbulReporter: {
28-
reports: [ 'html', 'lcovonly' ],
28+
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
2929
fixWebpackSourcePaths: true
3030
},
3131
angularCli: {

0 commit comments

Comments
 (0)