@netlify/build 27.20.3 → 27.20.5

package/lib/steps/plugin.js

@@ -1,85 +1,55 @@
-import { addErrorInfo } from '../error/info.js'
-import { logStepCompleted } from '../log/messages/ipc.js'
-import { pipePluginOutput, unpipePluginOutput } from '../log/stream.js'
-import { callChild } from '../plugins/ipc.js'
-import { getSuccessStatus } from '../status/success.js'
-
-import { getPluginErrorType } from './error.js'
-import { updateNetlifyConfig, listConfigSideFiles } from './update_config.js'
-
+import { addErrorInfo } from '../error/info.js';
+import { logStepCompleted } from '../log/messages/ipc.js';
+import { pipePluginOutput, unpipePluginOutput } from '../log/stream.js';
+import { callChild } from '../plugins/ipc.js';
+import { getSuccessStatus } from '../status/success.js';
+import { getPluginErrorType } from './error.js';
+import { updateNetlifyConfig, listConfigSideFiles } from './update_config.js';
 // Fire a plugin step
-export const firePluginStep = async function ({
-  event,
-  childProcess,
-  packageName,
-  pluginPackageJson,
-  loadedFrom,
-  origin,
-  envChanges,
-  errorParams,
-  configOpts,
-  netlifyConfig,
-  configMutations,
-  headersPath,
-  redirectsPath,
-  constants,
-  steps,
-  error,
-  logs,
-  debug,
-  verbose,
-}) {
-  const listeners = pipePluginOutput(childProcess, logs)
-
-  try {
-    const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath])
-    const {
-      newEnvChanges,
-      configMutations: newConfigMutations,
-      status,
-    } = await callChild({
-      childProcess,
-      eventName: 'run',
-      payload: { event, error, envChanges, netlifyConfig, constants },
-      logs,
-      verbose,
-    })
-    const {
-      netlifyConfig: netlifyConfigA,
-      configMutations: configMutationsA,
-      headersPath: headersPathA,
-      redirectsPath: redirectsPathA,
-    } = await updateNetlifyConfig({
-      configOpts,
-      netlifyConfig,
-      headersPath,
-      redirectsPath,
-      configMutations,
-      newConfigMutations,
-      configSideFiles,
-      errorParams,
-      logs,
-      debug,
-    })
-    const newStatus = getSuccessStatus(status, { steps, event, packageName })
-    return {
-      newEnvChanges,
-      netlifyConfig: netlifyConfigA,
-      configMutations: configMutationsA,
-      headersPath: headersPathA,
-      redirectsPath: redirectsPathA,
-      newStatus,
+export const firePluginStep = async function ({ event, childProcess, packageName, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, debug, verbose, }) {
+    const listeners = pipePluginOutput(childProcess, logs);
+    try {
+        const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
+        const { newEnvChanges, configMutations: newConfigMutations, status, } = await callChild({
+            childProcess,
+            eventName: 'run',
+            payload: { event, error, envChanges, netlifyConfig, constants },
+            logs,
+            verbose,
+        });
+        const { netlifyConfig: netlifyConfigA, configMutations: configMutationsA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await updateNetlifyConfig({
+            configOpts,
+            netlifyConfig,
+            headersPath,
+            redirectsPath,
+            configMutations,
+            newConfigMutations,
+            configSideFiles,
+            errorParams,
+            logs,
+            debug,
+        });
+        const newStatus = getSuccessStatus(status, { steps, event, packageName });
+        return {
+            newEnvChanges,
+            netlifyConfig: netlifyConfigA,
+            configMutations: configMutationsA,
+            headersPath: headersPathA,
+            redirectsPath: redirectsPathA,
+            newStatus,
+        };
     }
-  } catch (newError) {
-    const errorType = getPluginErrorType(newError, loadedFrom)
-    addErrorInfo(newError, {
-      ...errorType,
-      plugin: { pluginPackageJson, packageName },
-      location: { event, packageName, loadedFrom, origin },
-    })
-    return { newError }
-  } finally {
-    await unpipePluginOutput(childProcess, logs, listeners)
-    logStepCompleted(logs, verbose)
-  }
-}
+    catch (newError) {
+        const errorType = getPluginErrorType(newError, loadedFrom);
+        addErrorInfo(newError, {
+            ...errorType,
+            plugin: { pluginPackageJson, packageName },
+            location: { event, packageName, loadedFrom, origin },
+        });
+        return { newError };
+    }
+    finally {
+        await unpipePluginOutput(childProcess, logs, listeners);
+        logStepCompleted(logs, verbose);
+    }
+};

package/lib/steps/return.js

@@ -1,52 +1,25 @@
-import { logTimer } from '../log/messages/core.js'
-import { logStepSuccess } from '../log/messages/steps.js'
-
-import { handleStepError } from './error.js'
-
+import { logTimer } from '../log/messages/core.js';
+import { logStepSuccess } from '../log/messages/steps.js';
+import { handleStepError } from './error.js';
 // Retrieve the return value of a step
-export const getStepReturn = function ({
-  event,
-  packageName,
-  newError,
-  newEnvChanges,
-  newStatus,
-  coreStep,
-  coreStepName: timerName = `${packageName} ${event}`,
-  childEnv,
-  mode,
-  api,
-  errorMonitor,
-  deployId,
-  netlifyConfig,
-  configMutations,
-  headersPath,
-  redirectsPath,
-  logs,
-  debug,
-  timers,
-  durationNs,
-  testOpts,
-}) {
-  if (newError !== undefined) {
-    return handleStepError({
-      event,
-      newError,
-      childEnv,
-      mode,
-      api,
-      errorMonitor,
-      deployId,
-      coreStep,
-      netlifyConfig,
-      logs,
-      debug,
-      testOpts,
-    })
-  }
-
-  logStepSuccess(logs)
-
-  logTimer(logs, durationNs, timerName)
-
-  return { newEnvChanges, netlifyConfig, configMutations, headersPath, redirectsPath, newStatus, timers }
-}
+export const getStepReturn = function ({ event, packageName, newError, newEnvChanges, newStatus, coreStep, coreStepName: timerName = `${packageName} ${event}`, childEnv, mode, api, errorMonitor, deployId, netlifyConfig, configMutations, headersPath, redirectsPath, logs, debug, timers, durationNs, testOpts, }) {
+    if (newError !== undefined) {
+        return handleStepError({
+            event,
+            newError,
+            childEnv,
+            mode,
+            api,
+            errorMonitor,
+            deployId,
+            coreStep,
+            netlifyConfig,
+            logs,
+            debug,
+            testOpts,
+        });
+    }
+    logStepSuccess(logs);
+    logTimer(logs, durationNs, timerName);
+    return { newEnvChanges, netlifyConfig, configMutations, headersPath, redirectsPath, newStatus, timers };
+};

package/lib/steps/run_core_steps.js

@@ -1,17 +1,15 @@
-import { getConfigOpts, loadConfig } from '../core/config.js'
-import { getConstants } from '../core/constants.js'
-import { normalizeFlags } from '../core/normalize_flags.js'
-import { getSeverity } from '../core/severity.js'
-import { handleBuildError } from '../error/handle.js'
-import { getErrorInfo } from '../error/info.js'
-import { startErrorMonitor } from '../error/monitor/start.js'
-import { getBufferLogs, getSystemLogger } from '../log/logger.js'
-import { logBuildStart } from '../log/messages/core.js'
-import { reportStatuses } from '../status/report.js'
-
-import { getSteps } from './get.js'
-import { runSteps } from './run_steps.js'
-
+import { getConfigOpts, loadConfig } from '../core/config.js';
+import { getConstants } from '../core/constants.js';
+import { normalizeFlags } from '../core/normalize_flags.js';
+import { getSeverity } from '../core/severity.js';
+import { handleBuildError } from '../error/handle.js';
+import { getErrorInfo } from '../error/info.js';
+import { startErrorMonitor } from '../error/monitor/start.js';
+import { getBufferLogs, getSystemLogger } from '../log/logger.js';
+import { logBuildStart } from '../log/messages/core.js';
+import { reportStatuses } from '../status/report.js';
+import { getSteps } from './get.js';
+import { runSteps } from './run_steps.js';
 /**
  * Runs specific core steps for a build and returns whether it succeeded or not.
  *
@@ -37,163 +35,113 @@ import { runSteps } from './run_steps.js'
  * @returns {string[]} buildResult.logs - When using the `buffer` option, all log messages
  */
 export const runCoreSteps = async (buildSteps, flags = {}) => {
-  const { errorMonitor, mode, logs, debug, ...flagsA } = startBuild(flags)
-  const errorParams = { errorMonitor, mode, logs, debug }
-  const systemLog = getSystemLogger(logs, debug)
-
-  try {
-    const { netlifyConfig: netlifyConfigA, configMutations } = await executeBuildStep({
-      ...flagsA,
-      errorMonitor,
-      mode,
-      logs,
-      debug,
-      errorParams,
-      buildSteps,
-      systemLog,
-    })
-    const { success, severityCode } = getSeverity('success')
-
-    return { success, severityCode, netlifyConfig: netlifyConfigA, configMutations, logs }
-  } catch (error) {
-    const { severity } = await handleBuildError(error, errorParams)
-    const { success, severityCode } = getSeverity(severity)
-
-    return { success, severityCode, logs }
-  }
-}
-
+    const { errorMonitor, mode, logs, debug, ...flagsA } = startBuild(flags);
+    const errorParams = { errorMonitor, mode, logs, debug };
+    const systemLog = getSystemLogger(logs, debug);
+    try {
+        const { netlifyConfig: netlifyConfigA, configMutations } = await executeBuildStep({
+            ...flagsA,
+            errorMonitor,
+            mode,
+            logs,
+            debug,
+            errorParams,
+            buildSteps,
+            systemLog,
+        });
+        const { success, severityCode } = getSeverity('success');
+        return { success, severityCode, netlifyConfig: netlifyConfigA, configMutations, logs };
+    }
+    catch (error) {
+        const { severity } = await handleBuildError(error, errorParams);
+        const { success, severityCode } = getSeverity(severity);
+        return { success, severityCode, logs };
+    }
+};
 const startBuild = function (flags) {
-  const logs = getBufferLogs(flags)
-
-  logBuildStart(logs)
-
-  const { bugsnagKey, ...flagsA } = normalizeFlags(flags, logs)
-  const errorMonitor = startErrorMonitor({ flags: flagsA, logs, bugsnagKey })
-
-  return { ...flagsA, errorMonitor, logs }
-}
-
+    const logs = getBufferLogs(flags);
+    logBuildStart(logs);
+    const { bugsnagKey, ...flagsA } = normalizeFlags(flags, logs);
+    const errorMonitor = startErrorMonitor({ flags: flagsA, logs, bugsnagKey });
+    return { ...flagsA, errorMonitor, logs };
+};
 const getBuildSteps = function (buildSteps) {
-  const allSteps = getSteps([]).steps.filter(({ coreStepId }) => buildSteps.includes(coreStepId))
-
-  return allSteps
-}
-
-const executeBuildStep = async function ({
-  config,
-  defaultConfig,
-  cachedConfig,
-  debug,
-  nodePath,
-  functionsDistDir,
-  edgeFunctionsDistDir,
-  errorMonitor,
-  mode,
-  logs,
-  errorParams,
-  featureFlags,
-  buildSteps,
-  repositoryRoot,
-  systemLog,
-}) {
-  const configOpts = getConfigOpts({
-    config,
-    defaultConfig,
-    featureFlags,
-    mode,
-    repositoryRoot,
-  })
-  const {
-    netlifyConfig,
-    buildDir,
-    siteInfo,
-    childEnv,
-    userNodeVersion,
-    repositoryRoot: repositoryRootA,
-  } = await loadConfig({
-    configOpts,
-    cachedConfig,
-    debug,
-    logs,
-    nodePath,
-    timers: [],
-  })
-  const constants = await getConstants({
-    buildDir,
-    functionsDistDir,
-    edgeFunctionsDistDir,
-    netlifyConfig,
-    siteInfo,
-    mode,
-  })
-
-  Object.assign(errorParams, { netlifyConfig, siteInfo, childEnv, userNodeVersion })
-
-  try {
-    const { netlifyConfig: netlifyConfigA, configMutations } = await runBuildStep({
-      netlifyConfig,
-      buildDir,
-      nodePath,
-      logs,
-      debug,
-      constants,
-      featureFlags,
-      childEnv,
-      buildSteps,
-      repositoryRoot: repositoryRootA,
-      systemLog,
-    })
-
-    return {
-      netlifyConfig: netlifyConfigA,
-      configMutations,
+    const allSteps = getSteps([]).steps.filter(({ coreStepId }) => buildSteps.includes(coreStepId));
+    return allSteps;
+};
+const executeBuildStep = async function ({ config, defaultConfig, cachedConfig, debug, nodePath, functionsDistDir, edgeFunctionsDistDir, errorMonitor, mode, logs, errorParams, featureFlags, buildSteps, repositoryRoot, systemLog, }) {
+    const configOpts = getConfigOpts({
+        config,
+        defaultConfig,
+        featureFlags,
+        mode,
+        repositoryRoot,
+    });
+    const { netlifyConfig, buildDir, siteInfo, childEnv, userNodeVersion, repositoryRoot: repositoryRootA, } = await loadConfig({
+        configOpts,
+        cachedConfig,
+        debug,
+        logs,
+        nodePath,
+        timers: [],
+    });
+    const constants = await getConstants({
+        buildDir,
+        functionsDistDir,
+        edgeFunctionsDistDir,
+        netlifyConfig,
+        siteInfo,
+        mode,
+    });
+    Object.assign(errorParams, { netlifyConfig, siteInfo, childEnv, userNodeVersion });
+    try {
+        const { netlifyConfig: netlifyConfigA, configMutations } = await runBuildStep({
+            netlifyConfig,
+            buildDir,
+            nodePath,
+            logs,
+            debug,
+            constants,
+            featureFlags,
+            childEnv,
+            buildSteps,
+            repositoryRoot: repositoryRootA,
+            systemLog,
+        });
+        return {
+            netlifyConfig: netlifyConfigA,
+            configMutations,
+        };
+    }
+    catch (error) {
+        const [{ statuses }] = getErrorInfo(error);
+        await reportStatuses({
+            statuses,
+            childEnv,
+            mode,
+            netlifyConfig,
+            errorMonitor,
+            logs,
+            debug,
+            pluginsOptions: [],
+        });
+        throw error;
     }
-  } catch (error) {
-    const [{ statuses }] = getErrorInfo(error)
-
-    await reportStatuses({
-      statuses,
-      childEnv,
-      mode,
-      netlifyConfig,
-      errorMonitor,
-      logs,
-      debug,
-      pluginsOptions: [],
-    })
-
-    throw error
-  }
-}
-
-const runBuildStep = async function ({
-  netlifyConfig,
-  buildDir,
-  nodePath,
-  constants,
-  logs,
-  debug,
-  featureFlags,
-  childEnv,
-  buildSteps,
-  repositoryRoot,
-  systemLog,
-}) {
-  const { netlifyConfig: netlifyConfigA, configMutations } = await runSteps({
-    steps: getBuildSteps(buildSteps),
-    buildDir,
-    nodePath,
-    constants,
-    netlifyConfig,
-    logs,
-    debug,
-    timers: [],
-    featureFlags,
-    childEnv,
-    repositoryRoot,
-    systemLog,
-  })
-
-  return { netlifyConfig: netlifyConfigA, configMutations }
-}
+};
+const runBuildStep = async function ({ netlifyConfig, buildDir, nodePath, constants, logs, debug, featureFlags, childEnv, buildSteps, repositoryRoot, systemLog, }) {
+    const { netlifyConfig: netlifyConfigA, configMutations } = await runSteps({
+        steps: getBuildSteps(buildSteps),
+        buildDir,
+        nodePath,
+        constants,
+        netlifyConfig,
+        logs,
+        debug,
+        timers: [],
+        featureFlags,
+        childEnv,
+        repositoryRoot,
+        systemLog,
+    });
+    return { netlifyConfig: netlifyConfigA, configMutations };
+};