netlify-cli 12.2.10 → 12.2.11

package/src/commands/open/open.mjs

@@ -1,10 +1,8 @@
-import utils from '../../utils/index.cjs'
+import { log } from '../../utils/command-helpers.mjs'
 
 import { createOpenAdminCommand, openAdmin } from './open-admin.mjs'
 import { createOpenSiteCommand, openSite } from './open-site.mjs'
 
-const { log } = utils
-
 /**
  * The open command
  * @param {import('commander').OptionValues} options

package/src/commands/recipes/recipes.mjs

@@ -4,7 +4,7 @@ import { basename } from 'path'
 import inquirer from 'inquirer'
 import { findBestMatch } from 'string-similarity'
 
-import utils from '../../utils/command-helpers.cjs'
+import { NETLIFYDEVERR, chalk, log } from '../../utils/command-helpers.mjs'
 
 import { getRecipe, listRecipes } from './common.mjs'
 import { createRecipesListCommand } from './recipes-list.mjs'
@@ -32,7 +32,7 @@ const recipesCommand = async (recipeName, options, command) => {
       throw error
     }
 
-    utils.log(`${utils.NETLIFYDEVERR} ${utils.chalk.yellow(recipeName)} is not a valid recipe name.`)
+    log(`${NETLIFYDEVERR} ${chalk.yellow(recipeName)} is not a valid recipe name.`)
 
     const recipes = await listRecipes()
     const recipeNames = recipes.map(({ name }) => name)
@@ -43,7 +43,7 @@ const recipesCommand = async (recipeName, options, command) => {
       const prompt = inquirer.prompt({
         type: 'confirm',
         name: 'suggestion',
-        message: `Did you mean ${utils.chalk.blue(suggestion)}`,
+        message: `Did you mean ${chalk.blue(suggestion)}`,
         default: false,
       })
 

package/src/commands/sites/sites-create-template.mjs

@@ -3,19 +3,18 @@
 import inquirer from 'inquirer'
 import pick from 'lodash/pick.js'
 import parseGitHubUrl from 'parse-github-url'
-import prettyjson from 'prettyjson'
+import { render } from 'prettyjson'
 
+import { chalk, error, getTerminalLink, log, logJson, warn } from '../../utils/command-helpers.mjs'
+import execa from '../../utils/execa.mjs'
 import getRepoData from '../../utils/get-repo-data.mjs'
-import utils from '../../utils/index.cjs'
-import { getGitHubToken } from '../../utils/init/config-github.cjs'
-import { configureRepo } from '../../utils/init/config.cjs'
-import { createRepo, getTemplatesFromGitHub, validateTemplate } from '../../utils/sites/utils.cjs'
+import { getGitHubToken } from '../../utils/init/config-github.mjs'
+import { configureRepo } from '../../utils/init/config.mjs'
+import { createRepo, getTemplatesFromGitHub, validateTemplate } from '../../utils/sites/utils.mjs'
 import { track } from '../../utils/telemetry/index.mjs'
 
 import { getSiteNameInput } from './sites-create.mjs'
 
-const { chalk, error, execa, getTerminalLink, log, logJson, warn } = utils
-
 export const fetchTemplates = async (token) => {
   const templatesFromGithubOrg = await getTemplatesFromGitHub(token)
 
@@ -170,7 +169,7 @@ const sitesCreateTemplate = async (repository, options, command) => {
 
   const siteUrl = site.ssl_url || site.url
   log(
-    prettyjson.render({
+    render({
       'Admin URL': site.admin_url,
       URL: siteUrl,
       'Site ID': site.id,

package/src/commands/sites/sites-create.mjs

@@ -4,14 +4,12 @@ import inquirer from 'inquirer'
 import pick from 'lodash/pick.js'
 import prettyjson from 'prettyjson'
 
+import { chalk, error, log, logJson, warn } from '../../utils/command-helpers.mjs'
 import getRepoData from '../../utils/get-repo-data.mjs'
-import utils from '../../utils/index.cjs'
-import { configureRepo } from '../../utils/init/config.cjs'
+import { configureRepo } from '../../utils/init/config.mjs'
 import { track } from '../../utils/telemetry/index.mjs'
 import { link } from '../link/index.mjs'
 
-const { chalk, error, log, logJson, warn } = utils
-
 export const getSiteNameInput = async (name) => {
   if (!name) {
     const { name: nameInput } = await inquirer.prompt([

package/src/commands/sites/sites-delete.mjs

@@ -1,9 +1,7 @@
 // @ts-check
 import inquirer from 'inquirer'
 
-import utils from '../../utils/index.cjs'
-
-const { chalk, error, exit, log } = utils
+import { chalk, error, exit, log } from '../../utils/command-helpers.mjs'
 
 /**
  * The sites:delete command

package/src/commands/sites/sites-list.mjs

@@ -1,9 +1,7 @@
 // @ts-check
 import { listSites } from '../../lib/api.mjs'
 import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
-import utils from '../../utils/index.cjs'
-
-const { chalk, log, logJson } = utils
+import { chalk, log, logJson } from '../../utils/command-helpers.mjs'
 
 /**
  * The sites:list command

package/src/commands/status/status-hooks.mjs

@@ -2,9 +2,7 @@
 import { get } from 'dot-prop'
 import prettyjson from 'prettyjson'
 
-import utils from '../../utils/index.cjs'
-
-const { error, log, warn } = utils
+import { error, log, warn } from '../../utils/command-helpers.mjs'
 
 /**
  * The status:hooks command

package/src/commands/status/status.mjs

@@ -2,12 +2,10 @@
 import clean from 'clean-deep'
 import prettyjson from 'prettyjson'
 
-import utils from '../../utils/index.cjs'
+import { chalk, error, exit, getToken, log, logJson, warn } from '../../utils/command-helpers.mjs'
 
 import { createStatusHooksCommand } from './status-hooks.mjs'
 
-const { chalk, error, exit, getToken, log, logJson, warn } = utils
-
 /**
  * The status command
  * @param {import('commander').OptionValues} options

package/src/commands/switch/switch.mjs

@@ -1,11 +1,9 @@
 // @ts-check
 import inquirer from 'inquirer'
 
-import utils from '../../utils/index.cjs'
+import { chalk, log } from '../../utils/command-helpers.mjs'
 import { login } from '../login/index.mjs'
 
-const { chalk, log } = utils
-
 const LOGIN_NEW = 'I would like to login to a new account'
 
 /**

package/src/commands/unlink/unlink.mjs

@@ -1,9 +1,7 @@
 // @ts-check
-import utils from '../../utils/index.cjs'
+import { exit, log } from '../../utils/command-helpers.mjs'
 import { track } from '../../utils/telemetry/index.mjs'
 
-const { exit, log } = utils
-
 /**
  * The unlink command
  * @param {import('commander').OptionValues} options

package/src/commands/watch/watch.mjs

@@ -3,11 +3,9 @@ import pWaitFor from 'p-wait-for'
 import prettyjson from 'prettyjson'
 
 import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
-import utils from '../../utils/index.cjs'
+import { chalk, error, log } from '../../utils/command-helpers.mjs'
 import { init } from '../init/index.mjs'
 
-const { chalk, error, log } = utils
-
 // 1 second
 const INIT_WAIT = 1e3
 

package/src/lib/account.mjs

@@ -0,0 +1,14 @@
+// @ts-check
+
+/**
+ * @param {any} account
+ * @param {string} capability
+ * @returns {boolean}
+ */
+const supportsBooleanCapability = (account, capability) => Boolean(account?.capabilities?.[capability]?.included)
+
+/**
+ * @param {any} account
+ * @returns {boolean}
+ */
+export const supportsBackgroundFunctions = (account) => supportsBooleanCapability(account, 'background_functions')

package/src/lib/api.mjs

@@ -1,4 +1,4 @@
-import { warn } from '../utils/command-helpers.cjs'
+import { warn } from '../utils/command-helpers.mjs'
 
 export const cancelDeploy = async ({ api, deployId }) => {
   try {

package/src/lib/completion/generate-autocompletion.mjs

@@ -2,7 +2,7 @@
 import { existsSync, mkdirSync, writeFileSync } from 'fs'
 import { dirname } from 'path'
 
-import { sortOptions, warn } from '../../utils/command-helpers.cjs'
+import { sortOptions, warn } from '../../utils/command-helpers.mjs'
 
 import { AUTOCOMPLETION_FILE } from './constants.mjs'
 

package/src/lib/edge-functions/consts.mjs

@@ -0,0 +1,4 @@
+export const DIST_IMPORT_MAP_PATH = 'edge-functions-import-map.json'
+export const INTERNAL_EDGE_FUNCTIONS_FOLDER = 'edge-functions'
+export const EDGE_FUNCTIONS_FOLDER = 'edge-functions-dist'
+export const PUBLIC_URL_PATH = '.netlify/internal/edge-functions'

package/src/lib/edge-functions/{deploy.cjs → deploy.mjs}

@@ -1,14 +1,14 @@
 // @ts-check
-const { stat } = require('fs').promises
-const { join } = require('path')
+import { stat } from 'fs/promises'
+import { join } from 'path'
 
-const { getPathInProject } = require('../settings.cjs')
+import { getPathInProject } from '../settings.cjs'
 
-const { EDGE_FUNCTIONS_FOLDER, PUBLIC_URL_PATH } = require('./consts.cjs')
+import { EDGE_FUNCTIONS_FOLDER, PUBLIC_URL_PATH } from './consts.mjs'
 
 const distPath = getPathInProject([EDGE_FUNCTIONS_FOLDER])
 
-const deployFileNormalizer = (rootDir, file) => {
+export const deployFileNormalizer = (rootDir, file) => {
   const absoluteDistPath = join(rootDir, distPath)
   const isEdgeFunction = file.root === absoluteDistPath
   const normalizedPath = isEdgeFunction ? `${PUBLIC_URL_PATH}/${file.normalizedPath}` : file.normalizedPath
@@ -19,7 +19,7 @@ const deployFileNormalizer = (rootDir, file) => {
   }
 }
 
-const getDistPathIfExists = async ({ rootDir }) => {
+export const getDistPathIfExists = async ({ rootDir }) => {
   try {
     const absoluteDistPath = join(rootDir, distPath)
     const stats = await stat(absoluteDistPath)
@@ -34,10 +34,4 @@ const getDistPathIfExists = async ({ rootDir }) => {
   }
 }
 
-const isEdgeFunctionFile = (filePath) => filePath.startsWith(`${PUBLIC_URL_PATH}/`)
-
-module.exports = {
-  deployFileNormalizer,
-  getDistPathIfExists,
-  isEdgeFunctionFile,
-}
+export const isEdgeFunctionFile = (filePath) => filePath.startsWith(`${PUBLIC_URL_PATH}/`)

package/src/lib/edge-functions/{headers.cjs → headers.mjs}

@@ -1,4 +1,4 @@
-module.exports = {
+const headers = {
   ForwardedHost: 'x-forwarded-host',
   ForwardedProtocol: 'x-forwarded-proto',
   Functions: 'x-deno-functions',
@@ -8,3 +8,5 @@ module.exports = {
   IP: 'x-nf-client-connection-ip',
   Site: 'X-NF-Site-Info',
 }
+
+export default headers

package/src/lib/edge-functions/{internal.cjs → internal.mjs}

@@ -1,13 +1,13 @@
 // @ts-check
-const { promises: fs } = require('fs')
-const { dirname, join, resolve } = require('path')
-const { cwd } = require('process')
-const { pathToFileURL } = require('url')
+import { readFile, stat } from 'fs/promises'
+import { dirname, join, resolve } from 'path'
+import { cwd } from 'process'
+import { pathToFileURL } from 'url'
 
-const { warn } = require('../../utils/command-helpers.cjs')
-const { getPathInProject } = require('../settings.cjs')
+import { warn } from '../../utils/command-helpers.mjs'
+import { getPathInProject } from '../settings.cjs'
 
-const { INTERNAL_EDGE_FUNCTIONS_FOLDER } = require('./consts.cjs')
+import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.mjs'
 
 /**
  * Reads an import map from a path and returns the parsed data, if it exists
@@ -18,7 +18,7 @@ const { INTERNAL_EDGE_FUNCTIONS_FOLDER } = require('./consts.cjs')
  */
 const getImportMap = async (importMapPath) => {
   try {
-    const data = await fs.readFile(importMapPath)
+    const data = await readFile(importMapPath)
     const importMap = JSON.parse(data)
 
     return importMap
@@ -29,19 +29,25 @@ const getImportMap = async (importMapPath) => {
   }
 }
 
-const getInternalFunctions = async () => {
+export const getInternalFunctions = async () => {
   const path = join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
 
   try {
-    const stats = await fs.stat(path)
+    const stats = await stat(path)
 
     if (!stats.isDirectory()) {
-      throw new Error('Path is not a directory')
+      throw new Error('Internal edge functions directory expected')
     }
+  } catch {
+    return {
+      functions: [],
+      path: null,
+    }
+  }
 
+  try {
     const manifestPath = join(path, 'manifest.json')
-    // eslint-disable-next-line import/no-dynamic-require, n/global-require
-    const manifest = require(manifestPath)
+    const manifest = JSON.parse(await readFile(manifestPath))
 
     if (manifest.version !== 1) {
       throw new Error('Unsupported manifest format')
@@ -75,5 +81,3 @@ const getInternalFunctions = async () => {
     }
   }
 }
-
-module.exports = { getInternalFunctions }

package/src/lib/edge-functions/{proxy.cjs → proxy.mjs}

@@ -1,20 +1,20 @@
 // @ts-check
-const { Buffer } = require('buffer')
-const { relative } = require('path')
-const { cwd, env } = require('process')
+import { Buffer } from 'buffer'
+import { relative } from 'path'
+import { cwd, env } from 'process'
 
-const getAvailablePort = require('get-port')
-const { v4: generateUUID } = require('uuid')
+import getAvailablePort from 'get-port'
+import { v4 as generateUUID } from 'uuid'
 
-const { NETLIFYDEVERR, NETLIFYDEVWARN, chalk, error: printError, log } = require('../../utils/command-helpers.cjs')
-const { getGeoLocation } = require('../geo-location.cjs')
-const { getPathInProject } = require('../settings.cjs')
-const { startSpinner, stopSpinner } = require('../spinner.cjs')
+import { NETLIFYDEVERR, NETLIFYDEVWARN, chalk, error as printError, log } from '../../utils/command-helpers.mjs'
+import { getGeoLocation } from '../geo-location.mjs'
+import { getPathInProject } from '../settings.cjs'
+import { startSpinner, stopSpinner } from '../spinner.cjs'
 
-const { DIST_IMPORT_MAP_PATH } = require('./consts.cjs')
-const headers = require('./headers.cjs')
-const { getInternalFunctions } = require('./internal.cjs')
-const { EdgeFunctionsRegistry } = require('./registry.cjs')
+import { DIST_IMPORT_MAP_PATH } from './consts.mjs'
+import headers from './headers.mjs'
+import { getInternalFunctions } from './internal.mjs'
+import { EdgeFunctionsRegistry } from './registry.mjs'
 
 const headersSymbol = Symbol('Edge Functions Headers')
 
@@ -40,20 +40,20 @@ const getDownloadUpdateFunctions = () => {
   }
 }
 
-const handleProxyRequest = (req, proxyReq) => {
+export const handleProxyRequest = (req, proxyReq) => {
   Object.entries(req[headersSymbol]).forEach(([header, value]) => {
     proxyReq.setHeader(header, value)
   })
 }
 
-const createSiteInfoHeader = (siteInfo = {}) => {
+export const createSiteInfoHeader = (siteInfo = {}) => {
   const { id, name, url } = siteInfo
   const site = { id, name, url }
   const siteString = JSON.stringify(site)
   return Buffer.from(siteString).toString('base64')
 }
 
-const initializeProxy = async ({
+export const initializeProxy = async ({
   config,
   configPath,
   env: configEnv,
@@ -88,7 +88,7 @@ const initializeProxy = async ({
     port: isolatePort,
     projectDir,
   })
-  const hasEdgeFunctions = userFunctionsPath !== undefined || internalFunctions.length !== 0
+  const hasEdgeFunctions = userFunctionsPath !== undefined || internalFunctionsPath
 
   return async (req) => {
     if (req.headers[headers.Passthrough] !== undefined || !hasEdgeFunctions) {
@@ -145,7 +145,7 @@ const initializeProxy = async ({
   }
 }
 
-const isEdgeFunctionsRequest = (req) => req[headersSymbol] !== undefined
+export const isEdgeFunctionsRequest = (req) => req[headersSymbol] !== undefined
 
 const prepareServer = async ({
   certificatePath,
@@ -195,5 +195,3 @@ const prepareServer = async ({
     printError(error.message, { exit: false })
   }
 }
-
-module.exports = { handleProxyRequest, initializeProxy, isEdgeFunctionsRequest, createSiteInfoHeader }

package/src/lib/edge-functions/{registry.cjs → registry.mjs}

@@ -1,7 +1,7 @@
 // @ts-check
-const { fileURLToPath } = require('url')
+import { fileURLToPath } from 'url'
 
-const { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log, warn, watchDebounced } = require('../../utils/command-helpers.cjs')
+import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log, warn, watchDebounced } from '../../utils/command-helpers.mjs'
 
 /**
  * @typedef EdgeFunction
@@ -26,7 +26,7 @@ const { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log, warn, watchDebounced } = requi
 
 /** @typedef {(EdgeFunctionDeclarationWithPath | EdgeFunctionDeclarationWithPattern) } EdgeFunctionDeclaration */
 
-class EdgeFunctionsRegistry {
+export class EdgeFunctionsRegistry {
   /**
    * @param {Object} opts
    * @param {import('@netlify/edge-bundler')} opts.bundler
@@ -448,5 +448,3 @@ class EdgeFunctionsRegistry {
     this.directoryWatchers.set(directory, watcher)
   }
 }
-
-module.exports = { EdgeFunctionsRegistry }

package/src/lib/{exec-fetcher.cjs → exec-fetcher.mjs}

@@ -1,18 +1,18 @@
 // @ts-check
-const path = require('path')
-const process = require('process')
+import path from 'path'
+import process from 'process'
 
-const { fetchLatest, fetchVersion, newerVersion, updateAvailable } = require('gh-release-fetch')
-const isExe = require('isexe')
+import { fetchLatest, fetchVersion, newerVersion, updateAvailable } from 'gh-release-fetch'
+import isExe from 'isexe'
 
-const { NETLIFYDEVWARN, error, getTerminalLink, log } = require('../utils/command-helpers.cjs')
-const execa = require('../utils/execa.cjs')
+import { NETLIFYDEVWARN, error, getTerminalLink, log } from '../utils/command-helpers.mjs'
+import execa from '../utils/execa.mjs'
 
 const isWindows = () => process.platform === 'win32'
 
 const getRepository = ({ packageName }) => `netlify/${packageName}`
 
-const getExecName = ({ execName }) => (isWindows() ? `${execName}.exe` : execName)
+export const getExecName = ({ execName }) => (isWindows() ? `${execName}.exe` : execName)
 
 const getOptions = () => {
   // this is used in out CI tests to avoid hitting GitHub API limit
@@ -33,7 +33,14 @@ const isVersionOutdated = async ({ currentVersion, latestVersion, packageName })
   return outdated
 }
 
-const shouldFetchLatestVersion = async ({ binPath, execArgs, execName, latestVersion, packageName, pattern }) => {
+export const shouldFetchLatestVersion = async ({
+  binPath,
+  execArgs,
+  execName,
+  latestVersion,
+  packageName,
+  pattern,
+}) => {
   const execPath = path.join(binPath, getExecName({ execName }))
 
   const exists = await isExe(execPath, { ignoreErrors: true })
@@ -69,7 +76,7 @@ const shouldFetchLatestVersion = async ({ binPath, execArgs, execName, latestVer
   }
 }
 
-const getArch = () => {
+export const getArch = () => {
   switch (process.arch) {
     case 'x64':
       return 'amd64'
@@ -91,7 +98,7 @@ const getArch = () => {
  * @param {string} config.packageName
  * @param {string} [config.latestVersion ]
  */
-const fetchLatestVersion = async ({ destination, execName, extension, latestVersion, packageName }) => {
+export const fetchLatestVersion = async ({ destination, execName, extension, latestVersion, packageName }) => {
   const win = isWindows()
   const arch = getArch()
   const platform = win ? 'windows' : process.platform
@@ -133,5 +140,3 @@ ${issueLink}`)
     error(error_)
   }
 }
-
-module.exports = { getArch, getExecName, shouldFetchLatestVersion, fetchLatestVersion }

package/src/lib/functions/{background.cjs → background.mjs}

@@ -1,16 +1,16 @@
-const { NETLIFYDEVERR, NETLIFYDEVLOG } = require('../../utils/index.cjs')
+import { NETLIFYDEVERR, NETLIFYDEVLOG } from '../../utils/command-helpers.mjs'
 
-const { formatLambdaError, styleFunctionName } = require('./utils.cjs')
+import { formatLambdaError, styleFunctionName } from './utils.mjs'
 
 const BACKGROUND_FUNCTION_STATUS_CODE = 202
 
-const handleBackgroundFunction = (functionName, response) => {
+export const handleBackgroundFunction = (functionName, response) => {
   console.log(`${NETLIFYDEVLOG} Queueing background function ${styleFunctionName(functionName)} for execution`)
   response.status(BACKGROUND_FUNCTION_STATUS_CODE)
   response.end()
 }
 
-const handleBackgroundFunctionResult = (functionName, err) => {
+export const handleBackgroundFunctionResult = (functionName, err) => {
   if (err) {
     console.log(
       `${NETLIFYDEVERR} Error during background function ${styleFunctionName(functionName)} execution:`,
@@ -20,5 +20,3 @@ const handleBackgroundFunctionResult = (functionName, err) => {
     console.log(`${NETLIFYDEVLOG} Done executing background function ${styleFunctionName(functionName)}`)
   }
 }
-
-module.exports = { handleBackgroundFunction, handleBackgroundFunctionResult }

package/src/lib/functions/{config.cjs → config.mjs}

@@ -1,7 +1,7 @@
 // The function configuration keys returned by @netlify/config are not an exact
 // match to the properties that @netlify/zip-it-and-ship-it expects. We do that
 // translation here.
-const normalizeFunctionsConfig = ({ functionsConfig = {}, projectRoot, siteEnv = {} }) =>
+export const normalizeFunctionsConfig = ({ functionsConfig = {}, projectRoot, siteEnv = {} }) =>
   Object.entries(functionsConfig).reduce(
     (result, [pattern, config]) => ({
       ...result,
@@ -19,5 +19,3 @@ const normalizeFunctionsConfig = ({ functionsConfig = {}, projectRoot, siteEnv =
     }),
     {},
   )
-
-module.exports = { normalizeFunctionsConfig }

package/src/lib/functions/form-submissions-handler.mjs

@@ -5,9 +5,9 @@ import { parse as parseContentType } from 'content-type'
 import multiparty from 'multiparty'
 import getRawBody from 'raw-body'
 
-import { warn } from '../../utils/command-helpers.cjs'
+import { warn } from '../../utils/command-helpers.mjs'
 import { BACKGROUND } from '../../utils/functions/index.mjs'
-import { capitalize } from '../string.cjs'
+import { capitalize } from '../string.mjs'
 
 const getFormHandler = function ({ functionsRegistry }) {
   const handlers = ['submission-created', `submission-created${BACKGROUND}`]

package/src/lib/functions/{local-proxy.cjs → local-proxy.mjs}

@@ -1,11 +1,11 @@
 // @ts-check
-const { stdout } = require('process')
+import { stdout } from 'process'
 
-const { getBinaryPath: getFunctionsProxyPath } = require('@netlify/local-functions-proxy')
+import { getBinaryPath as getFunctionsProxyPath } from '@netlify/local-functions-proxy'
 
-const { execa } = require('../../utils/index.cjs')
+import execa from '../../utils/execa.mjs'
 
-const runFunctionsProxy = ({ binaryPath, context, directory, event, name, timeout }) => {
+export const runFunctionsProxy = ({ binaryPath, context, directory, event, name, timeout }) => {
   const functionsProxyPath = getFunctionsProxyPath()
   const requestData = {
     resource: '',
@@ -43,5 +43,3 @@ const runFunctionsProxy = ({ binaryPath, context, directory, event, name, timeou
 
   return proxyProcess
 }
-
-module.exports = { runFunctionsProxy }

package/src/lib/functions/{memoized-build.cjs → memoized-build.mjs}

@@ -8,7 +8,7 @@ const DEBOUNCE_INTERVAL = 300
 // This allows us to discard any duplicate filesystem events, while ensuring
 // that actual updates happening during the zip operation will be executed
 // after it finishes (only the last update will run).
-const memoizedBuild = ({ cache, cacheKey, command }) => {
+export const memoizedBuild = ({ cache, cacheKey, command }) => {
   if (cache[cacheKey] === undefined) {
     cache[cacheKey] = {
       // eslint-disable-next-line promise/prefer-await-to-then
@@ -29,5 +29,3 @@ const memoizedBuild = ({ cache, cacheKey, command }) => {
 
   return cache[cacheKey].task
 }
-
-module.exports = { memoizedBuild }

package/src/lib/functions/{netlify-function.cjs → netlify-function.mjs}

@@ -1,9 +1,8 @@
 // @ts-check
-const CronParser = require('cron-parser')
+import CronParser from 'cron-parser'
 
-const { error: errorExit } = require('../../utils/command-helpers.cjs')
-
-const BACKGROUND_SUFFIX = '-background'
+import { error as errorExit } from '../../utils/command-helpers.mjs'
+import { BACKGROUND } from '../../utils/functions/get-functions.mjs'
 
 // Returns a new set with all elements of `setA` that don't exist in `setB`.
 const difference = (setA, setB) => new Set([...setA].filter((item) => !setB.has(item)))
@@ -15,7 +14,7 @@ const getNextRun = function (schedule) {
   return cron.next().toDate()
 }
 
-class NetlifyFunction {
+export default class NetlifyFunction {
   constructor({
     config,
     directory,
@@ -40,7 +39,7 @@ class NetlifyFunction {
 
     // Determines whether this is a background function based on the function
     // name.
-    this.isBackground = name.endsWith(BACKGROUND_SUFFIX)
+    this.isBackground = name.endsWith(BACKGROUND)
 
     const functionConfig = config.functions && config.functions[name]
     this.schedule = functionConfig && functionConfig.schedule
@@ -143,5 +142,3 @@ class NetlifyFunction {
     return url.href
   }
 }
-
-module.exports = { NetlifyFunction }