@netlify/build 29.3.0 → 29.4.88-test

package/lib/core/build.js

@@ -30,7 +30,7 @@ export const startBuild = function (flags) {
     const errorMonitor = startErrorMonitor({ flags: flagsA, logs, bugsnagKey });
     return { ...flagsA, errorMonitor, logs, timers };
 };
-const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cachedConfigPath, cwd, repositoryRoot, apiHost, token, siteId, 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, }) {
+const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cachedConfigPath, outputConfigPath, cwd, repositoryRoot, apiHost, token, siteId, 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, }) {
     const configOpts = getConfigOpts({
         config,
         defaultConfig,
@@ -84,6 +84,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
         configOpts,
         siteInfo,
         configPath,
+        outputConfigPath,
         headersPath,
         redirectsPath,
         buildDir,
@@ -127,7 +128,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
 };
 export const execBuild = measureDuration(tExecBuild, 'total', { parentTag: 'build_site' });
 // Runs a build then report any plugin statuses
-export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, }) {
+export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, }) {
     try {
         const { stepsCount, netlifyConfig: netlifyConfigA, statuses, pluginsOptions: pluginsOptionsA, failedPlugins, timers: timersA, configMutations, } = await initAndRunBuild({
             pluginsOptions,
@@ -135,6 +136,7 @@ export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig
             configOpts,
             siteInfo,
             configPath,
+            outputConfigPath,
             headersPath,
             redirectsPath,
             buildDir,
@@ -224,7 +226,7 @@ export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig
     }
 };
 // Initialize plugin processes then runs a build
-const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, sendStatus, saveConfig, timers, testOpts, buildbotServerSocket, constants, featureFlags, timeline, devCommand, quiet, }) {
+const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, sendStatus, saveConfig, timers, testOpts, buildbotServerSocket, constants, featureFlags, timeline, devCommand, quiet, }) {
     const { pluginsOptions: pluginsOptionsA, timers: timersA } = await getPluginsOptions({
         pluginsOptions,
         netlifyConfig,
@@ -261,6 +263,7 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
             configOpts,
             packageJson,
             configPath,
+            outputConfigPath,
             headersPath,
             redirectsPath,
             buildDir,
@@ -314,7 +317,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, 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, 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,
@@ -334,6 +337,7 @@ const runBuild = async function ({ childProcesses, pluginsOptions, netlifyConfig
         buildbotServerSocket,
         events,
         configPath,
+        outputConfigPath,
         headersPath,
         redirectsPath,
         buildDir,

package/lib/core/config.js

@@ -97,13 +97,14 @@ export const resolveUpdatedConfig = async function (configOpts, configMutations)
 // This is only done when `saveConfig` is `true`. This allows performing this
 // in the buildbot but not in local builds, since only the latter run in a
 // container and we want to avoid saving files on local machines.
-export const saveUpdatedConfig = async function ({ configMutations, buildDir, repositoryRoot, configPath = `${repositoryRoot}/netlify.toml`, headersPath, redirectsPath, logs, featureFlags, context, branch, debug, saveConfig, }) {
+export const saveUpdatedConfig = async function ({ configMutations, buildDir, repositoryRoot, configPath = `${repositoryRoot}/netlify.toml`, outputConfigPath = configPath, headersPath, redirectsPath, logs, featureFlags, context, branch, debug, saveConfig, }) {
     if (!saveConfig) {
         return;
     }
     await updateConfig(configMutations, {
         buildDir,
         configPath,
+        outputConfigPath,
         headersPath,
         redirectsPath,
         context,

package/lib/core/flags.js

@@ -162,6 +162,11 @@ Default: false`,
         describe: 'Whether configuration changes should be saved to netlify.toml',
         hidden: true,
     },
+    outputConfigPath: {
+        type: 'string',
+        describe: 'Path where to save the netlify.toml resulting from configuration changes. Only applicable if `saveConfig` is set. Defaults to "netlify.toml" in the root directory.',
+        hidden: true,
+    },
     testOpts: {
         describe: 'Options for testing only',
         hidden: true,

package/lib/plugins_core/deploy/index.js

@@ -36,7 +36,7 @@ const coreStep = async function ({ buildDir, configPath, repositoryRoot, constan
         await closeBuildbotClient(client);
     }
 };
-const shouldDeploy = function ({ buildbotServerSocket }) {
+export const shouldDeploy = function ({ buildbotServerSocket }) {
     return buildbotServerSocket !== undefined;
 };
 export const deploySite = {

package/lib/plugins_core/functions/index.js

@@ -6,9 +6,10 @@ import { logBundleResults, logFunctionsNonExistingDir, logFunctionsToBundle } fr
 import { getZipError } from './error.js';
 import { getUserAndInternalFunctions, validateFunctionsSrc } from './utils.js';
 import { getZisiParameters } from './zisi.js';
-// Returns `true` if at least one of the functions has been configured to use
-// esbuild.
-const isUsingEsbuild = (functionsConfig = {}) => Object.values(functionsConfig).some((configObject) => configObject.node_bundler === 'esbuild');
+// Get a list of all unique bundlers in this run
+const getBundlers = (results = []) => Array.from(new Set(results
+    .map((bundle) => (bundle.runtime === "js" /* RuntimeType.JAVASCRIPT */ ? bundle.bundler : null))
+    .filter(Boolean)));
 const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, }) => {
     const zisiParameters = getZisiParameters({
         buildDir,
@@ -20,14 +21,14 @@ const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, fun
         isRunningLocally,
         repositoryRoot,
     });
-    const bundler = isUsingEsbuild(functionsConfig) ? 'esbuild' : 'zisi';
     try {
         // Printing an empty line before bundling output.
         log(logs, '');
         const sourceDirectories = [internalFunctionsSrc, functionsSrc].filter(Boolean);
         const results = await zipItAndShipIt.zipFunctions(sourceDirectories, functionsDist, zisiParameters);
+        const bundlers = getBundlers(results);
         logBundleResults({ logs, results });
-        return { bundler };
+        return { bundlers };
     }
     catch (error) {
         throw await getZipError(error, functionsSrc);
@@ -39,7 +40,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     const functionsDist = resolve(buildDir, relativeFunctionsDist);
     const internalFunctionsSrc = resolve(buildDir, relativeInternalFunctionsSrc);
     const internalFunctionsSrcExists = await pathExists(internalFunctionsSrc);
-    const functionsSrcExists = await validateFunctionsSrc({ functionsSrc, logs, relativeFunctionsSrc });
+    const functionsSrcExists = await validateFunctionsSrc({ functionsSrc, relativeFunctionsSrc });
     const [userFunctions = [], internalFunctions = []] = await getUserAndInternalFunctions({
         featureFlags,
         functionsSrc,
@@ -64,7 +65,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     if (userFunctions.length === 0 && internalFunctions.length === 0) {
         return {};
     }
-    const { bundler } = await zipFunctionsAndLogResults({
+    const { bundlers } = await zipFunctionsAndLogResults({
         buildDir,
         childEnv,
         featureFlags,
@@ -78,7 +79,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
     });
     return {
         tags: {
-            bundler,
+            bundler: bundlers,
         },
     };
 };

package/lib/plugins_core/save_artifacts/index.js

@@ -0,0 +1,33 @@
+import { saveUpdatedConfig } from '../../core/config.js';
+import { shouldDeploy } from '../deploy/index.js';
+const coreStep = async function ({ buildDir, configPath, outputConfigPath, repositoryRoot, logs, featureFlags, context, branch, configMutations, headersPath, redirectsPath, debug, saveConfig, }) {
+    await saveUpdatedConfig({
+        configMutations,
+        buildDir,
+        repositoryRoot,
+        configPath,
+        outputConfigPath,
+        headersPath,
+        redirectsPath,
+        logs,
+        featureFlags,
+        context,
+        branch,
+        debug,
+        saveConfig,
+    });
+    return {};
+};
+// This step and the deploy step must be mutually exclusive, or we end up
+// mutating the config twice.
+const shouldSaveArtifacts = (options) => {
+    return !shouldDeploy(options) && options.saveConfig === true;
+};
+export const saveArtifacts = {
+    event: 'onPostBuild',
+    coreStep,
+    coreStepId: 'save_artifacts',
+    coreStepName: 'Save deploy artifacts',
+    coreStepDescription: () => 'Save deploy artifacts',
+    condition: shouldSaveArtifacts,
+};

package/lib/steps/core_step.js

@@ -2,12 +2,13 @@ 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, 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, }) {
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
         const childEnvA = setEnvChanges(envChanges, { ...childEnv });
         const { newEnvChanges = {}, configMutations: newConfigMutations = [], tags, } = await coreStep({
             configPath,
+            outputConfigPath,
             buildDir,
             repositoryRoot,
             constants,

package/lib/steps/get.js

@@ -3,6 +3,7 @@ import { buildCommandCore } from '../plugins_core/build_command.js';
 import { deploySite } from '../plugins_core/deploy/index.js';
 import { bundleEdgeFunctions } from '../plugins_core/edge_functions/index.js';
 import { bundleFunctions } from '../plugins_core/functions/index.js';
+import { saveArtifacts } from '../plugins_core/save_artifacts/index.js';
 // Get all build steps
 export const getSteps = function (steps) {
     const stepsA = addCoreSteps(steps);
@@ -27,7 +28,7 @@ export const getDevSteps = function (command, steps) {
     return { steps: sortedSteps, events };
 };
 const addCoreSteps = function (steps) {
-    return [buildCommandCore, ...steps, bundleFunctions, bundleEdgeFunctions, deploySite];
+    return [buildCommandCore, ...steps, bundleFunctions, bundleEdgeFunctions, deploySite, saveArtifacts];
 };
 // Sort plugin steps by event order.
 const sortSteps = function (steps, events) {

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, 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, }) {
     const constantsA = await addMutableConstants({ constants, buildDir, netlifyConfig });
     if (!(await shouldRunStep({
         event,
@@ -19,6 +19,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
         constants: constantsA,
         buildbotServerSocket,
         buildDir,
+        saveConfig,
     }))) {
         return {};
     }
@@ -37,6 +38,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
         coreStepId,
         coreStepName,
         configPath,
+        outputConfigPath,
         buildDir,
         repositoryRoot,
         nodePath,
@@ -121,9 +123,10 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
 // or available. However, one might be created by a build plugin, in which case,
 // those core plugins should be triggered. We use a dynamic `condition()` to
 // model this behavior.
-const shouldRunStep = async function ({ event, packageName, error, failedPlugins, netlifyConfig, condition, constants, buildbotServerSocket, buildDir, }) {
+const shouldRunStep = async function ({ event, packageName, error, failedPlugins, netlifyConfig, condition, constants, buildbotServerSocket, buildDir, saveConfig, }) {
     if (failedPlugins.includes(packageName) ||
-        (condition !== undefined && !(await condition({ buildDir, constants, buildbotServerSocket, netlifyConfig })))) {
+        (condition !== undefined &&
+            !(await condition({ buildDir, constants, buildbotServerSocket, netlifyConfig, saveConfig })))) {
         return false;
     }
     if (error !== undefined) {
@@ -139,13 +142,14 @@ 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, 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, }) {
     if (coreStep !== undefined) {
         return fireCoreStep({
             coreStep,
             coreStepId,
             coreStepName,
             configPath,
+            outputConfigPath,
             buildDir,
             repositoryRoot,
             constants,

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, 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, }) {
     const { index: stepsCount, error: errorA, netlifyConfig: netlifyConfigC, statuses: statusesB, failedPlugins: failedPluginsA, timers: timersC, configMutations: configMutationsB, } = await pReduce(steps, async ({ index, error, failedPlugins, envChanges, netlifyConfig: netlifyConfigA, configMutations, headersPath: headersPathA, redirectsPath: redirectsPathA, statuses, timers: timersA, }, { 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, } = await runStep({
             event,
@@ -22,6 +22,7 @@ export const runSteps = async function ({ steps, buildbotServerSocket, events, c
             origin,
             condition,
             configPath,
+            outputConfigPath,
             buildDir,
             repositoryRoot,
             nodePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.3.0",
+  "version": "29.4.88-test",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -65,11 +65,11 @@
   "dependencies": {
     "@bugsnag/js": "^7.0.0",
     "@netlify/cache-utils": "^5.1.0",
-    "@netlify/config": "^20.2.0",
+    "@netlify/config": "^20.3.0",
     "@netlify/edge-bundler": "8.0.0",
     "@netlify/functions-utils": "^5.1.1",
     "@netlify/git-utils": "^5.1.0",
-    "@netlify/plugins-list": "^6.59.0",
+    "@netlify/plugins-list": "^6.61.0",
     "@netlify/run-utils": "^5.1.0",
     "@netlify/zip-it-and-ship-it": "^8.2.0",
     "@sindresorhus/slugify": "^2.0.0",
@@ -148,6 +148,5 @@
     "compilerOptions": {
       "module": "commonjs"
     }
-  },
-  "gitHead": "7a313d1bf93d7df494c725d3984a9e7640ae4d09"
+  }
 }