@netlify/build 29.49.0 → 29.50.0

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.push(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

@@ -62,7 +62,7 @@ const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, fun
     try {
         // Printing an empty line before bundling output.
         log(logs, '');
-        const sourceDirectories = [frameworkFunctionsSrc, internalFunctionsSrc, functionsSrc].filter(Boolean);
+        const sourceDirectories = [internalFunctionsSrc, frameworkFunctionsSrc, functionsSrc].filter(Boolean);
         const results = await zipItAndShipIt.zipFunctions(sourceDirectories, functionsDist, zisiParameters);
         validateCustomRoutes(results);
         const bundlers = Array.from(getBundlers(results));
@@ -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/lib/plugins_core/pre_cleanup/index.js

@@ -1,22 +1,22 @@
 import { rm } from 'node:fs/promises';
-import { scanForBlobs, getBlobsDirs } from '../../utils/blobs.js';
+import { resolve } from 'node:path';
+import { getBlobsDirs } from '../../utils/blobs.js';
+import { FRAMEWORKS_API_ENDPOINT } from '../../utils/frameworks_api.js';
 const coreStep = async ({ buildDir, packagePath }) => {
-    const blobsDirs = getBlobsDirs(buildDir, packagePath);
+    const dirs = [...getBlobsDirs(buildDir, packagePath), resolve(buildDir, packagePath || '', FRAMEWORKS_API_ENDPOINT)];
     try {
-        await Promise.all(blobsDirs.map((dir) => rm(dir, { recursive: true, force: true })));
+        await Promise.all(dirs.map((dir) => rm(dir, { recursive: true, force: true })));
     }
     catch {
         // Ignore errors if it fails, we can continue anyway.
     }
     return {};
 };
-const blobsPresent = async ({ buildDir, packagePath }) => Boolean(await scanForBlobs(buildDir, packagePath));
 export const preCleanup = {
     event: 'onPreBuild',
     coreStep,
     coreStepId: 'pre_cleanup',
     coreStepName: 'Pre cleanup',
     coreStepDescription: () => 'Cleaning up leftover files from previous builds',
-    condition: blobsPresent,
     quiet: true,
 };

package/lib/steps/get.js

@@ -3,9 +3,9 @@ import { DEV_EVENTS, EVENTS } from '../plugins/events.js';
 import { uploadBlobs } from '../plugins_core/blobs_upload/index.js';
 import { buildCommandCore } from '../plugins_core/build_command.js';
 import { deploySite } from '../plugins_core/deploy/index.js';
-import { applyDeployConfig } from '../plugins_core/deploy_config/index.js';
 import { devUploadBlobs } from '../plugins_core/dev_blobs_upload/index.js';
 import { bundleEdgeFunctions } from '../plugins_core/edge_functions/index.js';
+import { applyDeployConfig } from '../plugins_core/frameworks_api/index.js';
 import { bundleFunctions } from '../plugins_core/functions/index.js';
 import { preCleanup } from '../plugins_core/pre_cleanup/index.js';
 import { preDevCleanup } from '../plugins_core/pre_dev_cleanup/index.js';

package/lib/utils/blobs.js

@@ -75,24 +75,22 @@ const METADATA_SUFFIX = '.json';
  * path to its metadata file.
  */
 export const getKeysToUpload = async (blobsDir) => {
-    const blobsToUpload = [];
     const files = await new fdir()
         .withRelativePaths() // we want the relative path from the blobsDir
         .filter((fpath) => !path.basename(fpath).startsWith(METADATA_PREFIX))
         .crawl(blobsDir)
         .withPromise();
-    files.forEach((filePath) => {
+    return files.map((filePath) => {
         const key = filePath.split(path.sep).join('/');
         const contentPath = path.resolve(blobsDir, filePath);
         const basename = path.basename(filePath);
         const metadataPath = path.resolve(blobsDir, path.dirname(filePath), `${METADATA_PREFIX}${basename}${METADATA_SUFFIX}`);
-        blobsToUpload.push({
+        return {
             key,
             contentPath,
             metadataPath,
-        });
+        };
     });
-    return blobsToUpload;
 };
 /** Read a file and its metadata file from the blobs directory */
 export const getFileWithMetadata = async (key, contentPath, metadataPath) => {

package/lib/utils/frameworks_api.d.ts

@@ -1,3 +1,4 @@
+export declare const FRAMEWORKS_API_ENDPOINT = ".netlify/v1";
 export declare const FRAMEWORKS_API_BLOBS_ENDPOINT = ".netlify/v1/blobs";
 export declare const FRAMEWORKS_API_CONFIG_ENDPOINT = ".netlify/v1/config.json";
 export declare const FRAMEWORKS_API_EDGE_FUNCTIONS_ENDPOINT = ".netlify/v1/edge-functions";

package/lib/utils/frameworks_api.js

@@ -1,10 +1,11 @@
 import { basename, dirname, resolve, sep } from 'node:path';
 import { fdir } from 'fdir';
-export const FRAMEWORKS_API_BLOBS_ENDPOINT = '.netlify/v1/blobs';
-export const FRAMEWORKS_API_CONFIG_ENDPOINT = '.netlify/v1/config.json';
-export const FRAMEWORKS_API_EDGE_FUNCTIONS_ENDPOINT = '.netlify/v1/edge-functions';
+export const FRAMEWORKS_API_ENDPOINT = '.netlify/v1';
+export const FRAMEWORKS_API_BLOBS_ENDPOINT = `${FRAMEWORKS_API_ENDPOINT}/blobs`;
+export const FRAMEWORKS_API_CONFIG_ENDPOINT = `${FRAMEWORKS_API_ENDPOINT}/config.json`;
+export const FRAMEWORKS_API_EDGE_FUNCTIONS_ENDPOINT = `${FRAMEWORKS_API_ENDPOINT}/edge-functions`;
 export const FRAMEWORKS_API_EDGE_FUNCTIONS_IMPORT_MAP = 'import_map.json';
-export const FRAMEWORKS_API_FUNCTIONS_ENDPOINT = '.netlify/v1/functions';
+export const FRAMEWORKS_API_FUNCTIONS_ENDPOINT = `${FRAMEWORKS_API_ENDPOINT}/functions`;
 /**
  * Traverses a directory tree in search of leaf files. The key of each leaf
  * file is determined by its path relative to the base directory.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.49.0",
+  "version": "29.50.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -71,14 +71,14 @@
     "@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/functions-utils": "^5.2.70",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/opentelemetry-utils": "^1.2.1",
     "@netlify/plugins-list": "^6.80.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.37.1",
+    "@netlify/zip-it-and-ship-it": "9.37.2",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
     "chalk": "^5.0.0",
@@ -165,5 +165,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "77980fa9db268a0beead2e2727a36d833716bc11"
+  "gitHead": "73b6616a85923ed3c436747b5d69353400236a71"
 }