Skip to content

Commit 5c6aa87

Browse files
clydinhansl
authored andcommitted
fix(@angular/cli): make schema properly support configuration options
1 parent 0330a49 commit 5c6aa87

File tree

1 file changed

+12
-41
lines changed

1 file changed

+12
-41
lines changed

packages/@angular/cli/lib/config/schema.json

Lines changed: 12 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@
135135
"default": false,
136136
"description": "Specifies if declaring module exports the component."
137137
}
138-
},
139-
"required": []
138+
}
140139
},
141140
"@schematics/angular:directive": {
142141
"type": "object",
@@ -178,8 +177,7 @@
178177
"default": false,
179178
"description": "Specifies if declaring module exports the directive."
180179
}
181-
},
182-
"required": []
180+
}
183181
},
184182
"@schematics/angular:module": {
185183
"type": "object",
@@ -216,8 +214,7 @@
216214
"description": "Allows specification of the declaring module.",
217215
"alias": "m"
218216
}
219-
},
220-
"required": []
217+
}
221218
},
222219
"@schematics/angular:service": {
223220
"type": "object",
@@ -327,6 +324,10 @@
327324
"root",
328325
"projectType"
329326
],
327+
"additionalProperties": false,
328+
"patternProperties": {
329+
"^[a-z]{1,3}-.*": {}
330+
},
330331
"definitions": {
331332
"target": {
332333
"oneOf": [
@@ -511,11 +512,7 @@
511512
"description": "The output path of the index.html file. By default will overwrite the input file."
512513
}
513514
},
514-
"additionalProperties": false,
515-
"required": [
516-
"browserTarget",
517-
"serverTarget"
518-
]
515+
"additionalProperties": false
519516
},
520517
"browser": {
521518
"title": "Webpack browser schema for Build Facade.",
@@ -750,12 +747,6 @@
750747
}
751748
},
752749
"additionalProperties": false,
753-
"required": [
754-
"outputPath",
755-
"index",
756-
"main",
757-
"tsConfig"
758-
],
759750
"definitions": {
760751
"assetPattern": {
761752
"type": "object",
@@ -1021,10 +1012,7 @@
10211012
"description": "Log progress to the console while building."
10221013
}
10231014
},
1024-
"additionalProperties": false,
1025-
"required": [
1026-
"browserTarget"
1027-
]
1015+
"additionalProperties": false
10281016
},
10291017
"extracti18n": {
10301018
"description": "Extract i18n target options for Build Facade.",
@@ -1060,10 +1048,7 @@
10601048
"description": "Name of the file to output."
10611049
}
10621050
},
1063-
"additionalProperties": false,
1064-
"required": [
1065-
"browserTarget"
1066-
]
1051+
"additionalProperties": false
10671052
},
10681053
"karma": {
10691054
"description": "Karma target options for Build Facade.",
@@ -1212,11 +1197,6 @@
12121197
}
12131198
},
12141199
"additionalProperties": false,
1215-
"required": [
1216-
"main",
1217-
"tsConfig",
1218-
"karmaConfig"
1219-
],
12201200
"definitions": {
12211201
"assetPattern": {
12221202
"type": "object",
@@ -1327,10 +1307,7 @@
13271307
"description": "Base URL for protractor to connect to."
13281308
}
13291309
},
1330-
"additionalProperties": false,
1331-
"required": [
1332-
"protractorConfig"
1333-
]
1310+
"additionalProperties": false
13341311
},
13351312
"server": {
13361313
"title": "Angular Webpack Architect Builder Schema",
@@ -1487,11 +1464,6 @@
14871464
}
14881465
},
14891466
"additionalProperties": false,
1490-
"required": [
1491-
"outputPath",
1492-
"main",
1493-
"tsConfig"
1494-
],
14951467
"definitions": {
14961468
"fileReplacement": {
14971469
"oneOf": [
@@ -1605,8 +1577,7 @@
16051577
}
16061578
}
16071579
},
1608-
"additionalProperties": false,
1609-
"required": []
1580+
"additionalProperties": false
16101581
}
16111582
}
16121583
}

0 commit comments

Comments
 (0)