Add taskUtil as dependency to moduleBundler

SAP · Jul 2, 2024 · bb33e24 · bb33e24
1 parent 702ea88
commit bb33e24
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 62 deletions.
diff --git a/lib/processors/bundlers/moduleBundler.js b/lib/processors/bundlers/moduleBundler.js
@@ -135,11 +135,12 @@ const log = getLogger("builder:processors:bundlers:moduleBundler");
  * @param {string} [parameters.options.targetUi5CoreVersion] Optional semver compliant sap.ui.core project version, e.g '2.0.0'.
  This allows the bundler to make assumptions on available runtime APIs.
  Omit if the ultimate UI5 version at runtime is unknown or can't be determined.
+ * @param {@ui5/project/build/helpers/TaskUtil|object} [parameters.taskUtil] TaskUtil
  * @returns {Promise<module:@ui5/builder/processors/bundlers/moduleBundler~ModuleBundlerResult[]>}
  * Promise resolving with module bundle resources
  */
 /* eslint-enable max-len */
-export default function({resources, options: {
+export default function({resources, taskUtil, options: {
  bundleDefinition, bundleOptions, moduleNameMapping, targetUi5CoreVersion
 }}) {
  // Apply defaults without modifying the passed object
@@ -152,12 +153,8 @@ export default function({resources, options: {
  ignoreMissingModules: false
  }, bundleOptions);
 
- // Take the project from the resources if available.
- // It's needed for specVersion check. If unavailable,
- // the specVersion would be treated as the most recent one.
- const project = resources?.[0]?.getProject();
  // Apply defaults without modifying the passed object
- bundleDefinition = applyDefaultsToBundleDefinition(bundleDefinition, project?.getSpecVersion());
+ bundleDefinition = applyDefaultsToBundleDefinition(bundleDefinition, taskUtil);
 
  const pool = new LocatorResourcePool({
  ignoreMissingModules: bundleOptions.ignoreMissingModules
@@ -200,7 +197,7 @@ export default function({resources, options: {
  });
 }
 
-function applyDefaultsToBundleDefinition(bundleDefinition, specVersion) {
+function applyDefaultsToBundleDefinition(bundleDefinition, taskUtil) {
  bundleDefinition.sections = bundleDefinition?.sections?.map((section) => {
  const defaultValues = {
  resolve: false,
@@ -213,7 +210,7 @@ function applyDefaultsToBundleDefinition(bundleDefinition, specVersion) {
  // Since specVersion: 4.0 "require" section starts loading asynchronously.
  // If specVersion cannot be determined, the latest spec is taken into account.
  // This is a breaking change in specVersion: 4.0
- if (section.mode === "require" && (!specVersion || specVersion.gte("4.0"))) {
+ if (section.mode === "require" && (!taskUtil || taskUtil.getProject().getSpecVersion().gte("4.0"))) {
  defaultValues.async = true;
  }
 

diff --git a/lib/tasks/bundlers/generateBundle.js b/lib/tasks/bundlers/generateBundle.js
@@ -103,7 +103,7 @@ export default async function({
  if (coreVersion) {
  options.targetUi5CoreVersion = coreVersion;
  }
- return moduleBundler({options, resources}).then((bundles) => {
+ return moduleBundler({options, resources, taskUtil}).then((bundles) => {
  return Promise.all(bundles.map(({bundle, sourceMap} = {}) => {
  if (!bundle) {
  // Skip empty bundles

diff --git a/lib/tasks/bundlers/generateComponentPreload.js b/lib/tasks/bundlers/generateComponentPreload.js
@@ -159,7 +159,8 @@ export default async function({
  }
  return moduleBundler({
  resources,
- options
+ options,
+ taskUtil
  });
  }));
  })

diff --git a/lib/tasks/bundlers/generateLibraryPreload.js b/lib/tasks/bundlers/generateLibraryPreload.js
@@ -265,7 +265,7 @@ export default async function({workspace, taskUtil, options: {skipBundles = [],
  if (coreVersion) {
  options.targetUi5CoreVersion = coreVersion;
  }
- return moduleBundler({options, resources});
+ return moduleBundler({options, resources, taskUtil});
  };
 
  return nonDbgWorkspace.byGlob("/**/*.{js,json,xml,html,properties,library,js.map}").then(async (resources) => {

diff --git a/test/lib/tasks/bundlers/generateBundle.js b/test/lib/tasks/bundlers/generateBundle.js
@@ -98,7 +98,8 @@ test.serial("generateBundle: No taskUtil, no bundleOptions", async (t) => {
  bundleDefinition,
  bundleOptions: undefined
  },
- resources
+ resources,
+ taskUtil: undefined
  }]);
 
  t.is(combo.byGlob.callCount, 1,
@@ -171,7 +172,8 @@ test.serial("generateBundle: No bundleOptions, with taskUtil", async (t) => {
  bundleOptions: undefined,
  targetUi5CoreVersion: "1.120.0",
  },
- resources
+ resources,
+ taskUtil
  }]);
 
  t.is(combo.byGlob.callCount, 0,
@@ -292,7 +294,8 @@ test.serial("generateBundle: bundleOptions: optimize=false, with taskUtil", asyn
  },
  targetUi5CoreVersion: "1.120.0",
  },
- resources
+ resources,
+ taskUtil
  }]);
 
  t.is(combo.byGlob.callCount, 0,
@@ -415,7 +418,8 @@ test.serial("generateBundle: bundleOptions: sourceMap=false, with taskUtil", asy
  bundleOptions,
  targetUi5CoreVersion: "1.120.0"
  },
- resources
+ resources,
+ taskUtil
  }]);
 
  t.is(combo.byGlob.callCount, 0,
@@ -513,7 +517,8 @@ test.serial("generateBundle: Empty bundle (skipIfEmpty=true)", async (t) => {
  bundleOptions,
  targetUi5CoreVersion: "1.120.0"
  },
- resources
+ resources,
+ taskUtil
  }]);
 
  t.is(combo.byGlob.callCount, 0,
@@ -640,7 +645,8 @@ test.serial("generateBundle: No bundleOptions, with taskUtil, UI5 Version >= 2",
  bundleOptions: undefined,
  targetUi5CoreVersion: "2.0.0",
  },
- resources
+ resources,
+ taskUtil
  }]);
 
  t.is(combo.byGlob.callCount, 0,

diff --git a/test/lib/tasks/bundlers/generateComponentPreload.js b/test/lib/tasks/bundlers/generateComponentPreload.js
@@ -96,7 +96,8 @@ test.serial("generateComponentPreload - one namespace", async (t) => {
  ignoreMissingModules: true
  }
  },
- resources
+ resources,
+ taskUtil: undefined
  }]);
 
  t.is(byGlob.callCount, 1,
@@ -188,7 +189,8 @@ test.serial("generateComponentPreload - one namespace - excludes", async (t) =>
  ignoreMissingModules: true
  }
  },
- resources
+ resources,
+ taskUtil: undefined
  }]);
 
  t.is(byGlob.callCount, 1,
@@ -293,7 +295,8 @@ test.serial("generateComponentPreload - one namespace - excludes w/o namespace",
  ignoreMissingModules: true
  }
  },
- resources
+ resources,
+ taskUtil
  }]);
 
  t.is(byGlob.callCount, 1,
@@ -414,7 +417,8 @@ test.serial("generateComponentPreload - multiple namespaces - excludes", async (
  ignoreMissingModules: true
  }
  },
- resources
+ resources,
+ taskUtil: undefined
  }]);
  t.deepEqual(moduleBundlerStub.getCall(1).args, [{
  options: {
@@ -455,7 +459,8 @@ test.serial("generateComponentPreload - multiple namespaces - excludes", async (
  ignoreMissingModules: true
  }
  },
- resources
+ resources,
+ taskUtil: undefined
  }]);
 
  t.is(byGlob.callCount, 1,
@@ -599,7 +604,8 @@ test.serial("generateComponentPreload - nested namespaces - excludes", async (t)
  ignoreMissingModules: true
  }
  },
- resources
+ resources,
+ taskUtil: undefined
  }]);
  t.deepEqual(moduleBundlerStub.getCall(1).args, [{
  options: {
@@ -648,7 +654,8 @@ test.serial("generateComponentPreload - nested namespaces - excludes", async (t)
  ignoreMissingModules: true
  }
  },
- resources
+ resources,
+ taskUtil: undefined
  }]);
  t.deepEqual(moduleBundlerStub.getCall(2).args, [{
  options: {
@@ -690,7 +697,8 @@ test.serial("generateComponentPreload - nested namespaces - excludes", async (t)
  ignoreMissingModules: true
  }
  },
- resources
+ resources,
+ taskUtil: undefined
  }]);
 
  t.is(log.warn.callCount, 1, "log.warn should be called once");