Skip to content

Commit 1abbf6f

Browse files
committed
Refactor to Angular 6
1 parent 33a900c commit 1abbf6f

15 files changed

+4815
-5992
lines changed

angular.json

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"version": 1,
4-
"newProjectRoot": "",
4+
"newProjectRoot": "projects",
55
"projects": {
66
"ngxmatfire": {
77
"root": "",
8-
"sourceRoot": ".",
8+
"sourceRoot": "src",
99
"projectType": "application",
10+
"schematics": {},
1011
"architect": {
1112
"build": {
1213
"builder": "@angular-devkit/build-angular:browser",
1314
"options": {
14-
"outputPath": "dist",
15+
"outputPath": "dist/ngxmatfire",
1516
"index": "src/index.html",
1617
"main": "src/main.ts",
1718
"tsConfig": "src/tsconfig.app.json",
@@ -66,7 +67,7 @@
6667
"builder": "@angular-devkit/build-angular:karma",
6768
"options": {
6869
"main": "src/test.ts",
69-
"karmaConfig": "./karma.conf.js",
70+
"karmaConfig": "src/karma.conf.js",
7071
"polyfills": "src/polyfills.ts",
7172
"tsConfig": "src/tsconfig.spec.json",
7273
"scripts": [],
@@ -92,37 +93,27 @@
9293
}
9394
},
9495
"ngxmatfire-e2e": {
95-
"root": "",
96-
"sourceRoot": ".",
96+
"root": "e2e/",
9797
"projectType": "application",
9898
"architect": {
9999
"e2e": {
100100
"builder": "@angular-devkit/build-angular:protractor",
101101
"options": {
102-
"protractorConfig": "./protractor.conf.js",
102+
"protractorConfig": "e2e/protractor.conf.js",
103103
"devServerTarget": "ngxmatfire:serve"
104104
}
105105
},
106106
"lint": {
107107
"builder": "@angular-devkit/build-angular:tslint",
108108
"options": {
109-
"tsConfig": [
110-
"e2e/tsconfig.e2e.json"
111-
],
112-
"exclude": []
109+
"tsConfig": "e2e/tsconfig.e2e.json",
110+
"exclude": [
111+
"**/node_modules/**"
112+
]
113113
}
114114
}
115115
}
116116
}
117117
},
118-
"defaultProject": "ngxmatfire",
119-
"schematics": {
120-
"@schematics/angular:component": {
121-
"prefix": "app",
122-
"styleext": "scss"
123-
},
124-
"@schematics/angular:directive": {
125-
"prefix": "app"
126-
}
127-
}
118+
"defaultProject": "ngxmatfire"
128119
}

e2e/tsconfig.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
{
2-
"compileOnSave": false,
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
4-
"declaration": false,
5-
"emitDecoratorMetadata": true,
6-
"experimentalDecorators": true,
4+
"outDir": "../out-tsc/app",
75
"module": "commonjs",
8-
"moduleResolution": "node",
9-
"outDir": "../dist/out-tsc-e2e",
10-
"sourceMap": true,
116
"target": "es5",
12-
"typeRoots": [
13-
"../node_modules/@types"
7+
"types": [
8+
"jasmine",
9+
"jasminewd2",
10+
"node"
1411
]
1512
}
1613
}

0 commit comments

Comments
 (0)