@netlify/build 36.3.4 → 36.4.0

package/lib/core/feature_flags.js

@@ -11,9 +11,9 @@ const getFeatureFlag = function (name) {
 // Default values for feature flags
 export const DEFAULT_FEATURE_FLAGS = {
     buildbot_zisi_trace_nft: false,
-    buildbot_zisi_esbuild_parser: false,
     netlify_build_updated_plugin_compatibility: false,
     netlify_build_plugin_system_log: false,
     edge_bundler_generate_tarball: false,
     netlify_build_db_setup: false,
+    netlify_build_server_entry: false,
 };

package/lib/plugins_core/functions/feature_flags.js

@@ -1,5 +1,4 @@
 export const getZisiFeatureFlags = (featureFlags) => ({
     ...featureFlags,
-    parseWithEsbuild: featureFlags.buildbot_zisi_esbuild_parser,
     traceWithNft: featureFlags.buildbot_zisi_trace_nft,
 });

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

@@ -6,12 +6,13 @@ export declare const bundleFunctions: {
     coreStepId: string;
     coreStepName: string;
     coreStepDescription: () => string;
-    condition: ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, packagePath, returnValues, }: {
+    condition: ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, featureFlags, packagePath, returnValues, }: {
         buildDir: any;
         constants: {
             INTERNAL_FUNCTIONS_SRC: any;
             FUNCTIONS_SRC: any;
         };
+        featureFlags: any;
         packagePath: any;
         returnValues: any;
     }) => Promise<boolean>;

package/lib/plugins_core/functions/index.js

@@ -7,6 +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 } 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
@@ -101,6 +102,10 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
         }
     }
     const generatedFunctions = getGeneratedFunctions(returnValues);
+    const serverEntry = await getServerEntry({ buildDir, packagePath, featureFlags });
+    if (serverEntry) {
+        log(logs, `Netlify Server detected at ${serverEntry.relativeEntryPath}`);
+    }
     logFunctionsToBundle({
         logs,
         userFunctions,
@@ -114,7 +119,8 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     if (userFunctions.length === 0 &&
         internalFunctions.length === 0 &&
         frameworkFunctions.length === 0 &&
-        generatedFunctions.length === 0) {
+        generatedFunctions.length === 0 &&
+        serverEntry === undefined) {
         return {};
     }
     const { bundlers, fallbackCount, warningsCount } = await zipFunctionsAndLogResults({
@@ -132,7 +138,10 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
         repositoryRoot,
         userNodeVersion,
         systemLog,
-        generatedFunctions: generatedFunctions.map((func) => func.path),
+        generatedFunctions: [
+            ...generatedFunctions.map((func) => func.path),
+            ...(serverEntry ? [serverEntry.shimPath] : []),
+        ],
     });
     const fallback = fallbackCount > 0 ? 'true' : 'false';
     const warnings = warningsCount > 0 ? 'true' : 'false';
@@ -150,7 +159,11 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
 // one configured by the user or the internal one) exists. We use a dynamic
 // `condition` because the directories might be created by the build command
 // or plugins.
-const hasFunctionsDirectories = async function ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, packagePath, returnValues, }) {
+const hasFunctionsDirectories = async function ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, featureFlags, packagePath, returnValues, }) {
+    if (featureFlags?.netlify_build_server_entry &&
+        (await pathExists(resolve(buildDir, packagePath || '', 'netlify/server')))) {
+        return true;
+    }
     const hasFunctionsSrc = FUNCTIONS_SRC !== undefined && FUNCTIONS_SRC !== '';
     if (hasFunctionsSrc) {
         return true;

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

@@ -0,0 +1,12 @@
+import { type FeatureFlags } from '../../core/feature_flags.js';
+export declare const SERVER_ENTRY_FUNCTION_NAME = "___netlify-server";
+export interface ServerEntry {
+    entryPath: string;
+    shimPath: string;
+    relativeEntryPath: string;
+}
+export declare const getServerEntry: ({ buildDir, packagePath, featureFlags, }: {
+    buildDir: string;
+    packagePath?: string;
+    featureFlags?: FeatureFlags;
+}) => Promise<ServerEntry | undefined>;

package/lib/plugins_core/functions/server_entry.js

@@ -0,0 +1,53 @@
+import { mkdir, readdir, writeFile } from 'fs/promises';
+import { join, resolve } from 'path';
+import { pathExists } from 'path-exists';
+import { addErrorInfo } from '../../error/info.js';
+export const SERVER_ENTRY_FUNCTION_NAME = '___netlify-server';
+const SERVER_ENTRY_DIR = 'netlify/server';
+const SERVER_ENTRY_BASENAMES = new Set(['index.js', 'index.mjs', 'index.ts', 'index.mts']);
+const SERVER_SHIM_DIR = '.netlify/server-entry';
+// Finds the user's server entrypoint and materializes the function entry it is
+// deployed as.
+export const getServerEntry = async ({ buildDir, packagePath, featureFlags, }) => {
+    if (!featureFlags?.netlify_build_server_entry) {
+        return undefined;
+    }
+    const packageRoot = resolve(buildDir, packagePath ?? '');
+    const serverDir = join(packageRoot, SERVER_ENTRY_DIR);
+    if (!(await pathExists(serverDir))) {
+        return undefined;
+    }
+    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.`);
+        addErrorInfo(error, { type: 'resolveConfig' });
+        throw error;
+    }
+    const entryPath = join(serverDir, candidates[0]);
+    const shimDir = join(packageRoot, SERVER_SHIM_DIR);
+    const shimPath = join(shimDir, `${SERVER_ENTRY_FUNCTION_NAME}.mjs`);
+    await mkdir(shimDir, { recursive: true });
+    await writeFile(shimPath, getShimContents(entryPath));
+    return {
+        entryPath,
+        shimPath,
+        relativeEntryPath: `${SERVER_ENTRY_DIR}/${candidates[0]}`,
+    };
+};
+// The shim gives the server the deploy surface of a function without touching
+// the user's code.
+const getShimContents = (entryPath) => `import * as server from ${JSON.stringify(entryPath)}
+
+export default server.default ?? server
+export const shutdown = server.shutdown
+
+export const config = {
+  name: "Netlify Server",
+  generator: "netlify-server",
+  path: "/*",
+  preferStatic: true,
+}
+`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "36.3.4",
+  "version": "36.4.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -69,14 +69,14 @@
     "@bugsnag/js": "^8.0.0",
     "@netlify/blobs": "^10.4.4",
     "@netlify/cache-utils": "^7.1.1",
-    "@netlify/config": "^25.2.2",
+    "@netlify/config": "^25.2.3",
     "@netlify/edge-bundler": "16.0.3",
-    "@netlify/functions-utils": "^7.1.3",
+    "@netlify/functions-utils": "^7.1.5",
     "@netlify/git-utils": "^7.1.0",
     "@netlify/opentelemetry-utils": "^3.1.0",
     "@netlify/plugins-list": "^6.81.6",
     "@netlify/run-utils": "^7.1.0",
-    "@netlify/zip-it-and-ship-it": "15.3.3",
+    "@netlify/zip-it-and-ship-it": "15.4.0",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^7.0.0",
     "ansis": "^4.1.0",
@@ -152,5 +152,5 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "gitHead": "724a4f230b81cf9c6d46f50122d128c220756a6c"
+  "gitHead": "aaee524cfed2fc082e6cb7268ce7230071b39068"
 }