[FIX] minify: Change default to not omit source map resources

Source map resources for non-bundle files are required to be part of the build result if that is used as input for another build. Otherwise custom bundles packaging those resources won't be able to find the corresponding source maps, leading to basically unusable source maps.
SAP · Jul 27, 2022 · 6d75a49 · 6d75a49
1 parent 75bc013
commit 6d75a49
Show file tree

Hide file tree

Showing 157 changed files with 378 additions and 127 deletions.
diff --git a/lib/tasks/minify.js b/lib/tasks/minify.js
@@ -10,11 +10,11 @@ const minifier = require("../processors/minifier");
  * @param {module:@ui5/builder.tasks.TaskUtil|object} [parameters.taskUtil] TaskUtil
  * @param {object} parameters.options Options
  * @param {string} parameters.options.pattern Pattern to locate the files to be processed
- * @param {boolean} [parameters.options.omitSourceMapResources=true] Whether source map resources shall
+ * @param {boolean} [parameters.options.omitSourceMapResources=false] Whether source map resources shall
  * 		be tagged as "OmitFromBuildResult" and no sourceMappingURL shall be added to the minified resource
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = async function({workspace, taskUtil, options: {pattern, omitSourceMapResources = true}}) {
+module.exports = async function({workspace, taskUtil, options: {pattern, omitSourceMapResources = false}}) {
 	const resources = await workspace.byGlob(pattern);
 	const processedResources = await minifier({
 		resources,

diff --git a/test/expected/build/application.a/dest-deps-excl/test.js b/test/expected/build/application.a/dest-deps-excl/test.js
diff --git a/test/expected/build/application.a/dest-deps-excl/test.js.map b/test/expected/build/application.a/dest-deps-excl/test.js.map
diff --git a/test/expected/build/application.a/dest-deps/resources/library/d/some.js b/test/expected/build/application.a/dest-deps/resources/library/d/some.js
diff --git a/test/expected/build/application.a/dest-deps/resources/library/d/some.js.map b/test/expected/build/application.a/dest-deps/resources/library/d/some.js.map
diff --git a/test/expected/build/application.a/dest-deps/resources/ui5loader.js b/test/expected/build/application.a/dest-deps/resources/ui5loader.js
diff --git a/test/expected/build/application.a/dest-deps/resources/ui5loader.js.map b/test/expected/build/application.a/dest-deps/resources/ui5loader.js.map
diff --git a/test/expected/build/application.a/dest-deps/test.js b/test/expected/build/application.a/dest-deps/test.js
diff --git a/test/expected/build/application.a/dest-deps/test.js.map b/test/expected/build/application.a/dest-deps/test.js.map
diff --git a/test/expected/build/application.a/dest-depself/resources/library/d/some.js b/test/expected/build/application.a/dest-depself/resources/library/d/some.js
diff --git a/test/expected/build/application.a/dest-depself/resources/library/d/some.js.map b/test/expected/build/application.a/dest-depself/resources/library/d/some.js.map
diff --git a/test/expected/build/application.a/dest-depself/resources/ui5loader.js b/test/expected/build/application.a/dest-depself/resources/ui5loader.js
diff --git a/test/expected/build/application.a/dest-depself/resources/ui5loader.js.map b/test/expected/build/application.a/dest-depself/resources/ui5loader.js.map
diff --git a/test/expected/build/application.a/dest-depself/test.js b/test/expected/build/application.a/dest-depself/test.js
diff --git a/test/expected/build/application.a/dest-depself/test.js.map b/test/expected/build/application.a/dest-depself/test.js.map
diff --git a/test/expected/build/application.a/dest-self/test.js b/test/expected/build/application.a/dest-self/test.js
diff --git a/test/expected/build/application.a/dest-self/test.js.map b/test/expected/build/application.a/dest-self/test.js.map
diff --git a/test/expected/build/application.a/dest/test.js b/test/expected/build/application.a/dest/test.js
diff --git a/test/expected/build/application.a/dest/test.js.map b/test/expected/build/application.a/dest/test.js.map
diff --git a/test/expected/build/application.b/dest/manifest-bundle.zip b/test/expected/build/application.b/dest/manifest-bundle.zip
diff --git a/test/expected/build/application.g/cachebuster/Component.js b/test/expected/build/application.g/cachebuster/Component.js
diff --git a/test/expected/build/application.g/cachebuster/Component.js.map b/test/expected/build/application.g/cachebuster/Component.js.map
diff --git a/test/expected/build/application.g/cachebuster/sap-ui-cachebuster-info.json b/test/expected/build/application.g/cachebuster/sap-ui-cachebuster-info.json
@@ -1,16 +1,16 @@
 {
-  "subcomponentA/Component.js.map": 1657810572395,
-  "subcomponentB/manifest.json": 1542320456755,
-  "manifest.json": 1603970570100,
-  "subcomponentB/Component.js": 1542320456755,
-  "subcomponentA/Component.js": 1542320456755,
-  "Component.js": 1542320456754,
-  "subcomponentA/Component-dbg.js": 1542320456755,
-  "subcomponentA/manifest.json": 1542320456755,
-  "subcomponentB/Component-dbg.js": 1542320456755,
-  "subcomponentB/Component.js.map": 1657810572395,
-  "Component-dbg.js": 1542320456754,
-  "Component.js.map": 1657810572395,
-  "Component-preload.js": 1657810572977,
-  "Component-preload.js.map": 1657810572977
+  "subcomponentA/Component-dbg.js": 1657901214883,
+  "subcomponentA/manifest.json": 1657901214883,
+  "manifest.json": 1657901214883,
+  "subcomponentB/Component.js": 1657901214883,
+  "subcomponentA/Component.js": 1657901214883,
+  "Component.js": 1657901214883,
+  "subcomponentB/manifest.json": 1657901214883,
+  "subcomponentA/Component.js.map": 1658915303066,
+  "subcomponentB/Component-dbg.js": 1657901214883,
+  "subcomponentB/Component.js.map": 1658915303066,
+  "Component-dbg.js": 1657901214883,
+  "Component.js.map": 1658915303066,
+  "Component-preload.js": 1658915303178,
+  "Component-preload.js.map": 1658915303179
 }
diff --git a/test/expected/build/application.g/cachebuster/subcomponentA/Component.js b/test/expected/build/application.g/cachebuster/subcomponentA/Component.js
diff --git a/test/expected/build/application.g/cachebuster/subcomponentA/Component.js.map b/test/expected/build/application.g/cachebuster/subcomponentA/Component.js.map
diff --git a/test/expected/build/application.g/cachebuster/subcomponentB/Component.js b/test/expected/build/application.g/cachebuster/subcomponentB/Component.js
diff --git a/test/expected/build/application.g/cachebuster/subcomponentB/Component.js.map b/test/expected/build/application.g/cachebuster/subcomponentB/Component.js.map
diff --git a/test/expected/build/application.g/cachebuster_hash/Component.js b/test/expected/build/application.g/cachebuster_hash/Component.js
diff --git a/test/expected/build/application.g/cachebuster_hash/Component.js.map b/test/expected/build/application.g/cachebuster_hash/Component.js.map
diff --git a/test/expected/build/application.g/cachebuster_hash/sap-ui-cachebuster-info.json b/test/expected/build/application.g/cachebuster_hash/sap-ui-cachebuster-info.json
@@ -1,16 +1,16 @@
 {
-  "subcomponentB/Component.js": "8d21f8ab86d26da1758a55d49779d64c6e469e54",
-  "subcomponentA/manifest.json": "7dfcdf568dcfb47c74d309e2f00193688b112fb7",
-  "manifest.json": "a867583cff8c3a5135bfbdd97dcb7a9cad4948bd",
+  "subcomponentA/Component.js": "37e2d3c99ddf728313ceaddd087c6d547fcbdf8f",
   "subcomponentB/manifest.json": "3a08d0555e3e49fe683e01205090eed3182b4a9f",
-  "subcomponentA/Component.js": "6182eab4f507255e4ceb6275325ae84b0e58cd20",
-  "Component.js": "9812808a09dfbc3c7dd5e41e0b6faa3320f67ff9",
-  "Component-dbg.js": "874c35543ae850262d1552b6c2d00cecaae205a7",
-  "Component.js.map": "f20221563528aeb044a47fc8a3787e7a7a0636a7",
-  "subcomponentA/Component-dbg.js": "fef3a5814776e5575302f814e96ae31a13df12b7",
-  "subcomponentA/Component.js.map": "03f57fa13b37175d2ebda02e67443f32ce45a643",
+  "manifest.json": "a867583cff8c3a5135bfbdd97dcb7a9cad4948bd",
+  "subcomponentA/manifest.json": "7dfcdf568dcfb47c74d309e2f00193688b112fb7",
+  "subcomponentB/Component.js": "d2a467cc8d05c693b22dbef82c2bff4610611d81",
+  "Component.js": "174e92417f0fa7889c2bdb8a243c4d748d66a4da",
   "subcomponentB/Component-dbg.js": "c03da2c5ff162c1d9d5e5c4a3edc2cebcda6b0a1",
   "subcomponentB/Component.js.map": "03f57fa13b37175d2ebda02e67443f32ce45a643",
+  "subcomponentA/Component-dbg.js": "fef3a5814776e5575302f814e96ae31a13df12b7",
+  "subcomponentA/Component.js.map": "03f57fa13b37175d2ebda02e67443f32ce45a643",
+  "Component-dbg.js": "874c35543ae850262d1552b6c2d00cecaae205a7",
+  "Component.js.map": "f20221563528aeb044a47fc8a3787e7a7a0636a7",
   "Component-preload.js": "300e005e16a9a3d641ca6b02e9cd5135f4a2bc7c",
   "Component-preload.js.map": "46b2eb04f4d7707bab262e54d258ad414eaf909b"
 }
diff --git a/test/expected/build/application.g/cachebuster_hash/subcomponentA/Component.js b/test/expected/build/application.g/cachebuster_hash/subcomponentA/Component.js
diff --git a/test/expected/build/application.g/cachebuster_hash/subcomponentA/Component.js.map b/test/expected/build/application.g/cachebuster_hash/subcomponentA/Component.js.map
diff --git a/test/expected/build/application.g/cachebuster_hash/subcomponentB/Component.js b/test/expected/build/application.g/cachebuster_hash/subcomponentB/Component.js
diff --git a/test/expected/build/application.g/cachebuster_hash/subcomponentB/Component.js.map b/test/expected/build/application.g/cachebuster_hash/subcomponentB/Component.js.map
diff --git a/test/expected/build/application.g/dest/Component.js b/test/expected/build/application.g/dest/Component.js
diff --git a/test/expected/build/application.g/dest/Component.js.map b/test/expected/build/application.g/dest/Component.js.map
diff --git a/test/expected/build/application.g/dest/subcomponentA/Component.js b/test/expected/build/application.g/dest/subcomponentA/Component.js
diff --git a/test/expected/build/application.g/dest/subcomponentA/Component.js.map b/test/expected/build/application.g/dest/subcomponentA/Component.js.map
diff --git a/test/expected/build/application.g/dest/subcomponentB/Component.js b/test/expected/build/application.g/dest/subcomponentB/Component.js
diff --git a/test/expected/build/application.g/dest/subcomponentB/Component.js.map b/test/expected/build/application.g/dest/subcomponentB/Component.js.map
diff --git a/test/expected/build/application.g/dest2/Component.js b/test/expected/build/application.g/dest2/Component.js
diff --git a/test/expected/build/application.g/dest2/Component.js.map b/test/expected/build/application.g/dest2/Component.js.map
diff --git a/test/expected/build/application.g/dest2/subcomponentA/Component.js b/test/expected/build/application.g/dest2/subcomponentA/Component.js
diff --git a/test/expected/build/application.g/dest2/subcomponentA/Component.js.map b/test/expected/build/application.g/dest2/subcomponentA/Component.js.map
diff --git a/test/expected/build/application.g/dest2/subcomponentB/Component.js b/test/expected/build/application.g/dest2/subcomponentB/Component.js
diff --git a/test/expected/build/application.g/dest2/subcomponentB/Component.js.map b/test/expected/build/application.g/dest2/subcomponentB/Component.js.map
diff --git a/test/expected/build/application.h/dest/Component.js b/test/expected/build/application.h/dest/Component.js
diff --git a/test/expected/build/application.h/dest/Component.js.map b/test/expected/build/application.h/dest/Component.js.map
diff --git a/test/expected/build/application.h/dest/sectionsA/section1.js b/test/expected/build/application.h/dest/sectionsA/section1.js
diff --git a/test/expected/build/application.h/dest/sectionsA/section1.js.map b/test/expected/build/application.h/dest/sectionsA/section1.js.map
diff --git a/test/expected/build/application.h/dest/sectionsA/section2.js b/test/expected/build/application.h/dest/sectionsA/section2.js
diff --git a/test/expected/build/application.h/dest/sectionsA/section2.js.map b/test/expected/build/application.h/dest/sectionsA/section2.js.map
diff --git a/test/expected/build/application.h/dest/sectionsA/section3.js b/test/expected/build/application.h/dest/sectionsA/section3.js
diff --git a/test/expected/build/application.h/dest/sectionsA/section3.js.map b/test/expected/build/application.h/dest/sectionsA/section3.js.map
diff --git a/test/expected/build/application.h/dest/sectionsB/section1.js b/test/expected/build/application.h/dest/sectionsB/section1.js
diff --git a/test/expected/build/application.h/dest/sectionsB/section1.js.map b/test/expected/build/application.h/dest/sectionsB/section1.js.map
diff --git a/test/expected/build/application.h/dest/sectionsB/section2.js b/test/expected/build/application.h/dest/sectionsB/section2.js
diff --git a/test/expected/build/application.h/dest/sectionsB/section2.js.map b/test/expected/build/application.h/dest/sectionsB/section2.js.map