@netlify/build 29.4.0 → 29.4.88-test

package/lib/plugins_core/functions/index.js

@@ -6,9 +6,10 @@ import { logBundleResults, logFunctionsNonExistingDir, logFunctionsToBundle } fr
 import { getZipError } from './error.js';
 import { getUserAndInternalFunctions, validateFunctionsSrc } from './utils.js';
 import { getZisiParameters } from './zisi.js';
-// Returns `true` if at least one of the functions has been configured to use
-// esbuild.
-const isUsingEsbuild = (functionsConfig = {}) => Object.values(functionsConfig).some((configObject) => configObject.node_bundler === 'esbuild');
+// Get a list of all unique bundlers in this run
+const getBundlers = (results = []) => Array.from(new Set(results
+    .map((bundle) => (bundle.runtime === "js" /* RuntimeType.JAVASCRIPT */ ? bundle.bundler : null))
+    .filter(Boolean)));
 const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, }) => {
     const zisiParameters = getZisiParameters({
         buildDir,
@@ -20,14 +21,14 @@ const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, fun
         isRunningLocally,
         repositoryRoot,
     });
-    const bundler = isUsingEsbuild(functionsConfig) ? 'esbuild' : 'zisi';
     try {
         // Printing an empty line before bundling output.
         log(logs, '');
         const sourceDirectories = [internalFunctionsSrc, functionsSrc].filter(Boolean);
         const results = await zipItAndShipIt.zipFunctions(sourceDirectories, functionsDist, zisiParameters);
+        const bundlers = getBundlers(results);
         logBundleResults({ logs, results });
-        return { bundler };
+        return { bundlers };
     }
     catch (error) {
         throw await getZipError(error, functionsSrc);
@@ -39,7 +40,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     const functionsDist = resolve(buildDir, relativeFunctionsDist);
     const internalFunctionsSrc = resolve(buildDir, relativeInternalFunctionsSrc);
     const internalFunctionsSrcExists = await pathExists(internalFunctionsSrc);
-    const functionsSrcExists = await validateFunctionsSrc({ functionsSrc, logs, relativeFunctionsSrc });
+    const functionsSrcExists = await validateFunctionsSrc({ functionsSrc, relativeFunctionsSrc });
     const [userFunctions = [], internalFunctions = []] = await getUserAndInternalFunctions({
         featureFlags,
         functionsSrc,
@@ -64,7 +65,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     if (userFunctions.length === 0 && internalFunctions.length === 0) {
         return {};
     }
-    const { bundler } = await zipFunctionsAndLogResults({
+    const { bundlers } = await zipFunctionsAndLogResults({
         buildDir,
         childEnv,
         featureFlags,
@@ -78,7 +79,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     });
     return {
         tags: {
-            bundler,
+            bundler: bundlers,
         },
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.4.0",
+  "version": "29.4.88-test",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -69,7 +69,7 @@
     "@netlify/edge-bundler": "8.0.0",
     "@netlify/functions-utils": "^5.1.1",
     "@netlify/git-utils": "^5.1.0",
-    "@netlify/plugins-list": "^6.59.0",
+    "@netlify/plugins-list": "^6.61.0",
     "@netlify/run-utils": "^5.1.0",
     "@netlify/zip-it-and-ship-it": "^8.2.0",
     "@sindresorhus/slugify": "^2.0.0",
@@ -148,6 +148,5 @@
     "compilerOptions": {
       "module": "commonjs"
     }
-  },
-  "gitHead": "87d6d9344ac37b4c40b70c582958347c0f7fd8eb"
+  }
 }