@netlify/build 37.2.0 → 37.3.1

package/lib/core/build.d.ts

@@ -12,6 +12,7 @@ export declare const startBuild: (flags: Partial<BuildFlags>) => {
     telemetry: boolean;
     verbose: boolean;
     functionsDistDir: string;
+    serverDistDir: string;
     edgeFunctionsDistDir: string;
     cacheDir: string;
     sendStatus: boolean;

package/lib/core/build.js

@@ -32,7 +32,7 @@ export const startBuild = function (flags) {
     const errorMonitor = startErrorMonitor({ flags: { debug, systemLogFile, ...flagsA }, logs, bugsnagKey });
     return { ...flagsA, debug, systemLogFile, errorMonitor, logs, timers };
 };
-const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cachedConfigPath, outputConfigPath, cwd, packagePath, repositoryRoot, apiHost, token, siteId, accountId, context, branch, baseRelDir, env: envOpt, debug, systemLogFile, verbose, nodePath, functionsDistDir, edgeFunctionsDistDir, cacheDir, dry, mode, offline, deployId, buildId, testOpts, errorMonitor, errorParams, logs, timers, buildbotServerSocket, sendStatus, saveConfig, featureFlags, timeline, devCommand, quiet, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, eventHandlers, skewProtectionToken, }) {
+const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cachedConfigPath, outputConfigPath, cwd, packagePath, repositoryRoot, apiHost, token, siteId, accountId, context, branch, baseRelDir, env: envOpt, debug, systemLogFile, verbose, nodePath, functionsDistDir, edgeFunctionsDistDir, serverDistDir, cacheDir, dry, mode, offline, deployId, buildId, testOpts, errorMonitor, errorParams, logs, timers, buildbotServerSocket, sendStatus, saveConfig, featureFlags, timeline, devCommand, quiet, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, eventHandlers, skewProtectionToken, }) {
     const configOpts = getConfigOpts({
         config,
         defaultConfig,
@@ -73,6 +73,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
         buildDir,
         functionsDistDir,
         edgeFunctionsDistDir,
+        serverDistDir,
         cacheDir,
         packagePath,
         netlifyConfig,

package/lib/core/constants.d.ts

@@ -37,6 +37,10 @@ export interface NetlifyPluginConstants {
      * the directory where built Edge Functions are placed before deployment. Its value is always defined, but the target might not have been created yet.
      */
     EDGE_FUNCTIONS_DIST: string;
+    /**
+     * the directory where the built Netlify Server is placed before deployment. Its value is always defined, but the target might not have been created yet.
+     */
+    SERVER_DIST: string;
     /**
      * the directory where database migrations are placed before deployment.
      */
@@ -84,12 +88,13 @@ export interface NetlifyPluginConstants {
 /**
  * Retrieve constants passed to plugins
  */
-export declare const getConstants: ({ configPath, buildDir, packagePath, functionsDistDir, edgeFunctionsDistDir, cacheDir, netlifyConfig, siteInfo: { id: siteId, account_id: accountId }, apiHost, token, mode, }: {
+export declare const getConstants: ({ configPath, buildDir, packagePath, functionsDistDir, edgeFunctionsDistDir, serverDistDir, cacheDir, netlifyConfig, siteInfo: { id: siteId, account_id: accountId }, apiHost, token, mode, }: {
     configPath: any;
     buildDir: any;
     packagePath: any;
     functionsDistDir: any;
     edgeFunctionsDistDir: any;
+    serverDistDir: any;
     cacheDir: any;
     netlifyConfig: any;
     siteInfo: {

package/lib/core/constants.js

@@ -5,7 +5,7 @@ import { ROOT_PACKAGE_JSON } from '../utils/json.js';
 /**
  * Retrieve constants passed to plugins
  */
-export const getConstants = async function ({ configPath, buildDir, packagePath, functionsDistDir, edgeFunctionsDistDir, cacheDir, netlifyConfig, siteInfo: { id: siteId, account_id: accountId }, apiHost, token, mode, }) {
+export const getConstants = async function ({ configPath, buildDir, packagePath, functionsDistDir, edgeFunctionsDistDir, serverDistDir, cacheDir, netlifyConfig, siteInfo: { id: siteId, account_id: accountId }, apiHost, token, mode, }) {
     const isLocal = mode !== 'buildbot';
     const normalizedCacheDir = getCacheDir({ cacheDir, cwd: join(buildDir, packagePath || '') });
     const constants = {
@@ -21,6 +21,8 @@ export const getConstants = async function ({ configPath, buildDir, packagePath,
         // only on local development join with the packagePath as this directory
         // on buildbot this `functionsDistDir` is an absolute path to `/tmp/zisi-.....` so we cannot join it with the pacakgePath
         EDGE_FUNCTIONS_DIST: !isLocal ? edgeFunctionsDistDir : join(packagePath || '', edgeFunctionsDistDir),
+        // The directory where the built Netlify Server is placed before deployment
+        SERVER_DIST: !isLocal ? serverDistDir : join(packagePath || '', serverDistDir),
         // Path to the Netlify build cache folder
         CACHE_DIR: normalizedCacheDir,
         // Boolean indicating whether the build was run locally (Netlify CLI) or in the production CI
@@ -126,6 +128,7 @@ const CONSTANT_PATHS = new Set([
     'INTERNAL_FUNCTIONS_SRC',
     'DB_MIGRATIONS_DIST',
     'EDGE_FUNCTIONS_DIST',
+    'SERVER_DIST',
     'EDGE_FUNCTIONS_SRC',
     'DB_MIGRATIONS_SRC',
     'CACHE_DIR',

package/lib/core/flags.d.ts

@@ -98,6 +98,11 @@ export const FLAGS: {
         describe: string;
         hidden: boolean;
     };
+    serverDistDir: {
+        string: boolean;
+        describe: string;
+        hidden: boolean;
+    };
     cacheDir: {
         string: boolean;
         describe: string;

package/lib/core/flags.js

@@ -123,6 +123,12 @@ Default: automatically guessed`,
     edgeFunctionsDistDir: {
         string: true,
         describe: `Path to the directory where packaged Edge Functions are kept.
+Default: automatically guessed`,
+        hidden: true,
+    },
+    serverDistDir: {
+        string: true,
+        describe: `Path to the directory where the packaged Netlify Server is kept.
 Default: automatically guessed`,
         hidden: true,
     },

package/lib/core/normalize_flags.d.ts

@@ -9,6 +9,7 @@ export type ResolvedFlags = {
     verbose: boolean;
     /** The dist directory of the functions @default `.netlify/functions/` */
     functionsDistDir: string;
+    serverDistDir: string;
     /** The dist directory of the edge functions @default `.netlify/edge-functions-dist/` */
     edgeFunctionsDistDir: string;
     /** The directory that is used for storing the cache @default `.netlify/cache/` */

package/lib/core/normalize_flags.js

@@ -6,6 +6,7 @@ export const DEFAULT_API_HOST = 'api.netlify.com';
 const REQUIRE_MODE = 'require';
 const DEFAULT_EDGE_FUNCTIONS_DIST = '.netlify/edge-functions-dist/';
 const DEFAULT_FUNCTIONS_DIST = '.netlify/functions/';
+const DEFAULT_SERVER_DIST = '.netlify/server/';
 const DEFAULT_CACHE_DIR = '.netlify/cache/';
 const DEFAULT_STATSD_PORT = 8125;
 const DEFAULT_OTEL_TRACING_PORT = 4317;
@@ -42,6 +43,7 @@ const getDefaultFlags = function ({ env: envOpt = {} }, combinedEnv) {
         telemetry: false,
         verbose: Boolean(combinedEnv.NETLIFY_BUILD_DEBUG),
         functionsDistDir: DEFAULT_FUNCTIONS_DIST,
+        serverDistDir: DEFAULT_SERVER_DIST,
         edgeFunctionsDistDir: DEFAULT_EDGE_FUNCTIONS_DIST,
         cacheDir: DEFAULT_CACHE_DIR,
         deployId: combinedEnv.DEPLOY_ID,

package/lib/index.d.ts

@@ -11,4 +11,5 @@ export type { NetlifyPluginUtils } from './types/options/netlify_plugin_utils.js
 export type { ListedFunction, ListedFunctionFile } from './types/options/netlify_plugin_functions_util.js';
 export { startDev } from './core/dev.js';
 export { runCoreSteps } from './steps/run_core_steps.js';
+export { SERVER_DIRECTORY } from './plugins_core/functions/server_entry.js';
 export default buildSite;

package/lib/index.js

@@ -3,5 +3,6 @@ export { getVersion } from './utils/json.js';
 // actual main types
 export { startDev } from './core/dev.js';
 export { runCoreSteps } from './steps/run_core_steps.js';
+export { SERVER_DIRECTORY } from './plugins_core/functions/server_entry.js';
 // default export the buildSite function
 export default buildSite;

package/lib/plugins_core/functions/index.d.ts

@@ -1,4 +1,4 @@
-import { type BundleOptions, type BundleResult, type FunctionResult, zipFunctions } from '@netlify/zip-it-and-ship-it';
+import { zipFunctions, type FunctionResult } from '@netlify/zip-it-and-ship-it';
 import type { CoreStepFunction } from '../types.js';
 export declare const bundleFunctions: {
     event: string;
@@ -18,6 +18,5 @@ export declare const bundleFunctions: {
     }) => Promise<boolean>;
 };
 export declare const zipItAndShipIt: {
-    bundle(options: BundleOptions): Promise<BundleResult>;
     zipFunctions(input: import("@netlify/zip-it-and-ship-it").MixedPaths, destFolder: string, args_2?: import("@netlify/zip-it-and-ship-it").ZipFunctionsOptions | undefined): Promise<FunctionResult[]>;
 };

package/lib/plugins_core/functions/index.js

@@ -1,5 +1,5 @@
 import { resolve } from 'path';
-import { bundle, zipFunctions, } from '@netlify/zip-it-and-ship-it';
+import { zipFunctions } from '@netlify/zip-it-and-ship-it';
 import { pathExists } from '../../utils/path_exists.js';
 import { addErrorInfo } from '../../error/info.js';
 import { log } from '../../log/logger.js';
@@ -7,7 +7,7 @@ import { getGeneratedFunctions } from '../../steps/return_values.js';
 import { logBundleResults, logFunctionsNonExistingDir, logFunctionsToBundle, trackBundleResults, } from '../../log/messages/core_steps.js';
 import { FRAMEWORKS_API_FUNCTIONS_PATH } from '../../utils/frameworks_api.js';
 import { getZipError } from './error.js';
-import { getServerEntry, useServer, writeServerShim } from './server_entry.js';
+import { getServerEntry, SERVER_DIRECTORY, useServerAsFunction, writeServerShim } from './server_entry.js';
 import { getUserAndInternalFunctions, validateFunctionsSrc } from './utils.js';
 import { getZisiParameters } from './zisi.js';
 // see https://docs.netlify.com/functions/trigger-on-events/#available-triggers
@@ -42,7 +42,7 @@ const validateCustomRoutes = function (functions) {
         }
     }
 };
-const zipFunctionsAndLogResults = async ({ branch, buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, generatedFunctions, frameworkFunctionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, server, userNodeVersion, systemLog, }) => {
+const zipFunctionsAndLogResults = async ({ branch, buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, generatedFunctions, frameworkFunctionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, userNodeVersion, systemLog, }) => {
     const zisiParameters = getZisiParameters({
         branch,
         buildDir,
@@ -52,24 +52,22 @@ const zipFunctionsAndLogResults = async ({ branch, buildDir, childEnv, featureFl
         functionsDist,
         internalFunctionsSrc,
         isRunningLocally,
-        paths: {
-            generated: {
-                directories: [internalFunctionsSrc, frameworkFunctionsSrc].filter(Boolean),
-                functions: generatedFunctions,
-            },
-            user: {
-                directories: [functionsSrc].filter(Boolean),
-            },
-        },
         repositoryRoot,
-        server,
         userNodeVersion,
         systemLog,
     });
     try {
         // Printing an empty line before bundling output.
         log(logs, '');
-        const { functions: results } = await zipItAndShipIt.bundle(zisiParameters);
+        const results = await zipItAndShipIt.zipFunctions({
+            generated: {
+                directories: [internalFunctionsSrc, frameworkFunctionsSrc].filter(Boolean),
+                functions: generatedFunctions,
+            },
+            user: {
+                directories: [functionsSrc].filter(Boolean),
+            },
+        }, functionsDist, zisiParameters);
         validateCustomRoutes(results);
         logBundleResults({ logs, results });
         const summary = trackBundleResults({ results, systemLog });
@@ -104,13 +102,11 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
         }
     }
     const generatedFunctions = getGeneratedFunctions(returnValues);
-    const serverEntry = await getServerEntry({ buildDir, packagePath, featureFlags });
+    const serverEntry = useServerAsFunction(featureFlags) ? await getServerEntry({ buildDir, packagePath }) : undefined;
     if (serverEntry) {
         log(logs, `Netlify Server detected at ${serverEntry.relativeEntryPath}`);
     }
-    const asFunction = featureFlags?.netlify_build_server_entry === true;
-    const standalone = featureFlags?.netlify_build_server_standalone === true;
-    const serverShimPath = serverEntry && asFunction ? await writeServerShim(serverEntry) : undefined;
+    const serverShimPath = serverEntry === undefined ? undefined : await writeServerShim(serverEntry);
     logFunctionsToBundle({
         logs,
         userFunctions,
@@ -147,7 +143,6 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
             ...generatedFunctions.map((func) => func.path),
             ...(serverShimPath === undefined ? [] : [serverShimPath]),
         ],
-        server: serverEntry && standalone ? { path: serverEntry.entryPath } : undefined,
     });
     const fallback = fallbackCount > 0 ? 'true' : 'false';
     const warnings = warningsCount > 0 ? 'true' : 'false';
@@ -166,7 +161,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
 // `condition` because the directories might be created by the build command
 // or plugins.
 const hasFunctionsDirectories = async function ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, featureFlags, packagePath, returnValues, }) {
-    if (useServer(featureFlags) && (await pathExists(resolve(buildDir, packagePath || '', 'netlify/server')))) {
+    if (useServerAsFunction(featureFlags) && (await pathExists(resolve(buildDir, packagePath || '', SERVER_DIRECTORY)))) {
         return true;
     }
     const hasFunctionsSrc = FUNCTIONS_SRC !== undefined && FUNCTIONS_SRC !== '';
@@ -215,9 +210,6 @@ export const bundleFunctions = {
 // `zip-it-and-ship-it` methods. Therefore, we need to use an intermediary
 // function and export them so tests can use it.
 export const zipItAndShipIt = {
-    async bundle(options) {
-        return await bundle(options);
-    },
     async zipFunctions(...args) {
         return await zipFunctions(...args);
     },

package/lib/plugins_core/functions/server_entry.d.ts

@@ -1,14 +1,15 @@
 import { type FeatureFlags } from '../../core/feature_flags.js';
-export declare const useServer: (featureFlags?: FeatureFlags) => boolean;
+export declare const SERVER_DIRECTORY = "netlify/server";
+export declare const useServerAsFunction: (featureFlags?: FeatureFlags) => boolean;
+export declare const useServerStandalone: (featureFlags?: FeatureFlags) => boolean;
 export interface ServerEntry {
     entryPath: string;
     packageRoot: string;
     relativeEntryPath: string;
 }
-export declare const getServerEntry: ({ buildDir, packagePath, featureFlags, }: {
+export declare const getServerEntry: ({ buildDir, packagePath, }: {
     buildDir: string;
     packagePath?: string;
-    featureFlags?: FeatureFlags;
 }) => Promise<ServerEntry | undefined>;
 /**
  * Writes the file a server is bundled from when it travels as a function, and

package/lib/plugins_core/functions/server_entry.js

@@ -1,33 +1,29 @@
-import { mkdir, readdir, writeFile } from 'fs/promises';
-import { join, resolve } from 'path';
-import { pathExists } from '../../utils/path_exists.js';
+import { mkdir, writeFile } from 'fs/promises';
+import { basename, join, resolve } from 'path';
+import { findServerEntry } from '@netlify/zip-it-and-ship-it';
 import { addErrorInfo } from '../../error/info.js';
-const SERVER_ENTRY_DIR = 'netlify/server';
-const SERVER_ENTRY_BASENAMES = new Set(['index.js', 'index.mjs', 'index.ts', 'index.mts']);
-export const useServer = (featureFlags) => featureFlags?.netlify_build_server_entry === true || featureFlags?.netlify_build_server_standalone === true;
+// Where a site's server lives, relative to the package root.
+export const SERVER_DIRECTORY = 'netlify/server';
+export const useServerAsFunction = (featureFlags) => featureFlags?.netlify_build_server_entry === true;
+export const useServerStandalone = (featureFlags) => featureFlags?.netlify_build_server_standalone === true;
 // Finds the user's server entrypoint.
-export const getServerEntry = async ({ buildDir, packagePath, featureFlags, }) => {
-    if (!useServer(featureFlags)) {
-        return undefined;
-    }
+export const getServerEntry = async ({ buildDir, packagePath, }) => {
     const packageRoot = resolve(buildDir, packagePath ?? '');
-    const serverDir = join(packageRoot, SERVER_ENTRY_DIR);
-    if (!(await pathExists(serverDir))) {
-        return undefined;
+    let entryPath;
+    try {
+        entryPath = await findServerEntry(join(packageRoot, SERVER_DIRECTORY));
     }
-    const candidates = (await readdir(serverDir)).filter((name) => SERVER_ENTRY_BASENAMES.has(name)).sort();
-    if (candidates.length === 0) {
-        return undefined;
-    }
-    if (candidates.length > 1) {
-        const error = new Error(`Found multiple server entrypoints in ${SERVER_ENTRY_DIR} (${candidates.join(', ')}). A site can have one server only.`);
+    catch (error) {
         addErrorInfo(error, { type: 'resolveConfig' });
         throw error;
     }
+    if (entryPath === undefined) {
+        return undefined;
+    }
     return {
-        entryPath: join(serverDir, candidates[0]),
+        entryPath,
         packageRoot,
-        relativeEntryPath: `${SERVER_ENTRY_DIR}/${candidates[0]}`,
+        relativeEntryPath: `${SERVER_DIRECTORY}/${basename(entryPath)}`,
     };
 };
 // Everything below carries a server through the functions plumbing, which is

package/lib/plugins_core/functions/zisi.d.ts

@@ -1,4 +1,4 @@
-import { type BundleOptions, type FunctionConfig, type MixedPaths, type ServerOptions } from '@netlify/zip-it-and-ship-it';
+import { type FunctionConfig, type ZipFunctionsOptions } from '@netlify/zip-it-and-ship-it';
 import type { FeatureFlags } from '../../core/feature_flags.js';
 type GetZisiParametersType = {
     branch?: string;
@@ -11,11 +11,9 @@ type GetZisiParametersType = {
     isRunningLocally: boolean;
     repositoryRoot: string;
     userNodeVersion: string;
-    systemLog: BundleOptions['systemLog'];
-    paths: MixedPaths;
-    server?: ServerOptions;
+    systemLog: ZipFunctionsOptions['systemLog'];
 };
-export declare const getZisiParameters: ({ branch, buildDir, childEnv, featureFlags, functionsConfig, functionsDist, internalFunctionsSrc, isRunningLocally, paths, repositoryRoot, server, userNodeVersion, systemLog, }: GetZisiParametersType) => BundleOptions;
+export declare const getZisiParameters: ({ branch, buildDir, childEnv, featureFlags, functionsConfig, functionsDist, internalFunctionsSrc, isRunningLocally, repositoryRoot, userNodeVersion, systemLog, }: GetZisiParametersType) => ZipFunctionsOptions;
 export declare const normalizeFunctionConfig: ({ buildDir, functionConfig, isRunningLocally, nodeVersion, }: {
     buildDir: string;
     functionConfig: Record<string, any>;

package/lib/plugins_core/functions/zisi.js

@@ -16,7 +16,7 @@ const getLambdaNodeVersion = (childEnv, userNodeVersion) => {
     }
     return undefined;
 };
-export const getZisiParameters = ({ branch, buildDir, childEnv, featureFlags, functionsConfig, functionsDist, internalFunctionsSrc, isRunningLocally, paths, repositoryRoot, server, userNodeVersion, systemLog, }) => {
+export const getZisiParameters = ({ branch, buildDir, childEnv, featureFlags, functionsConfig, functionsDist, internalFunctionsSrc, isRunningLocally, repositoryRoot, userNodeVersion, systemLog, }) => {
     const nodeVersion = getLambdaNodeVersion(childEnv, userNodeVersion);
     const manifest = join(functionsDist, 'manifest.json');
     const config = Object.fromEntries(Object.entries(functionsConfig).map(([expression, object]) => [
@@ -30,16 +30,11 @@ export const getZisiParameters = ({ branch, buildDir, childEnv, featureFlags, fu
     return {
         basePath: buildDir,
         branch,
-        destFolder: functionsDist,
-        featureFlags: zisiFeatureFlags,
-        functions: {
-            config,
-            configFileDirectories,
-            paths,
-        },
+        config,
         manifest,
+        featureFlags: zisiFeatureFlags,
         repositoryRoot,
-        server,
+        configFileDirectories,
         systemLog,
     };
 };

package/lib/plugins_core/server/index.d.ts

@@ -0,0 +1,18 @@
+import { type ServerResult, zipServer } from '@netlify/zip-it-and-ship-it';
+import type { FeatureFlags } from '../../core/feature_flags.js';
+import type { CoreStepFunction } from '../types.js';
+export declare const bundleServer: {
+    event: string;
+    coreStep: CoreStepFunction;
+    coreStepId: string;
+    coreStepName: string;
+    coreStepDescription: () => string;
+    condition: ({ buildDir, featureFlags, packagePath, }: {
+        buildDir: string;
+        featureFlags?: FeatureFlags;
+        packagePath?: string;
+    }) => Promise<boolean>;
+};
+export declare const zipItAndShipIt: {
+    zipServer(srcPath: string, destFolder: string, args_2?: import("@netlify/zip-it-and-ship-it").ZipServerOptions | undefined): Promise<ServerResult>;
+};

package/lib/plugins_core/server/index.js

@@ -0,0 +1,44 @@
+import { resolve } from 'path';
+import { zipServer } from '@netlify/zip-it-and-ship-it';
+import { log } from '../../log/logger.js';
+import { pathExists } from '../../utils/path_exists.js';
+import { getZisiFeatureFlags } from '../functions/feature_flags.js';
+import { getServerEntry, SERVER_DIRECTORY, useServerStandalone } from '../functions/server_entry.js';
+const coreStep = async function ({ buildDir, constants: { SERVER_DIST }, featureFlags, logs, packagePath, repositoryRoot, systemLog, }) {
+    const serverEntry = await getServerEntry({ buildDir, packagePath });
+    if (serverEntry === undefined) {
+        return {};
+    }
+    log(logs, `Netlify Server detected at ${serverEntry.relativeEntryPath}`);
+    await zipItAndShipIt.zipServer(serverEntry.entryPath, resolve(buildDir, SERVER_DIST), {
+        basePath: buildDir,
+        featureFlags: getZisiFeatureFlags(featureFlags ?? {}),
+        repositoryRoot,
+        systemLog,
+    });
+    return {};
+};
+// The directory can be created by the build command or by a plugin, so this is
+// checked when the step is about to run rather than when it is scheduled.
+const hasServerDirectory = async function ({ buildDir, featureFlags, packagePath, }) {
+    if (!useServerStandalone(featureFlags)) {
+        return false;
+    }
+    return await pathExists(resolve(buildDir, packagePath ?? '', SERVER_DIRECTORY));
+};
+export const bundleServer = {
+    event: 'onBuild',
+    coreStep,
+    coreStepId: 'server_bundling',
+    coreStepName: 'Server bundling',
+    coreStepDescription: () => 'Server bundling',
+    condition: hasServerDirectory,
+};
+// Named imports with ES modules cannot be mocked (unlike CommonJS) because they
+// are bound at load time, and the tests assert on what reaches
+// `zip-it-and-ship-it`.
+export const zipItAndShipIt = {
+    async zipServer(...args) {
+        return await zipServer(...args);
+    },
+};

package/lib/steps/get.js

@@ -12,6 +12,7 @@ import { copyDbMigrations } from '../plugins_core/db_setup/migrations.js';
 import { preCleanup } from '../plugins_core/pre_cleanup/index.js';
 import { preDevCleanup } from '../plugins_core/pre_dev_cleanup/index.js';
 import { saveArtifacts } from '../plugins_core/save_artifacts/index.js';
+import { bundleServer } from '../plugins_core/server/index.js';
 import { scanForSecrets } from '../plugins_core/secrets_scanning/index.js';
 import { applySpaFallback } from '../plugins_core/spa_fallback/index.js';
 // Get all build steps
@@ -71,6 +72,7 @@ const addCoreSteps = function (steps) {
         applyDeployConfig,
         ...steps,
         bundleFunctions,
+        bundleServer,
         bundleEdgeFunctions,
         copyDbMigrations,
         applySpaFallback,

package/lib/steps/run_core_steps.js

@@ -39,7 +39,7 @@ const getBuildSteps = function (buildSteps) {
     const allSteps = getSteps([]).steps.filter(({ coreStepId }) => buildSteps.includes(coreStepId));
     return allSteps;
 };
-const executeBuildStep = async function ({ config, packagePath, defaultConfig, cachedConfig, debug, nodePath, functionsDistDir, edgeFunctionsDistDir, errorMonitor, mode, logs, errorParams, featureFlags, buildSteps, repositoryRoot, systemLog, edgeFunctionsBootstrapURL, deployId, token, quiet, }) {
+const executeBuildStep = async function ({ config, packagePath, defaultConfig, cachedConfig, debug, nodePath, functionsDistDir, edgeFunctionsDistDir, serverDistDir, errorMonitor, mode, logs, errorParams, featureFlags, buildSteps, repositoryRoot, systemLog, edgeFunctionsBootstrapURL, deployId, token, quiet, }) {
     const configOpts = getConfigOpts({
         config,
         defaultConfig,
@@ -62,6 +62,7 @@ const executeBuildStep = async function ({ config, packagePath, defaultConfig, c
         functionsDistDir,
         packagePath,
         edgeFunctionsDistDir,
+        serverDistDir,
         netlifyConfig,
         siteInfo,
         mode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "37.2.0",
+  "version": "37.3.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -67,13 +67,13 @@
     "@netlify/blobs": "^11.0.3",
     "@netlify/cache-utils": "^7.1.2",
     "@netlify/config": "^25.2.5",
-    "@netlify/edge-bundler": "16.1.0",
-    "@netlify/functions-utils": "^7.1.11",
+    "@netlify/edge-bundler": "16.1.1",
+    "@netlify/functions-utils": "^7.1.13",
     "@netlify/git-utils": "^7.1.1",
     "@netlify/opentelemetry-utils": "^4.0.0",
     "@netlify/plugins-list": "^6.81.6",
     "@netlify/run-utils": "^7.1.0",
-    "@netlify/zip-it-and-ship-it": "16.1.0",
+    "@netlify/zip-it-and-ship-it": "16.2.1",
     "@sindresorhus/slugify": "^2.0.0",
     "ansis": "^4.1.0",
     "execa": "^8.0.0",
@@ -137,5 +137,5 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "gitHead": "59dce05fb37f296eb1e1460f3a742703a5d4efcf"
+  "gitHead": "d99b17e8a25b18687ce7b7657621dd22827304b7"
 }