Skip to content

Commit 518ff63

Browse files
cyrilletuzifilipesilva
authored andcommitted
fix(@angular/cli): allow strings for assets in schema
1 parent 9617fba commit 518ff63

File tree

1 file changed

+26
-18
lines changed

1 file changed

+26
-18
lines changed

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

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -748,27 +748,35 @@
748748
},
749749
"additionalProperties": false,
750750
"definitions": {
751-
"assetPattern": {
752-
"type": "object",
753-
"properties": {
754-
"glob": {
755-
"type": "string",
756-
"description": "The pattern to match."
757-
},
758-
"input": {
759-
"type": "string",
760-
"description": "The input path dir in which to apply 'glob'. Defaults to the project root."
751+
"assetPattern":
752+
"oneOf": [
753+
{
754+
"type": "object",
755+
"properties": {
756+
"glob": {
757+
"type": "string",
758+
"description": "The pattern to match."
759+
},
760+
"input": {
761+
"type": "string",
762+
"description": "The input path dir in which to apply 'glob'. Defaults to the project root."
763+
},
764+
"output": {
765+
"type": "string",
766+
"description": "Absolute path within the output."
767+
}
768+
},
769+
"additionalProperties": false,
770+
"required": [
771+
"glob",
772+
"input",
773+
"output"
774+
]
761775
},
762-
"output": {
776+
{
763777
"type": "string",
764-
"description": "Absolute path within the output."
778+
"description": "The file to include."
765779
}
766-
},
767-
"additionalProperties": false,
768-
"required": [
769-
"glob",
770-
"input",
771-
"output"
772780
]
773781
},
774782
"fileReplacement": {

0 commit comments

Comments
 (0)