Skip to content

Commit 718ef69

Browse files
Merge pull request #101 from dasco144/upgrade-ng12
Upgrade ng12
2 parents 549d091 + 0186147 commit 718ef69

File tree

11 files changed

+2961
-4836
lines changed

11 files changed

+2961
-4836
lines changed

angular.json

+26-12
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"build": {
1414
"builder": "@angular-devkit/build-angular:browser",
1515
"options": {
16-
"aot": true,
1716
"outputPath": "dist/demo",
1817
"index": "src/index.html",
1918
"main": "src/main.ts",
@@ -26,7 +25,13 @@
2625
"styles": [
2726
"src/styles.css"
2827
],
29-
"scripts": []
28+
"scripts": [],
29+
"vendorChunk": true,
30+
"extractLicenses": false,
31+
"buildOptimizer": false,
32+
"sourceMap": true,
33+
"optimization": false,
34+
"namedChunks": true
3035
},
3136
"configurations": {
3237
"production": {
@@ -40,7 +45,6 @@
4045
"outputHashing": "all",
4146
"sourceMap": false,
4247
"namedChunks": false,
43-
"aot": true,
4448
"extractLicenses": true,
4549
"vendorChunk": false,
4650
"buildOptimizer": true,
@@ -55,19 +59,24 @@
5559
"maximumWarning": "6kb"
5660
}
5761
]
58-
}
59-
}
62+
},
63+
"development": {}
64+
},
65+
"defaultConfiguration": "production"
6066
},
6167
"serve": {
6268
"builder": "@angular-devkit/build-angular:dev-server",
6369
"options": {
64-
"browserTarget": "demo:build"
6570
},
6671
"configurations": {
6772
"production": {
6873
"browserTarget": "demo:build:production"
74+
},
75+
"development": {
76+
"browserTarget": "demo:build:development"
6977
}
70-
}
78+
},
79+
"defaultConfiguration": "development"
7180
},
7281
"extract-i18n": {
7382
"builder": "@angular-devkit/build-angular:extract-i18n",
@@ -114,14 +123,17 @@
114123
"e2e": {
115124
"builder": "@angular-devkit/build-angular:protractor",
116125
"options": {
117-
"protractorConfig": "e2e/protractor.conf.js",
118-
"devServerTarget": "demo:serve"
126+
"protractorConfig": "e2e/protractor.conf.js"
119127
},
120128
"configurations": {
121129
"production": {
122130
"devServerTarget": "demo:serve:production"
131+
},
132+
"development": {
133+
"devServerTarget": "demo:serve:development"
123134
}
124-
}
135+
},
136+
"defaultConfiguration": "development"
125137
},
126138
"lint": {
127139
"builder": "@angular-devkit/build-angular:tslint",
@@ -149,8 +161,10 @@
149161
"configurations": {
150162
"production": {
151163
"tsConfig": "projects/ngx-gauge/tsconfig.lib.prod.json"
152-
}
153-
}
164+
},
165+
"development": {}
166+
},
167+
"defaultConfiguration": "production"
154168
},
155169
"test": {
156170
"builder": "@angular-devkit/build-angular:karma",

apps/demo/src/polyfills.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import 'core-js/es7/reflect';
5353
/***************************************************************************************************
5454
* Zone JS is required by Angular itself.
5555
*/
56-
import 'zone.js/dist/zone'; // Included with Angular CLI.
56+
import 'zone.js'; // Included with Angular CLI.
5757

5858
/***************************************************************************************************
5959
* APPLICATION IMPORTS

0 commit comments

Comments
 (0)