Skip to content

Commit f98f2e5

Browse files
committed
merge
2 parents 08fae7c + 50c105b commit f98f2e5

File tree

33 files changed

+2391
-25730
lines changed

33 files changed

+2391
-25730
lines changed

angular.json

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
"prefix": "app",
2323
"architect": {
2424
"build": {
25-
"builder": "@angular-devkit/build-angular:application",
25+
"builder": "@angular-devkit/build-angular:browser-esbuild",
2626
"options": {
27-
"outputPath": "dist",
27+
"baseHref": "/ng-app/",
28+
"outputPath": "../../collected_static/ng-app",
2829
"index": "src/index.html",
29-
"browser": "src/main.ts",
30+
"main": "src/main.ts",
3031
"polyfills": [
3132
"zone.js"
3233
],
@@ -83,7 +84,7 @@
8384
"defaultConfiguration": "production"
8485
},
8586
"serve": {
86-
"builder": "@angular-devkit/build-angular:dev-server",
87+
"builder": "@angular/build:dev-server",
8788
"configurations": {
8889
"production": {
8990
"buildTarget": "seed:build:production"
@@ -94,16 +95,15 @@
9495
},
9596
"defaultConfiguration": "development",
9697
"options": {
97-
"disableHostCheck": true,
9898
"host": "0.0.0.0",
9999
"proxyConfig": "proxy.conf.mjs"
100100
}
101101
},
102102
"extract-i18n": {
103-
"builder": "@angular-devkit/build-angular:extract-i18n"
103+
"builder": "@angular/build:extract-i18n"
104104
},
105105
"test": {
106-
"builder": "@angular-devkit/build-angular:karma",
106+
"builder": "@angular/build:karma",
107107
"options": {
108108
"polyfills": [
109109
"zone.js",
@@ -134,5 +134,31 @@
134134
}
135135
}
136136
}
137+
},
138+
"schematics": {
139+
"@schematics/angular:component": {
140+
"type": "component"
141+
},
142+
"@schematics/angular:directive": {
143+
"type": "directive"
144+
},
145+
"@schematics/angular:service": {
146+
"type": "service"
147+
},
148+
"@schematics/angular:guard": {
149+
"typeSeparator": "."
150+
},
151+
"@schematics/angular:interceptor": {
152+
"typeSeparator": "."
153+
},
154+
"@schematics/angular:module": {
155+
"typeSeparator": "."
156+
},
157+
"@schematics/angular:pipe": {
158+
"typeSeparator": "."
159+
},
160+
"@schematics/angular:resolver": {
161+
"typeSeparator": "."
162+
}
137163
}
138164
}

0 commit comments

Comments
 (0)