[FIX] Builder: Handle files without extension (#637)

Fixes: SAP/ui5-tooling#546 Co-authored-by: Matthias Osswald <mat.osswald@sap.com>
SAP · Aug 25, 2021 · 07aaa24 · 07aaa24
1 parent c05587a
commit 07aaa24
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 5 deletions.
diff --git a/lib/builder/builder.js b/lib/builder/builder.js
@@ -372,7 +372,7 @@ module.exports = {
 					log.verbose("Finished building project %s. Writing out files...", project.metadata.name);
 					buildLogger.completeWork(1);
 
-					return workspace.byGlob("/**/*.*").then((resources) => {
+					return workspace.byGlob("/**/*").then((resources) => {
 						const tagCollection = projectContext.getResourceTagCollection();
 						return Promise.all(resources.map((resource) => {
 							if (tagCollection.getTag(resource, projectContext.STANDARD_TAGS.OmitFromBuildResult)) {

diff --git a/lib/tasks/generateResourcesJson.js b/lib/tasks/generateResourcesJson.js
@@ -114,7 +114,7 @@ function getCreatorOptions(projectName) {
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
 module.exports = async function({workspace, dependencies, options: {projectName}}) {
-	const resources = await workspace.byGlob(["/resources/**/*.*"].concat(DEFAULT_EXCLUDES));
+	const resources = await workspace.byGlob(["/resources/**/*"].concat(DEFAULT_EXCLUDES));
 
 	// TODO 3.0: Make dependencies parameter mandatory
 	let dependencyResources;

diff --git a/test/expected/build/application.a/dest-deps-excl/fileWithoutExtension b/test/expected/build/application.a/dest-deps-excl/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/expected/build/application.a/dest-deps/fileWithoutExtension b/test/expected/build/application.a/dest-deps/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/expected/build/application.a/dest-depself/fileWithoutExtension b/test/expected/build/application.a/dest-depself/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/expected/build/application.a/dest-dev/fileWithoutExtension b/test/expected/build/application.a/dest-dev/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/expected/build/application.a/dest-self/fileWithoutExtension b/test/expected/build/application.a/dest-self/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/expected/build/application.a/dest/fileWithoutExtension b/test/expected/build/application.a/dest/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/expected/build/application.j/dest-resources-json/fileWithoutExtension b/test/expected/build/application.j/dest-resources-json/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/expected/build/application.j/dest-resources-json/resources.json b/test/expected/build/application.j/dest-resources-json/resources.json
@@ -80,14 +80,18 @@
 			"name": "changes/id_456_addField.change",
 			"size": 430
 		},
+		{
+			"name": "fileWithoutExtension",
+			"size": 27
+		},
 		{
 			"name": "manifest.json",
 			"module": "application/j/manifest.json",
 			"size": 423
 		},
 		{
 			"name": "resources.json",
-			"size": 2040
+			"size": 2098
 		}
 	]
 }
diff --git a/test/expected/build/application.j/dest/fileWithoutExtension b/test/expected/build/application.j/dest/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/fixtures/application.a/webapp/fileWithoutExtension b/test/fixtures/application.a/webapp/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/fixtures/application.j/webapp/fileWithoutExtension b/test/fixtures/application.j/webapp/fileWithoutExtension
@@ -0,0 +1 @@
+A file without an extension
diff --git a/test/lib/builder/builder.js b/test/lib/builder/builder.js
@@ -173,10 +173,10 @@ test.serial("Build", async (t) => {
 	t.true(appBuildParams.taskUtil instanceof DummyTaskUtil, "Correct taskUtil instance provided to type");
 
 	t.is(getResourceTagCollectionStub.callCount, 1, "getResourceTagCollection called once");
-	t.is(getTagStub.callCount, 2, "getTag called once");
+	t.is(getTagStub.callCount, 3, "getTag called three times");
 	t.deepEqual(getTagStub.getCall(0).args[1], "👻", "First getTag call with expected tag name");
 	t.deepEqual(getTagStub.getCall(1).args[1], "👻", "Second getTag call with expected tag name");
-	t.is(isRootProjectStub.callCount, 2, "isRootProject called once");
+	t.is(isRootProjectStub.callCount, 3, "isRootProject called three times");
 	t.is(executeCleanupTasksStub.callCount, 1, "Cleanup called once");
 });