From 919d675861ada3a39a7ee3c209615f6d74f7b0b3 Mon Sep 17 00:00:00 2001 From: Yavor Ivanov Date: Thu, 20 Jun 2024 12:57:51 +0300 Subject: [PATCH] fix tests --- .../schema/specVersion/kind/project.json | 128 ++++++++++++------ .../__helper__/builder-bundleOptions.js | 2 +- 2 files changed, 87 insertions(+), 43 deletions(-) diff --git a/lib/validation/schema/specVersion/kind/project.json b/lib/validation/schema/specVersion/kind/project.json index 5cd00d030..0982cf5c1 100644 --- a/lib/validation/schema/specVersion/kind/project.json +++ b/lib/validation/schema/specVersion/kind/project.json @@ -412,56 +412,100 @@ }, "sections": { "type": "array", - "items": { - "type": "object", - "additionalProperties": false, - "required": ["mode", "filters"], - "properties": { - "name": { - "type": "string" - }, + "if": { + "$comment": "Add async prop only if mode = 'require'", + "items": { + "type": "object", "mode": { - "enum": ["raw", "preload", "require", "provided", "bundleInfo", "depCache"] - }, - "filters": { - "type": "array", - "items": { + "enum": ["require"] + } + } + }, + "then": { + "items": { + "type": "object", + "additionalProperties": false, + "required": ["mode", "filters"], + "properties": { + "name": { "type": "string" - } - }, - "resolve": { - "type": "boolean", - "default": false - }, - "resolveConditional": { - "type": "boolean", - "default": false - }, - "renderer": { - "type": "boolean", - "default": false - }, - "sort": { - "type": "boolean", - "default": true - }, - "declareRawModules": { - "type": "boolean", - "default": false - }, - "if": { - "$comment": "Add async prop only if mode = 'require'", - "properties": { - "mode": { "enum": ["require"] } - } - }, - "then": { + }, + "mode": { + "enum": ["raw", "preload", "require", "provided", "bundleInfo", "depCache"] + }, + "filters": { + "type": "array", + "items": { + "type": "string" + } + }, + "resolve": { + "type": "boolean", + "default": false + }, + "resolveConditional": { + "type": "boolean", + "default": false + }, + "renderer": { + "type": "boolean", + "default": false + }, + "sort": { + "type": "boolean", + "default": true + }, + "declareRawModules": { + "type": "boolean", + "default": false + }, "async": { "type": "boolean", "default": true } } } + }, + "else": { + "items": { + "type": "object", + "additionalProperties": false, + "required": ["mode", "filters"], + "properties": { + "name": { + "type": "string" + }, + "mode": { + "enum": ["raw", "preload", "require", "provided", "bundleInfo", "depCache"] + }, + "filters": { + "type": "array", + "items": { + "type": "string" + } + }, + "resolve": { + "type": "boolean", + "default": false + }, + "resolveConditional": { + "type": "boolean", + "default": false + }, + "renderer": { + "type": "boolean", + "default": false + }, + "sort": { + "type": "boolean", + "default": true + }, + "declareRawModules": { + "type": "boolean", + "default": false + } + } + } } } } diff --git a/test/lib/validation/schema/__helper__/builder-bundleOptions.js b/test/lib/validation/schema/__helper__/builder-bundleOptions.js index 8d5650e52..144590c17 100644 --- a/test/lib/validation/schema/__helper__/builder-bundleOptions.js +++ b/test/lib/validation/schema/__helper__/builder-bundleOptions.js @@ -59,7 +59,7 @@ export default { keyword: "additionalProperties", dataPath: "/builder/bundles/0/bundleOptions", params: { - additionalProperty: "debugMode", + additionalProperty: "usePredefineCalls", }, message: "should NOT have additional properties", },