Revert "[FEATURE] Add 'component' type"

RandomByte · RandomByte · commit 8566b725e781 · 2025-07-04T11:43:12.000+02:00
This reverts commit d6fdbea.
diff --git a/lib/specifications/SpecificationVersion.js b/lib/specifications/SpecificationVersion.js
@@ -5,7 +5,8 @@ const SUPPORTED_VERSIONS = [
 	"0.1", "1.0", "1.1",
 	"2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6",
 	"3.0", "3.1", "3.2",
-	"4.0"
+	"4.0",
+	"5.0",
 ];
 
 /**
diff --git a/lib/validation/schema/specVersion/kind/extension.json b/lib/validation/schema/specVersion/kind/extension.json
@@ -5,7 +5,7 @@
 	"type": "object",
 	"required": ["specVersion", "kind", "type", "metadata"],
 	"properties": {
-		"specVersion": { "enum": ["4.0", "3.2", "3.1", "3.0", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] },
+		"specVersion": { "enum": ["5.0", "4.0", "3.2", "3.1", "3.0", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] },
 		"kind": {
 			"enum": ["extension"]
 		},
diff --git a/lib/validation/schema/specVersion/kind/extension/project-shim.json b/lib/validation/schema/specVersion/kind/extension/project-shim.json
@@ -6,14 +6,14 @@
 	"required": ["specVersion", "kind", "type", "metadata", "shims"],
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0"] }
+			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0", "5.0"] }
 		}
 	},
 	"then": {
 		"additionalProperties": false,
 		"properties": {
 			"specVersion": {
-				"enum": ["3.0", "3.1", "3.2", "4.0"]
+				"enum": ["3.0", "3.1", "3.2", "4.0", "5.0"]
 			},
 			"kind": {
 				"enum": ["extension"]
diff --git a/lib/validation/schema/specVersion/kind/extension/server-middleware.json b/lib/validation/schema/specVersion/kind/extension/server-middleware.json
@@ -7,13 +7,13 @@
 	"required": ["specVersion", "kind", "type", "metadata", "middleware"],
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0"] }
+			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0", "5.0"] }
 		}
 	},
 	"then": {
 		"additionalProperties": false,
 		"properties": {
-			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0"] },
+			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0", "5.0"] },
 			"kind": {
 				"enum": ["extension"]
 			},
diff --git a/lib/validation/schema/specVersion/kind/extension/task.json b/lib/validation/schema/specVersion/kind/extension/task.json
@@ -6,13 +6,13 @@
 	"required": ["specVersion", "kind", "type", "metadata", "task"],
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0"] }
+			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0", "5.0"] }
 		}
 	},
 	"then": {
 		"additionalProperties": false,
 		"properties": {
-			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0"] },
+			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0", "5.0"] },
 			"kind": {
 				"enum": ["extension"]
 			},
diff --git a/lib/validation/schema/specVersion/kind/project.json b/lib/validation/schema/specVersion/kind/project.json
@@ -5,7 +5,7 @@
 	"type": "object",
 	"required": ["specVersion", "type"],
 	"properties": {
-		"specVersion": { "enum": ["4.0", "3.2", "3.1", "3.0", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] },
+		"specVersion": { "enum": ["5.0", "4.0", "3.2", "3.1", "3.0", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] },
 		"kind": {
 			"enum": ["project", null],
 			"$comment": "Using null to allow not defining 'kind' which defaults to project"
diff --git a/lib/validation/schema/specVersion/kind/project/application.json b/lib/validation/schema/specVersion/kind/project/application.json
@@ -6,13 +6,13 @@
 	"required": ["specVersion", "type", "metadata"],
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["4.0"] }
+			"specVersion": { "enum": ["4.0", "5.0"] }
 		}
 	},
 	"then": {
 		"additionalProperties": false,
 		"properties": {
-			"specVersion": { "enum": ["4.0"] },
+			"specVersion": { "enum": ["4.0", "5.0"] },
 			"kind": {
 				"enum": ["project", null]
 			},
diff --git a/lib/validation/schema/specVersion/kind/project/component.json b/lib/validation/schema/specVersion/kind/project/component.json
@@ -6,13 +6,13 @@
 	"required": ["specVersion", "type", "metadata"],
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["3.1"] }
+			"specVersion": { "enum": ["5.0"] }
 		}
 	},
 	"then": {
 		"additionalProperties": false,
 		"properties": {
-			"specVersion": { "enum": ["3.1"] },
+			"specVersion": { "enum": ["5.0"] },
 			"kind": {
 				"enum": ["project", null]
 			},
@@ -29,7 +29,7 @@
 				"$ref": "#/definitions/resources"
 			},
 			"builder": {
-				"$ref": "#/definitions/builder-specVersion-3.0"
+				"$ref": "#/definitions/builder-specVersion-4.0"
 			},
 			"server": {
 				"$ref": "../project.json#/definitions/server"
@@ -44,6 +44,7 @@
 	},
 
 	"definitions": {
+
 		"resources": {
 			"type": "object",
 			"additionalProperties": false,
@@ -71,7 +72,8 @@
 				}
 			}
 		},
-		"builder-specVersion-3.0": {
+
+		"builder-specVersion-4.0": {
 			"type": "object",
 			"additionalProperties": false,
 			"properties": {
@@ -88,7 +90,7 @@
 					}
 				},
 				"bundles": {
-					"$ref": "../project.json#/definitions/builder-bundles-3.0"
+					"$ref": "../project.json#/definitions/builder-bundles-4.0"
 				},
 				"componentPreload": {
 					"$ref": "../project.json#/definitions/builder-componentPreload-specVersion-2.3"
diff --git a/lib/validation/schema/specVersion/kind/project/library.json b/lib/validation/schema/specVersion/kind/project/library.json
@@ -6,13 +6,13 @@
 	"required": ["specVersion", "type", "metadata"],
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["4.0"] }
+			"specVersion": { "enum": ["4.0", "5.0"] }
 		}
 	},
 	"then": {
 		"additionalProperties": false,
 		"properties": {
-			"specVersion": { "enum": ["4.0"] },
+			"specVersion": { "enum": ["4.0", "5.0"] },
 			"kind": {
 				"enum": ["project", null]
 			},
diff --git a/lib/validation/schema/specVersion/kind/project/module.json b/lib/validation/schema/specVersion/kind/project/module.json
@@ -6,13 +6,13 @@
 	"required": ["specVersion", "type", "metadata"],
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["3.1", "3.2", "4.0"] }
+			"specVersion": { "enum": ["3.1", "3.2", "4.0", "5.0"] }
 		}
 	},
 	"then": {
 		"additionalProperties": false,
 		"properties": {
-			"specVersion": { "enum": ["3.1", "3.2", "4.0"] },
+			"specVersion": { "enum": ["3.1", "3.2", "4.0", "5.0"] },
 			"kind": {
 				"enum": ["project", null]
 			},
diff --git a/lib/validation/schema/specVersion/kind/project/theme-library.json b/lib/validation/schema/specVersion/kind/project/theme-library.json
@@ -6,13 +6,13 @@
 	"required": ["specVersion", "type", "metadata"],
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0"] }
+			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0", "5.0"] }
 		}
 	},
 	"then": {
 		"additionalProperties": false,
 		"properties": {
-			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0"] },
+			"specVersion": { "enum": ["3.0", "3.1", "3.2", "4.0", "5.0"] },
 			"kind": {
 				"enum": ["project", null]
 			},
diff --git a/lib/validation/schema/specVersion/specVersion.json b/lib/validation/schema/specVersion/specVersion.json
@@ -5,7 +5,7 @@
 	"type": "object",
 	"required": ["specVersion"],
 	"properties": {
-		"specVersion": { "enum": ["4.0", "3.2", "3.1", "3.0", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] },
+		"specVersion": { "enum": ["5.0", "4.0", "3.2", "3.1", "3.0", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] },
 		"kind": {
 			"enum": ["project", "extension", null],
 			"$comment": "Using null to allow not defining 'kind' which defaults to project"
diff --git a/lib/validation/schema/ui5.json b/lib/validation/schema/ui5.json
@@ -10,18 +10,19 @@
 	"properties": {
 		"specVersion": {
 			"enum": [
+				"5.0",
 				"4.0",
 				"3.2", "3.1", "3.0",
 				"2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0",
 				"1.1", "1.0", "0.1"
 			],
-			"errorMessage": "Unsupported \"specVersion\"\nYour UI5 CLI installation might be outdated.\nSupported specification versions: \"4.0\", \"3.2\", \"3.1\", \"3.0\", \"2.6\", \"2.5\", \"2.4\", \"2.3\", \"2.2\", \"2.1\", \"2.0\", \"1.1\", \"1.0\", \"0.1\"\nFor details, see: https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions"
+			"errorMessage": "Unsupported \"specVersion\"\nYour UI5 CLI installation might be outdated.\nSupported specification versions: \"5.0\", \"4.0\", \"3.2\", \"3.1\", \"3.0\", \"2.6\", \"2.5\", \"2.4\", \"2.3\", \"2.2\", \"2.1\", \"2.0\", \"1.1\", \"1.0\", \"0.1\"\nFor details, see: https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions"
 		}
 	},
 
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["4.0", "3.2", "3.1", "3.0", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] }
+			"specVersion": { "enum": ["5.0", "4.0", "3.2", "3.1", "3.0", "2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0"] }
 		}
 	},
 	"then": {
diff --git a/test/lib/specifications/SpecificationVersion.js b/test/lib/specifications/SpecificationVersion.js
@@ -239,14 +239,14 @@ test("(static) getVersionsForRange", (t) => {
 	// range: >=2.2
 	t.deepEqual(SpecificationVersion.getVersionsForRange(">=2.2"), [
 		"2.2", "2.3", "2.4", "2.5", "2.6",
-		"3.0", "3.1", "3.2", "4.0"
+		"3.0", "3.1", "3.2", "4.0", "5.0",
 	]);
 
 	// range: > 1.0
 	t.deepEqual(SpecificationVersion.getVersionsForRange("> 1.0"), [
 		"1.1",
 		"2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6",
-		"3.0", "3.1", "3.2", "4.0"
+		"3.0", "3.1", "3.2", "4.0", "5.0",
 	]);
 
 	// range: 2.2 - 2.4
diff --git a/test/lib/validation/schema/__helper__/builder-bundleOptions.js b/test/lib/validation/schema/__helper__/builder-bundleOptions.js
@@ -12,8 +12,9 @@ export default {
 	 * @param {string} type one of "application", "component" and "library"
 	 */
 	defineTests: function(test, assertValidation, type) {
-		// Version specific tests
-		SpecificationVersion.getVersionsForRange(">=4.0").forEach(function(specVersion) {
+		// Version specific tests (component type only became available with specVersion 5.0)
+		const range = type === "component" ? ">=5.0" : ">=4.0";
+		SpecificationVersion.getVersionsForRange(range).forEach(function(specVersion) {
 			test(`${type} (specVersion ${specVersion}): builder/bundles/bundleOptions`, async (t) => {
 				await assertValidation(t, {
 					"specVersion": specVersion,
@@ -133,7 +134,10 @@ export default {
 				]);
 			});
 		});
-
+		if (type === "component") {
+			// Not applicable for specVersions < 5.0
+			return;
+		}
 		SpecificationVersion.getVersionsForRange("3.0 - 3.2").forEach(function(specVersion) {
 			test(`${type} (specVersion ${specVersion}): builder/bundles/bundleOptions`, async (t) => {
 				await assertValidation(t, {
diff --git a/test/lib/validation/schema/__helper__/customConfiguration.js b/test/lib/validation/schema/__helper__/customConfiguration.js
@@ -40,7 +40,7 @@ export default {
 		}
 
 		// Component type only became available with specVersion 3.1
-		const range = type === "component" ? ">=3.1" : ">=2.1";
+		const range = type === "component" ? ">=5.0" : ">=2.1";
 		SpecificationVersion.getVersionsForRange(range).forEach((specVersion) => {
 			test(`${type}: Valid customConfiguration (specVersion ${specVersion})`, async (t) => {
 				await assertValidation(t, Object.assign( {
diff --git a/test/lib/validation/schema/__helper__/framework.js b/test/lib/validation/schema/__helper__/framework.js
@@ -14,7 +14,7 @@ export default {
 	 */
 	defineTests: function(test, assertValidation, type) {
 		// Component type only became available with specVersion 3.1
-		const range = type === "component" ? ">=3.1" : ">=2.0";
+		const range = type === "component" ? ">=5.0" : ">=2.0";
 		SpecificationVersion.getVersionsForRange(range).forEach((specVersion) => {
 			test(`${type} (specVersion ${specVersion}): framework configuration: OpenUI5`, async (t) => {
 				const config = {
diff --git a/test/lib/validation/schema/__helper__/project.js b/test/lib/validation/schema/__helper__/project.js
@@ -31,7 +31,7 @@ export default {
 
 		// version specific tests
 		// Component type only became available with specVersion 3.1
-		const range = type === "component" ? ">=3.1" : ">=2.0";
+		const range = type === "component" ? ">=5.0" : ">=2.0";
 		SpecificationVersion.getVersionsForRange(range).forEach((specVersion) => {
 			// tests for all kinds and version 2.0 and above
 			test(`${type} (specVersion ${specVersion}): No metadata`, async (t) => {
@@ -287,7 +287,7 @@ export default {
 		}
 
 		// Component type only became available with specVersion 3.1
-		const v3Range = type === "component" ? ">=3.1" : ">=3.0";
+		const v3Range = type === "component" ? ">=5.0" : ">=3.0";
 		SpecificationVersion.getVersionsForRange(v3Range).forEach((specVersion) => {
 			test(`${type} (specVersion ${specVersion}): Invalid metadata.name`, async (t) => {
 				await assertValidation(t, {
diff --git a/test/lib/validation/schema/specVersion/kind/project/component.js b/test/lib/validation/schema/specVersion/kind/project/component.js
@@ -46,7 +46,7 @@ test.after.always((t) => {
 	t.context.ajvCoverage.verify(thresholds);
 });
 
-SpecificationVersion.getVersionsForRange(">=3.1").forEach(function(specVersion) {
+SpecificationVersion.getVersionsForRange(">=5.0").forEach(function(specVersion) {
 	test(`Valid configuration (specVersion ${specVersion})`, async (t) => {
 		await assertValidation(t, {
 			"specVersion": specVersion,
@@ -107,8 +107,7 @@ SpecificationVersion.getVersionsForRange(">=3.1").forEach(function(specVersion)
 						"bundleOptions": {
 							"optimize": true,
 							"decorateBootstrapModule": true,
-							"addTryCatchRestartWrapper": true,
-							"usePredefineCalls": true
+							"addTryCatchRestartWrapper": true
 						}
 					},
 					{
@@ -436,17 +435,13 @@ SpecificationVersion.getVersionsForRange(">=3.1").forEach(function(specVersion)
 				keyword: "enum",
 				message: "should be equal to one of the allowed values",
 				params: {
-					allowedValues: ["3.1"].includes(specVersion) ? [
+					allowedValues: [
 						"raw",
 						"preload",
 						"require",
 						"provided",
-						"bundleInfo"
-					] : [
-						"raw",
-						"preload",
-						"require",
-						"provided"
+						"bundleInfo",
+						"depCache",
 					]
 				}
 			},
diff --git a/test/lib/validation/schema/ui5.js b/test/lib/validation/schema/ui5.js
@@ -102,7 +102,7 @@ test("Invalid specVersion", async (t) => {
 			message:
 "Unsupported \"specVersion\"\n" +
 "Your UI5 CLI installation might be outdated.\n" +
-"Supported specification versions: \"4.0\", \"3.2\", \"3.1\", \"3.0\", \"2.6\", " +
+"Supported specification versions: \"5.0\", \"4.0\", \"3.2\", \"3.1\", \"3.0\", \"2.6\", " +
 "\"2.5\", \"2.4\", \"2.3\", \"2.2\", \"2.1\", \"2.0\", \"1.1\", \"1.0\", \"0.1\"\n" +
 "For details, see: https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions",
 			params: {
@@ -113,6 +113,7 @@ test("Invalid specVersion", async (t) => {
 						message: "should be equal to one of the allowed values",
 						params: {
 							allowedValues: [
+								"5.0",
 								"4.0",
 								"3.2",
 								"3.1",
