netlify-cli 12.2.6 → 12.2.8

package/src/lib/one-graph/{cli-netlify-graph.cjs → cli-netlify-graph.mjs}

@@ -1,23 +1,20 @@
 /* eslint-disable eslint-comments/disable-enable-pair */
 
 // @ts-check
-const fs = require('fs')
-const path = require('path')
-const process = require('process')
-
-const inquirer = require('inquirer')
-const inquirerAutocompletePrompt = require('inquirer-autocomplete-prompt')
-const {
-  // eslint-disable-next-line no-unused-vars
-  CodegenHelpers,
-  GraphQL,
-  GraphQLHelpers,
-  IncludedCodegen,
-  InternalConsole,
-  NetlifyGraph,
-} = require('netlify-onegraph-internal')
-
-const { chalk, detectServerSettings, error, execa, getFunctionsDir, log, warn } = require('../../utils/index.cjs')
+import fs from 'fs'
+import path from 'path'
+import process from 'process'
+import { pathToFileURL } from 'url'
+
+import inquirer from 'inquirer'
+import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt'
+import { GraphQL, GraphQLHelpers, IncludedCodegen, InternalConsole, NetlifyGraph } from 'netlify-onegraph-internal'
+
+import detectServerSettings from '../../utils/detect-server-settings.mjs'
+import { getFunctionsDir } from '../../utils/functions/index.mjs'
+import utils from '../../utils/index.cjs'
+
+const { chalk, error, execa, log, warn } = utils
 
 const { printSchema } = GraphQL
 
@@ -30,7 +27,8 @@ const internalConsole = {
 
 InternalConsole.registerConsole(internalConsole)
 
-const { extractFunctionsFromOperationDoc } = NetlifyGraph
+const { defaultExampleOperationsDoc, extractFunctionsFromOperationDoc, generateHandlerSource } = NetlifyGraph
+const { normalizeOperationsDoc } = GraphQLHelpers
 
 /**
  * Updates the netlify.toml in-place with the `graph.codeGenerator` key set to `codegenModuleImportPath
@@ -370,9 +368,9 @@ const runPrettier = async (filePath) => {
  * @param {string} input.operationsDoc The GraphQL operations doc to use when generating the functions
  * @param {Record<string, NetlifyGraph.ExtractedFunction>} input.functions The parsed queries with metadata to use when generating library functions
  * @param {Record<string, NetlifyGraph.ExtractedFragment>} input.fragments The parsed queries with metadata to use when generating library functions
- * @param {CodegenHelpers.GenerateRuntimeFunction} input.generate
+ * @param {import('netlify-onegraph-internal').CodegenHelpers.GenerateRuntimeFunction} input.generate
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
- * @returns {Promise<CodegenHelpers.NamedExportedFile[]>} In-memory files
+ * @returns {Promise<import('netlify-onegraph-internal').CodegenHelpers.NamedExportedFile[]>} In-memory files
  */
 const generateRuntimeSource = async ({
   fragments,
@@ -406,7 +404,7 @@ const generateRuntimeSource = async ({
  * @param {string} input.operationsDoc The GraphQL operations doc to use when generating the functions
  * @param {Record<string, NetlifyGraph.ExtractedFunction>} input.functions The parsed queries with metadata to use when generating library functions
  * @param {Record<string, NetlifyGraph.ExtractedFragment>} input.fragments The parsed queries with metadata to use when generating library functions
- * @param {CodegenHelpers.GenerateRuntimeFunction} input.generate
+ * @param {import('netlify-onegraph-internal').CodegenHelpers.GenerateRuntimeFunction} input.generate
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
  * @returns {Promise<void>} Void, effectfully writes the generated library to the filesystem
  */
@@ -543,14 +541,14 @@ const readGraphQLSchemaFile = (netlifyGraphConfig) => {
 /**
  * Given a NetlifyGraphConfig, read the appropriate files and write a handler for the given operationId to the filesystem
  * @param {object} input
- * @param {CodegenHelpers.GenerateHandlerFunction} input.generate
+ * @param {import('netlify-onegraph-internal').CodegenHelpers.GenerateHandlerFunction} input.generate
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig
  * @param {GraphQL.GraphQLSchema} input.schema The GraphQL schema to use when generating the handler
  * @param {string} input.operationId The operationId to use when generating the handler
  * @param {string} input.operationsDoc The document containing the operation with operationId and any fragment dependency to use when generating the handler
  * @param {object} input.handlerOptions The options to use when generating the handler
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
- * @returns {Promise<{exportedFiles: CodegenHelpers.ExportedFile[]; operation: GraphQL.OperationDefinitionNode;} | undefined>} The generated files
+ * @returns {Promise<{exportedFiles: import('netlify-onegraph-internal').CodegenHelpers.ExportedFile[]; operation: GraphQL.OperationDefinitionNode;} | undefined>} The generated files
  */
 const generateHandlerSourceByOperationId = async ({
   generate,
@@ -579,7 +577,7 @@ const generateHandlerSourceByOperationId = async ({
 /**
  * Given a NetlifyGraphConfig, read the appropriate files and write a handler for the given operationId to the filesystem
  * @param {object} input
- * @param {CodegenHelpers.GenerateHandlerFunction} input.generate
+ * @param {import('netlify-onegraph-internal').CodegenHelpers.GenerateHandlerFunction} input.generate
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig
  * @param {GraphQL.GraphQLSchema} input.schema The GraphQL schema to use when generating the handler
  * @param {string} input.operationId The operationId to use when generating the handler
@@ -663,7 +661,7 @@ const generateHandlerByOperationId = async ({ generate, handlerOptions, netlifyG
 /**
  * Given a NetlifyGraphConfig, read the appropriate files and write a handler for the given operationId to the filesystem
  * @param {object} input
- * @param {CodegenHelpers.GenerateHandlerFunction} input.generate
+ * @param {import('netlify-onegraph-internal').CodegenHelpers.GenerateHandlerFunction} input.generate
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig
  * @param {GraphQL.GraphQLSchema} input.schema The GraphQL schema to use when generating the handler
  * @param {string} input.operationName The name of the operation to use when generating the handler
@@ -715,13 +713,13 @@ const generateHandlerByOperationName = async ({
 /**
  * Given a NetlifyGraphConfig, read the appropriate files and write a handler for the given operationId to the filesystem
  * @param {object} input
- * @param {CodegenHelpers.GenerateHandlerPreviewFunction} input.generate
+ * @param {import('netlify-onegraph-internal').CodegenHelpers.GenerateHandlerPreviewFunction} input.generate
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig
  * @param {GraphQL.GraphQLSchema} input.schema The GraphQL schema to use when generating the handler
  * @param {string} input.operationName The name of the operation to use when generating the handler
  * @param {object} input.handlerOptions The options to use when generating the handler
  * @param {(message: string) => void} input.logger A function that if provided will be used to log messages
- * @returns {CodegenHelpers.ExportedFile | undefined}
+ * @returns {import('netlify-onegraph-internal').CodegenHelpers.ExportedFile | undefined}
  */
 const generateHandlerPreviewByOperationName = ({
   generate,
@@ -876,7 +874,7 @@ let lastWarnedFailedCodegenModule
  * @param {object} input
  * @param {object} input.config The parsed netlify.toml file
  * @param {string=} input.cwd The optional directory to use as a base path when resolving codegen modules
- * @returns {Promise<CodegenHelpers.CodegenModule | void>} codegenModule
+ * @returns {Promise<import('netlify-onegraph-internal').CodegenHelpers.CodegenModule | void>} codegenModule
  */
 const dynamicallyLoadCodegenModule = async ({ config, cwd }) => {
   const basePath = cwd || process.cwd()
@@ -909,17 +907,11 @@ const dynamicallyLoadCodegenModule = async ({ config, cwd }) => {
     const relativePath = path.join(basePath, importPath)
     const absoluteOrNodePath = path.resolve(...absolute)
 
-    const finalPath = fs.existsSync(relativePath) ? relativePath : absoluteOrNodePath
+    const finalPath = fs.existsSync(relativePath) ? relativePath : pathToFileURL(absoluteOrNodePath).href
 
-    /** @type {CodegenHelpers.CodegenModule | undefined} */
-    let newModule
-    try {
-      // eslint-disable-next-line import/no-dynamic-require, n/global-require
-      newModule = require(finalPath)
-    } catch {
-      // eslint-disable-next-line import/no-dynamic-require
-      newModule = await import(finalPath)
-    }
+    /** @type {import('netlify-onegraph-internal').CodegenHelpers.CodegenModule | undefined} */
+    // eslint-disable-next-line import/no-dynamic-require
+    const newModule = await import(finalPath)
 
     if (newModule) {
       const hasGenerators = Array.isArray(newModule.generators)
@@ -1011,14 +1003,14 @@ const autocompleteCodegenModules = async ({ config }) => {
   )
 }
 
-module.exports = {
+export {
   autocompleteCodegenModules,
   autocompleteOperationNames,
   buildSchema,
-  defaultExampleOperationsDoc: NetlifyGraph.defaultExampleOperationsDoc,
-  extractFunctionsFromOperationDoc: NetlifyGraph.extractFunctionsFromOperationDoc,
+  defaultExampleOperationsDoc,
+  extractFunctionsFromOperationDoc,
   generateFunctionsFile,
-  generateHandlerSource: NetlifyGraph.generateHandlerSource,
+  generateHandlerSource,
   generateHandlerByOperationId,
   generateHandlerByOperationName,
   generateHandlerPreviewByOperationName,
@@ -1031,7 +1023,7 @@ module.exports = {
   getGraphEditUrlBySiteName,
   getNetlifyGraphConfig,
   loadNetlifyGraphConfig,
-  normalizeOperationsDoc: GraphQLHelpers.normalizeOperationsDoc,
+  normalizeOperationsDoc,
   parse,
   readGraphQLOperationsSourceFile,
   readGraphQLSchemaFile,

package/src/recipes/vscode/{index.cjs → index.mjs}

@@ -1,13 +1,13 @@
-const { join } = require('path')
+import { join } from 'path'
 
-const execa = require('execa')
-const inquirer = require('inquirer')
+import execa from 'execa'
+import inquirer from 'inquirer'
 
-const { NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } = require('../../utils/command-helpers.cjs')
+import { NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.cjs'
 
-const { applySettings, getSettings, writeSettings } = require('./settings.cjs')
+import { applySettings, getSettings, writeSettings } from './settings.mjs'
 
-const description = 'Create VS Code settings for an optimal experience with Netlify projects'
+export const description = 'Create VS Code settings for an optimal experience with Netlify projects'
 
 const getPrompt = ({ fileExists, path }) => {
   const formattedPath = chalk.underline(path)
@@ -48,7 +48,7 @@ const getDenoExtPrompt = () => {
   })
 }
 
-const run = async ({ config, repositoryRoot }) => {
+export const run = async ({ config, repositoryRoot }) => {
   const { DenoBridge } = await import('@netlify/edge-bundler')
   const deno = new DenoBridge({
     onBeforeDownload: () =>
@@ -86,5 +86,3 @@ const run = async ({ config, repositoryRoot }) => {
     error('Could not write VS Code settings file.')
   }
 }
-
-module.exports = { description, run }

package/src/recipes/vscode/{settings.cjs → settings.mjs}

@@ -1,9 +1,9 @@
-const { promises: fs } = require('fs')
-const { dirname, relative } = require('path')
+import { mkdir, readFile, stat, writeFile } from 'fs/promises'
+import { dirname, relative } from 'path'
 
-const unixify = require('unixify')
+import unixify from 'unixify'
 
-const applySettings = (existingSettings, { denoBinary, edgeFunctionsPath, repositoryRoot }) => {
+export const applySettings = (existingSettings, { denoBinary, edgeFunctionsPath, repositoryRoot }) => {
   const relativeEdgeFunctionsPath = unixify(relative(repositoryRoot, edgeFunctionsPath))
   const settings = {
     ...existingSettings,
@@ -30,15 +30,15 @@ const applySettings = (existingSettings, { denoBinary, edgeFunctionsPath, reposi
   return settings
 }
 
-const getSettings = async (settingsPath) => {
+export const getSettings = async (settingsPath) => {
   try {
-    const stats = await fs.stat(settingsPath)
+    const stats = await stat(settingsPath)
 
     if (!stats.isFile()) {
       throw new Error(`${settingsPath} is not a valid file.`)
     }
 
-    const file = await fs.readFile(settingsPath)
+    const file = await readFile(settingsPath)
 
     return {
       fileExists: true,
@@ -56,11 +56,9 @@ const getSettings = async (settingsPath) => {
   }
 }
 
-const writeSettings = async ({ settings, settingsPath }) => {
+export const writeSettings = async ({ settings, settingsPath }) => {
   const serializedSettings = JSON.stringify(settings, null, 2)
 
-  await fs.mkdir(dirname(settingsPath), { recursive: true })
-  await fs.writeFile(settingsPath, serializedSettings)
+  await mkdir(dirname(settingsPath), { recursive: true })
+  await writeFile(settingsPath, serializedSettings)
 }
-
-module.exports = { applySettings, getSettings, writeSettings }

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

@@ -1,4 +1,4 @@
-const { Buffer } = require('buffer')
+import { Buffer } from 'buffer'
 
 const SEC_TO_MILLISEC = 1e3
 
@@ -46,4 +46,4 @@ const createStreamPromise = function (stream, timeoutSeconds, bytesLimit = DEFAU
   })
 }
 
-module.exports = { createStreamPromise }
+export default createStreamPromise

package/src/utils/{detect-server-settings.cjs → detect-server-settings.mjs}

@@ -1,18 +1,18 @@
 // @ts-check
-const { EOL } = require('os')
-const path = require('path')
-const process = require('process')
+import { EOL } from 'os'
+import path from 'path'
+import process from 'process'
 
-const frameworkInfoPromise = import('@netlify/framework-info')
-const fuzzy = require('fuzzy')
-const getPort = require('get-port')
-const isPlainObject = require('is-plain-obj')
+import { getFramework, listFrameworks } from '@netlify/framework-info'
+import fuzzy from 'fuzzy'
+import getPort from 'get-port'
+import isPlainObject from 'is-plain-obj'
 
-const { readFileAsyncCatchError } = require('../lib/fs.cjs')
+import { readFileAsyncCatchError } from '../lib/fs.cjs'
 
-const { NETLIFYDEVWARN, chalk, log } = require('./command-helpers.cjs')
-const { acquirePort } = require('./dev.cjs')
-const { getInternalFunctionsDir } = require('./functions/index.cjs')
+import { NETLIFYDEVWARN, chalk, log } from './command-helpers.cjs'
+import { acquirePort } from './dev.cjs'
+import { getInternalFunctionsDir } from './functions/index.mjs'
 
 const formatProperty = (str) => chalk.magenta(`'${str}'`)
 const formatValue = (str) => chalk.green(`'${str}'`)
@@ -184,7 +184,6 @@ const getSettingsFromFramework = (framework) => {
 const hasDevCommand = (framework) => Array.isArray(framework.dev.commands) && framework.dev.commands.length !== 0
 
 const detectFrameworkSettings = async ({ projectDir }) => {
-  const { listFrameworks } = await frameworkInfoPromise
   const projectFrameworks = await listFrameworks({ projectDir })
   const frameworks = projectFrameworks.filter((framework) => hasDevCommand(framework))
 
@@ -194,10 +193,8 @@ const detectFrameworkSettings = async ({ projectDir }) => {
 
   if (frameworks.length > 1) {
     // performance optimization, load inquirer on demand
-    // eslint-disable-next-line n/global-require
-    const inquirer = require('inquirer')
-    // eslint-disable-next-line n/global-require
-    const inquirerAutocompletePrompt = require('inquirer-autocomplete-prompt')
+    const { default: inquirer } = await import('inquirer')
+    const { default: inquirerAutocompletePrompt } = await import('inquirer-autocomplete-prompt')
     /** multiple matching detectors, make the user choose */
     inquirer.registerPrompt('autocomplete', inquirerAutocompletePrompt)
     const scriptInquirerOptions = formatSettingsArrForInquirer(frameworks)
@@ -279,7 +276,6 @@ const mergeSettings = async ({ devConfig, frameworkSettings = {} }) => {
  */
 const handleForcedFramework = async ({ devConfig, projectDir }) => {
   // this throws if `devConfig.framework` is not a supported framework
-  const { getFramework } = await frameworkInfoPromise
   const frameworkSettings = getSettingsFromFramework(await getFramework(devConfig.framework, { projectDir }))
   return mergeSettings({ devConfig, frameworkSettings })
 }
@@ -369,6 +365,4 @@ const formatSettingsArrForInquirer = function (frameworks) {
   return formattedArr.flat()
 }
 
-module.exports = {
-  detectServerSettings,
-}
+export default detectServerSettings

package/src/utils/functions/constants.mjs

@@ -0,0 +1 @@
+export const CLOCKWORK_USERAGENT = 'Netlify Clockwork'

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

@@ -1,8 +1,8 @@
 // @ts-check
-const { resolve } = require('path')
+import { resolve } from 'path'
 
-const { isDirectoryAsync, isFileAsync } = require('../../lib/fs.cjs')
-const { getPathInProject } = require('../../lib/settings.cjs')
+import { isDirectoryAsync, isFileAsync } from '../../lib/fs.cjs'
+import { getPathInProject } from '../../lib/settings.cjs'
 
 /**
  * retrieves the function directory out of the flags or config
@@ -12,25 +12,23 @@ const { getPathInProject } = require('../../lib/settings.cjs')
  * @param {string} [defaultValue]
  * @returns {string}
  */
-const getFunctionsDir = ({ config, options }, defaultValue) =>
+export const getFunctionsDir = ({ config, options }, defaultValue) =>
   options.functions ||
   (config.dev && config.dev.functions) ||
   config.functionsDirectory ||
   (config.dev && config.dev.Functions) ||
   defaultValue
 
-const getFunctionsManifestPath = async ({ base }) => {
+export const getFunctionsManifestPath = async ({ base }) => {
   const path = resolve(base, getPathInProject(['functions', 'manifest.json']))
   const isFile = await isFileAsync(path)
 
   return isFile ? path : null
 }
 
-const getInternalFunctionsDir = async ({ base }) => {
+export const getInternalFunctionsDir = async ({ base }) => {
   const path = resolve(base, getPathInProject(['functions-internal']))
   const isDirectory = await isDirectoryAsync(path)
 
   return isDirectory ? path : null
 }
-
-module.exports = { getFunctionsDir, getInternalFunctionsDir, getFunctionsManifestPath }

package/src/utils/functions/{get-functions.cjs → get-functions.mjs}

@@ -1,9 +1,10 @@
 // @ts-check
-const { fileExistsAsync } = require('../../lib/fs.cjs')
+import { fileExistsAsync } from '../../lib/fs.cjs'
 
 const getUrlPath = (functionName) => `/.netlify/functions/${functionName}`
 
-const BACKGROUND = '-background'
+export const BACKGROUND = '-background'
+const JS = 'js'
 
 const addFunctionProps = ({ mainFile, name, runtime, schedule }) => {
   const urlPath = getUrlPath(name)
@@ -11,8 +12,6 @@ const addFunctionProps = ({ mainFile, name, runtime, schedule }) => {
   return { mainFile, name, runtime, urlPath, isBackground, schedule }
 }
 
-const JS = 'js'
-
 /**
  * @param {Record<string, { schedule?: string }>} functionConfigRecord
  * @returns {Record<string, { schedule?: string }>}
@@ -20,7 +19,7 @@ const JS = 'js'
 const extractSchedule = (functionConfigRecord) =>
   Object.fromEntries(Object.entries(functionConfigRecord).map(([name, { schedule }]) => [name, { schedule }]))
 
-const getFunctions = async (functionsSrcDir, config = {}) => {
+export const getFunctions = async (functionsSrcDir, config = {}) => {
   if (!(await fileExistsAsync(functionsSrcDir))) {
     return []
   }
@@ -34,23 +33,3 @@ const getFunctions = async (functionsSrcDir, config = {}) => {
   const functionsWithProps = functions.filter(({ runtime }) => runtime === JS).map((func) => addFunctionProps(func))
   return functionsWithProps
 }
-
-const getFunctionsAndWatchDirs = async (functionsSrcDir) => {
-  if (!(await fileExistsAsync(functionsSrcDir))) {
-    return { functions: [], watchDirs: [functionsSrcDir] }
-  }
-
-  // performance optimization, load '@netlify/zip-it-and-ship-it' on demand
-  const { listFunctions } = await import('@netlify/zip-it-and-ship-it')
-
-  // get all functions files so we know which directories to watch
-  const functions = await listFunctions(functionsSrcDir)
-  const watchDirs = [functionsSrcDir]
-
-  // filter for only main files to serve
-  const functionsWithProps = functions.filter(({ runtime }) => runtime === JS).map((func) => addFunctionProps(func))
-
-  return { functions: functionsWithProps, watchDirs }
-}
-
-module.exports = { getFunctions, getFunctionsAndWatchDirs, BACKGROUND }

package/src/utils/functions/index.mjs

@@ -0,0 +1,3 @@
+export * from './constants.mjs'
+export * from './functions.mjs'
+export * from './get-functions.mjs'

package/src/utils/get-package-json.mjs

@@ -0,0 +1,16 @@
+import { readFile } from 'fs/promises'
+import { dirname, join } from 'path'
+import { fileURLToPath } from 'url'
+
+let packageJson
+
+const getPackageJson = async () => {
+  if (!packageJson) {
+    const packageJsonPath = join(dirname(fileURLToPath(import.meta.url)), '../../package.json')
+    packageJson = JSON.parse(await readFile(packageJsonPath))
+  }
+
+  return packageJson
+}
+
+export default getPackageJson

package/src/utils/{get-repo-data.cjs → get-repo-data.mjs}

@@ -1,15 +1,14 @@
 // @ts-check
-const { dirname } = require('path')
-const process = require('process')
-const util = require('util')
+import { dirname } from 'path'
+import process from 'process'
+import util from 'util'
 
-const findUp = require('find-up')
-const gitRepoInfo = require('git-repo-info')
-const gitconfiglocal = require('gitconfiglocal')
-const isEmpty = require('lodash/isEmpty')
-const parseGitRemote = require('parse-github-url')
+import findUp from 'find-up'
+import gitRepoInfo from 'git-repo-info'
+import gitconfiglocal from 'gitconfiglocal'
+import parseGitRemote from 'parse-github-url'
 
-const { log } = require('./command-helpers.cjs')
+import { log } from './command-helpers.cjs'
 
 /**
  *
@@ -30,7 +29,7 @@ const getRepoData = async function ({ remoteName } = {}) {
       log(`Git directory located in ${baseGitPath}`)
     }
 
-    if (isEmpty(gitConfig) || isEmpty(gitConfig.remote)) {
+    if (!gitConfig || !gitConfig.remote || Object.keys(gitConfig.remote).length === 0) {
       throw new Error('No Git remote found')
     }
 
@@ -39,7 +38,11 @@ const getRepoData = async function ({ remoteName } = {}) {
       remoteName = remotes.find((remote) => remote === 'origin') || remotes[0]
     }
 
-    if (!Object.prototype.hasOwnProperty.call(gitConfig.remote, remoteName) || isEmpty(gitConfig.remote[remoteName])) {
+    if (
+      !Object.prototype.hasOwnProperty.call(gitConfig.remote, remoteName) ||
+      !gitConfig.remote[remoteName] ||
+      Object.keys(gitConfig.remote[remoteName]).length === 0
+    ) {
       throw new Error(
         `The specified remote "${remoteName}" is not defined in Git repo. Please use --gitRemoteName flag to specify a remote.`,
       )
@@ -69,4 +72,4 @@ const PROVIDERS = {
   'gitlab.com': 'gitlab',
 }
 
-module.exports = { getRepoData }
+export default getRepoData

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

@@ -1,12 +1,12 @@
 // @ts-check
-const { readFile, writeFile } = require('fs').promises
-const path = require('path')
+import { readFile, writeFile } from 'fs/promises'
+import path from 'path'
 
-const parseIgnore = require('parse-gitignore')
+import parseIgnore from 'parse-gitignore'
 
-const { fileExistsAsync } = require('../lib/fs.cjs')
+import { fileExistsAsync } from '../lib/fs.cjs'
 
-const { log } = require('./command-helpers.cjs')
+import { log } from './command-helpers.cjs'
 
 const hasGitIgnore = async function (dir) {
   const gitIgnorePath = path.join(dir, '.gitignore')
@@ -14,7 +14,7 @@ const hasGitIgnore = async function (dir) {
   return hasIgnore
 }
 
-const ensureNetlifyIgnore = async function (dir) {
+export const ensureNetlifyIgnore = async function (dir) {
   const gitIgnorePath = path.join(dir, '.gitignore')
   const ignoreContent = '# Local Netlify folder\n.netlify\n'
 
@@ -40,5 +40,3 @@ const ensureNetlifyIgnore = async function (dir) {
     await writeFile(gitIgnorePath, newContents, 'utf8')
   }
 }
-
-module.exports = { ensureNetlifyIgnore }

package/src/utils/index.cjs

@@ -1,42 +1,22 @@
 // @ts-check
 const commandHelpers = require('./command-helpers.cjs')
-const createStreamPromise = require('./create-stream-promise.cjs')
 const deploy = require('./deploy/index.cjs')
-const detectServerSettings = require('./detect-server-settings.cjs')
 const dev = require('./dev.cjs')
 const env = require('./env/index.cjs')
 const execa = require('./execa.cjs')
-const functions = require('./functions/index.cjs')
 const getGlobalConfig = require('./get-global-config.cjs')
-const getRepoData = require('./get-repo-data.cjs')
 const ghAuth = require('./gh-auth.cjs')
-const gitignore = require('./gitignore.cjs')
-const liveTunnel = require('./live-tunnel.cjs')
 const openBrowser = require('./open-browser.cjs')
 const parseRawFlags = require('./parse-raw-flags.cjs')
-const proxy = require('./proxy.cjs')
-const readRepoURL = require('./read-repo-url.cjs')
-const StateConfig = require('./state-config.cjs')
-const telemetry = require('./telemetry/index.cjs')
 
 module.exports = {
   ...commandHelpers,
-  ...createStreamPromise,
   ...deploy,
-  ...detectServerSettings,
   ...dev,
   ...env,
-  ...functions,
-  ...getRepoData,
   ...ghAuth,
-  ...gitignore,
-  ...liveTunnel,
   ...openBrowser,
   ...parseRawFlags,
-  ...proxy,
-  ...readRepoURL,
-  ...StateConfig,
-  ...telemetry,
   execa,
   getGlobalConfig,
 }

package/src/utils/{live-tunnel.cjs → live-tunnel.mjs}

@@ -1,14 +1,14 @@
 // @ts-check
-const process = require('process')
+import process from 'process'
 
-const fetch = require('node-fetch')
-const pWaitFor = require('p-wait-for')
+import fetch from 'node-fetch'
+import pWaitFor from 'p-wait-for'
 
-const { fetchLatestVersion, shouldFetchLatestVersion } = require('../lib/exec-fetcher.cjs')
-const { getPathInHome } = require('../lib/settings.cjs')
+import { fetchLatestVersion, shouldFetchLatestVersion } from '../lib/exec-fetcher.cjs'
+import { getPathInHome } from '../lib/settings.cjs'
 
-const { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log } = require('./command-helpers.cjs')
-const execa = require('./execa.cjs')
+import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log } from './command-helpers.cjs'
+import execa from './execa.cjs'
 
 const PACKAGE_NAME = 'live-tunnel-client'
 const EXEC_NAME = PACKAGE_NAME
@@ -87,7 +87,7 @@ const installTunnelClient = async function () {
   })
 }
 
-const startLiveTunnel = async ({ localPort, netlifyApiToken, siteId }) => {
+export const startLiveTunnel = async ({ localPort, netlifyApiToken, siteId }) => {
   const session = await createTunnel({
     siteId,
     netlifyApiToken,
@@ -121,5 +121,3 @@ const startLiveTunnel = async ({ localPort, netlifyApiToken, siteId }) => {
 
   return session.session_url
 }
-
-module.exports = { startLiveTunnel }