@netlify/build 25.0.2 → 26.0.2

package/src/error/build.js

@@ -1,13 +1,11 @@
-'use strict'
+import safeJsonStringify from 'safe-json-stringify'
 
-const safeJsonStringify = require('safe-json-stringify')
-
-const { CUSTOM_ERROR_KEY } = require('./info')
+import { CUSTOM_ERROR_KEY } from './info.js'
 
 // Retrieve error information from child process and re-build it in current
 // process. We need this since errors static properties are not kept by
 // `v8.serialize()`.
-const jsonToError = function ({ name, message, stack, ...errorProps }) {
+export const jsonToError = function ({ name, message, stack, ...errorProps }) {
   // eslint-disable-next-line unicorn/error-message
   const error = new Error('')
 
@@ -36,11 +34,9 @@ const assignErrorProp = function (error, name, value) {
 }
 
 // Inverse of `jsonToError()`.
-const errorToJson = function ({ name, message, stack, [CUSTOM_ERROR_KEY]: customError, ...errorProps }) {
+export const errorToJson = function ({ name, message, stack, [CUSTOM_ERROR_KEY]: customError, ...errorProps }) {
   return {
     ...safeJsonStringify.ensureProperties(errorProps),
     ...safeJsonStringify.ensureProperties({ name, message, stack, [CUSTOM_ERROR_KEY]: customError }),
   }
 }
-
-module.exports = { jsonToError, errorToJson }

package/src/error/cancel.js

@@ -1,12 +1,8 @@
-'use strict'
-
 // Cancel builds, for example when a plugin uses `utils.build.cancelBuild()`
-const cancelBuild = async function ({ api, deployId }) {
+export const cancelBuild = async function ({ api, deployId }) {
   if (api === undefined || !deployId) {
     return
   }
 
   await api.cancelSiteDeploy({ deploy_id: deployId })
 }
-
-module.exports = { cancelBuild }

package/src/error/colors.js

@@ -1,9 +1,7 @@
-'use strict'
-
-const stripAnsi = require('strip-ansi')
+import stripAnsi from 'strip-ansi'
 
 // Remove ANSI sequences from `error.message`
-const removeErrorColors = function (error) {
+export const removeErrorColors = function (error) {
   if (!(error instanceof Error)) {
     return
   }
@@ -11,5 +9,3 @@ const removeErrorColors = function (error) {
   error.message = stripAnsi(error.message)
   error.stack = stripAnsi(error.stack)
 }
-
-module.exports = { removeErrorColors }

package/src/error/handle.js

@@ -1,19 +1,17 @@
-'use strict'
+import { cwd as getCwd } from 'process'
 
-const { cwd: getCwd } = require('process')
+import pathExists from 'path-exists'
 
-const pathExists = require('path-exists')
+import { logBuildError } from '../log/messages/core.js'
+import { logOldCliVersionError } from '../log/old_version.js'
 
-const { logBuildError } = require('../log/messages/core')
-const { logOldCliVersionError } = require('../log/old_version')
-
-const { removeErrorColors } = require('./colors')
-const { getErrorInfo } = require('./info')
-const { reportBuildError } = require('./monitor/report')
-const { parseErrorInfo } = require('./parse/parse')
+import { removeErrorColors } from './colors.js'
+import { getErrorInfo } from './info.js'
+import { reportBuildError } from './monitor/report.js'
+import { parseErrorInfo } from './parse/parse.js'
 
 // Logs and reports a build failure
-const handleBuildError = async function (
+export const handleBuildError = async function (
   error,
   { errorMonitor, netlifyConfig, childEnv, mode, logs, debug, testOpts },
 ) {
@@ -26,7 +24,7 @@ const handleBuildError = async function (
   removeErrorColors(error)
   // Some errors, such as telemetry ones, should not be logged
   if (basicErrorInfo.showInBuildLog) {
-    await logBuildError({ error, netlifyConfig, mode, logs, debug, testOpts })
+    logBuildError({ error, netlifyConfig, mode, logs, debug, testOpts })
   }
   logOldCliVersionError({ mode, testOpts })
   await reportBuildError({ error, errorMonitor, childEnv, logs, testOpts })
@@ -57,5 +55,3 @@ const isCancelCrash = async function (error) {
     return true
   }
 }
-
-module.exports = { handleBuildError }

package/src/error/info.js

@@ -1,7 +1,5 @@
-'use strict'
-
 // Add information related to an error without colliding with existing properties
-const addDefaultErrorInfo = function (error, info) {
+export const addDefaultErrorInfo = function (error, info) {
   if (!canHaveErrorInfo(error)) {
     return
   }
@@ -10,7 +8,7 @@ const addDefaultErrorInfo = function (error, info) {
 }
 
 // Retrieve error information added by our system
-const addErrorInfo = function (error, info) {
+export const addErrorInfo = function (error, info) {
   if (!canHaveErrorInfo(error)) {
     return
   }
@@ -18,7 +16,7 @@ const addErrorInfo = function (error, info) {
   error[CUSTOM_ERROR_KEY] = { ...error[CUSTOM_ERROR_KEY], ...info }
 }
 
-const getErrorInfo = function (error) {
+export const getErrorInfo = function (error) {
   if (!isBuildError(error)) {
     return [{}, error]
   }
@@ -28,14 +26,14 @@ const getErrorInfo = function (error) {
 }
 
 // Change error type from one to another
-const changeErrorType = function (error, oldType, newType) {
+export const changeErrorType = function (error, oldType, newType) {
   const [{ type }] = getErrorInfo(error)
   if (type === oldType) {
     addErrorInfo(error, { type: newType })
   }
 }
 
-const isBuildError = function (error) {
+export const isBuildError = function (error) {
   return canHaveErrorInfo(error) && error[CUSTOM_ERROR_KEY] !== undefined
 }
 
@@ -45,6 +43,4 @@ const canHaveErrorInfo = function (error) {
   return error != null
 }
 
-const CUSTOM_ERROR_KEY = 'customErrorInfo'
-
-module.exports = { addDefaultErrorInfo, addErrorInfo, getErrorInfo, changeErrorType, isBuildError, CUSTOM_ERROR_KEY }
+export const CUSTOM_ERROR_KEY = 'customErrorInfo'

package/src/error/monitor/location.js

@@ -1,7 +1,5 @@
-'use strict'
-
 // Retrieve plugin's location and build logs
-const getLocationMetadata = function (location, envMetadata) {
+export const getLocationMetadata = function (location, envMetadata) {
   const buildLogs = getBuildLogs(envMetadata)
 
   if (buildLogs === undefined && location === undefined) {
@@ -21,5 +19,3 @@ const getBuildLogs = function ({ SITE_NAME, DEPLOY_ID }) {
 }
 
 const NETLIFY_ORIGIN = 'https://app.netlify.com'
-
-module.exports = { getLocationMetadata }

package/src/error/monitor/normalize.js

@@ -1,9 +1,7 @@
-'use strict'
-
 // We group errors by `error.message`. However some `error.message` contain
 // unique IDs, etc. which defeats that grouping. So we normalize those to make
 // them consistent
-const normalizeGroupingMessage = function (message, type) {
+export const normalizeGroupingMessage = function (message, type) {
   const messageA = removeDependenciesLogs(message, type)
   return NORMALIZE_REGEXPS.reduce(normalizeMessage, messageA)
 }
@@ -57,7 +55,7 @@ const NORMALIZE_REGEXPS = [
   [/(Required inputs for plugin).*/gm, '$1'],
   // Netlify Functions validation check
   [/(should target a directory, not a regular file):.*/, '$1'],
-  // zip-it-and-ship-it error when there is a `require()` but dependencies
+  // zip-it-and-ship-it error when there is an `import()` but dependencies
   // were not installed
   [/(Cannot find module) '([^']+)'/g, "$1 'moduleName'"],
   [/(A Netlify Function is using) "[^"]+"/g, '$1 "moduleName"'],
@@ -77,5 +75,3 @@ const NORMALIZE_REGEXPS = [
   // Multiple empty lines
   [/^\s*$/gm, ''],
 ]
-
-module.exports = { normalizeGroupingMessage }

package/src/error/monitor/print.js

@@ -1,9 +1,7 @@
-'use strict'
-
-const { log } = require('../../log/logger')
+import { log } from '../../log/logger.js'
 
 // Print event payload instead of sending actual request during tests
-const printEventForTest = function (
+export const printEventForTest = function (
   { name: errorClass, message: errorMessage },
   {
     context,
@@ -42,7 +40,3 @@ const printEventForTest = function (
   )
   log(logs, `\nError monitoring payload:\n${eventString}`)
 }
-
-module.exports = {
-  printEventForTest,
-}

package/src/error/monitor/report.js

@@ -1,21 +1,19 @@
-'use strict'
+import { type as osType, freemem, totalmem } from 'os'
+import { promisify } from 'util'
 
-const { type: osType, freemem, totalmem } = require('os')
-const { promisify } = require('util')
+import osName from 'os-name'
 
-const osName = require('os-name')
+import { getEnvMetadata } from '../../env/metadata.js'
+import { log } from '../../log/logger.js'
+import { parseErrorInfo } from '../parse/parse.js'
+import { getHomepage } from '../parse/plugin.js'
 
-const { getEnvMetadata } = require('../../env/metadata')
-const { log } = require('../../log/logger')
-const { parseErrorInfo } = require('../parse/parse')
-const { getHomepage } = require('../parse/plugin')
-
-const { getLocationMetadata } = require('./location')
-const { normalizeGroupingMessage } = require('./normalize')
-const { printEventForTest } = require('./print')
+import { getLocationMetadata } from './location.js'
+import { normalizeGroupingMessage } from './normalize.js'
+import { printEventForTest } from './print.js'
 
 // Report a build failure for monitoring purpose
-const reportBuildError = async function ({ error, errorMonitor, childEnv, logs, testOpts }) {
+export const reportBuildError = async function ({ error, errorMonitor, childEnv, logs, testOpts }) {
   if (errorMonitor === undefined) {
     return
   }
@@ -130,5 +128,3 @@ const onError = function (event, eventProps) {
   })
   return true
 }
-
-module.exports = { reportBuildError }

package/src/error/monitor/start.js

@@ -1,15 +1,15 @@
-'use strict'
+import { fileURLToPath } from 'url'
 
-const Bugsnag = require('@bugsnag/js')
-const memoizeOne = require('memoize-one')
+import Bugsnag from '@bugsnag/js'
+import memoizeOne from 'memoize-one'
 
-const { name, version } = require('../../../package.json')
-const { log } = require('../../log/logger')
+import { log } from '../../log/logger.js'
+import { ROOT_PACKAGE_JSON } from '../../utils/json.js'
 
-const projectRoot = `${__dirname}/../../..`
+const projectRoot = fileURLToPath(new URL('../../..', import.meta.url))
 
 // Start a client to monitor errors
-const startErrorMonitor = function ({ flags: { mode }, logs, bugsnagKey }) {
+export const startErrorMonitor = function ({ flags: { mode }, logs, bugsnagKey }) {
   if (!bugsnagKey) {
     return
   }
@@ -20,8 +20,8 @@ const startErrorMonitor = function ({ flags: { mode }, logs, bugsnagKey }) {
   try {
     const errorMonitor = startBugsnag({
       apiKey: bugsnagKey,
-      appVersion: `${name} ${version}`,
-      appType: name,
+      appVersion: `${ROOT_PACKAGE_JSON.name} ${ROOT_PACKAGE_JSON.version}`,
+      appType: ROOT_PACKAGE_JSON.name,
       releaseStage,
       logger,
       projectRoot,
@@ -67,5 +67,3 @@ const getLogger = function (logs, isTest) {
 }
 
 const noop = function () {}
-
-module.exports = { startErrorMonitor }

package/src/error/parse/clean_stack.js

@@ -1,9 +1,7 @@
-'use strict'
+import { cwd } from 'process'
 
-const { cwd } = require('process')
-
-const cleanStack = require('clean-stack')
-const stripAnsi = require('strip-ansi')
+import cleanStack from 'clean-stack'
+import stripAnsi from 'strip-ansi'
 
 // Clean stack traces:
 //  - remove our internal code, e.g. the logic spawning plugins
@@ -13,7 +11,7 @@ const stripAnsi = require('strip-ansi')
 // Keep non stack trace lines as is.
 // We do not use libraries that patch `Error.prepareStackTrace()` because they
 // tend to create issues.
-const cleanStacks = function ({ stack, rawStack, debug }) {
+export const cleanStacks = function ({ stack, rawStack, debug }) {
   if (stack === undefined) {
     return
   }
@@ -87,5 +85,3 @@ const normalizePathSlashes = function (line) {
 }
 
 const BACKLASH_REGEXP = /\\/g
-
-module.exports = { cleanStacks }

package/src/error/parse/location.js

@@ -1,10 +1,8 @@
-'use strict'
-
-const { getBuildCommandDescription, getPluginOrigin } = require('../../log/description')
+import { getBuildCommandDescription, getPluginOrigin } from '../../log/description.js'
 
 // Retrieve an error's location to print in logs.
 // Each error type has its own logic (or none if there's no location to print).
-const getLocationInfo = function ({ stack, location, locationType }) {
+export const getLocationInfo = function ({ stack, location, locationType }) {
   // No location to print
   if (locationType === undefined && stack === undefined) {
     return
@@ -58,5 +56,3 @@ const LOCATIONS = {
   buildFail: getBuildFailLocation,
   api: getApiLocation,
 }
-
-module.exports = { getLocationInfo }

package/src/error/parse/normalize.js

@@ -1,9 +1,7 @@
-'use strict'
-
 // Ensure error is an `Error` instance.
 // If is an `Error` instance but is missing usual `Error` properties, we make
 // sure its static properties are preserved.
-const normalizeError = function (error) {
+export const normalizeError = function (error) {
   if (Array.isArray(error)) {
     return normalizeArray(error)
   }
@@ -29,5 +27,3 @@ const normalizeArray = function (errorArray) {
   error.errors = errors
   return error
 }
-
-module.exports = { normalizeError }

package/src/error/parse/parse.js

@@ -1,17 +1,15 @@
-'use strict'
+import { serializeObject } from '../../log/serialize.js'
+import { getErrorInfo } from '../info.js'
+import { getTypeInfo } from '../type.js'
 
-const { serializeObject } = require('../../log/serialize')
-const { getErrorInfo } = require('../info')
-const { getTypeInfo } = require('../type')
-
-const { getLocationInfo } = require('./location')
-const { normalizeError } = require('./normalize')
-const { getPluginInfo } = require('./plugin')
-const { getErrorProps } = require('./properties')
-const { getStackInfo } = require('./stack')
+import { getLocationInfo } from './location.js'
+import { normalizeError } from './normalize.js'
+import { getPluginInfo } from './plugin.js'
+import { getErrorProps } from './properties.js'
+import { getStackInfo } from './stack.js'
 
 // Add additional type-specific error information
-const getFullErrorInfo = function ({ error, colors, debug }) {
+export const getFullErrorInfo = function ({ error, colors, debug }) {
   const basicErrorInfo = parseErrorInfo(error)
   const {
     message,
@@ -57,7 +55,7 @@ const getTsConfigInfo = function (tsConfig) {
 }
 
 // Parse error instance into all the basic properties containing information
-const parseErrorInfo = function (error) {
+export const parseErrorInfo = function (error) {
   const { message, stack, ...errorProps } = normalizeError(error)
   const [errorInfo, errorPropsA] = getErrorInfo(errorProps)
   const {
@@ -97,5 +95,3 @@ const getTitle = function (title, errorInfo) {
 
   return title(errorInfo)
 }
-
-module.exports = { getFullErrorInfo, parseErrorInfo }

package/src/error/parse/plugin.js

@@ -1,8 +1,6 @@
-'use strict'
-
 // Retrieve plugin's package.json details to include in error messages.
 // Please note `pluginPackageJson` has been normalized by `normalize-package-data`.
-const getPluginInfo = function ({ pluginPackageJson = {} }, { packageName, loadedFrom }) {
+export const getPluginInfo = function ({ pluginPackageJson = {} }, { packageName, loadedFrom }) {
   if (Object.keys(pluginPackageJson).length === 0) {
     return
   }
@@ -38,7 +36,7 @@ const getVersion = function ({ version }) {
   return version
 }
 
-const getHomepage = function (pluginPackageJson = {}, { loadedFrom } = {}) {
+export const getHomepage = function (pluginPackageJson = {}, { loadedFrom } = {}) {
   return (
     getRepository(pluginPackageJson) ||
     getNpmLink(pluginPackageJson, { loadedFrom }) ||
@@ -70,5 +68,3 @@ const FIELDS = {
   'npm link': getNpmLink,
   'Report issues': getIssuesLink,
 }
-
-module.exports = { getPluginInfo, getHomepage }

package/src/error/parse/properties.js

@@ -1,11 +1,9 @@
-'use strict'
+import { inspect } from 'util'
 
-const { inspect } = require('util')
-
-const { omit } = require('../../utils/omit')
+import { omit } from '../../utils/omit.js'
 
 // In uncaught exceptions, print error static properties
-const getErrorProps = function ({ errorProps, showErrorProps, colors }) {
+export const getErrorProps = function ({ errorProps, showErrorProps, colors }) {
   if (!showErrorProps) {
     return
   }
@@ -23,5 +21,3 @@ const INSPECT_MAX_DEPTH = 5
 
 // Remove error static properties that should not be logged
 const CLEANED_ERROR_PROPS = ['requireStack']
-
-module.exports = { getErrorProps }

package/src/error/parse/serialize_log.js

@@ -1,9 +1,7 @@
-'use strict'
-
-const { THEME } = require('../../log/theme')
+import { THEME } from '../../log/theme.js'
 
 // Serialize an error object into a title|body string to print in logs
-const serializeLogError = function ({
+export const serializeLogError = function ({
   fullErrorInfo: { title, severity, message, pluginInfo, locationInfo, tsConfigInfo, errorProps },
 }) {
   const body = getBody({ message, pluginInfo, locationInfo, tsConfigInfo, errorProps, severity })
@@ -42,5 +40,3 @@ const LOG_BLOCK_NAMES = {
   tsConfigInfo: 'TypeScript configuration',
   errorProps: 'Error properties',
 }
-
-module.exports = { serializeLogError }

package/src/error/parse/serialize_status.js

@@ -1,7 +1,5 @@
-'use strict'
-
 // Serialize an error object to `statuses` properties
-const serializeErrorStatus = function ({ fullErrorInfo: { title, message, locationInfo, errorProps }, state }) {
+export const serializeErrorStatus = function ({ fullErrorInfo: { title, message, locationInfo, errorProps }, state }) {
   const text = getText({ locationInfo, errorProps })
   return { state, title, summary: message, text }
 }
@@ -23,5 +21,3 @@ const getErrorProps = function (errorProps) {
 
   return `Error properties:\n${errorProps}`
 }
-
-module.exports = { serializeErrorStatus }

package/src/error/parse/stack.js

@@ -1,9 +1,7 @@
-'use strict'
-
-const { cleanStacks } = require('./clean_stack')
+import { cleanStacks } from './clean_stack.js'
 
 // Retrieve the stack trace
-const getStackInfo = function ({ message, stack, stackType, rawStack, severity, debug }) {
+export const getStackInfo = function ({ message, stack, stackType, rawStack, severity, debug }) {
   const { message: messageA, stack: stackA } = splitStackInfo({ message, stack, stackType })
   const messageB = severity === 'none' ? messageA.replace(SUCCESS_ERROR_NAME, '') : messageA
   const stackB = cleanStacks({ stack: stackA, rawStack, debug })
@@ -43,5 +41,3 @@ const isStackTrace = function (line) {
 }
 
 const SUCCESS_ERROR_NAME = 'Error: '
-
-module.exports = { getStackInfo }

package/src/error/type.js

@@ -1,7 +1,5 @@
-'use strict'
-
 // Retrieve error-type specific information
-const getTypeInfo = function ({ type }) {
+export const getTypeInfo = function ({ type }) {
   const typeA = TYPES[type] === undefined ? DEFAULT_TYPE : type
   return { type: typeA, ...TYPES[typeA] }
 }
@@ -182,5 +180,3 @@ const TYPES = {
 
 // When no error type matches, it's an uncaught exception, i.e. a bug
 const DEFAULT_TYPE = 'exception'
-
-module.exports = { getTypeInfo }

package/src/install/functions.js

@@ -1,15 +1,13 @@
-'use strict'
+import { dirname } from 'path'
 
-const { dirname } = require('path')
+import readdirp from 'readdirp'
 
-const readdirp = require('readdirp')
+import { logInstallFunctionDependencies } from '../log/messages/install.js'
 
-const { logInstallFunctionDependencies } = require('../log/messages/install')
-
-const { installDependencies } = require('./main')
+import { installDependencies } from './main.js'
 
 // Install dependencies of Netlify Functions
-const installFunctionDependencies = async function (functionsSrc, isLocal) {
+export const installFunctionDependencies = async function (functionsSrc, isLocal) {
   const packagePaths = await getPackagePaths(functionsSrc)
   if (packagePaths.length === 0) {
     return
@@ -28,5 +26,3 @@ const getPackagePaths = function (functionsSrc) {
 const getPackageRoot = function ({ fullPath }) {
   return dirname(fullPath)
 }
-
-module.exports = { installFunctionDependencies }

package/src/install/local.js

@@ -1,16 +1,14 @@
-'use strict'
+import pkgDir from 'pkg-dir'
 
-const pkgDir = require('pkg-dir')
+import { logInstallLocalPluginsDeps } from '../log/messages/install.js'
 
-const { logInstallLocalPluginsDeps } = require('../log/messages/install')
-
-const { installDependencies } = require('./main')
+import { installDependencies } from './main.js'
 
 // Install dependencies of local plugins.
 // Users must add this plugin to their `netlify.toml` `plugins` to use this
 // feature. We don't want to provide it by default because this makes build
 // slow and buggy.
-const installLocalPluginsDependencies = async function ({ plugins, pluginsOptions, buildDir, mode, logs }) {
+export const installLocalPluginsDependencies = async function ({ plugins, pluginsOptions, buildDir, mode, logs }) {
   if (!plugins.some(isLocalInstallOptIn)) {
     return
   }
@@ -37,7 +35,7 @@ const isLocalInstallOptIn = function (plugin) {
   return plugin.package === LOCAL_INSTALL_PLUGIN_NAME
 }
 
-const LOCAL_INSTALL_PLUGIN_NAME = '@netlify/plugin-local-install-core'
+export const LOCAL_INSTALL_PLUGIN_NAME = '@netlify/plugin-local-install-core'
 
 // Core plugins and non-local plugins already have their dependencies installed
 const getLocalPluginsOptions = function (pluginsOptions) {
@@ -62,5 +60,3 @@ const removeMainRoot = async function (localPluginsOptions, buildDir) {
   const mainPackageDir = await pkgDir(buildDir)
   return localPluginsOptions.filter(({ packageDir }) => packageDir !== mainPackageDir)
 }
-
-module.exports = { installLocalPluginsDependencies, LOCAL_INSTALL_PLUGIN_NAME }

package/src/install/main.js

@@ -1,19 +1,17 @@
-'use strict'
+import { homedir } from 'os'
 
-const { homedir } = require('os')
+import execa from 'execa'
+import pathExists from 'path-exists'
 
-const execa = require('execa')
-const pathExists = require('path-exists')
-
-const { addErrorInfo } = require('../error/info')
+import { addErrorInfo } from '../error/info.js'
 
 // Install Node.js dependencies in a specific directory
-const installDependencies = function ({ packageRoot, isLocal }) {
+export const installDependencies = function ({ packageRoot, isLocal }) {
   return runCommand({ packageRoot, isLocal, type: 'install' })
 }
 
 // Add new Node.js dependencies, with exact semver ranges
-const addExactDependencies = function ({ packageRoot, isLocal, packages }) {
+export const addExactDependencies = function ({ packageRoot, isLocal, packages }) {
   return runCommand({ packageRoot, packages, isLocal, type: 'addExact' })
 }
 
@@ -81,5 +79,3 @@ const isNotNpmLogMessage = function (line) {
   return NPM_LOG_MESSAGES.every((message) => !line.includes(message))
 }
 const NPM_LOG_MESSAGES = ['complete log of this run', '-debug.log']
-
-module.exports = { installDependencies, addExactDependencies }