netlify-cli 12.2.10 → 12.2.11

package/src/utils/addons/render.mjs

@@ -1,7 +1,7 @@
 // @ts-check
 import AsciiTable from 'ascii-table'
 
-import { chalk } from '../command-helpers.cjs'
+import { chalk } from '../command-helpers.mjs'
 
 export const renderMissingValues = function (values, manifest) {
   const display = values

package/src/utils/{command-helpers.cjs → command-helpers.mjs}

@@ -1,22 +1,21 @@
 // @ts-check
-const { once } = require('events')
-const os = require('os')
-const process = require('process')
-const { format, inspect } = require('util')
+import { once } from 'events'
+import os from 'os'
+import process from 'process'
+import { format, inspect } from 'util'
 
-// eslint-disable-next-line no-restricted-modules
-const { Instance: ChalkInstance } = require('chalk')
-const chokidar = require('chokidar')
-const decache = require('decache')
-const WSL = require('is-wsl')
-const debounce = require('lodash/debounce')
-const { default: omit } = require('omit.js')
-const terminalLink = require('terminal-link')
+// eslint-disable-next-line no-restricted-imports
+import chalkModule from 'chalk'
+import chokidar from 'chokidar'
+import decache from 'decache'
+import WSL from 'is-wsl'
+import debounce from 'lodash/debounce.js'
+import terminalLink from 'terminal-link'
 
-const { name, version } = require('../../package.json')
-const { clearSpinner, startSpinner } = require('../lib/spinner.cjs')
+import { clearSpinner, startSpinner } from '../lib/spinner.cjs'
 
-const getGlobalConfig = require('./get-global-config.cjs')
+import getGlobalConfig from './get-global-config.mjs'
+import getPackageJson from './get-package-json.mjs'
 
 /** The parsed process argv without the binary only arguments and flags */
 const argv = process.argv.slice(2)
@@ -28,13 +27,13 @@ const argv = process.argv.slice(2)
  */
 const safeChalk = function (noColors) {
   if (noColors) {
-    const colorlessChalk = new ChalkInstance({ level: 0 })
+    const colorlessChalk = new chalkModule.Instance({ level: 0 })
     return colorlessChalk
   }
-  return new ChalkInstance()
+  return new chalkModule.Instance()
 }
 
-const chalk = safeChalk(argv.includes('--json'))
+export const chalk = safeChalk(argv.includes('--json'))
 
 /**
  * Adds the filler to the start of the string
@@ -43,24 +42,26 @@ const chalk = safeChalk(argv.includes('--json'))
  * @param {string} [filler]
  * @returns {string}
  */
-const padLeft = (str, count, filler = ' ') => str.padStart(str.length + count, filler)
+export const padLeft = (str, count, filler = ' ') => str.padStart(str.length + count, filler)
 
 const platform = WSL ? 'wsl' : os.platform()
 const arch = os.arch() === 'ia32' ? 'x86' : os.arch()
 
-const USER_AGENT = `${name}/${version} ${platform}-${arch} node-${process.version}`
+const { name, version } = await getPackageJson()
+
+export const USER_AGENT = `${name}/${version} ${platform}-${arch} node-${process.version}`
 
 /** A list of base command flags that needs to be sorted down on documentation and on help pages */
 const BASE_FLAGS = new Set(['--debug', '--httpProxy', '--httpProxyCertificateFilename'])
 
-const NETLIFY_CYAN = chalk.rgb(40, 180, 170)
+export const NETLIFY_CYAN = chalk.rgb(40, 180, 170)
 
-const NETLIFYDEV = `${chalk.greenBright('◈')} ${NETLIFY_CYAN('Netlify Dev')} ${chalk.greenBright('◈')}`
-const NETLIFYDEVLOG = `${chalk.greenBright('◈')}`
-const NETLIFYDEVWARN = `${chalk.yellowBright('◈')}`
-const NETLIFYDEVERR = `${chalk.redBright('◈')}`
+export const NETLIFYDEV = `${chalk.greenBright('◈')} ${NETLIFY_CYAN('Netlify Dev')} ${chalk.greenBright('◈')}`
+export const NETLIFYDEVLOG = `${chalk.greenBright('◈')}`
+export const NETLIFYDEVWARN = `${chalk.yellowBright('◈')}`
+export const NETLIFYDEVERR = `${chalk.redBright('◈')}`
 
-const BANG = process.platform === 'win32' ? '»' : '›'
+export const BANG = process.platform === 'win32' ? '»' : '›'
 
 /**
  * Sorts two options so that the base flags are at the bottom of the list
@@ -70,7 +71,7 @@ const BANG = process.platform === 'win32' ? '»' : '›'
  * @example
  * options.sort(sortOptions)
  */
-const sortOptions = (optionA, optionB) => {
+export const sortOptions = (optionA, optionB) => {
   // base flags should be always at the bottom
   if (BASE_FLAGS.has(optionA.long) || BASE_FLAGS.has(optionB.long)) {
     return -1
@@ -88,7 +89,7 @@ const TOKEN_TIMEOUT = 3e5
  * @param {object} config.ticket
  * @returns
  */
-const pollForToken = async ({ api, ticket }) => {
+export const pollForToken = async ({ api, ticket }) => {
   const spinner = startSpinner({ text: 'Waiting for authorization...' })
   try {
     const accessToken = await api.getAccessToken(ticket, { timeout: TOKEN_TIMEOUT })
@@ -118,7 +119,7 @@ const pollForToken = async ({ api, ticket }) => {
  * @param {string} [tokenFromOptions] optional token from the provided --auth options
  * @returns {Promise<[null|string, 'flag' | 'env' |'config' |'not found']>}
  */
-const getToken = async (tokenFromOptions) => {
+export const getToken = async (tokenFromOptions) => {
   // 1. First honor command flag --auth
   if (tokenFromOptions) {
     return [tokenFromOptions, 'flag']
@@ -146,13 +147,13 @@ const isDefaultJson = () => argv[0] === 'functions:invoke' || (argv[0] === 'api'
  * logs a json message
  * @param {string|object} message
  */
-const logJson = (message = '') => {
+export const logJson = (message = '') => {
   if (argv.includes('--json') || isDefaultJson()) {
     process.stdout.write(JSON.stringify(message, null, 2))
   }
 }
 
-const log = (message = '', ...args) => {
+export const log = (message = '', ...args) => {
   // If  --silent or --json flag passed disable logger
   if (argv.includes('--json') || argv.includes('--silent') || isDefaultJson()) {
     return
@@ -165,7 +166,7 @@ const log = (message = '', ...args) => {
  * logs a warning message
  * @param {string} message
  */
-const warn = (message = '') => {
+export const warn = (message = '') => {
   const bang = chalk.yellow(BANG)
   log(` ${bang}   Warning: ${message}`)
 }
@@ -176,7 +177,7 @@ const warn = (message = '') => {
  * @param {object} [options]
  * @param {boolean} [options.exit]
  */
-const error = (message = '', options = {}) => {
+export const error = (message = '', options = {}) => {
   const err = message instanceof Error ? message : new Error(message)
   if (options.exit === false) {
     const bang = chalk.red(BANG)
@@ -190,18 +191,21 @@ const error = (message = '', options = {}) => {
   }
 }
 
-const exit = (code = 0) => {
+export const exit = (code = 0) => {
   process.exit(code)
 }
 
 // When `build.publish` is not set by the user, the CLI behavior differs in
 // several ways. It detects it by checking if `build.publish` is `undefined`.
 // However, `@netlify/config` adds a default value to `build.publish`.
-// This removes it.
-const normalizeConfig = (config) =>
-  config.build.publishOrigin === 'default'
-    ? { ...config, build: omit(config.build, ['publish', 'publishOrigin']) }
-    : config
+// This removes 'publish' and 'publishOrigin' in this case.
+export const normalizeConfig = (config) => {
+  // Unused var here is in order to omit 'publish' from build config
+  // eslint-disable-next-line no-unused-vars
+  const { publish, publishOrigin, ...build } = config.build
+
+  return publishOrigin === 'default' ? { ...config, build } : config
+}
 
 const DEBOUNCE_WAIT = 100
 
@@ -215,7 +219,7 @@ const DEBOUNCE_WAIT = 100
  * @param {() => any} [opts.onChange]
  * @param {() => any} [opts.onUnlink]
  */
-const watchDebounced = async (target, { depth, onAdd = () => {}, onChange = () => {}, onUnlink = () => {} }) => {
+export const watchDebounced = async (target, { depth, onAdd = () => {}, onChange = () => {}, onUnlink = () => {} }) => {
   const watcher = chokidar.watch(target, { depth, ignored: /node_modules/, ignoreInitial: true })
 
   await once(watcher, 'ready')
@@ -241,27 +245,4 @@ const watchDebounced = async (target, { depth, onAdd = () => {}, onChange = () =
   return watcher
 }
 
-const getTerminalLink = (text, url) => terminalLink(text, url, { fallback: () => `${text} ${url}` })
-
-module.exports = {
-  BANG,
-  chalk,
-  error,
-  exit,
-  getTerminalLink,
-  getToken,
-  log,
-  logJson,
-  NETLIFY_CYAN,
-  NETLIFYDEV,
-  NETLIFYDEVERR,
-  NETLIFYDEVLOG,
-  NETLIFYDEVWARN,
-  normalizeConfig,
-  padLeft,
-  pollForToken,
-  sortOptions,
-  USER_AGENT,
-  warn,
-  watchDebounced,
-}
+export const getTerminalLink = (text, url) => terminalLink(text, url, { fallback: () => `${text} ${url}` })

package/src/utils/{deferred.cjs → create-deferred.mjs}

@@ -10,4 +10,4 @@ const createDeferred = () => {
   return { promise, reject: rejectDeferred, resolve: resolveDeferred }
 }
 
-module.exports = { createDeferred }
+export default createDeferred

package/src/utils/deploy/constants.mjs

@@ -0,0 +1,19 @@
+// Local deploy timeout in ms: 20 mins
+export const DEFAULT_DEPLOY_TIMEOUT = 1_200_000
+// Concurrent file hash calls
+export const DEFAULT_CONCURRENT_HASH = 100
+// Number of concurrent uploads
+export const DEFAULT_CONCURRENT_UPLOAD = 5
+// Number of files
+export const DEFAULT_SYNC_LIMIT = 100
+// Number of times to retry an upload
+export const DEFAULT_MAX_RETRY = 5
+
+export const UPLOAD_RANDOM_FACTOR = 0.5
+// 5 seconds
+export const UPLOAD_INITIAL_DELAY = 5000
+// 1.5 minute (90s)
+export const UPLOAD_MAX_DELAY = 90_000
+
+// 1 second
+export const DEPLOY_POLL = 1000

package/src/utils/deploy/{deploy-site.cjs → deploy-site.mjs}

@@ -1,23 +1,23 @@
-const cleanDeep = require('clean-deep')
-const tempy = require('tempy')
+import cleanDeep from 'clean-deep'
+import tempy from 'tempy'
 
-const edgeFunctions = require('../../lib/edge-functions/index.cjs')
-const { rmdirRecursiveAsync } = require('../../lib/fs.cjs')
-const { warn } = require('../command-helpers.cjs')
+import { deployFileNormalizer, getDistPathIfExists, isEdgeFunctionFile } from '../../lib/edge-functions/deploy.mjs'
+import { rmdirRecursiveAsync } from '../../lib/fs.cjs'
+import { warn } from '../command-helpers.mjs'
 
-const {
+import {
   DEFAULT_CONCURRENT_HASH,
   DEFAULT_CONCURRENT_UPLOAD,
   DEFAULT_DEPLOY_TIMEOUT,
   DEFAULT_MAX_RETRY,
   DEFAULT_SYNC_LIMIT,
-} = require('./constants.cjs')
-const { hashFiles } = require('./hash-files.cjs')
-const { hashFns } = require('./hash-fns.cjs')
-const { uploadFiles } = require('./upload-files.cjs')
-const { getUploadList, waitForDeploy, waitForDiff } = require('./util.cjs')
+} from './constants.mjs'
+import hashFiles from './hash-files.mjs'
+import hashFns from './hash-fns.mjs'
+import uploadFiles from './upload-files.mjs'
+import { getUploadList, waitForDeploy, waitForDiff } from './util.mjs'
 
-const deploySite = async (
+export const deploySite = async (
   api,
   siteId,
   dir,
@@ -54,7 +54,7 @@ const deploySite = async (
     phase: 'start',
   })
 
-  const edgeFunctionsDistPath = await edgeFunctions.getDistPathIfExists({ rootDir })
+  const edgeFunctionsDistPath = await getDistPathIfExists({ rootDir })
   const [{ files, filesShaMap }, { fnShaMap, functionSchedules, functions, functionsWithNativeModules }] =
     await Promise.all([
       hashFiles({
@@ -63,7 +63,7 @@ const deploySite = async (
         directories: [configPath, dir, edgeFunctionsDistPath].filter(Boolean),
         filter,
         hashAlgorithm,
-        normalizer: edgeFunctions.deployFileNormalizer.bind(null, rootDir),
+        normalizer: deployFileNormalizer.bind(null, rootDir),
         statusCb,
       }),
       hashFns(fnDir, {
@@ -79,7 +79,7 @@ const deploySite = async (
         siteEnv,
       }),
     ])
-  const edgeFunctionsCount = Object.keys(files).filter(edgeFunctions.isEdgeFunctionFile).length
+  const edgeFunctionsCount = Object.keys(files).filter(isEdgeFunctionFile).length
   const filesCount = Object.keys(files).length - edgeFunctionsCount
   const functionsCount = Object.keys(functions).length
   const stats = buildStatsString([
@@ -186,5 +186,3 @@ const buildStatsString = (possibleParts) => {
 
   return parts.length > 1 ? `${message} and ${parts[parts.length - 1]}` : message
 }
-
-module.exports = { deploySite }

package/src/utils/deploy/{hash-files.cjs → hash-files.mjs}

@@ -1,9 +1,11 @@
-const { promisify } = require('util')
+import { promisify } from 'util'
 
-const walker = require('folder-walker')
-const pump = promisify(require('pump'))
+import walker from 'folder-walker'
+import pumpModule from 'pump'
 
-const { fileFilterCtor, fileNormalizerCtor, hasherCtor, manifestCollectorCtor } = require('./hasher-segments.cjs')
+import { fileFilterCtor, fileNormalizerCtor, hasherCtor, manifestCollectorCtor } from './hasher-segments.mjs'
+
+const pump = promisify(pumpModule)
 
 const hashFiles = async ({
   assetType = 'file',
@@ -33,4 +35,4 @@ const hashFiles = async ({
   return { files, filesShaMap }
 }
 
-module.exports = { hashFiles }
+export default hashFiles

package/src/utils/deploy/{hash-fns.cjs → hash-fns.mjs}

@@ -1,10 +1,13 @@
-const path = require('path')
-const { promisify } = require('util')
+import { readFile } from 'fs/promises'
+import path from 'path'
+import { promisify } from 'util'
 
-const fromArray = require('from2-array')
-const pump = promisify(require('pump'))
+import fromArray from 'from2-array'
+import pumpModule from 'pump'
 
-const { hasherCtor, manifestCollectorCtor } = require('./hasher-segments.cjs')
+import { hasherCtor, manifestCollectorCtor } from './hasher-segments.mjs'
+
+const pump = promisify(pumpModule)
 
 // Maximum age of functions manifest (2 minutes).
 const MANIFEST_FILE_TTL = 12e4
@@ -26,8 +29,8 @@ const getFunctionZips = async ({
 
   if (manifestPath) {
     try {
-      // eslint-disable-next-line import/no-dynamic-require, n/global-require
-      const { functions, timestamp } = require(manifestPath)
+      // read manifest.json file
+      const { functions, timestamp } = JSON.parse(await readFile(manifestPath))
       const manifestAge = Date.now() - timestamp
 
       if (manifestAge > MANIFEST_FILE_TTL) {
@@ -131,4 +134,4 @@ const hashFns = async (
   return { functionSchedules, functions, functionsWithNativeModules, fnShaMap }
 }
 
-module.exports = { hashFns }
+export default hashFns

package/src/utils/deploy/{hasher-segments.cjs → hasher-segments.mjs}

@@ -1,15 +1,15 @@
-const flushWriteStream = require('flush-write-stream')
-const hasha = require('hasha')
-const transform = require('parallel-transform')
-const { objCtor: objFilterCtor } = require('through2-filter')
-const { obj: map } = require('through2-map')
+import flushWriteStream from 'flush-write-stream'
+import hasha from 'hasha'
+import transform from 'parallel-transform'
+import { objCtor as objFilterCtor } from 'through2-filter'
+import { obj as map } from 'through2-map'
 
-const { normalizePath } = require('./util.cjs')
+import { normalizePath } from './util.mjs'
 
 // a parallel transform stream segment ctor that hashes fileObj's created by folder-walker
 // TODO: use promises instead of callbacks
 /* eslint-disable promise/prefer-await-to-callbacks */
-const hasherCtor = ({ concurrentHash, hashAlgorithm }) => {
+export const hasherCtor = ({ concurrentHash, hashAlgorithm }) => {
   const hashaOpts = { algorithm: hashAlgorithm }
   if (!concurrentHash) throw new Error('Missing required opts')
   return transform(concurrentHash, { objectMode: true }, async (fileObj, cb) => {
@@ -24,7 +24,7 @@ const hasherCtor = ({ concurrentHash, hashAlgorithm }) => {
 }
 
 // Inject normalized file names into normalizedPath and assetType
-const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction }) =>
+export const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction }) =>
   map((fileObj) => {
     const normalizedFile = { ...fileObj, assetType, normalizedPath: normalizePath(fileObj.relname) }
 
@@ -36,7 +36,7 @@ const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction }) =>
   })
 
 // A writable stream segment ctor that normalizes file paths, and writes shaMap's
-const manifestCollectorCtor = (filesObj, shaMap, { assetType, statusCb }) => {
+export const manifestCollectorCtor = (filesObj, shaMap, { assetType, statusCb }) => {
   if (!statusCb || !assetType) throw new Error('Missing required options')
   return flushWriteStream.obj((fileObj, _, cb) => {
     filesObj[fileObj.normalizedPath] = fileObj.hash
@@ -60,11 +60,4 @@ const manifestCollectorCtor = (filesObj, shaMap, { assetType, statusCb }) => {
 /* eslint-enable promise/prefer-await-to-callbacks */
 
 // transform stream ctor that filters folder-walker results for only files
-const fileFilterCtor = objFilterCtor((fileObj) => fileObj.type === 'file')
-
-module.exports = {
-  hasherCtor,
-  fileNormalizerCtor,
-  manifestCollectorCtor,
-  fileFilterCtor,
-}
+export const fileFilterCtor = objFilterCtor((fileObj) => fileObj.type === 'file')

package/src/utils/deploy/{upload-files.cjs → upload-files.mjs}

@@ -1,9 +1,9 @@
-const fs = require('fs')
+import fs from 'fs'
 
-const backoff = require('backoff')
-const pMap = require('p-map')
+import backoff from 'backoff'
+import pMap from 'p-map'
 
-const { UPLOAD_INITIAL_DELAY, UPLOAD_MAX_DELAY, UPLOAD_RANDOM_FACTOR } = require('./constants.cjs')
+import { UPLOAD_INITIAL_DELAY, UPLOAD_MAX_DELAY, UPLOAD_RANDOM_FACTOR } from './constants.mjs'
 
 const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRetry, statusCb }) => {
   if (!concurrentUpload || !statusCb || !maxRetry) throw new Error('Missing required option concurrentUpload')
@@ -115,4 +115,4 @@ const retryUpload = (uploadFn, maxRetry) =>
     tryUpload()
   })
 
-module.exports = { uploadFiles }
+export default uploadFiles

package/src/utils/deploy/{util.cjs → util.mjs}

@@ -1,24 +1,19 @@
-const { sep } = require('path')
+import { sep } from 'path'
 
-const pWaitFor = require('p-wait-for')
+import pWaitFor from 'p-wait-for'
 
-const { DEPLOY_POLL } = require('./constants.cjs')
+import { DEPLOY_POLL } from './constants.mjs'
 
 // normalize windows paths to unix paths
-const normalizePath = (relname) => {
+export const normalizePath = (relname) => {
   if (relname.includes('#') || relname.includes('?')) {
     throw new Error(`Invalid filename ${relname}. Deployed filenames cannot contain # or ? characters`)
   }
-  return (
-    relname
-      .split(sep)
-      // .map(segment => encodeURI(segment)) // TODO I'm fairly certain we shouldn't encodeURI here, thats only for the file upload step
-      .join('/')
-  )
+  return relname.split(sep).join('/')
 }
 
 // poll an async deployId until its done diffing
-const waitForDiff = async (api, deployId, siteId, timeout) => {
+export const waitForDiff = async (api, deployId, siteId, timeout) => {
   // capture ready deploy during poll
   let deploy
 
@@ -56,7 +51,7 @@ const waitForDiff = async (api, deployId, siteId, timeout) => {
 }
 
 // Poll a deployId until its ready
-const waitForDeploy = async (api, deployId, siteId, timeout) => {
+export const waitForDeploy = async (api, deployId, siteId, timeout) => {
   // capture ready deploy during poll
   let deploy
 
@@ -93,14 +88,7 @@ const waitForDeploy = async (api, deployId, siteId, timeout) => {
 }
 
 // Transform the fileShaMap and fnShaMap into a generic shaMap that file-uploader.js can use
-const getUploadList = (required, shaMap) => {
+export const getUploadList = (required, shaMap) => {
   if (!required || !shaMap) return []
   return required.flatMap((sha) => shaMap[sha])
 }
-
-module.exports = {
-  normalizePath,
-  waitForDiff,
-  waitForDeploy,
-  getUploadList,
-}

package/src/utils/detect-server-settings.mjs

@@ -10,8 +10,8 @@ import isPlainObject from 'is-plain-obj'
 
 import { readFileAsyncCatchError } from '../lib/fs.cjs'
 
-import { NETLIFYDEVWARN, chalk, log } from './command-helpers.cjs'
-import { acquirePort } from './dev.cjs'
+import { NETLIFYDEVWARN, chalk, log } from './command-helpers.mjs'
+import { acquirePort } from './dev.mjs'
 import { getInternalFunctionsDir } from './functions/index.mjs'
 
 const formatProperty = (str) => chalk.magenta(`'${str}'`)

package/src/utils/{dev.cjs → dev.mjs}

@@ -1,15 +1,15 @@
 // @ts-check
-const process = require('process')
+import process from 'process'
 
-const { get } = require('dot-prop')
-const getPort = require('get-port')
-const jwt = require('jsonwebtoken')
-const isEmpty = require('lodash/isEmpty')
+import { get } from 'dot-prop'
+import getPort from 'get-port'
+import jwt from 'jsonwebtoken'
+import isEmpty from 'lodash/isEmpty.js'
 
-const { supportsBackgroundFunctions } = require('../lib/account.cjs')
+import { supportsBackgroundFunctions } from '../lib/account.mjs'
 
-const { NETLIFYDEVLOG, chalk, error, log, warn } = require('./command-helpers.cjs')
-const { loadDotEnvFiles } = require('./dot-env.cjs')
+import { NETLIFYDEVLOG, chalk, error, log, warn } from './command-helpers.mjs'
+import { loadDotEnvFiles } from './dot-env.mjs'
 
 // Possible sources of environment variables. For the purpose of printing log messages only. Order does not matter.
 const ENV_VAR_SOURCES = {
@@ -98,7 +98,7 @@ const BACKGROUND_FUNCTION_TIMEOUT = 900
  * @param {*} config.siteInfo
  * @returns
  */
-const getSiteInformation = async ({ api, offline, site, siteInfo }) => {
+export const getSiteInformation = async ({ api, offline, site, siteInfo }) => {
   if (site.id && !offline) {
     validateSiteInfo({ site, siteInfo })
     const [accounts, addons] = await Promise.all([getAccounts({ api }), getAddons({ api, site })])
@@ -139,7 +139,7 @@ const getEnvSourceName = (source) => {
 
 // Takes a set of environment variables in the format provided by @netlify/config, augments it with variables from both
 // dot-env files and the process itself, and injects into `process.env`.
-const injectEnvVariables = async ({ devConfig, env, site }) => {
+export const injectEnvVariables = async ({ devConfig, env, site }) => {
   const environment = new Map(Object.entries(env))
   const dotEnvFiles = await loadDotEnvFiles({ envFiles: devConfig.envFiles, projectDir: site.root })
 
@@ -186,7 +186,7 @@ const injectEnvVariables = async ({ devConfig, env, site }) => {
   process.env.NETLIFY_DEV = 'true'
 }
 
-const acquirePort = async ({ configuredPort, defaultPort, errorMessage }) => {
+export const acquirePort = async ({ configuredPort, defaultPort, errorMessage }) => {
   const acquiredPort = await getPort({ port: configuredPort || defaultPort })
   if (configuredPort && acquiredPort !== configuredPort) {
     throw new Error(`${errorMessage}: '${configuredPort}'`)
@@ -199,7 +199,7 @@ const acquirePort = async ({ configuredPort, defaultPort, errorMessage }) => {
 // - netlify_token -- the bearer token for the Netlify API
 // - authlify_token_id -- the authlify token ID stored for the site after
 //   enabling API Authentication.
-const generateNetlifyGraphJWT = ({ authlifyTokenId, netlifyToken, siteId }) => {
+export const generateNetlifyGraphJWT = ({ authlifyTokenId, netlifyToken, siteId }) => {
   const claims = {
     netlify_token: netlifyToken,
     authlify_token_id: authlifyTokenId,
@@ -215,17 +215,9 @@ const generateNetlifyGraphJWT = ({ authlifyTokenId, netlifyToken, siteId }) => {
   )
 }
 
-const processOnExit = (fn) => {
+export const processOnExit = (fn) => {
   const signals = ['SIGINT', 'SIGTERM', 'SIGQUIT', 'SIGHUP', 'exit']
   signals.forEach((signal) => {
     process.on(signal, fn)
   })
 }
-
-module.exports = {
-  getSiteInformation,
-  injectEnvVariables,
-  acquirePort,
-  generateNetlifyGraphJWT,
-  processOnExit,
-}

package/src/utils/{dot-env.cjs → dot-env.mjs}

@@ -1,14 +1,14 @@
 // @ts-check
-const { readFile } = require('fs').promises
-const path = require('path')
+import { readFile } from 'fs/promises'
+import path from 'path'
 
-const dotenv = require('dotenv')
+import dotenv from 'dotenv'
 
-const { isFileAsync } = require('../lib/fs.cjs')
+import { isFileAsync } from '../lib/fs.cjs'
 
-const { warn } = require('./command-helpers.cjs')
+import { warn } from './command-helpers.mjs'
 
-const loadDotEnvFiles = async function ({ envFiles, projectDir }) {
+export const loadDotEnvFiles = async function ({ envFiles, projectDir }) {
   const response = await tryLoadDotEnvFiles({ projectDir, dotenvFiles: envFiles })
 
   const filesWithWarning = response.filter((el) => el.warning)
@@ -22,7 +22,7 @@ const loadDotEnvFiles = async function ({ envFiles, projectDir }) {
 // in the user configuration, the order is highest to lowest
 const defaultEnvFiles = ['.env.development.local', '.env.local', '.env.development', '.env']
 
-const tryLoadDotEnvFiles = async ({ projectDir, dotenvFiles = defaultEnvFiles }) => {
+export const tryLoadDotEnvFiles = async ({ projectDir, dotenvFiles = defaultEnvFiles }) => {
   const results = await Promise.all(
     dotenvFiles.map(async (file) => {
       const filepath = path.resolve(projectDir, file)
@@ -45,5 +45,3 @@ const tryLoadDotEnvFiles = async ({ projectDir, dotenvFiles = defaultEnvFiles })
   // we return in order of lowest to highest priority
   return results.filter(Boolean).reverse()
 }
-
-module.exports = { loadDotEnvFiles, tryLoadDotEnvFiles }