Resolve bundles' defaults before generateBundleTask call

SAP · Jun 27, 2024 · e6a9e0b · e6a9e0b
1 parent 1f7e58e
commit e6a9e0b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/lib/build/definitions/application.js b/lib/build/definitions/application.js
@@ -85,19 +85,27 @@ export default function({project, taskUtil, getTask}) {
  requiresDependencies: true,
  taskFunction: async ({workspace, dependencies, taskUtil, options}) => {
  const generateBundleTask = await getTask("generateBundle");
- return bundles.reduce(function(sequence, bundle) {
- return sequence.then(async function() {
- const {bundleDefinition, bundleOptions} = await enhanceBundleWithDefaults(
- bundle.bundleDefinition, bundle.bundleOptions, taskUtil.getProject());
+ // Async resolve default values for bundle definitions and options
+ const bundlesDefaults = await Promise.all(
+ bundles.map((bundle) =>
+ enhanceBundleWithDefaults(
+ bundle.bundleDefinition,
+ bundle.bundleOptions,
+ taskUtil.getProject()
+ )
+ )
+ );
 
+ return bundlesDefaults.reduce(async function(sequence, bundle) {
+ return sequence.then(function() {
  return generateBundleTask.task({
  workspace,
  dependencies,
  taskUtil,
  options: {
  projectName: options.projectName,
- bundleDefinition,
- bundleOptions
+ bundleDefinition: bundle.bundleDefinition,
+ bundleOptions: bundle.bundleOptions
  }
  });
  });

diff --git a/lib/build/definitions/library.js b/lib/build/definitions/library.js
@@ -120,19 +120,27 @@ export default function({project, taskUtil, getTask}) {
  requiresDependencies: true,
  taskFunction: async ({workspace, dependencies, taskUtil, options}) => {
  const generateBundleTask = await getTask("generateBundle");
- return bundles.reduce(function(sequence, bundle) {
- return sequence.then(async function() {
- const {bundleDefinition, bundleOptions} = await enhanceBundleWithDefaults(
- bundle.bundleDefinition, bundle.bundleOptions, taskUtil.getProject());
-
+ // Async resolve default values for bundle definitions and options
+ const bundlesDefaults = await Promise.all(
+ bundles.map((bundle) =>
+ enhanceBundleWithDefaults(
+ bundle.bundleDefinition,
+ bundle.bundleOptions,
+ taskUtil.getProject()
+ )
+ )
+ );
+
+ return bundlesDefaults.reduce(function(sequence, bundle) {
+ return sequence.then(function() {
  return generateBundleTask.task({
  workspace,
  dependencies,
  taskUtil,
  options: {
  projectName: options.projectName,
- bundleDefinition,
- bundleOptions
+ bundleDefinition: bundle.bundleDefinition,
+ bundleOptions: bundle.bundleOptions
  }
  });
  });