Skip to content

Commit 062faaa

Browse files
cyrilletuzihansl
authored andcommitted
fix(@angular/cli): allow strings for assets in schema
1 parent b509d61 commit 062faaa

File tree

1 file changed

+25
-17
lines changed

1 file changed

+25
-17
lines changed

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

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,26 +1211,34 @@
12111211
"additionalProperties": false,
12121212
"definitions": {
12131213
"assetPattern": {
1214-
"type": "object",
1215-
"properties": {
1216-
"glob": {
1217-
"type": "string",
1218-
"description": "The pattern to match."
1219-
},
1220-
"input": {
1221-
"type": "string",
1222-
"description": "The input path dir in which to apply 'glob'. Defaults to the project root."
1214+
"oneOf": [
1215+
{
1216+
"type": "object",
1217+
"properties": {
1218+
"glob": {
1219+
"type": "string",
1220+
"description": "The pattern to match."
1221+
},
1222+
"input": {
1223+
"type": "string",
1224+
"description": "The input path dir in which to apply 'glob'. Defaults to the project root."
1225+
},
1226+
"output": {
1227+
"type": "string",
1228+
"description": "Absolute path within the output."
1229+
}
1230+
},
1231+
"additionalProperties": false,
1232+
"required": [
1233+
"glob",
1234+
"input",
1235+
"output"
1236+
]
12231237
},
1224-
"output": {
1238+
{
12251239
"type": "string",
1226-
"description": "Absolute path within the output."
1240+
"description": "The file to include."
12271241
}
1228-
},
1229-
"additionalProperties": false,
1230-
"required": [
1231-
"glob",
1232-
"input",
1233-
"output"
12341242
]
12351243
},
12361244
"extraEntryPoint": {

0 commit comments

Comments
 (0)