[INTERNAL] generateLibraryPreload: Add tests for bundling of modules …

…requiring top-level scope
SAP · Jun 5, 2023 · d96d28c · d96d28c
1 parent 9153d85
commit d96d28c
Show file tree

Hide file tree

Showing 30 changed files with 215 additions and 2 deletions.
diff --git a/test/expected/build/application.a/dest-deps/resources/library/d/legacy-dbg.js b/test/expected/build/application.a/dest-deps/resources/library/d/legacy-dbg.js
@@ -0,0 +1,5 @@
+/*!
+ * Some fancy copyright
+ */
+var topLevelVar = "Old World";
+console.log('Hello ' + topLevelVar);
diff --git a/test/expected/build/application.a/dest-deps/resources/library/d/legacy.js b/test/expected/build/application.a/dest-deps/resources/library/d/legacy.js
diff --git a/test/expected/build/application.a/dest-deps/resources/library/d/legacy.js.map b/test/expected/build/application.a/dest-deps/resources/library/d/legacy.js.map
diff --git a/test/expected/build/application.a/dest-depself/resources/library/d/legacy-dbg.js b/test/expected/build/application.a/dest-depself/resources/library/d/legacy-dbg.js
@@ -0,0 +1,5 @@
+/*!
+ * Some fancy copyright
+ */
+var topLevelVar = "Old World";
+console.log('Hello ' + topLevelVar);
diff --git a/test/expected/build/application.a/dest-depself/resources/library/d/legacy.js b/test/expected/build/application.a/dest-depself/resources/library/d/legacy.js
diff --git a/test/expected/build/application.a/dest-depself/resources/library/d/legacy.js.map b/test/expected/build/application.a/dest-depself/resources/library/d/legacy.js.map
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/.library b/test/expected/build/library.d-minified/preload/resources/library/d/.library
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library xmlns="http://www.sap.com/sap.ui.library.xsd" >
+
+	<name>library.d</name>
+	<vendor>SAP SE</vendor>
+	<copyright>Some fancy copyright</copyright>
+	<version>1.0.0</version>
+
+	<documentation>Library D</documentation>
+
+</library>
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/legacy.js b/test/expected/build/library.d-minified/preload/resources/library/d/legacy.js
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/legacy.js.map b/test/expected/build/library.d-minified/preload/resources/library/d/legacy.js.map
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/library-preload.js b/test/expected/build/library.d-minified/preload/resources/library/d/library-preload.js
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/library-preload.js.map b/test/expected/build/library.d-minified/preload/resources/library/d/library-preload.js.map
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/manifest.json b/test/expected/build/library.d-minified/preload/resources/library/d/manifest.json
@@ -0,0 +1,28 @@
+{
+  "_version": "1.21.0",
+  "sap.app": {
+    "id": "library.d",
+    "type": "library",
+    "embeds": [],
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
+    "title": "Library D",
+    "description": "Library D",
+    "resources": "resources.json",
+    "offline": true
+  },
+  "sap.ui": {
+    "technology": "UI5",
+    "supportedThemes": []
+  },
+  "sap.ui5": {
+    "dependencies": {
+      "minUI5Version": "1.0",
+      "libs": {}
+    },
+    "library": {
+      "i18n": false
+    }
+  }
+}
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/some.js b/test/expected/build/library.d-minified/preload/resources/library/d/some.js
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/some.js.map b/test/expected/build/library.d-minified/preload/resources/library/d/some.js.map
diff --git a/test/expected/build/library.d-minified/preload/test-resources/library/d/Test.html b/test/expected/build/library.d-minified/preload/test-resources/library/d/Test.html
diff --git a/test/expected/build/library.d/dest/resources/library/d/legacy-dbg.js b/test/expected/build/library.d/dest/resources/library/d/legacy-dbg.js
@@ -0,0 +1,5 @@
+/*!
+ * Some fancy copyright
+ */
+var topLevelVar = "Old World";
+console.log('Hello ' + topLevelVar);
diff --git a/test/expected/build/library.d/dest/resources/library/d/legacy.js b/test/expected/build/library.d/dest/resources/library/d/legacy.js
diff --git a/test/expected/build/library.d/dest/resources/library/d/legacy.js.map b/test/expected/build/library.d/dest/resources/library/d/legacy.js.map
diff --git a/test/expected/build/library.d/preload/resources/library/d/legacy.js b/test/expected/build/library.d/preload/resources/library/d/legacy.js
@@ -0,0 +1,5 @@
+/*!
+ * ${copyright}
+ */
+var topLevelVar = "Old World";
+console.log('Hello ' + topLevelVar);
diff --git a/test/expected/build/library.d/preload/resources/library/d/library-preload.js b/test/expected/build/library.d/preload/resources/library/d/library-preload.js
diff --git a/test/expected/build/library.d/preload/resources/library/d/library-preload.js.map b/test/expected/build/library.d/preload/resources/library/d/library-preload.js.map
diff --git a/test/fixtures/library.d-minified/main/src/library/d/.library b/test/fixtures/library.d-minified/main/src/library/d/.library
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library xmlns="http://www.sap.com/sap.ui.library.xsd" >
+
+	<name>library.d</name>
+	<vendor>SAP SE</vendor>
+	<copyright>Some fancy copyright</copyright>
+	<version>1.0.0</version>
+
+	<documentation>Library D</documentation>
+
+</library>
diff --git a/test/fixtures/library.d-minified/main/src/library/d/legacy.js b/test/fixtures/library.d-minified/main/src/library/d/legacy.js
diff --git a/test/fixtures/library.d-minified/main/src/library/d/legacy.js.map b/test/fixtures/library.d-minified/main/src/library/d/legacy.js.map
diff --git a/test/fixtures/library.d-minified/main/src/library/d/manifest.json b/test/fixtures/library.d-minified/main/src/library/d/manifest.json
@@ -0,0 +1,28 @@
+{
+  "_version": "1.21.0",
+  "sap.app": {
+    "id": "library.d",
+    "type": "library",
+    "embeds": [],
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
+    "title": "Library D",
+    "description": "Library D",
+    "resources": "resources.json",
+    "offline": true
+  },
+  "sap.ui": {
+    "technology": "UI5",
+    "supportedThemes": []
+  },
+  "sap.ui5": {
+    "dependencies": {
+      "minUI5Version": "1.0",
+      "libs": {}
+    },
+    "library": {
+      "i18n": false
+    }
+  }
+}
diff --git a/test/fixtures/library.d-minified/main/src/library/d/some.js b/test/fixtures/library.d-minified/main/src/library/d/some.js
diff --git a/test/fixtures/library.d-minified/main/src/library/d/some.js.map b/test/fixtures/library.d-minified/main/src/library/d/some.js.map
diff --git a/test/fixtures/library.d-minified/main/test/library/d/Test.html b/test/fixtures/library.d-minified/main/test/library/d/Test.html
diff --git a/test/fixtures/library.d/main/src/library/d/legacy.js b/test/fixtures/library.d/main/src/library/d/legacy.js
@@ -0,0 +1,5 @@
+/*!
+ * ${copyright}
+ */
+var topLevelVar = "Old World";
+console.log('Hello ' + topLevelVar);
diff --git a/test/lib/tasks/bundlers/generateLibraryPreload.integration.js b/test/lib/tasks/bundlers/generateLibraryPreload.integration.js
@@ -13,6 +13,7 @@ import * as taskRepository from "../../../../lib/tasks/taskRepository.js";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const libraryDPath = path.join(__dirname, "..", "..", "..", "fixtures", "library.d");
+const libraryDMinifiedPath = path.join(__dirname, "..", "..", "..", "fixtures", "library.d-minified");
 const sapUiCorePath = path.join(__dirname, "..", "..", "..", "fixtures", "sap.ui.core");
 
 import recursive from "recursive-readdir";
@@ -51,7 +52,7 @@ test.serial("integration: build library.d with library preload", async (t) => {
 	assert.directoryDeepEqual(destPath, expectedPath);
 
 	// Check for all file contents
-	t.is(expectedFiles.length, 5, "5 files are expected");
+	t.is(expectedFiles.length, 6, "6 files are expected");
 	expectedFiles.forEach((expectedFile) => {
 		const relativeFile = path.relative(expectedPath, expectedFile);
 		const destFile = path.join(destPath, relativeFile);
@@ -82,6 +83,59 @@ const libraryDTree = {
 	}
 };
 
+test.serial("integration: build library.d-minified with library preload", async (t) => {
+	const destPath = "./test/tmp/build/library.d-minified/preload";
+	const expectedPath = "./test/expected/build/library.d-minified/preload";
+	const excludedTasks = ["*"];
+	const includedTasks = ["generateLibraryPreload"];
+
+	const graph = await graphFromObject({
+		dependencyTree: libraryDMinifiedTree
+	});
+	graph.setTaskRepository(taskRepository);
+	await t.notThrowsAsync(graph.build({
+		destPath,
+		excludedTasks,
+		includedTasks
+	}));
+
+	const expectedFiles = await findFiles(expectedPath);
+
+	// Check for all directories and files
+	assert.directoryDeepEqual(destPath, expectedPath);
+
+	// Check for all file contents
+	t.is(expectedFiles.length, 9, "9 files are expected");
+	expectedFiles.forEach((expectedFile) => {
+		const relativeFile = path.relative(expectedPath, expectedFile);
+		const destFile = path.join(destPath, relativeFile);
+		assert.fileEqual(destFile, expectedFile);
+	});
+});
+
+const libraryDMinifiedTree = {
+	"id": "library.d",
+	"version": "1.0.0",
+	"path": libraryDMinifiedPath,
+	"dependencies": [],
+	"configuration": {
+		"specVersion": "2.0",
+		"type": "library",
+		"metadata": {
+			"name": "library.d",
+			"copyright": "Some fancy copyright"
+		},
+		"resources": {
+			"configuration": {
+				"paths": {
+					"src": "main/src",
+					"test": "main/test"
+				}
+			}
+		}
+	}
+};
+
 test.serial("integration: build sap.ui.core with library preload", async (t) => {
 	const destPath = "./test/tmp/build/sap.ui.core/preload";
 	const expectedPath = "./test/expected/build/sap.ui.core/preload";