@netlify/build 29.9.2 → 29.10.1

package/lib/core/build.js

@@ -277,6 +277,7 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
             packageJson,
             configPath,
             outputConfigPath,
+            userNodeVersion,
             headersPath,
             redirectsPath,
             buildDir,
@@ -331,7 +332,7 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
 };
 // Load plugin main files, retrieve their event handlers then runs them,
 // together with the build command
-const runBuild = async function ({ childProcesses, pluginsOptions, netlifyConfig, configOpts, packageJson, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, childEnv, context, branch, dry, buildbotServerSocket, constants, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, timeline, devCommand, quiet, }) {
+const runBuild = async function ({ childProcesses, pluginsOptions, netlifyConfig, configOpts, packageJson, configPath, outputConfigPath, userNodeVersion, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, childEnv, context, branch, dry, buildbotServerSocket, constants, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, timeline, devCommand, quiet, }) {
     const { pluginsSteps, timers: timersA } = await loadPlugins({
         pluginsOptions,
         childProcesses,
@@ -377,6 +378,7 @@ const runBuild = async function ({ childProcesses, pluginsOptions, netlifyConfig
         testOpts,
         featureFlags,
         quiet,
+        userNodeVersion,
     });
     return {
         stepsCount,

package/lib/plugins_core/functions/index.js

@@ -1,5 +1,5 @@
 import { resolve } from 'path';
-import { zipFunctions } from '@netlify/zip-it-and-ship-it';
+import { RUNTIME, zipFunctions } from '@netlify/zip-it-and-ship-it';
 import { pathExists } from 'path-exists';
 import { log } from '../../log/logger.js';
 import { logBundleResults, logFunctionsNonExistingDir, logFunctionsToBundle } from '../../log/messages/core_steps.js';
@@ -10,9 +10,9 @@ import { getZisiParameters } from './zisi.js';
 const getBundlers = (results = []) => 
 // using a Set to filter duplicates
 new Set(results
-    .map((bundle) => (bundle.runtime === "js" /* RuntimeType.JAVASCRIPT */ ? bundle.bundler : null))
+    .map((bundle) => (bundle.runtime === RUNTIME.JAVASCRIPT ? bundle.bundler : null))
     .filter(Boolean));
-const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, }) => {
+const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, userNodeVersion, }) => {
     const zisiParameters = getZisiParameters({
         buildDir,
         childEnv,
@@ -22,6 +22,7 @@ const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, fun
         internalFunctionsSrc,
         isRunningLocally,
         repositoryRoot,
+        userNodeVersion,
     });
     try {
         // Printing an empty line before bundling output.
@@ -37,7 +38,7 @@ const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, fun
     }
 };
 // Plugin to package Netlify functions with @netlify/zip-it-and-ship-it
-const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC: relativeInternalFunctionsSrc, IS_LOCAL: isRunningLocally, FUNCTIONS_SRC: relativeFunctionsSrc, FUNCTIONS_DIST: relativeFunctionsDist, }, buildDir, logs, netlifyConfig, featureFlags, repositoryRoot, }) {
+const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC: relativeInternalFunctionsSrc, IS_LOCAL: isRunningLocally, FUNCTIONS_SRC: relativeFunctionsSrc, FUNCTIONS_DIST: relativeFunctionsDist, }, buildDir, logs, netlifyConfig, featureFlags, repositoryRoot, userNodeVersion, }) {
     const functionsSrc = relativeFunctionsSrc === undefined ? undefined : resolve(buildDir, relativeFunctionsSrc);
     const functionsDist = resolve(buildDir, relativeFunctionsDist);
     const internalFunctionsSrc = resolve(buildDir, relativeInternalFunctionsSrc);
@@ -78,6 +79,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
         isRunningLocally,
         logs,
         repositoryRoot,
+        userNodeVersion,
     });
     const metrics = getMetrics(internalFunctions, userFunctions);
     return {

package/lib/plugins_core/functions/zisi.js

@@ -1,12 +1,28 @@
 import { join, resolve } from 'path';
 import mapObject from 'map-obj';
+import semver from 'semver';
 import { getZisiFeatureFlags } from './feature_flags.js';
-export const getZisiParameters = ({ buildDir, childEnv, featureFlags, functionsConfig, functionsDist, internalFunctionsSrc, isRunningLocally, repositoryRoot, }) => {
-    const nodeVersion = childEnv.AWS_LAMBDA_JS_RUNTIME;
+const getLambdaNodeVersion = (childEnv, userNodeVersion) => {
+    if (childEnv.AWS_LAMBDA_JS_RUNTIME) {
+        return childEnv.AWS_LAMBDA_JS_RUNTIME;
+    }
+    // As of time of writing the default Lambda Node.js version is 16 and
+    // we do not want to take the risk and downgrade users from this default version on initial release
+    // of the dependency between user and lambda Node.js version.
+    // The check ensures that if the user version is lower than 16 we keep the default version.
+    //
+    // TODO: Remove this once Node.js 16 is deprecated. Do NOT change this if the default Lambda version is updated.
+    if (semver.gte(userNodeVersion, '16.0.0')) {
+        return userNodeVersion;
+    }
+    return undefined;
+};
+export const getZisiParameters = ({ buildDir, childEnv, featureFlags, functionsConfig, functionsDist, internalFunctionsSrc, isRunningLocally, repositoryRoot, userNodeVersion, }) => {
+    const nodeVersion = getLambdaNodeVersion(childEnv, userNodeVersion);
     const manifest = join(functionsDist, 'manifest.json');
     const config = mapObject(functionsConfig, (expression, object) => [
         expression,
-        normalizeFunctionConfig({ buildDir, featureFlags, functionConfig: object, isRunningLocally, nodeVersion }),
+        normalizeFunctionConfig({ buildDir, functionConfig: object, isRunningLocally, nodeVersion }),
     ]);
     const zisiFeatureFlags = getZisiFeatureFlags(featureFlags);
     // Only internal functions are allowed to have a json config file
@@ -24,7 +40,7 @@ export const getZisiParameters = ({ buildDir, childEnv, featureFlags, functionsC
 // The function configuration keys returned by @netlify/config are not an exact
 // match to the properties that @netlify/zip-it-and-ship-it expects. We do that
 // translation here.
-export const normalizeFunctionConfig = ({ buildDir, functionConfig = {}, isRunningLocally, nodeVersion }) => ({
+export const normalizeFunctionConfig = ({ buildDir, functionConfig = {}, isRunningLocally, nodeVersion, }) => ({
     externalNodeModules: functionConfig.external_node_modules,
     includedFiles: functionConfig.included_files,
     name: functionConfig.name,

package/lib/steps/core_step.js

@@ -2,7 +2,7 @@ import { setEnvChanges } from '../env/changes.js';
 import { addErrorInfo, isBuildError } from '../error/info.js';
 import { updateNetlifyConfig, listConfigSideFiles } from './update_config.js';
 // Fire a core step
-export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, constants, buildbotServerSocket, events, logs, nodePath, childEnv, context, branch, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, }) {
+export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, constants, buildbotServerSocket, events, logs, nodePath, childEnv, context, branch, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, }) {
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
         const childEnvA = setEnvChanges(envChanges, { ...childEnv });
@@ -27,6 +27,7 @@ export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName
             debug,
             systemLog,
             saveConfig,
+            userNodeVersion,
         });
         const { netlifyConfig: netlifyConfigA, configMutations: configMutationsA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await updateNetlifyConfig({
             configOpts,

package/lib/steps/run_step.js

@@ -7,7 +7,7 @@ import { fireCoreStep } from './core_step.js';
 import { firePluginStep } from './plugin.js';
 import { getStepReturn } from './return.js';
 // Run a step (core, build command or plugin)
-export const runStep = async function ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, }) {
+export const runStep = async function ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, }) {
     const constantsA = await addMutableConstants({ constants, buildDir, netlifyConfig });
     if (!(await shouldRunStep({
         event,
@@ -64,6 +64,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
         headersPath,
         redirectsPath,
         featureFlags,
+        userNodeVersion,
     });
     const newValues = await getStepReturn({
         event,
@@ -143,7 +144,7 @@ const getFireStep = function (packageName, coreStepId, event) {
     const parentTag = normalizeTagName(packageName);
     return measureDuration(tFireStep, event, { parentTag, category: 'pluginEvent' });
 };
-const tFireStep = function ({ event, childProcess, packageName, pluginPackageJson, loadedFrom, origin, coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, nodePath, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, error, logs, debug, systemLog, verbose, saveConfig, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, featureFlags, }) {
+const tFireStep = function ({ event, childProcess, packageName, pluginPackageJson, loadedFrom, origin, coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, nodePath, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, error, logs, debug, systemLog, verbose, saveConfig, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, featureFlags, userNodeVersion, }) {
     if (coreStep !== undefined) {
         return fireCoreStep({
             coreStep,
@@ -172,6 +173,7 @@ const tFireStep = function ({ event, childProcess, packageName, pluginPackageJso
             debug,
             systemLog,
             saveConfig,
+            userNodeVersion,
         });
     }
     return firePluginStep({

package/lib/steps/run_steps.js

@@ -7,7 +7,7 @@ import { runStep } from './run_step.js';
 // list of `failedPlugins` (that ran `utils.build.failPlugin()`).
 // If an error arises, runs `onError` events.
 // Runs `onEnd` events at the end, whether an error was thrown or not.
-export const runSteps = async function ({ steps, buildbotServerSocket, events, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, childEnv, context, branch, constants, mode, api, errorMonitor, deployId, errorParams, netlifyConfig, configOpts, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, }) {
+export const runSteps = async function ({ steps, buildbotServerSocket, events, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, childEnv, context, branch, constants, mode, api, errorMonitor, deployId, errorParams, netlifyConfig, configOpts, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, }) {
     const { index: stepsCount, error: errorA, netlifyConfig: netlifyConfigC, statuses: statusesB, failedPlugins: failedPluginsA, timers: timersC, configMutations: configMutationsB, metrics: metricsC, } = await pReduce(steps, async ({ index, error, failedPlugins, envChanges, netlifyConfig: netlifyConfigA, configMutations, headersPath: headersPathA, redirectsPath: redirectsPathA, statuses, timers: timersA, metrics: metricsA, }, { event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, pluginPackageJson, loadedFrom, origin, condition, }) => {
         const { newIndex = index, newError = error, failedPlugin = [], newEnvChanges = {}, netlifyConfig: netlifyConfigB = netlifyConfigA, configMutations: configMutationsA = configMutations, headersPath: headersPathB = headersPathA, redirectsPath: redirectsPathB = redirectsPathA, newStatus, timers: timersB = timersA, metrics: metricsB = [], } = await runStep({
             event,
@@ -56,6 +56,7 @@ export const runSteps = async function ({ steps, buildbotServerSocket, events, c
             testOpts,
             featureFlags,
             quiet,
+            userNodeVersion,
         });
         const statusesA = addStatus({ newStatus, statuses, event, packageName, pluginPackageJson });
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.9.2",
+  "version": "29.10.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -65,14 +65,14 @@
   "dependencies": {
     "@bugsnag/js": "^7.0.0",
     "@netlify/cache-utils": "^5.1.3",
-    "@netlify/config": "^20.3.7",
+    "@netlify/config": "^20.4.1",
     "@netlify/edge-bundler": "8.13.2",
-    "@netlify/framework-info": "^9.8.5",
-    "@netlify/functions-utils": "^5.2.2",
+    "@netlify/framework-info": "^9.8.6",
+    "@netlify/functions-utils": "^5.2.3",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/plugins-list": "^6.68.0",
     "@netlify/run-utils": "^5.1.0",
-    "@netlify/zip-it-and-ship-it": "8.10.0",
+    "@netlify/zip-it-and-ship-it": "9.2.1",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
     "chalk": "^5.0.0",
@@ -147,5 +147,5 @@
       "module": "commonjs"
     }
   },
-  "gitHead": "2d5c91400f4665f2daeb0fd7f5d1ddcd1cfbb526"
+  "gitHead": "3d1699220b89fad0095efd7adc0bb5c49c47b3de"
 }

package/types/config/functions.d.ts

@@ -17,7 +17,7 @@ type FunctionsObject = {
       /**
        * the function bundling method used in [`@netlify/zip-it-and-ship-it`](https://github.com/netlify/zip-it-and-ship-it).
        */
-      node_bundler?: 'esbuild'
+      node_bundler?: 'esbuild' | 'none'
 
       /**
        * a list of Node.js modules that are copied to the bundled artifact without adjusting their source or references during the bundling process.