@netlify/build 25.0.3 → 26.1.0

package/src/log/messages/mutations.js

@@ -1,15 +1,13 @@
-'use strict'
+import { readFile } from 'fs'
+import { inspect, promisify } from 'util'
 
-const { readFile } = require('fs')
-const { inspect, promisify } = require('util')
+import pathExists from 'path-exists'
 
-const pathExists = require('path-exists')
-
-const { log, logMessage, logSubHeader } = require('../logger')
+import { log, logMessage, logSubHeader } from '../logger.js'
 
 const pReadFile = promisify(readFile)
 
-const logConfigMutations = function (logs, newConfigMutations, debug) {
+export const logConfigMutations = function (logs, newConfigMutations, debug) {
   const configMutationsToLog = debug ? newConfigMutations : newConfigMutations.filter(shouldLogConfigMutation)
   configMutationsToLog.forEach(({ keysString, value }) => {
     logConfigMutation(logs, keysString, value)
@@ -37,7 +35,7 @@ const shouldHideConfigValue = function (keysString) {
 
 const SECRET_PROPS = ['build.environment']
 
-const logConfigOnUpload = async function ({ logs, configPath, debug }) {
+export const logConfigOnUpload = async function ({ logs, configPath, debug }) {
   if (!debug) {
     return
   }
@@ -53,7 +51,7 @@ const logConfigOnUpload = async function ({ logs, configPath, debug }) {
   logMessage(logs, configContents.trim())
 }
 
-const logHeadersOnUpload = async function ({ logs, headersPath, debug }) {
+export const logHeadersOnUpload = async function ({ logs, headersPath, debug }) {
   if (!debug) {
     return
   }
@@ -69,7 +67,7 @@ const logHeadersOnUpload = async function ({ logs, headersPath, debug }) {
   logMessage(logs, headersContents.trim())
 }
 
-const logRedirectsOnUpload = async function ({ logs, redirectsPath, debug }) {
+export const logRedirectsOnUpload = async function ({ logs, redirectsPath, debug }) {
   if (!debug) {
     return
   }
@@ -84,10 +82,3 @@ const logRedirectsOnUpload = async function ({ logs, redirectsPath, debug }) {
   const redirectsContents = await pReadFile(redirectsPath, 'utf8')
   logMessage(logs, `${redirectsContents.trim()}\n`)
 }
-
-module.exports = {
-  logConfigMutations,
-  logConfigOnUpload,
-  logHeadersOnUpload,
-  logRedirectsOnUpload,
-}

package/src/log/messages/plugins.js

@@ -1,8 +1,6 @@
-'use strict'
+import { log, logArray, logWarning, logSubHeader } from '../logger.js'
 
-const { log, logArray, logWarning, logSubHeader } = require('../logger')
-
-const logPluginsFetchError = function (logs, message) {
+export const logPluginsFetchError = function (logs, message) {
   logWarning(
     logs,
     `
@@ -11,7 +9,7 @@ ${message}`,
   )
 }
 
-const logPluginsList = function ({ pluginsList, debug, logs }) {
+export const logPluginsList = function ({ pluginsList, debug, logs }) {
   if (!debug) {
     return
   }
@@ -27,7 +25,7 @@ const getPluginsListItem = function ([packageName, versions]) {
   return `${packageName}@${versions[0].version}`
 }
 
-const logFailPluginWarning = function (methodName, event) {
+export const logFailPluginWarning = function (methodName, event) {
   logWarning(
     undefined,
     `Plugin error: since "${event}" happens after deploy, the build has already succeeded and cannot fail anymore. This plugin should either:
@@ -36,13 +34,6 @@ const logFailPluginWarning = function (methodName, event) {
   )
 }
 
-const logDeploySuccess = function (logs) {
+export const logDeploySuccess = function (logs) {
   log(logs, 'Site deploy was successfully initiated')
 }
-
-module.exports = {
-  logPluginsFetchError,
-  logPluginsList,
-  logFailPluginWarning,
-  logDeploySuccess,
-}

package/src/log/messages/status.js

@@ -1,9 +1,7 @@
-'use strict'
+import { logMessage, logHeader, logSubHeader } from '../logger.js'
+import { THEME } from '../theme.js'
 
-const { logMessage, logHeader, logSubHeader } = require('../logger')
-const { THEME } = require('../theme')
-
-const logStatuses = function (logs, statuses) {
+export const logStatuses = function (logs, statuses) {
   logHeader(logs, 'Summary')
   statuses.forEach((status) => {
     logStatus(logs, status)
@@ -16,7 +14,3 @@ const logStatus = function (logs, { packageName, title = `Plugin ${packageName}
   logSubHeader(logs, titleA)
   logMessage(logs, body)
 }
-
-module.exports = {
-  logStatuses,
-}

package/src/log/messages/steps.js

@@ -1,10 +1,8 @@
-'use strict'
+import { getLogHeaderFunc } from '../header_func.js'
+import { log, logMessage } from '../logger.js'
+import { THEME } from '../theme.js'
 
-const { getLogHeaderFunc } = require('../header_func')
-const { log, logMessage } = require('../logger')
-const { THEME } = require('../theme')
-
-const logStepStart = function ({ logs, event, packageName, coreStepDescription, index, error, netlifyConfig }) {
+export const logStepStart = function ({ logs, event, packageName, coreStepDescription, index, error, netlifyConfig }) {
   const description = getDescription({ coreStepDescription, netlifyConfig, packageName, event })
   const logHeaderFunc = getLogHeaderFunc(error)
   logHeaderFunc(logs, `${index + 1}. ${description}`)
@@ -15,16 +13,10 @@ const getDescription = function ({ coreStepDescription, netlifyConfig, packageNa
   return coreStepDescription === undefined ? `${packageName} (${event} event)` : coreStepDescription({ netlifyConfig })
 }
 
-const logBuildCommandStart = function (logs, buildCommand) {
+export const logBuildCommandStart = function (logs, buildCommand) {
   log(logs, THEME.highlightWords(`$ ${buildCommand}`))
 }
 
-const logStepSuccess = function (logs) {
+export const logStepSuccess = function (logs) {
   logMessage(logs, '')
 }
-
-module.exports = {
-  logStepStart,
-  logBuildCommandStart,
-  logStepSuccess,
-}

package/src/log/old_version.js

@@ -1,17 +1,15 @@
-'use strict'
+import { stdout } from 'process'
 
-const { stdout } = require('process')
+import UpdateNotifier from 'update-notifier'
 
-const UpdateNotifier = require('update-notifier')
-
-const { ROOT_PACKAGE_JSON } = require('../utils/json')
+import { ROOT_PACKAGE_JSON } from '../utils/json.js'
 
 // Many build errors happen in local builds that do not use the latest version
 // of `@netlify/build`. We print a warning message on those.
 // We only print this when Netlify CLI has been used. Programmatic usage might
 // come from a deep dependency calling `@netlify/build` and user might not be
 // able to take any upgrade action, making the message noisy.
-const logOldCliVersionError = function ({ mode, testOpts }) {
+export const logOldCliVersionError = function ({ mode, testOpts }) {
   if (mode !== 'cli') {
     return
   }
@@ -41,5 +39,3 @@ const getCorePackageJson = function (testOpts) {
 const OLD_VERSION_MESSAGE = `Please update netlify-cli to its latest version.
 If netlify-cli is already the latest version,
 please update your dependencies lock file instead.`
-
-module.exports = { logOldCliVersionError }

package/src/log/serialize.js

@@ -1,17 +1,13 @@
-'use strict'
+import { dump } from 'js-yaml'
 
-const { dump } = require('js-yaml')
-
-const serializeObject = function (object) {
+export const serializeObject = function (object) {
   return dump(object, { noRefs: true, sortKeys: true, lineWidth: Number.POSITIVE_INFINITY }).trimRight()
 }
 
-const serializeArray = function (array) {
+export const serializeArray = function (array) {
   return array.map(addDash).join('\n')
 }
 
 const addDash = function (string) {
   return ` - ${string}`
 }
-
-module.exports = { serializeObject, serializeArray }

package/src/log/stream.js

@@ -1,7 +1,5 @@
-'use strict'
-
-const { stdout, stderr } = require('process')
-const { promisify } = require('util')
+import { stdout, stderr } from 'process'
+import { promisify } from 'util'
 
 // TODO: replace with `timers/promises` after dropping Node < 15.0.0
 const pSetTimeout = promisify(setTimeout)
@@ -10,7 +8,7 @@ const pSetTimeout = promisify(setTimeout)
 // which solves many problems. However we can only do it in build.command.
 // Plugins have several events, so need to be switch on and off instead.
 // In buffer mode (`logs` not `undefined`), `pipe` is necessary.
-const getBuildCommandStdio = function (logs) {
+export const getBuildCommandStdio = function (logs) {
   if (logs !== undefined) {
     return 'pipe'
   }
@@ -19,7 +17,7 @@ const getBuildCommandStdio = function (logs) {
 }
 
 // Add build command output
-const handleBuildCommandOutput = function ({ stdout: commandStdout, stderr: commandStderr }, logs) {
+export const handleBuildCommandOutput = function ({ stdout: commandStdout, stderr: commandStderr }, logs) {
   if (logs === undefined) {
     return
   }
@@ -37,7 +35,7 @@ const pushBuildCommandOutput = function (output, logsArray) {
 }
 
 // Start plugin step output
-const pipePluginOutput = function (childProcess, logs) {
+export const pipePluginOutput = function (childProcess, logs) {
   if (logs === undefined) {
     return streamOutput(childProcess)
   }
@@ -46,7 +44,7 @@ const pipePluginOutput = function (childProcess, logs) {
 }
 
 // Stop streaming/buffering plugin step output
-const unpipePluginOutput = async function (childProcess, logs, listeners) {
+export const unpipePluginOutput = async function (childProcess, logs, listeners) {
   // Let `childProcess` `stdout` and `stderr` flush before stopping redirecting
   await pSetTimeout(0)
 
@@ -85,10 +83,3 @@ const unpushOutputToLogs = function (childProcess, logs, { stdoutListener, stder
   childProcess.stdout.removeListener('data', stdoutListener)
   childProcess.stderr.removeListener('data', stderrListener)
 }
-
-module.exports = {
-  getBuildCommandStdio,
-  handleBuildCommandOutput,
-  pipePluginOutput,
-  unpipePluginOutput,
-}

package/src/log/theme.js

@@ -1,41 +1,26 @@
-'use strict'
-
-const {
-  cyanBright: { bold: cyanBrightBold },
-  cyan: { bold: cyanBold },
-  cyan,
-  redBright: { bold: redBrightBold },
-  redBright,
-  red: { bold: redBold },
-  yellowBright: { bold: yellowBrightBold },
-  yellowBright,
-  yellow: { bold: yellowBold },
-  gray,
-} = require('chalk')
+import chalk from 'chalk'
 
 // Color theme. Please use this instead of requiring chalk directly, to ensure
 // consistent colors.
-const THEME = {
+export const THEME = {
   // Main headers
-  header: cyanBrightBold,
+  header: chalk.cyanBright.bold,
   // Single lines used as subheaders
-  subHeader: cyanBold,
+  subHeader: chalk.cyan.bold,
   // One of several words that should be highlighted inside a line
-  highlightWords: cyan,
+  highlightWords: chalk.cyan,
   // Same for errors
-  errorHeader: redBrightBold,
-  errorSubHeader: redBold,
-  errorLine: redBright,
-  errorHighlightWords: redBrightBold,
+  errorHeader: chalk.redBright.bold,
+  errorSubHeader: chalk.red.bold,
+  errorLine: chalk.redBright,
+  errorHighlightWords: chalk.redBright.bold,
   // Same for warnings
-  warningHeader: yellowBrightBold,
-  warningSubHeader: yellowBold,
-  warningLine: yellowBright,
-  warningHighlightWords: yellowBrightBold,
+  warningHeader: chalk.yellowBright.bold,
+  warningSubHeader: chalk.yellow.bold,
+  warningLine: chalk.yellowBright,
+  warningHighlightWords: chalk.yellowBright.bold,
   // One of several words that should be dimmed inside a line
-  dimWords: gray,
+  dimWords: chalk.gray,
   // No colors
   none: (string) => string,
 }
-
-module.exports = { THEME }

package/src/plugins/child/diff.js

@@ -1,14 +1,12 @@
-'use strict'
+import { isDeepStrictEqual } from 'util'
 
-const { isDeepStrictEqual } = require('util')
-
-const isPlainObj = require('is-plain-obj')
-const rfdc = require('rfdc')
+import isPlainObj from 'is-plain-obj'
+import rfdc from 'rfdc'
 
 const clone = rfdc()
 
 // Copy `netlifyConfig` so we can compare before/after mutating it
-const cloneNetlifyConfig = function (netlifyConfig) {
+export const cloneNetlifyConfig = function (netlifyConfig) {
   return clone(netlifyConfig)
 }
 
@@ -20,7 +18,7 @@ const cloneNetlifyConfig = function (netlifyConfig) {
 //  - Apply the change to `netlifyConfig` in the parent process so it can
 //    run `@netlify/config` to normalize and validate the new values
 // `configMutations` is passed to parent process as JSON
-const getConfigMutations = function (netlifyConfig, netlifyConfigCopy, event) {
+export const getConfigMutations = function (netlifyConfig, netlifyConfigCopy, event) {
   const configMutations = diffObjects(netlifyConfig, netlifyConfigCopy, [])
   return configMutations.map((configMutation) => getConfigMutation(configMutation, event))
 }
@@ -55,5 +53,3 @@ const getConfigMutation = function ({ keys, value }, event) {
     event,
   }
 }
-
-module.exports = { cloneNetlifyConfig, getConfigMutations }

package/src/plugins/child/error.js

@@ -1,14 +1,12 @@
-'use strict'
+import logProcessErrors from 'log-process-errors'
 
-const logProcessErrors = require('log-process-errors')
-
-const { errorToJson } = require('../../error/build')
-const { addDefaultErrorInfo, isBuildError } = require('../../error/info')
-const { normalizeError } = require('../../error/parse/normalize')
-const { sendEventToParent } = require('../ipc')
+import { errorToJson } from '../../error/build.js'
+import { addDefaultErrorInfo, isBuildError } from '../../error/info.js'
+import { normalizeError } from '../../error/parse/normalize.js'
+import { sendEventToParent } from '../ipc.js'
 
 // Handle any top-level error and communicate it back to parent
-const handleError = async function (error, verbose) {
+export const handleError = async function (error, verbose) {
   const errorA = normalizeError(error)
   addDefaultErrorInfo(errorA, { type: 'pluginInternal' })
   const errorPayload = errorToJson(errorA)
@@ -17,7 +15,7 @@ const handleError = async function (error, verbose) {
 
 // On uncaught exceptions and unhandled rejections, print the stack trace.
 // Also, prevent child processes from crashing on uncaught exceptions.
-const handleProcessErrors = function () {
+export const handleProcessErrors = function () {
   logProcessErrors({ log: handleProcessError, exitOn: [], level: { multipleResolves: 'silent' } })
 }
 
@@ -32,5 +30,3 @@ const handleProcessError = async function (error, level, originalError) {
 
   await handleError(errorA)
 }
-
-module.exports = { handleError, handleProcessErrors }

package/src/plugins/child/lazy.js

@@ -1,10 +1,8 @@
-'use strict'
-
-const memoizeOne = require('memoize-one')
+import memoizeOne from 'memoize-one'
 
 // Add a `object[propName]` whose value is the return value of `getFunc()`, but
 // is only retrieved when accessed.
-const addLazyProp = function (object, propName, getFunc) {
+export const addLazyProp = function (object, propName, getFunc) {
   const mGetFunc = memoizeOne(getFunc, returnTrue)
   // Mutation is required due to the usage of `Object.defineProperty()`
   // eslint-disable-next-line fp/no-mutating-methods
@@ -18,5 +16,3 @@ const addLazyProp = function (object, propName, getFunc) {
 const returnTrue = function () {
   return true
 }
-
-module.exports = { addLazyProp }

package/src/plugins/child/load.js

@@ -1,21 +1,19 @@
-'use strict'
+import filterObj from 'filter-obj'
 
-const filterObj = require('filter-obj')
-
-const { getLogic } = require('./logic')
-const { registerTypeScript } = require('./typescript')
-const { validatePlugin } = require('./validate')
+import { getLogic } from './logic.js'
+import { registerTypeScript } from './typescript.js'
+import { validatePlugin } from './validate.js'
 
 // Load context passed to every plugin method.
 // This also requires the plugin file and fire its top-level function.
 // This also validates the plugin.
 // Do it when parent requests it using the `load` event.
 // Also figure out the list of plugin steps. This is also passed to the parent.
-const load = async function ({ pluginPath, inputs, packageJson, verbose }) {
+export const load = async function ({ pluginPath, inputs, packageJson, verbose }) {
   const tsNodeService = registerTypeScript(pluginPath)
   const logic = await getLogic({ pluginPath, inputs, tsNodeService })
 
-  await validatePlugin(logic)
+  validatePlugin(logic)
 
   const methods = filterObj(logic, isEventHandler)
   const events = Object.keys(methods)
@@ -29,5 +27,3 @@ const load = async function ({ pluginPath, inputs, packageJson, verbose }) {
 const isEventHandler = function (event, value) {
   return typeof value === 'function'
 }
-
-module.exports = { load }

package/src/plugins/child/logic.js

@@ -1,12 +1,13 @@
-'use strict'
+import { createRequire } from 'module'
+import { pathToFileURL } from 'url'
 
-const { pathToFileURL } = require('url')
+import { addTsErrorInfo } from './typescript.js'
 
-const { addTsErrorInfo } = require('./typescript')
+const require = createRequire(import.meta.url)
 
 // Require the plugin file and fire its top-level function.
 // The returned object is the `logic` which includes all event handlers.
-const getLogic = async function ({ pluginPath, inputs, tsNodeService }) {
+export const getLogic = async function ({ pluginPath, inputs, tsNodeService }) {
   const logic = await importLogic(pluginPath, tsNodeService)
   const logicA = loadLogic({ logic, inputs })
   return logicA
@@ -18,7 +19,7 @@ const importLogic = async function (pluginPath, tsNodeService) {
     // which is currently making it impossible for local plugins to use both
     // pure ES modules and TypeScript.
     if (tsNodeService !== undefined) {
-      // eslint-disable-next-line node/global-require, import/no-dynamic-require
+      // eslint-disable-next-line import/no-dynamic-require
       return require(pluginPath)
     }
 
@@ -54,5 +55,3 @@ const loadLogic = function ({ logic, inputs }) {
     throw error
   }
 }
-
-module.exports = { getLogic }

package/src/plugins/child/main.js

@@ -1,11 +1,9 @@
-'use strict'
+import { setInspectColors } from '../../log/colors.js'
+import { sendEventToParent, getEventsFromParent } from '../ipc.js'
 
-const { setInspectColors } = require('../../log/colors')
-const { sendEventToParent, getEventsFromParent } = require('../ipc')
-
-const { handleProcessErrors, handleError } = require('./error')
-const { load } = require('./load')
-const { run } = require('./run')
+import { handleProcessErrors, handleError } from './error.js'
+import { load } from './load.js'
+import { run } from './run.js'
 
 // Boot plugin child process.
 const bootPlugin = async function () {

package/src/plugins/child/run.js

@@ -1,19 +1,17 @@
-'use strict'
+import { getNewEnvChanges, setEnvChanges } from '../../env/changes.js'
+import { logPluginMethodStart, logPluginMethodEnd } from '../../log/messages/ipc.js'
 
-const { getNewEnvChanges, setEnvChanges } = require('../../env/changes')
-const { logPluginMethodStart, logPluginMethodEnd } = require('../../log/messages/ipc')
-
-const { cloneNetlifyConfig, getConfigMutations } = require('./diff')
-const { getUtils } = require('./utils')
+import { cloneNetlifyConfig, getConfigMutations } from './diff.js'
+import { getUtils } from './utils.js'
 
 // Run a specific plugin event handler
-const run = async function (
+export const run = async function (
   { event, error, constants, envChanges, netlifyConfig },
   { methods, inputs, packageJson, verbose },
 ) {
   const method = methods[event]
   const runState = {}
-  const utils = await getUtils({ event, constants, runState })
+  const utils = getUtils({ event, constants, runState })
   const netlifyConfigCopy = cloneNetlifyConfig(netlifyConfig)
   const runOptions = { utils, constants, inputs, netlifyConfig: netlifyConfigCopy, packageJson, error }
 
@@ -28,5 +26,3 @@ const run = async function (
   const configMutations = getConfigMutations(netlifyConfig, netlifyConfigCopy, event)
   return { ...runState, newEnvChanges, configMutations }
 }
-
-module.exports = { run }

package/src/plugins/child/status.js

@@ -1,12 +1,10 @@
-'use strict'
+import isPlainObj from 'is-plain-obj'
+import mapObj from 'map-obj'
 
-const isPlainObj = require('is-plain-obj')
-const mapObj = require('map-obj')
-
-const { addErrorInfo } = require('../../error/info')
+import { addErrorInfo } from '../../error/info.js'
 
 // Report status information to the UI
-const show = function (runState, showArgs) {
+export const show = function (runState, showArgs) {
   validateShowArgs(showArgs)
   const { title, summary, text } = removeEmptyStrings(showArgs)
   runState.status = { state: 'success', title, summary, text }
@@ -67,5 +65,3 @@ const removeEmptyString = function (key, value) {
 
   return [key, value]
 }
-
-module.exports = { show }

package/src/plugins/child/typescript.js

@@ -1,16 +1,14 @@
-'use strict'
+import { extname } from 'path'
 
-const { extname } = require('path')
+import { register } from 'ts-node'
 
-const { register } = require('ts-node')
-
-const { addErrorInfo } = require('../../error/info')
+import { addErrorInfo } from '../../error/info.js'
 
 // Allow local plugins to be written with TypeScript.
 // Local plugins cannot be transpiled by the build command since they can be run
 // before it. Therefore, we type-check and transpile them automatically using
 // `ts-node`.
-const registerTypeScript = function (pluginPath) {
+export const registerTypeScript = function (pluginPath) {
   if (!isTypeScriptPlugin(pluginPath)) {
     return
   }
@@ -20,7 +18,7 @@ const registerTypeScript = function (pluginPath) {
 
 // On TypeScript errors, adds information about the `ts-node` configuration,
 // which includes the resolved `tsconfig.json`.
-const addTsErrorInfo = function (error, tsNodeService) {
+export const addTsErrorInfo = function (error, tsNodeService) {
   if (tsNodeService === undefined) {
     return
   }
@@ -39,5 +37,3 @@ const isTypeScriptPlugin = function (pluginPath) {
 }
 
 const TYPESCRIPT_EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.cts'])
-
-module.exports = { registerTypeScript, addTsErrorInfo }