netlify-cli 12.2.10 → 12.3.0

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 }

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

@@ -1,26 +1,26 @@
 // @ts-check
-const { mkdir } = require('fs').promises
-const { extname, isAbsolute, join } = require('path')
-const { env } = require('process')
+import { mkdir } from 'fs/promises'
+import { extname, isAbsolute, join } from 'path'
+import { env } from 'process'
 
-const {
-  NETLIFYDEVERR,
-  NETLIFYDEVLOG,
-  NETLIFYDEVWARN,
+import {
   chalk,
   getTerminalLink,
   log,
+  NETLIFYDEVERR,
+  NETLIFYDEVLOG,
+  NETLIFYDEVWARN,
   warn,
   watchDebounced,
-} = require('../../utils/index.cjs')
-const { getLogMessage } = require('../log.cjs')
+} from '../../utils/command-helpers.mjs'
+import { getLogMessage } from '../log.mjs'
 
-const { NetlifyFunction } = require('./netlify-function.cjs')
-const runtimes = require('./runtimes/index.cjs')
+import NetlifyFunction from './netlify-function.mjs'
+import runtimes from './runtimes/index.mjs'
 
 const ZIP_EXTENSION = '.zip'
 
-class FunctionsRegistry {
+export class FunctionsRegistry {
   constructor({ capabilities, config, isConnected = false, projectRoot, settings, timeouts }) {
     this.capabilities = capabilities
     this.config = config
@@ -262,5 +262,3 @@ class FunctionsRegistry {
     }
   }
 }
-
-module.exports = { FunctionsRegistry }

package/src/lib/functions/runtimes/go/{index.cjs → index.mjs}

@@ -1,13 +1,15 @@
 // @ts-check
-const { dirname, extname } = require('path')
-const { platform } = require('process')
+import { dirname, extname } from 'path'
+import { platform } from 'process'
 
-const tempy = require('tempy')
+import tempy from 'tempy'
+
+import execa from '../../../../utils/execa.mjs'
+import { runFunctionsProxy } from '../../local-proxy.mjs'
 
 const isWindows = platform === 'win32'
 
-const { execa } = require('../../../../utils/index.cjs')
-const { runFunctionsProxy } = require('../../local-proxy.cjs')
+export const name = 'go'
 
 const build = async ({ binaryPath, functionDirectory }) => {
   try {
@@ -37,14 +39,14 @@ const checkGoInstallation = async ({ cwd }) => {
   }
 }
 
-const getBuildFunction = ({ func }) => {
+export const getBuildFunction = ({ func }) => {
   const functionDirectory = dirname(func.mainFile)
   const binaryPath = tempy.file(isWindows ? { extension: 'exe' } : undefined)
 
   return () => build({ binaryPath, functionDirectory })
 }
 
-const invokeFunction = async ({ context, event, func, timeout }) => {
+export const invokeFunction = async ({ context, event, func, timeout }) => {
   const { stdout } = await runFunctionsProxy({
     binaryPath: func.buildData.binaryPath,
     context,
@@ -70,10 +72,8 @@ const invokeFunction = async ({ context, event, func, timeout }) => {
   }
 }
 
-const onRegister = (func) => {
+export const onRegister = (func) => {
   const isSource = extname(func.mainFile) === '.go'
 
   return isSource ? func : null
 }
-
-module.exports = { getBuildFunction, invokeFunction, name: 'go', onRegister }

package/src/lib/functions/runtimes/{index.cjs → index.mjs}

@@ -1,11 +1,12 @@
-const go = require('./go/index.cjs')
-const js = require('./js/index.cjs')
-const rust = require('./rust/index.cjs')
-
+/* eslint-disable import/no-namespace */
+import * as go from './go/index.mjs'
+import * as js from './js/index.mjs'
+import * as rust from './rust/index.mjs'
+/* eslint-enable import/no-namespace */
 /**
  * @callback BuildFunction
  * @param {object} func
- * @returns {Promise<{srcFiles: string[], buildPath?: string>}
+ * @returns {Promise<{srcFiles: string[], buildPath?: string}>}
  */
 
 /**
@@ -41,6 +42,10 @@ const rust = require('./rust/index.cjs')
  * @property {string} name
  */
 
-const runtimes = [js, go, rust].reduce((res, runtime) => ({ ...res, [runtime.name]: runtime }), {})
+const runtimes = {
+  [go.name]: go,
+  [js.name]: js,
+  [rust.name]: rust,
+}
 
-module.exports = runtimes
+export default runtimes

package/src/lib/functions/runtimes/js/builders/{netlify-lambda.cjs → netlify-lambda.mjs}

@@ -1,14 +1,14 @@
 // @ts-check
-const { readFile } = require('fs').promises
-const { resolve } = require('path')
+import { readFile } from 'fs/promises'
+import { resolve } from 'path'
 
-const minimist = require('minimist')
+import minimist from 'minimist'
 
-const { execa } = require('../../../../../utils/index.cjs')
-const { fileExistsAsync } = require('../../../../fs.cjs')
-const { memoizedBuild } = require('../../../memoized-build.cjs')
+import execa from '../../../../../utils/execa.mjs'
+import { fileExistsAsync } from '../../../../fs.cjs'
+import { memoizedBuild } from '../../../memoized-build.mjs'
 
-const detectNetlifyLambda = async function ({ packageJson } = {}) {
+export const detectNetlifyLambda = async function ({ packageJson } = {}) {
   const { dependencies, devDependencies, scripts } = packageJson || {}
   if (!((dependencies && dependencies['netlify-lambda']) || (devDependencies && devDependencies['netlify-lambda']))) {
     return false
@@ -19,7 +19,11 @@ const detectNetlifyLambda = async function ({ packageJson } = {}) {
   // eslint-disable-next-line fp/no-loops
   for (const [key, script] of matchingScripts) {
     // E.g. ["netlify-lambda", "build", "functions/folder"]
-    const match = minimist(script.split(' '))
+    const match = minimist(script.split(' '), {
+      // these are all valid options for netlify-lambda
+      boolean: ['s', 'static'],
+      string: ['c', 'config', 'p', 'port', 'b', 'babelrc', 't', 'timeout'],
+    })
     // We are not interested in 'netlify-lambda' and 'build' commands
     const functionDirectories = match._.slice(2)
     if (functionDirectories.length === 1) {
@@ -54,7 +58,7 @@ const detectNetlifyLambda = async function ({ packageJson } = {}) {
   return false
 }
 
-module.exports = async function handler() {
+export default async function handler() {
   const exists = await fileExistsAsync('package.json')
   if (!exists) {
     return false
@@ -64,4 +68,3 @@ module.exports = async function handler() {
   const packageJson = JSON.parse(content)
   return detectNetlifyLambda({ packageJson })
 }
-module.exports.detectNetlifyLambda = detectNetlifyLambda

package/src/lib/functions/runtimes/js/builders/{zisi.cjs → zisi.mjs}

@@ -1,14 +1,17 @@
-const { mkdir, writeFile } = require('fs').promises
-const path = require('path')
+import { mkdir, writeFile } from 'fs/promises'
+import { createRequire } from 'module'
+import path from 'path'
 
-const decache = require('decache')
-const readPkgUp = require('read-pkg-up')
-const sourceMapSupport = require('source-map-support')
+import decache from 'decache'
+import readPkgUp from 'read-pkg-up'
+import sourceMapSupport from 'source-map-support'
 
-const { NETLIFYDEVERR } = require('../../../../../utils/index.cjs')
-const { getPathInProject } = require('../../../../settings.cjs')
-const { normalizeFunctionsConfig } = require('../../../config.cjs')
-const { memoizedBuild } = require('../../../memoized-build.cjs')
+import { NETLIFYDEVERR } from '../../../../../utils/command-helpers.mjs'
+import { getPathInProject } from '../../../../settings.cjs'
+import { normalizeFunctionsConfig } from '../../../config.mjs'
+import { memoizedBuild } from '../../../memoized-build.mjs'
+
+const require = createRequire(import.meta.url)
 
 const addFunctionsConfigDefaults = (config) => ({
   ...config,
@@ -26,6 +29,7 @@ const buildFunction = async ({ cache, config, directory, func, hasTypeModule, pr
   }
   const functionDirectory = path.dirname(func.mainFile)
 
+  // performance
   const { zipFunction } = await import('@netlify/zip-it-and-ship-it')
 
   // If we have a function at `functions/my-func/index.js` and we pass
@@ -71,7 +75,7 @@ const buildFunction = async ({ cache, config, directory, func, hasTypeModule, pr
  * @param {string} params.mainFile
  * @param {string} params.projectRoot
  */
-const parseForSchedule = async ({ config, mainFile, projectRoot }) => {
+export const parseForSchedule = async ({ config, mainFile, projectRoot }) => {
   const { listFunction } = await import('@netlify/zip-it-and-ship-it')
   const listedFunction = await listFunction(mainFile, {
     config: netlifyConfigToZisiConfig({ config, projectRoot }),
@@ -104,7 +108,7 @@ const getTargetDirectory = async ({ errorExit }) => {
 const netlifyConfigToZisiConfig = ({ config, projectRoot }) =>
   addFunctionsConfigDefaults(normalizeFunctionsConfig({ functionsConfig: config.functions, projectRoot }))
 
-module.exports = async ({ config, directory, errorExit, func, projectRoot }) => {
+export default async function handler({ config, directory, errorExit, func, projectRoot }) {
   const functionsConfig = netlifyConfigToZisiConfig({ config, projectRoot })
 
   const packageJson = await readPkgUp(func.mainFile)
@@ -138,5 +142,3 @@ module.exports = async ({ config, directory, errorExit, func, projectRoot }) =>
     target: targetDirectory,
   }
 }
-
-module.exports.parseForSchedule = parseForSchedule

package/src/lib/functions/runtimes/js/{index.cjs → index.mjs}

@@ -1,12 +1,14 @@
-const { dirname } = require('path')
+import { dirname } from 'path'
 
-const lambdaLocal = require('lambda-local')
-const winston = require('winston')
+import lambdaLocal from 'lambda-local'
+import winston from 'winston'
 
-const detectNetlifyLambdaBuilder = require('./builders/netlify-lambda.cjs')
-const detectZisiBuilder = require('./builders/zisi.cjs')
+import detectNetlifyLambdaBuilder from './builders/netlify-lambda.mjs'
+import detectZisiBuilder, { parseForSchedule } from './builders/zisi.mjs'
 
-const SECONDS_TO_MILLISECONDS = 1e3
+export const name = 'js'
+
+const SECONDS_TO_MILLISECONDS = 1000
 
 let netlifyLambdaDetectorCache
 
@@ -28,7 +30,7 @@ const detectNetlifyLambdaWithCache = () => {
   return netlifyLambdaDetectorCache
 }
 
-const getBuildFunction = async ({ config, directory, errorExit, func, projectRoot }) => {
+export const getBuildFunction = async ({ config, directory, errorExit, func, projectRoot }) => {
   const netlifyLambdaBuilder = await detectNetlifyLambdaWithCache()
 
   if (netlifyLambdaBuilder) {
@@ -46,12 +48,12 @@ const getBuildFunction = async ({ config, directory, errorExit, func, projectRoo
   // main file otherwise.
   const functionDirectory = dirname(func.mainFile)
   const srcFiles = functionDirectory === directory ? [func.mainFile] : [functionDirectory]
-  const schedule = await detectZisiBuilder.parseForSchedule({ mainFile: func.mainFile, config, projectRoot })
+  const schedule = await parseForSchedule({ mainFile: func.mainFile, config, projectRoot })
 
   return () => ({ schedule, srcFiles })
 }
 
-const invokeFunction = async ({ context, event, func, timeout }) => {
+export const invokeFunction = async ({ context, event, func, timeout }) => {
   // If a function builder has defined a `buildPath` property, we use it.
   // Otherwise, we'll invoke the function's main file.
   const lambdaPath = (func.buildData && func.buildData.buildPath) || func.mainFile
@@ -66,7 +68,7 @@ const invokeFunction = async ({ context, event, func, timeout }) => {
   return result
 }
 
-const onDirectoryScan = async () => {
+export const onDirectoryScan = async () => {
   const netlifyLambdaBuilder = await detectNetlifyLambdaWithCache()
 
   // Before we start a directory scan, we check whether netlify-lambda is being
@@ -76,5 +78,3 @@ const onDirectoryScan = async () => {
     await netlifyLambdaBuilder.build()
   }
 }
-
-module.exports = { getBuildFunction, invokeFunction, name: 'js', onDirectoryScan }

package/src/lib/functions/runtimes/rust/{index.cjs → index.mjs}

@@ -1,16 +1,18 @@
 // @ts-check
-const { readFile } = require('fs').promises
-const { dirname, extname, join, resolve } = require('path')
-const { platform } = require('process')
+import { readFile } from 'fs/promises'
+import { dirname, extname, join, resolve } from 'path'
+import { platform } from 'process'
 
-const findUp = require('find-up')
-const toml = require('toml')
+import findUp from 'find-up'
+import toml from 'toml'
+
+import execa from '../../../../utils/execa.mjs'
+import { getPathInProject } from '../../../settings.cjs'
+import { runFunctionsProxy } from '../../local-proxy.mjs'
 
 const isWindows = platform === 'win32'
 
-const { execa } = require('../../../../utils/index.cjs')
-const { getPathInProject } = require('../../../settings.cjs')
-const { runFunctionsProxy } = require('../../local-proxy.cjs')
+export const name = 'rs'
 
 const build = async ({ func }) => {
   const functionDirectory = dirname(func.mainFile)
@@ -30,7 +32,7 @@ const build = async ({ func }) => {
   }
 }
 
-const getBuildFunction =
+export const getBuildFunction =
   ({ func }) =>
   () =>
     build({ func })
@@ -38,12 +40,12 @@ const getBuildFunction =
 const getCrateName = async (cwd) => {
   const manifestPath = await findUp('Cargo.toml', { cwd, type: 'file' })
   const manifest = await readFile(manifestPath, 'utf-8')
-  const { package } = toml.parse(manifest)
+  const { package: CargoPackage } = toml.parse(manifest)
 
-  return package.name
+  return CargoPackage.name
 }
 
-const invokeFunction = async ({ context, event, func, timeout }) => {
+export const invokeFunction = async ({ context, event, func, timeout }) => {
   const { stdout } = await runFunctionsProxy({
     binaryPath: func.buildData.binaryPath,
     context,
@@ -69,10 +71,8 @@ const invokeFunction = async ({ context, event, func, timeout }) => {
   }
 }
 
-const onRegister = (func) => {
+export const onRegister = (func) => {
   const isSource = extname(func.mainFile) === '.rs'
 
   return isSource ? func : null
 }
-
-module.exports = { getBuildFunction, invokeFunction, name: 'rs', onRegister }

package/src/lib/functions/scheduled.mjs

@@ -2,7 +2,7 @@ import AnsiToHtml from 'ansi-to-html'
 
 import { CLOCKWORK_USERAGENT } from '../../utils/functions/index.mjs'
 
-import { formatLambdaError } from './utils.cjs'
+import { formatLambdaError } from './utils.mjs'
 
 const ansiToHtml = new AnsiToHtml()
 

package/src/lib/functions/server.mjs

@@ -2,17 +2,16 @@
 import { get } from 'dot-prop'
 import jwtDecode from 'jwt-decode'
 
+import { NETLIFYDEVERR, NETLIFYDEVLOG, error as errorExit, log } from '../../utils/command-helpers.mjs'
+import { generateNetlifyGraphJWT } from '../../utils/dev.mjs'
 import { CLOCKWORK_USERAGENT, getInternalFunctionsDir } from '../../utils/functions/index.mjs'
-import utils from '../../utils/index.cjs'
 
-import { handleBackgroundFunction, handleBackgroundFunctionResult } from './background.cjs'
+import { handleBackgroundFunction, handleBackgroundFunctionResult } from './background.mjs'
 import { createFormSubmissionHandler } from './form-submissions-handler.mjs'
-import { FunctionsRegistry } from './registry.cjs'
+import { FunctionsRegistry } from './registry.mjs'
 import { handleScheduledFunction } from './scheduled.mjs'
-import { handleSynchronousFunction } from './synchronous.cjs'
-import { shouldBase64Encode } from './utils.cjs'
-
-const { NETLIFYDEVERR, NETLIFYDEVLOG, error: errorExit, generateNetlifyGraphJWT, log } = utils
+import { handleSynchronousFunction } from './synchronous.mjs'
+import { shouldBase64Encode } from './utils.mjs'
 
 const buildClientContext = function (headers) {
   // inject a client context based on auth header, ported over from netlify-lambda (https://github.com/netlify/netlify-lambda/pull/57)

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

@@ -1,10 +1,10 @@
 // @ts-check
-const { Buffer } = require('buffer')
+import { Buffer } from 'buffer'
 
-const { NETLIFYDEVERR } = require('../../utils/index.cjs')
-const renderErrorTemplate = require('../render-error-remplate.cjs')
+import { NETLIFYDEVERR } from '../../utils/command-helpers.mjs'
+import renderErrorTemplate from '../render-error-template.mjs'
 
-const { detectAwsSdkError } = require('./utils.cjs')
+import { detectAwsSdkError } from './utils.mjs'
 
 const addHeaders = (headers, response) => {
   if (!headers) {
@@ -16,7 +16,7 @@ const addHeaders = (headers, response) => {
   })
 }
 
-const handleSynchronousFunction = function (err, result, request, response) {
+export const handleSynchronousFunction = function (err, result, request, response) {
   if (err) {
     return handleErr(err, request, response)
   }
@@ -82,5 +82,3 @@ const validateLambdaResponse = (lambdaResponse) => {
 
   return {}
 }
-
-module.exports = { handleSynchronousFunction }

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

@@ -1,14 +1,8 @@
 // @ts-check
-const { chalk, warn } = require('../../utils/index.cjs')
-const { getLogMessage } = require('../log.cjs')
+import { chalk, warn } from '../../utils/command-helpers.mjs'
+import { getLogMessage } from '../log.mjs'
 
-const DEFAULT_LAMBDA_OPTIONS = {
-  verboseLevel: 3,
-}
-
-const SECONDS_TO_MILLISECONDS = 1000
-
-const detectAwsSdkError = ({ error }) => {
+export const detectAwsSdkError = ({ error }) => {
   const isAwsSdkError = error && error.errorMessage && error.errorMessage.includes("Cannot find module 'aws-sdk'")
 
   if (isAwsSdkError) {
@@ -16,7 +10,7 @@ const detectAwsSdkError = ({ error }) => {
   }
 }
 
-const formatLambdaError = (err) => chalk.red(`${err.errorType}: ${err.errorMessage}`)
+export const formatLambdaError = (err) => chalk.red(`${err.errorType}: ${err.errorMessage}`)
 
 // should be equivalent to https://github.com/netlify/proxy/blob/main/pkg/functions/request.go#L105
 const exceptionsList = new Set([
@@ -33,7 +27,7 @@ const exceptionsList = new Set([
  * @param {string | undefined} contentType
  * @returns {boolean}
  */
-const shouldBase64Encode = function (contentType) {
+export const shouldBase64Encode = function (contentType) {
   if (!contentType) {
     return true
   }
@@ -57,13 +51,4 @@ const shouldBase64Encode = function (contentType) {
   return true
 }
 
-const styleFunctionName = (name) => chalk.magenta(name)
-
-module.exports = {
-  detectAwsSdkError,
-  DEFAULT_LAMBDA_OPTIONS,
-  formatLambdaError,
-  SECONDS_TO_MILLISECONDS,
-  shouldBase64Encode,
-  styleFunctionName,
-}
+export const styleFunctionName = (name) => chalk.magenta(name)

package/src/lib/{geo-location.cjs → geo-location.mjs}

@@ -1,5 +1,5 @@
 // @ts-check
-const fetch = require('node-fetch')
+import fetch from 'node-fetch'
 
 const API_URL = 'https://netlifind.netlify.app'
 const STATE_GEO_PROPERTY = 'geolocation'
@@ -24,7 +24,7 @@ const REQUEST_TIMEOUT = 1e4
  * @property {string} timezone
  */
 
-const mockLocation = {
+export const mockLocation = {
   city: 'San Francisco',
   country: { code: 'US', name: 'United States' },
   subdivision: { code: 'CA', name: 'California' },
@@ -44,7 +44,7 @@ const mockLocation = {
  * @param {import('../utils/state-config.mjs').default} params.state
  * @returns {Promise<GeoLocation>}
  */
-const getGeoLocation = async ({ geoCountry, mode, offline, state }) => {
+export const getGeoLocation = async ({ geoCountry, mode, offline, state }) => {
   const cacheObject = state.get(STATE_GEO_PROPERTY)
 
   // If `--country` was used, we also set `--mode=mock`.
@@ -117,5 +117,3 @@ const getGeoLocationFromAPI = async () => {
 
   return geo
 }
-
-module.exports = { getGeoLocation, mockLocation }

package/src/lib/http-agent.mjs

@@ -4,7 +4,7 @@ import { readFile } from 'fs/promises'
 import HttpsProxyAgent from 'https-proxy-agent'
 import waitPort from 'wait-port'
 
-import { NETLIFYDEVERR, NETLIFYDEVWARN, exit, log } from '../utils/command-helpers.cjs'
+import { NETLIFYDEVERR, NETLIFYDEVWARN, exit, log } from '../utils/command-helpers.mjs'
 
 // https://github.com/TooTallNate/node-https-proxy-agent/issues/89
 // Maybe replace with https://github.com/delvedor/hpagent

package/src/lib/{log.cjs → log.mjs}

@@ -1,6 +1,6 @@
-const dotProp = require('dot-prop')
+import dotProp from 'dot-prop'
 
-const { chalk } = require('../utils/index.cjs')
+import { chalk } from '../utils/command-helpers.mjs'
 
 const RED_BACKGROUND = chalk.red('-background')
 const [PRO, BUSINESS, ENTERPRISE] = ['Pro', 'Business', 'Enterprise'].map((plan) => chalk.magenta(plan))
@@ -24,8 +24,4 @@ const messages = {
   },
 }
 
-const getLogMessage = (key) => dotProp.get(messages, key, 'Missing Log Message Key')
-
-module.exports = {
-  getLogMessage,
-}
+export const getLogMessage = (key) => dotProp.get(messages, key, 'Missing Log Message Key')

package/src/lib/one-graph/cli-client.mjs

@@ -13,8 +13,9 @@ import gitRepoInfo from 'git-repo-info'
 import WSL from 'is-wsl'
 import { GraphQL, InternalConsole, NetlifyGraph, NetlifyGraphLockfile, OneGraphClient } from 'netlify-onegraph-internal'
 
+import { chalk, error, log, warn, watchDebounced } from '../../utils/command-helpers.mjs'
+import execa from '../../utils/execa.mjs'
 import getPackageJson from '../../utils/get-package-json.mjs'
-import utils from '../../utils/index.cjs'
 
 import {
   generateFunctionsFile,
@@ -28,7 +29,6 @@ import {
   writeGraphQLSchemaFile,
 } from './cli-netlify-graph.mjs'
 
-const { chalk, error, execa, log, warn, watchDebounced } = utils
 const { parse } = GraphQL
 const { defaultExampleOperationsDoc, extractFunctionsFromOperationDoc } = NetlifyGraph
 

package/src/lib/one-graph/cli-netlify-graph.mjs

@@ -10,11 +10,10 @@ import inquirer from 'inquirer'
 import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt'
 import { GraphQL, GraphQLHelpers, IncludedCodegen, InternalConsole, NetlifyGraph } from 'netlify-onegraph-internal'
 
+import { chalk, error, log, warn } from '../../utils/command-helpers.mjs'
 import detectServerSettings from '../../utils/detect-server-settings.mjs'
+import execa from '../../utils/execa.mjs'
 import { getFunctionsDir } from '../../utils/functions/index.mjs'
-import utils from '../../utils/index.cjs'
-
-const { chalk, error, execa, log, warn } = utils
 
 const { printSchema } = GraphQL
 

package/src/lib/path.mjs

@@ -0,0 +1 @@
+export const normalizeBackslash = (path) => path.replace(/\\/g, '/')

package/src/lib/{render-error-remplate.cjs → render-error-template.mjs}

@@ -1,17 +1,21 @@
-const { readFile } = require('fs').promises
-const { join } = require('path')
+import { readFile } from 'fs/promises'
+import { dirname, join } from 'path'
+import { fileURLToPath } from 'url'
 
 let errorTemplateFile
+const dir = dirname(fileURLToPath(import.meta.url))
 
 const renderErrorTemplate = async (errString, templatePath, functionType) => {
   const errorDetailsRegex = /<!--@ERROR-DETAILS-->/g
   const functionTypeRegex = /<!--@FUNCTION-TYPE-->/g
+
   try {
-    errorTemplateFile = errorTemplateFile || (await readFile(join(__dirname, templatePath), 'utf-8'))
+    errorTemplateFile = errorTemplateFile || (await readFile(join(dir, templatePath), 'utf-8'))
+
     return errorTemplateFile.replace(errorDetailsRegex, errString).replace(functionTypeRegex, functionType)
   } catch {
     return errString
   }
 }
 
-module.exports = renderErrorTemplate
+export default renderErrorTemplate

package/src/lib/{string.cjs → string.mjs}

@@ -1,5 +1,3 @@
-const capitalize = function (t) {
+export const capitalize = function (t) {
   return t.replace(/(^\w|\s\w)/g, (string) => string.toUpperCase())
 }
-
-module.exports = { capitalize }

package/src/recipes/vscode/index.mjs

@@ -3,7 +3,7 @@ import { join } from 'path'
 import execa from 'execa'
 import inquirer from 'inquirer'
 
-import { NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.cjs'
+import { NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.mjs'
 
 import { applySettings, getSettings, writeSettings } from './settings.mjs'