@netlify/build 25.0.3 → 26.0.0

package/package.json

@@ -1,8 +1,10 @@
 {
   "name": "@netlify/build",
-  "version": "25.0.3",
+  "version": "26.0.0",
   "description": "Netlify build module",
-  "main": "src/core/main.js",
+  "type": "module",
+  "exports": "./src/core/main.js",
+  "main": "./src/core/main.js",
   "types": "types/index.d.ts",
   "bin": {
     "netlify-build": "./src/core/bin.js"

package/src/core/bin.js

@@ -1,15 +1,14 @@
 #!/usr/bin/env node
-'use strict'
 
-const process = require('process')
+import process from 'process'
 
-const filterObj = require('filter-obj')
-const yargs = require('yargs')
+import filterObj from 'filter-obj'
+import yargs from 'yargs'
 
-const { normalizeCliFeatureFlags } = require('./feature_flags')
-const { FLAGS } = require('./flags')
-const build = require('./main')
-const { FALLBACK_SEVERITY_ENTRY } = require('./severity')
+import { normalizeCliFeatureFlags } from './feature_flags.js'
+import { FLAGS } from './flags.js'
+import build from './main.js'
+import { FALLBACK_SEVERITY_ENTRY } from './severity.js'
 
 // CLI entry point.
 // Before adding logic to this file, please consider adding it to the main

package/src/core/config.js

@@ -1,19 +1,15 @@
-/* eslint-disable max-lines */
-'use strict'
+import { resolveConfig, updateConfig, restoreConfig } from '@netlify/config'
+import mapObj from 'map-obj'
 
-const mapObj = require('map-obj')
+import { getChildEnv } from '../env/main.js'
+import { addApiErrorHandlers } from '../error/api.js'
+import { changeErrorType } from '../error/info.js'
+import { logBuildDir, logConfigPath, logConfig, logContext } from '../log/messages/config.js'
+import { logConfigOnUpload, logHeadersOnUpload, logRedirectsOnUpload } from '../log/messages/mutations.js'
+import { measureDuration } from '../time/main.js'
+import { getPackageJson } from '../utils/package.js'
 
-const { getChildEnv } = require('../env/main')
-const { addApiErrorHandlers } = require('../error/api')
-const { changeErrorType } = require('../error/info')
-const { logBuildDir, logConfigPath, logConfig, logContext } = require('../log/messages/config')
-const { logConfigOnUpload, logHeadersOnUpload, logRedirectsOnUpload } = require('../log/messages/mutations')
-const { measureDuration } = require('../time/main')
-const { getPackageJson } = require('../utils/package')
-
-const { getUserNodeVersion } = require('./user_node_version')
-
-const netlifyConfigPromise = import('@netlify/config')
+import { getUserNodeVersion } from './user_node_version.js'
 
 // Retrieve immutable options passed to `@netlify/config`.
 // This does not include options which might change during the course of the
@@ -22,7 +18,7 @@ const netlifyConfigPromise = import('@netlify/config')
 //    the build
 //  - If plugins change the configuration, `configMutations` is used instead
 // In both cases, almost all options should remain the same.
-const getConfigOpts = function ({
+export const getConfigOpts = function ({
   config,
   defaultConfig,
   cwd,
@@ -78,7 +74,7 @@ const tLoadConfig = async function ({ configOpts, cachedConfig, cachedConfigPath
     siteInfo,
     env,
   } = await resolveInitialConfig(configOpts, cachedConfig, cachedConfigPath)
-  await logConfigInfo({ logs, configPath, buildDir, netlifyConfig, context: contextA, debug })
+  logConfigInfo({ logs, configPath, buildDir, netlifyConfig, context: contextA, debug })
 
   const apiA = addApiErrorHandlers(api)
   const envValues = mapObj(env, (key, { value }) => [key, value])
@@ -102,20 +98,19 @@ const tLoadConfig = async function ({ configOpts, cachedConfig, cachedConfigPath
   }
 }
 
-const loadConfig = measureDuration(tLoadConfig, 'resolve_config')
+export const loadConfig = measureDuration(tLoadConfig, 'resolve_config')
 
 // Retrieve initial configuration.
 // In the buildbot and CLI, we re-use the already parsed `@netlify/config`
 // return value which is passed as `cachedConfig`/`cachedConfigPath`.
 const resolveInitialConfig = async function (configOpts, cachedConfig, cachedConfigPath) {
-  const { resolveConfig } = await netlifyConfigPromise
   return await resolveConfig({ ...configOpts, cachedConfig, cachedConfigPath })
 }
 
-const logConfigInfo = async function ({ logs, configPath, buildDir, netlifyConfig, context, debug }) {
+const logConfigInfo = function ({ logs, configPath, buildDir, netlifyConfig, context, debug }) {
   logBuildDir(logs, buildDir)
   logConfigPath(logs, configPath)
-  await logConfig({ logs, netlifyConfig, debug })
+  logConfig({ logs, netlifyConfig, debug })
   logContext(logs, context)
 }
 
@@ -126,8 +121,7 @@ const logConfigInfo = async function ({ logs, configPath, buildDir, netlifyConfi
 // change would create debug logs which would be too verbose.
 // Errors are propagated and assigned to the specific plugin or core step
 // which changed the configuration.
-const resolveUpdatedConfig = async function (configOpts, configMutations) {
-  const { resolveConfig } = await netlifyConfigPromise
+export const resolveUpdatedConfig = async function (configOpts, configMutations) {
   try {
     return await resolveConfig({ ...configOpts, configMutations, debug: false })
   } catch (error) {
@@ -141,7 +135,7 @@ 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.
-const saveUpdatedConfig = async function ({
+export const saveUpdatedConfig = async function ({
   configMutations,
   buildDir,
   repositoryRoot,
@@ -158,7 +152,6 @@ const saveUpdatedConfig = async function ({
     return
   }
 
-  const { updateConfig } = await netlifyConfigPromise
   await updateConfig(configMutations, {
     buildDir,
     configPath,
@@ -174,7 +167,7 @@ const saveUpdatedConfig = async function ({
   await logRedirectsOnUpload({ logs, redirectsPath, debug })
 }
 
-const restoreUpdatedConfig = async function ({
+export const restoreUpdatedConfig = async function ({
   configMutations,
   buildDir,
   repositoryRoot,
@@ -187,15 +180,5 @@ const restoreUpdatedConfig = async function ({
     return
   }
 
-  const { restoreConfig } = await netlifyConfigPromise
   await restoreConfig(configMutations, { buildDir, configPath, headersPath, redirectsPath })
 }
-
-module.exports = {
-  getConfigOpts,
-  loadConfig,
-  resolveUpdatedConfig,
-  saveUpdatedConfig,
-  restoreUpdatedConfig,
-}
-/* eslint-enable max-lines */

package/src/core/constants.js

@@ -1,16 +1,13 @@
-'use strict'
+import { relative, normalize } from 'path'
 
-const { relative, normalize } = require('path')
+import { getCacheDir } from '@netlify/cache-utils'
+import mapObj from 'map-obj'
+import pathExists from 'path-exists'
 
-const mapObj = require('map-obj')
-const pathExists = require('path-exists')
-
-const { ROOT_PACKAGE_JSON } = require('../utils/json')
-
-const cacheUtilsPromise = import('@netlify/cache-utils')
+import { ROOT_PACKAGE_JSON } from '../utils/json.js'
 
 // Retrieve constants passed to plugins
-const getConstants = async function ({
+export const getConstants = async function ({
   configPath,
   buildDir,
   functionsDistDir,
@@ -22,7 +19,6 @@ const getConstants = async function ({
   mode,
 }) {
   const isLocal = mode !== 'buildbot'
-  const { getCacheDir } = await cacheUtilsPromise
   const normalizedCacheDir = getCacheDir({ cacheDir, cwd: buildDir })
 
   const constants = {
@@ -55,7 +51,7 @@ const INTERNAL_FUNCTIONS_SRC = '.netlify/functions-internal'
 // Retrieve constants which might change during the build if a plugin modifies
 // `netlifyConfig` or creates some default directories.
 // Unlike readonly constants, this is called again before each build step.
-const addMutableConstants = async function ({
+export const addMutableConstants = async function ({
   constants,
   buildDir,
   netlifyConfig: {
@@ -149,5 +145,3 @@ const CONSTANT_PATHS = new Set([
   'EDGE_HANDLERS_SRC',
   'CACHE_DIR',
 ])
-
-module.exports = { getConstants, addMutableConstants }

package/src/core/dry.js

@@ -1,12 +1,10 @@
-'use strict'
+import pFilter from 'p-filter'
 
-const pFilter = require('p-filter')
-
-const { logDryRunStart, logDryRunStep, logDryRunEnd } = require('../log/messages/dry')
-const { runsOnlyOnBuildFailure } = require('../plugins/events')
+import { logDryRunStart, logDryRunStep, logDryRunEnd } from '../log/messages/dry.js'
+import { runsOnlyOnBuildFailure } from '../plugins/events.js'
 
 // If the `dry` flag is specified, do a dry run
-const doDryRun = async function ({ buildDir, steps, netlifyConfig, constants, buildbotServerSocket, logs }) {
+export const doDryRun = async function ({ buildDir, steps, netlifyConfig, constants, buildbotServerSocket, logs }) {
   const successSteps = await pFilter(steps, ({ event, condition }) =>
     shouldIncludeStep({ buildDir, event, condition, netlifyConfig, constants, buildbotServerSocket }),
   )
@@ -39,5 +37,3 @@ const shouldIncludeStep = async function ({
 const getEventLength = function ({ event }) {
   return event.length
 }
-
-module.exports = { doDryRun }

package/src/core/feature_flags.js

@@ -1,7 +1,5 @@
-'use strict'
-
 // From CLI `--featureFlags=a,b,c` to programmatic `{ a: true, b: true, c: true }`
-const normalizeCliFeatureFlags = function (cliFeatureFlags) {
+export const normalizeCliFeatureFlags = function (cliFeatureFlags) {
   return Object.assign({}, ...cliFeatureFlags.split(',').filter(isNotEmpty).map(getFeatureFlag))
 }
 
@@ -14,7 +12,7 @@ const getFeatureFlag = function (name) {
 }
 
 // Default values for feature flags
-const DEFAULT_FEATURE_FLAGS = {
+export const DEFAULT_FEATURE_FLAGS = {
   buildbot_build_go_functions: false,
   buildbot_create_functions_manifest: false,
   buildbot_es_modules_esbuild: false,
@@ -23,5 +21,3 @@ const DEFAULT_FEATURE_FLAGS = {
   buildbot_scheduled_functions: false,
   zisi_parse_isc: false,
 }
-
-module.exports = { normalizeCliFeatureFlags, DEFAULT_FEATURE_FLAGS }

package/src/core/flags.js

@@ -1,9 +1,7 @@
-'use strict'
-
 /* eslint eslint-comments/no-use: off, max-lines: off */
 
 // All CLI flags
-const FLAGS = {
+export const FLAGS = {
   config: {
     string: true,
     describe: `Path to the configuration file.
@@ -129,7 +127,7 @@ Default: false`,
     describe: `Environment in which this is loaded. Can be:
   - 'buildbot': within Netlify Buildbot
   - 'cli': within Netlify CLI
-  - 'require': through require('@netlify/build')`,
+  - 'require': through import('@netlify/build')`,
     hidden: true,
   },
   debug: {
@@ -184,5 +182,3 @@ Default: false`,
     describe: 'Buffer output instead of printing it',
   },
 }
-
-module.exports = { FLAGS }

package/src/core/lingering.js

@@ -1,8 +1,6 @@
-'use strict'
+import psList from 'ps-list'
 
-const psList = require('ps-list')
-
-const { logLingeringProcesses } = require('../log/messages/core')
+import { logLingeringProcesses } from '../log/messages/core.js'
 
 // Print a warning when some build processes are still running.
 // We cannot rely on using the process tree:
@@ -20,7 +18,11 @@ const { logLingeringProcesses } = require('../log/messages/core')
 // Therefore, we run this in a controlled environment only (the buildbot) and
 // exclude specific processes manually. This is a lesser evil, although still
 // quite hacky.
-const warnOnLingeringProcesses = async function ({ mode, logs, testOpts: { silentLingeringProcesses = false } }) {
+export const warnOnLingeringProcesses = async function ({
+  mode,
+  logs,
+  testOpts: { silentLingeringProcesses = false },
+}) {
   if (mode !== 'buildbot' || silentLingeringProcesses) {
     return
   }
@@ -81,5 +83,3 @@ const IGNORED_COMMANDS = [
   'jest-worker',
   'broccoli-babel-transpiler',
 ]
-
-module.exports = { warnOnLingeringProcesses }

package/src/core/main.js

@@ -1,30 +1,28 @@
-'use strict'
-
 /* eslint-disable max-lines, import/max-dependencies */
-const { handleBuildError } = require('../error/handle')
-const { getErrorInfo } = require('../error/info')
-const { startErrorMonitor } = require('../error/monitor/start')
-const { getBufferLogs } = require('../log/logger')
-const { logBuildStart, logTimer, logBuildSuccess } = require('../log/messages/core')
-const { loadPlugins } = require('../plugins/load')
-const { getPluginsOptions } = require('../plugins/options')
-const { pinPlugins } = require('../plugins/pinned_version')
-const { startPlugins, stopPlugins } = require('../plugins/spawn')
-const { addCorePlugins } = require('../plugins_core/add')
-const { reportStatuses } = require('../status/report')
-const { getSteps } = require('../steps/get')
-const { runSteps } = require('../steps/run_steps')
-const { trackBuildComplete } = require('../telemetry/main')
-const { initTimers, measureDuration } = require('../time/main')
-const { reportTimers } = require('../time/report')
+import { handleBuildError } from '../error/handle.js'
+import { getErrorInfo } from '../error/info.js'
+import { startErrorMonitor } from '../error/monitor/start.js'
+import { getBufferLogs } from '../log/logger.js'
+import { logBuildStart, logTimer, logBuildSuccess } from '../log/messages/core.js'
+import { loadPlugins } from '../plugins/load.js'
+import { getPluginsOptions } from '../plugins/options.js'
+import { pinPlugins } from '../plugins/pinned_version.js'
+import { startPlugins, stopPlugins } from '../plugins/spawn.js'
+import { addCorePlugins } from '../plugins_core/add.js'
+import { reportStatuses } from '../status/report.js'
+import { getSteps } from '../steps/get.js'
+import { runSteps } from '../steps/run_steps.js'
+import { trackBuildComplete } from '../telemetry/main.js'
+import { initTimers, measureDuration } from '../time/main.js'
+import { reportTimers } from '../time/report.js'
 
-const { getConfigOpts, loadConfig } = require('./config')
-const { getConstants } = require('./constants')
-const { doDryRun } = require('./dry')
-const { warnOnLingeringProcesses } = require('./lingering')
-const { warnOnMissingSideFiles } = require('./missing_side_file')
-const { normalizeFlags } = require('./normalize_flags')
-const { getSeverity } = require('./severity')
+import { getConfigOpts, loadConfig } from './config.js'
+import { getConstants } from './constants.js'
+import { doDryRun } from './dry.js'
+import { warnOnLingeringProcesses } from './lingering.js'
+import { warnOnMissingSideFiles } from './missing_side_file.js'
+import { normalizeFlags } from './normalize_flags.js'
+import { getSeverity } from './severity.js'
 
 /**
  * Main entry point of Netlify Build.
@@ -50,7 +48,7 @@ const { getSeverity } = require('./severity')
  * 0 (success), 1 (build cancelled), 2 (user error), 3 (plugin error), 4 (system error). Can be used as exit code.
  * @returns {string[]} buildResult.logs - When using the `buffer` option, all log messages
  */
-const build = async function (flags = {}) {
+export default async function buildSite(flags = {}) {
   const {
     errorMonitor,
     framework,
@@ -595,7 +593,7 @@ const runBuild = async function ({
     verbose,
   })
 
-  const { steps, events } = await getSteps(pluginsSteps)
+  const { steps, events } = getSteps(pluginsSteps)
 
   if (dry) {
     await doDryRun({ buildDir, steps, netlifyConfig, constants, buildbotServerSocket, logs })
@@ -687,6 +685,4 @@ const telemetryReport = async function ({
     await handleBuildError(error, errorParams)
   }
 }
-
-module.exports = build
 /* eslint-enable max-lines, import/max-dependencies */

package/src/core/missing_side_file.js

@@ -1,16 +1,14 @@
-'use strict'
+import { relative } from 'path'
 
-const { relative } = require('path')
+import pathExists from 'path-exists'
 
-const pathExists = require('path-exists')
-
-const { logMissingSideFile } = require('../log/messages/core')
+import { logMissingSideFile } from '../log/messages/core.js'
 
 // Some files like `_headers` and `_redirects` must be copied to the publish
 // directory to be used in production. When those are present in the repository
 // but not in the publish directory, this most likely indicates that the build
 // command accidentally forgot to copy those. We then print a warning message.
-const warnOnMissingSideFiles = async function ({
+export const warnOnMissingSideFiles = async function ({
   buildDir,
   netlifyConfig: {
     build: { publish },
@@ -29,5 +27,3 @@ const warnOnMissingSideFile = async function ({ logs, sideFile, buildDir, publis
 
   logMissingSideFile(logs, sideFile, relative(buildDir, publish))
 }
-
-module.exports = { warnOnMissingSideFiles }

package/src/core/normalize_flags.js

@@ -1,14 +1,12 @@
-'use strict'
+import { env, execPath } from 'process'
 
-const { env, execPath } = require('process')
+import { logFlags } from '../log/messages/config.js'
+import { removeFalsy } from '../utils/remove_falsy.js'
 
-const { logFlags } = require('../log/messages/config')
-const { removeFalsy } = require('../utils/remove_falsy')
-
-const { DEFAULT_FEATURE_FLAGS } = require('./feature_flags')
+import { DEFAULT_FEATURE_FLAGS } from './feature_flags.js'
 
 // Normalize CLI flags
-const normalizeFlags = function (flags, logs) {
+export const normalizeFlags = function (flags, logs) {
   const rawFlags = removeFalsy(flags)
 
   // Combine the flags object env with the process.env
@@ -67,5 +65,3 @@ const REQUIRE_MODE = 'require'
 const DEFAULT_FUNCTIONS_DIST = '.netlify/functions/'
 const DEFAULT_CACHE_DIR = '.netlify/cache/'
 const DEFAULT_STATSD_PORT = 8125
-
-module.exports = { normalizeFlags }

package/src/core/severity.js

@@ -1,8 +1,6 @@
-'use strict'
-
 // Used to extract exit codes and respective status strings
 // 1|2|3 indicate whether this was a user|plugin|system error.
-const getSeverity = function (severity = FALLBACK_SEVERITY) {
+export const getSeverity = function (severity = FALLBACK_SEVERITY) {
   const severityEntry = severity in SEVERITY_MAP ? SEVERITY_MAP[severity] : FALLBACK_SEVERITY_ENTRY
   const success = severity === SUCCESS_SEVERITY
   return { success, ...severityEntry }
@@ -21,6 +19,4 @@ const SEVERITY_MAP = {
 const SUCCESS_SEVERITY = 'success'
 // Indicates a bug in our codebase
 const FALLBACK_SEVERITY = 'error'
-const FALLBACK_SEVERITY_ENTRY = SEVERITY_MAP[FALLBACK_SEVERITY]
-
-module.exports = { getSeverity, FALLBACK_SEVERITY_ENTRY }
+export const FALLBACK_SEVERITY_ENTRY = SEVERITY_MAP[FALLBACK_SEVERITY]

package/src/core/user_node_version.js

@@ -1,11 +1,9 @@
-'use strict'
+import { version as currentVersion, execPath } from 'process'
 
-const { version: currentVersion, execPath } = require('process')
+import execa from 'execa'
+import semver from 'semver'
 
-const execa = require('execa')
-const { clean: cleanVersion } = require('semver')
-
-const { addErrorInfo } = require('../error/info')
+import { addErrorInfo } from '../error/info.js'
 
 // Retrieve Node.js version if the Node.js path is using nvm.
 // `node.exe` on Windows, `bin/node` on Unix.
@@ -13,11 +11,11 @@ const NVM_NODE_VERSION_REGEXP = /[/\\]v(\d+\.\d+\.\d+)[/\\](bin[/\\]node|node.ex
 
 // Retrieve Node.js version from current process
 const getCurrentNodeVersion = function () {
-  return cleanVersion(currentVersion)
+  return semver.clean(currentVersion)
 }
 
 // Retrieve Node.js version from `--node-path` or fallback to extracting the current Node.js process version
-const getUserNodeVersion = async function (nodePath) {
+export const getUserNodeVersion = async function (nodePath) {
   // No `--node-path` CLI flag, use the current node process version
   if (nodePath === execPath) {
     return getCurrentNodeVersion()
@@ -31,7 +29,7 @@ const getUserNodeVersion = async function (nodePath) {
 
   // Fallback to actually running `node --version` with the given nodePath
   const { stdout } = await execa(nodePath, ['--version'], { reject: false })
-  const version = cleanVersion(stdout)
+  const version = semver.clean(stdout)
 
   if (version === null) {
     const error = new Error(`Invalid --node-path CLI flag: ${nodePath}`)
@@ -41,5 +39,3 @@ const getUserNodeVersion = async function (nodePath) {
 
   return version
 }
-
-module.exports = { getUserNodeVersion }

package/src/env/changes.js

@@ -1,14 +1,12 @@
-'use strict'
+import { env } from 'process'
 
-const { env } = require('process')
-
-const filterObj = require('filter-obj')
-const mapObj = require('map-obj')
+import filterObj from 'filter-obj'
+import mapObj from 'map-obj'
 
 // If plugins modify `process.env`, this is propagated in other plugins and in
 // `build.command`. Since those are different processes, we figure out when they
 // do this and communicate the new `process.env` to other processes.
-const getNewEnvChanges = function (envBefore, netlifyConfig, netlifyConfigCopy) {
+export const getNewEnvChanges = function (envBefore, netlifyConfig, netlifyConfigCopy) {
   const processEnvChanges = diffEnv(envBefore, env)
   const netlifyConfigEnvChanges = diffEnv(netlifyConfig.build.environment, netlifyConfigCopy.build.environment)
   return { ...processEnvChanges, ...netlifyConfigEnvChanges }
@@ -31,7 +29,7 @@ const setToNull = function (name) {
 
 // Set `process.env` changes from a previous different plugin.
 // Can also merge with a `currentEnv` plain object instead of `process.env`.
-const setEnvChanges = function (envChanges, currentEnv = env) {
+export const setEnvChanges = function (envChanges, currentEnv = env) {
   Object.entries(envChanges).forEach(([name, value]) => {
     setEnvChange(name, value, currentEnv)
   })
@@ -52,5 +50,3 @@ const setEnvChange = function (name, value, currentEnv) {
 
   currentEnv[name] = value
 }
-
-module.exports = { getNewEnvChanges, setEnvChanges }

package/src/env/main.js

@@ -1,14 +1,12 @@
-'use strict'
+import { env } from 'process'
 
-const { env } = require('process')
+import filterObj from 'filter-obj'
 
-const filterObj = require('filter-obj')
-
-const { getParentColorEnv } = require('../log/colors')
+import { getParentColorEnv } from '../log/colors.js'
 
 // Retrieve the environment variables passed to plugins and `build.command`
 // When run locally, this tries to emulate the production environment.
-const getChildEnv = function ({ envOpt, env: allConfigEnv }) {
+export const getChildEnv = function ({ envOpt, env: allConfigEnv }) {
   const parentColorEnv = getParentColorEnv()
   const parentEnv = { ...env, ...allConfigEnv, ...envOpt, ...parentColorEnv }
   return filterObj(parentEnv, shouldKeepEnv)
@@ -19,5 +17,3 @@ const shouldKeepEnv = function (key) {
 }
 
 const REMOVED_PARENT_ENV = new Set(['bugsnag_key'])
-
-module.exports = { getChildEnv }

package/src/env/metadata.js

@@ -1,11 +1,9 @@
-'use strict'
+import { env } from 'process'
 
-const { env } = require('process')
-
-const filterObj = require('filter-obj')
+import filterObj from 'filter-obj'
 
 // Retrieve enviroment variables used in error monitoring
-const getEnvMetadata = function (childEnv = env) {
+export const getEnvMetadata = function (childEnv = env) {
   return filterObj(childEnv, isEnvMetadata)
 }
 
@@ -81,5 +79,3 @@ const ENVIRONMENT_VARIABLES = new Set([
   'GIT_LFS_ENABLED',
   'GIT_LFS_FETCH_INCLUDE',
 ])
-
-module.exports = { getEnvMetadata }

package/src/error/api.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('./info')
+import { addErrorInfo } from './info.js'
 
 // Wrap `api.*` methods so that they add more error information
-const addApiErrorHandlers = function (api) {
+export const addApiErrorHandlers = function (api) {
   if (api === undefined) {
     return
   }
@@ -46,5 +44,3 @@ const redactError = function (error) {
 }
 
 const HEX_REGEXP = /[\da-f]{6,}/g
-
-module.exports = { addApiErrorHandlers }

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 }