@netlify/build 29.49.0 → 29.49.1

package/lib/plugins_core/edge_functions/index.js

@@ -19,17 +19,17 @@ const coreStep = async function ({ buildDir, packagePath, constants: { EDGE_FUNC
     const distImportMapPath = join(dirname(internalSrcPath), IMPORT_MAP_FILENAME);
     const srcPath = srcDirectory ? resolve(buildDir, srcDirectory) : undefined;
     const frameworksAPISrcPath = resolve(buildDir, packagePath || '', FRAMEWORKS_API_EDGE_FUNCTIONS_ENDPOINT);
-    let generatedFunctionsPath = internalSrcPath;
+    const generatedFunctionPaths = [internalSrcPath];
     if (featureFlags.netlify_build_frameworks_api) {
         if (await pathExists(frameworksAPISrcPath)) {
-            generatedFunctionsPath = frameworksAPISrcPath;
+            generatedFunctionPaths.unshift(frameworksAPISrcPath);
         }
         const frameworkImportMap = resolve(buildDir, packagePath || '', FRAMEWORKS_API_EDGE_FUNCTIONS_ENDPOINT, FRAMEWORKS_API_EDGE_FUNCTIONS_IMPORT_MAP);
         if (await pathExists(frameworkImportMap)) {
             importMapPaths.push(frameworkImportMap);
         }
     }
-    const sourcePaths = [generatedFunctionsPath, srcPath].filter(Boolean);
+    const sourcePaths = [...generatedFunctionPaths, srcPath].filter(Boolean);
     logFunctions({ frameworksAPISrcPath, internalSrcDirectory, internalSrcPath, logs, srcDirectory, srcPath });
     // If we're running in buildbot, we set the Deno cache dir to a directory
     // that is persisted between builds.
@@ -64,7 +64,7 @@ const coreStep = async function ({ buildDir, packagePath, constants: { EDGE_FUNC
             importMapPaths,
             userLogger: (...args) => log(logs, reduceLogLines(args)),
             systemLogger: systemLog,
-            internalSrcFolder: generatedFunctionsPath,
+            internalSrcFolder: generatedFunctionPaths,
             bootstrapURL: edgeFunctionsBootstrapURL,
             vendorDirectory,
         });

package/lib/plugins_core/functions/index.js

@@ -97,13 +97,12 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
             log(logs, '');
         }
     }
-    const hasFrameworkFunctions = frameworkFunctions.length !== 0;
     logFunctionsToBundle({
         logs,
         userFunctions,
         userFunctionsSrc: relativeFunctionsSrc,
         userFunctionsSrcExists: functionsSrcExists,
-        internalFunctions: hasFrameworkFunctions ? [] : internalFunctions,
+        internalFunctions,
         internalFunctionsSrc: relativeInternalFunctionsSrc,
         frameworkFunctions,
     });
@@ -118,7 +117,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
         functionsDist,
         functionsSrc,
         frameworkFunctionsSrc,
-        internalFunctionsSrc: hasFrameworkFunctions ? undefined : internalFunctionsSrc,
+        internalFunctionsSrc,
         isRunningLocally,
         logs,
         repositoryRoot,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.49.0",
+  "version": "29.49.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -71,7 +71,7 @@
     "@netlify/blobs": "^7.3.0",
     "@netlify/cache-utils": "^5.1.5",
     "@netlify/config": "^20.15.4",
-    "@netlify/edge-bundler": "12.1.0",
+    "@netlify/edge-bundler": "12.1.1",
     "@netlify/framework-info": "^9.8.13",
     "@netlify/functions-utils": "^5.2.69",
     "@netlify/git-utils": "^5.1.1",
@@ -165,5 +165,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "77980fa9db268a0beead2e2727a36d833716bc11"
+  "gitHead": "b993b18469d4355e164f605e742e69dcb5612905"
 }