fix(custom-webpack): specify possible types of customWebpackConfig va…

…lues (#971) Co-authored-by: JeB <[email protected]>
just-jeb · May 2, 2021 · 01f5427 · 01f5427
1 parent 6aa384b
commit 01f5427
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 18 deletions.
diff --git a/packages/custom-webpack/e2e/custom-webpack-config-schema.ts b/packages/custom-webpack/e2e/custom-webpack-config-schema.ts
@@ -1,19 +1,29 @@
 export const customWebpackConfig = {
-  type: 'object',
   description: 'Custom webpack configuration',
-  properties: {
-    path: { type: 'string', description: 'Path to the custom webpack configuration file' },
-    mergeRules: {
+  default: false,
+  oneOf: [
+    {
       type: 'object',
-      description:
-        'Merge rules as described here: https://github.com/survivejs/webpack-merge#mergewithrules',
+      properties: {
+        path: {
+          type: 'string',
+          description: 'Path to the custom webpack configuration file',
+        },
+        mergeRules: {
+          type: 'object',
+          description:
+            'Merge rules as described here: https://github.com/survivejs/webpack-merge#mergewithrules',
+        },
+        replaceDuplicatePlugins: {
+          type: 'boolean',
+          description: 'Flag that indicates whether to replace duplicate webpack plugins or not',
+        },
+      },
     },
-    replaceDuplicatePlugins: {
+    {
       type: 'boolean',
-      description: 'Flag that indicates whether to replace duplicate webpack plugins or not',
     },
-  },
-  default: false,
+  ],
 };
 
 export const indexTransform = {

diff --git a/packages/custom-webpack/src/schema.ext.json b/packages/custom-webpack/src/schema.ext.json
@@ -1,15 +1,34 @@
 {
   "properties": {
     "customWebpackConfig": {
-      "type": "object",
       "description": "Custom webpack configuration",
-      "properties": {
-        "path": {"type": "string", "description": "Path to the custom webpack configuration file"},
-        "mergeRules": {"type": "object", "description": "Merge rules as described here: https://github.com/survivejs/webpack-merge#mergewithrules"},
-        "replaceDuplicatePlugins": {"type": "boolean", "description": "Flag that indicates whether to replace duplicate webpack plugins or not"}
-      },
-      "default": false
+      "default": false,
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "path": {
+              "type": "string",
+              "description": "Path to the custom webpack configuration file"
+            },
+            "mergeRules": {
+              "type": "object",
+              "description": "Merge rules as described here: https://github.com/survivejs/webpack-merge#mergewithrules"
+            },
+            "replaceDuplicatePlugins": {
+              "type": "boolean",
+              "description": "Flag that indicates whether to replace duplicate webpack plugins or not"
+            }
+          }
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
-    "indexTransform": {"type": "string", "description": "Path to the file with index.html transform function" }
+    "indexTransform": {
+      "type": "string",
+      "description": "Path to the file with index.html transform function"
+    }
   }
 }