netlify-cli 12.2.10 → 12.2.11

package/src/utils/env/{index.cjs → index.mjs}

@@ -1,13 +1,13 @@
-const { error } = require('../command-helpers.cjs')
+import { error } from '../command-helpers.mjs'
 
-const AVAILABLE_CONTEXTS = ['all', 'production', 'deploy-preview', 'branch-deploy', 'dev']
-const AVAILABLE_SCOPES = ['builds', 'functions', 'runtime', 'post_processing']
+export const AVAILABLE_CONTEXTS = ['all', 'production', 'deploy-preview', 'branch-deploy', 'dev']
+export const AVAILABLE_SCOPES = ['builds', 'functions', 'runtime', 'post_processing']
 
 /**
  * @param {string|undefined} context - The deploy context or branch of the environment variable value
  * @returns {Array<string|undefined>} The normalized context or branch name
  */
-const normalizeContext = (context) => {
+export const normalizeContext = (context) => {
   if (!context) {
     return context
   }
@@ -33,7 +33,7 @@ const normalizeContext = (context) => {
  * @param {string} context - The deploy context or branch of the environment variable value
  * @returns {object<context: enum<dev,branch-deploy,deploy-preview,production,branch>, context_parameter: <string>, value: string>} The matching environment variable value object
  */
-const findValueInValues = (values, context) =>
+export const findValueInValues = (values, context) =>
   values.find((val) => {
     if (!AVAILABLE_CONTEXTS.includes(context)) {
       // the "context" option passed in is actually the name of a branch
@@ -48,7 +48,7 @@ const findValueInValues = (values, context) =>
  * @param {enum<general,account,addons,ui,configFile>} source - The source of the environment variable
  * @returns {object} The dictionary of env vars that match the given source
  */
-const filterEnvBySource = (env, source) =>
+export const filterEnvBySource = (env, source) =>
   Object.fromEntries(Object.entries(env).filter(([, variable]) => variable.sources[0] === source))
 
 /**
@@ -102,7 +102,7 @@ const fetchEnvelopeItems = async function ({ accountId, api, key, siteId }) {
  *   },
  * }
  */
-const formatEnvelopeData = ({ context = 'dev', envelopeItems = [], scope = 'any', source }) =>
+export const formatEnvelopeData = ({ context = 'dev', envelopeItems = [], scope = 'any', source }) =>
   envelopeItems
     // filter by context
     .filter(({ values }) => Boolean(findValueInValues(values, context)))
@@ -135,7 +135,7 @@ const formatEnvelopeData = ({ context = 'dev', envelopeItems = [], scope = 'any'
  * @param {object} siteInfo - The site object
  * @returns {object} An object of environment variables keys and their metadata
  */
-const getEnvelopeEnv = async ({ api, context = 'dev', env, key = '', scope = 'any', siteInfo }) => {
+export const getEnvelopeEnv = async ({ api, context = 'dev', env, key = '', scope = 'any', siteInfo }) => {
   const { account_slug: accountId, id: siteId } = siteInfo
 
   const [accountEnvelopeItems, siteEnvelopeItems] = await Promise.all([
@@ -167,7 +167,7 @@ const getEnvelopeEnv = async ({ api, context = 'dev', env, key = '', scope = 'an
  * @param {Array<enum<builds,functions,runtime,post_processing>>} scopes - An array of scopes
  * @returns {string} A human-readable, comma-separated list of scopes
  */
-const getHumanReadableScopes = (scopes) => {
+export const getHumanReadableScopes = (scopes) => {
   const HUMAN_SCOPES = ['Builds', 'Functions', 'Runtime', 'Post processing']
   const SCOPES_MAP = {
     builds: HUMAN_SCOPES[0],
@@ -193,7 +193,7 @@ const getHumanReadableScopes = (scopes) => {
  * @param {object} env - The site's env as it exists in Mongo
  * @returns {Array<object>} The array of Envelope env vars
  */
-const translateFromMongoToEnvelope = (env = {}) => {
+export const translateFromMongoToEnvelope = (env = {}) => {
   const envVars = Object.entries(env).map(([key, value]) => ({
     key,
     scopes: AVAILABLE_SCOPES,
@@ -214,7 +214,7 @@ const translateFromMongoToEnvelope = (env = {}) => {
  * @param {string} context - The deploy context or branch of the environment variable
  * @returns {object} The env object as compatible with Mongo
  */
-const translateFromEnvelopeToMongo = (envVars = [], context = 'dev') =>
+export const translateFromEnvelopeToMongo = (envVars = [], context = 'dev') =>
   envVars
     .sort((left, right) => (left.key.toLowerCase() < right.key.toLowerCase() ? -1 : 1))
     .reduce((acc, cur) => {
@@ -227,16 +227,3 @@ const translateFromEnvelopeToMongo = (envVars = [], context = 'dev') =>
       }
       return acc
     }, {})
-
-module.exports = {
-  AVAILABLE_CONTEXTS,
-  AVAILABLE_SCOPES,
-  findValueInValues,
-  filterEnvBySource,
-  formatEnvelopeData,
-  getEnvelopeEnv,
-  getHumanReadableScopes,
-  normalizeContext,
-  translateFromEnvelopeToMongo,
-  translateFromMongoToEnvelope,
-}

package/src/utils/execa.mjs

@@ -0,0 +1,17 @@
+import { env } from 'process'
+// This is a thin layer on top of `execa` that allows consumers to provide an
+// alternative path to the module location, making it easier to mock its logic
+// in tests (see `tests/utils/mock-execa.js`).
+// eslint-disable-next-line import/no-mutable-exports
+let execa
+
+if (env.NETLIFY_CLI_EXECA_PATH) {
+  // eslint-disable-next-line import/no-dynamic-require
+  const execaMock = await import(env.NETLIFY_CLI_EXECA_PATH)
+  execa = execaMock.default
+} else {
+  const execaLib = await import('execa')
+  execa = execaLib.default
+}
+
+export default execa

package/src/utils/get-global-config.mjs

@@ -0,0 +1,40 @@
+import { readFile } from 'fs/promises'
+
+import Configstore from 'configstore'
+import { v4 as uuidv4 } from 'uuid'
+
+import { getLegacyPathInHome, getPathInHome } from '../lib/settings.cjs'
+
+const globalConfigDefaults = {
+  /* disable stats from being sent to Netlify */
+  telemetryDisabled: false,
+  /* cliId */
+  cliId: uuidv4(),
+}
+
+// Memoise config result so that we only load it once
+let configStore
+
+const getGlobalConfig = async function () {
+  if (!configStore) {
+    const configPath = getPathInHome(['config.json'])
+    // Legacy config file in home ~/.netlify/config.json
+    const legacyPath = getLegacyPathInHome(['config.json'])
+    let legacyConfig
+    // Read legacy config if exists
+    try {
+      legacyConfig = JSON.parse(await readFile(legacyPath))
+    } catch {}
+    // Use legacy config as default values
+    const defaults = { ...globalConfigDefaults, ...legacyConfig }
+    configStore = new Configstore(null, defaults, { configPath })
+  }
+
+  return configStore
+}
+
+export const resetConfigCache = () => {
+  configStore = undefined
+}
+
+export default getGlobalConfig

package/src/utils/get-repo-data.mjs

@@ -8,7 +8,7 @@ import gitRepoInfo from 'git-repo-info'
 import gitconfiglocal from 'gitconfiglocal'
 import parseGitRemote from 'parse-github-url'
 
-import { log } from './command-helpers.cjs'
+import { log } from './command-helpers.mjs'
 
 /**
  *

package/src/utils/{gh-auth.cjs → gh-auth.mjs}

@@ -1,15 +1,15 @@
 // @ts-check
 // A simple ghauth inspired library for getting a personal access token
-const http = require('http')
-const process = require('process')
+import http from 'http'
+import process from 'process'
 
-const { Octokit } = require('@octokit/rest')
-const getPort = require('get-port')
-const inquirer = require('inquirer')
+import { Octokit } from '@octokit/rest'
+import getPort from 'get-port'
+import inquirer from 'inquirer'
 
-const { log } = require('./command-helpers.cjs')
-const { createDeferred } = require('./deferred.cjs')
-const { openBrowser } = require('./open-browser.cjs')
+import { log } from './command-helpers.mjs'
+import createDeferred from './create-deferred.mjs'
+import openBrowser from './open-browser.mjs'
 
 const SERVER_PORT = 3000
 
@@ -44,7 +44,7 @@ const promptForAuthMethod = async () => {
  * Authenticate with the netlify app
  * @returns {Promise<Token>} Returns a Promise with a token object
  */
-const authWithNetlify = async () => {
+export const authWithNetlify = async () => {
   const port = await getPort({ port: SERVER_PORT })
   const { promise: deferredPromise, reject: deferredReject, resolve: deferredResolve } = createDeferred()
 
@@ -116,12 +116,10 @@ const authWithToken = async () => {
  * Get a GitHub token
  * @returns {Promise<Token>} Returns a Promise with a token object
  */
-const getGitHubToken = async () => {
+export const getGitHubToken = async () => {
   log('')
 
   const withNetlify = await promptForAuthMethod()
 
   return withNetlify ? await authWithNetlify() : await authWithToken()
 }
-
-module.exports = { getGitHubToken, authWithNetlify }

package/src/utils/gitignore.mjs

@@ -6,7 +6,7 @@ import parseIgnore from 'parse-gitignore'
 
 import { fileExistsAsync } from '../lib/fs.cjs'
 
-import { log } from './command-helpers.cjs'
+import { log } from './command-helpers.mjs'
 
 const hasGitIgnore = async function (dir) {
   const gitIgnorePath = path.join(dir, '.gitignore')

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

@@ -1,7 +1,6 @@
-// TODO: use static `import` after migrating this repository to pure ES modules
-const netlifyHeadersParser = import('netlify-headers-parser')
+import { parseAllHeaders } from 'netlify-headers-parser'
 
-const { NETLIFYDEVERR, log } = require('./command-helpers.cjs')
+import { NETLIFYDEVERR, log } from './command-helpers.mjs'
 
 /**
  * Get the matching headers for `path` given a set of `rules`.
@@ -14,7 +13,7 @@ const { NETLIFYDEVERR, log } = require('./command-helpers.cjs')
  *
  * @returns {Object<string,string[]>}
  */
-const headersForPath = function (headers, path) {
+export const headersForPath = function (headers, path) {
   const matchingHeaders = headers.filter(({ forRegExp }) => forRegExp.test(path)).map(getHeaderValues)
   const headersRules = Object.assign({}, ...matchingHeaders)
   return headersRules
@@ -24,8 +23,7 @@ const getHeaderValues = function ({ values }) {
   return values
 }
 
-const parseHeaders = async function ({ configPath, headersFiles }) {
-  const { parseAllHeaders } = await netlifyHeadersParser
+export const parseHeaders = async function ({ configPath, headersFiles }) {
   const { errors, headers } = await parseAllHeaders({
     headersFiles,
     netlifyConfigPath: configPath,
@@ -47,8 +45,3 @@ const handleHeadersErrors = function (errors) {
 const getErrorMessage = function ({ message }) {
   return message
 }
-
-module.exports = {
-  headersForPath,
-  parseHeaders,
-}

package/src/utils/init/{config-github.cjs → config-github.mjs}

@@ -1,10 +1,10 @@
 // @ts-check
-const { Octokit } = require('@octokit/rest')
+import { Octokit } from '@octokit/rest'
 
-const { chalk, error: failAndExit, log } = require('../command-helpers.cjs')
-const { getGitHubToken: ghauth } = require('../gh-auth.cjs')
+import { chalk, error as failAndExit, log } from '../command-helpers.mjs'
+import { getGitHubToken as ghauth } from '../gh-auth.mjs'
 
-const { createDeployKey, formatErrorMessage, getBuildSettings, saveNetlifyToml, setupSite } = require('./utils.cjs')
+import { createDeployKey, formatErrorMessage, getBuildSettings, saveNetlifyToml, setupSite } from './utils.mjs'
 
 /**
  * @typedef Token
@@ -25,7 +25,7 @@ const PAGE_SIZE = 100
  * Get a valid GitHub token
  * @returns {Promise<string>}
  */
-const getGitHubToken = async ({ globalConfig }) => {
+export const getGitHubToken = async ({ globalConfig }) => {
   const userId = globalConfig.get('userId')
 
   /** @type {Token} */
@@ -203,7 +203,7 @@ const addNotificationHooks = async ({ api, siteId, token }) => {
  * @param {string} config.repoOwner
  * @param {string} config.siteId
  */
-const configGithub = async ({ command, repoName, repoOwner, siteId }) => {
+export const configGithub = async ({ command, repoName, repoOwner, siteId }) => {
   const { netlify } = command
   const {
     api,
@@ -256,5 +256,3 @@ const configGithub = async ({ command, repoName, repoOwner, siteId }) => {
   log()
   await addNotificationHooks({ siteId, api, token })
 }
-
-module.exports = { configGithub, getGitHubToken }

package/src/utils/init/{config-manual.cjs → config-manual.mjs}

@@ -1,9 +1,9 @@
 // @ts-check
-const inquirer = require('inquirer')
+import inquirer from 'inquirer'
 
-const { exit, log } = require('../command-helpers.cjs')
+import { exit, log } from '../command-helpers.mjs'
 
-const { createDeployKey, getBuildSettings, saveNetlifyToml, setupSite } = require('./utils.cjs')
+import { createDeployKey, getBuildSettings, saveNetlifyToml, setupSite } from './utils.mjs'
 
 const addDeployKey = async ({ deployKey }) => {
   log('\nGive this Netlify SSH public key access to your repository:\n')
@@ -58,7 +58,7 @@ const addDeployHook = async ({ deployHook }) => {
  * @param {*} config.repoData
  * @param {string} config.siteId
  */
-module.exports = async function configManual({ command, repoData, siteId }) {
+export default async function configManual({ command, repoData, siteId }) {
   const { netlify } = command
   const {
     api,

package/src/utils/init/{config.cjs → config.mjs}

@@ -1,8 +1,8 @@
 // @ts-check
-const { chalk, log } = require('../command-helpers.cjs')
+import { chalk, log } from '../command-helpers.mjs'
 
-const { configGithub } = require('./config-github.cjs')
-const configManual = require('./config-manual.cjs')
+import { configGithub } from './config-github.mjs'
+import configManual from './config-manual.mjs'
 
 const logSuccess = (repoData) => {
   log()
@@ -24,7 +24,7 @@ const logSuccess = (repoData) => {
  * @param {*} config.repoData
  * @param {string} config.siteId
  */
-const configureRepo = async ({ command, manual, repoData, siteId }) => {
+export const configureRepo = async ({ command, manual, repoData, siteId }) => {
   if (manual) {
     await configManual({ command, siteId, repoData })
   } else if (repoData.provider === 'github') {
@@ -36,4 +36,3 @@ const configureRepo = async ({ command, manual, repoData, siteId }) => {
 
   logSuccess(repoData)
 }
-module.exports = { configureRepo }

package/src/utils/init/{frameworks.cjs → frameworks.mjs}

@@ -1,8 +1,7 @@
 // @ts-check
-const frameworkInfoPromise = import('@netlify/framework-info')
+import { listFrameworks } from '@netlify/framework-info'
 
-const getFrameworkInfo = async ({ baseDirectory, nodeVersion }) => {
-  const { listFrameworks } = await frameworkInfoPromise
+export const getFrameworkInfo = async ({ baseDirectory, nodeVersion }) => {
   const frameworks = await listFrameworks({ projectDir: baseDirectory, nodeVersion })
   // several frameworks can be detected - first one has highest priority
   if (frameworks.length !== 0) {
@@ -22,5 +21,3 @@ const getFrameworkInfo = async ({ baseDirectory, nodeVersion }) => {
   }
   return {}
 }
-
-module.exports = { getFrameworkInfo }

package/src/utils/init/{node-version.cjs → node-version.mjs}

@@ -1,11 +1,11 @@
 // @ts-check
-const { readFile } = require('fs').promises
+import { readFile } from 'fs/promises'
 
-const { get } = require('dot-prop')
-const locatePath = require('locate-path')
-const nodeVersionAlias = require('node-version-alias')
+import { get } from 'dot-prop'
+import locatePath from 'locate-path'
+import nodeVersionAlias from 'node-version-alias'
 
-const { warn } = require('../command-helpers.cjs')
+import { warn } from '../command-helpers.mjs'
 
 const DEFAULT_NODE_VERSION = '12.18.0'
 const NVM_FLAG_PREFIX = '--'
@@ -14,7 +14,7 @@ const NVM_FLAG_PREFIX = '--'
 const normalizeConfiguredVersion = (version) =>
   version.startsWith(NVM_FLAG_PREFIX) ? version.slice(NVM_FLAG_PREFIX.length) : version
 
-const detectNodeVersion = async ({ baseDirectory, env }) => {
+export const detectNodeVersion = async ({ baseDirectory, env }) => {
   try {
     const nodeVersionFile = await locatePath(['.nvmrc', '.node-version'], { cwd: baseDirectory })
     const configuredVersion =
@@ -31,5 +31,3 @@ const detectNodeVersion = async ({ baseDirectory, env }) => {
     return DEFAULT_NODE_VERSION
   }
 }
-
-module.exports = { detectNodeVersion }

package/src/utils/init/{plugins.cjs → plugins.mjs}

@@ -1,10 +1,8 @@
 const isPluginInstalled = (configPlugins, plugin) =>
   configPlugins.some(({ package: configPlugin }) => configPlugin === plugin)
 
-const getRecommendPlugins = (frameworkPlugins, config) =>
+export const getRecommendPlugins = (frameworkPlugins, config) =>
   frameworkPlugins.filter((plugin) => !isPluginInstalled(config.plugins, plugin))
 
-const getUIPlugins = (configPlugins) =>
-  configPlugins.filter(({ origin }) => origin === 'ui').map(({ package }) => ({ package }))
-
-module.exports = { getRecommendPlugins, getUIPlugins }
+export const getUIPlugins = (configPlugins) =>
+  configPlugins.filter(({ origin }) => origin === 'ui').map(({ package: pkg }) => ({ package: pkg }))

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

@@ -1,20 +1,18 @@
 // @ts-check
-const { existsSync } = require('fs')
-const { writeFile } = require('fs').promises
-const path = require('path')
-const process = require('process')
+import { writeFile } from 'fs/promises'
+import path from 'path'
+import process from 'process'
 
-const cleanDeep = require('clean-deep')
-const inquirer = require('inquirer')
-const isEmpty = require('lodash/isEmpty')
+import cleanDeep from 'clean-deep'
+import inquirer from 'inquirer'
 
-const { normalizeBackslash } = require('../../lib/path.cjs')
-const { log } = require('../command-helpers.cjs')
-const { chalk, error: failAndExit, warn } = require('../command-helpers.cjs')
+import { fileExistsAsync } from '../../lib/fs.cjs'
+import { normalizeBackslash } from '../../lib/path.mjs'
+import { chalk, error as failAndExit, log, warn } from '../command-helpers.mjs'
 
-const { getFrameworkInfo } = require('./frameworks.cjs')
-const { detectNodeVersion } = require('./node-version.cjs')
-const { getRecommendPlugins, getUIPlugins } = require('./plugins.cjs')
+import { getFrameworkInfo } from './frameworks.mjs'
+import { detectNodeVersion } from './node-version.mjs'
+import { getRecommendPlugins, getUIPlugins } from './plugins.mjs'
 
 const normalizeDir = ({ baseDirectory, defaultValue, dir }) => {
   if (dir === undefined) {
@@ -85,7 +83,7 @@ const getPromptInputs = ({ defaultBaseDir, defaultBuildCmd, defaultBuildDir }) =
 const getBaseDirectory = ({ repositoryRoot, siteRoot }) =>
   path.normalize(repositoryRoot) === path.normalize(siteRoot) ? process.cwd() : siteRoot
 
-const getBuildSettings = async ({ config, env, repositoryRoot, siteRoot }) => {
+export const getBuildSettings = async ({ config, env, repositoryRoot, siteRoot }) => {
   const baseDirectory = getBaseDirectory({ repositoryRoot, siteRoot })
   const nodeVersion = await detectNodeVersion({ baseDirectory, env })
   const {
@@ -153,17 +151,25 @@ const getNetlifyToml = ({
   ## more info on configuring this file: https://docs.netlify.com/configure-builds/file-based-configuration/
 `
 
-const saveNetlifyToml = async ({ baseDir, buildCmd, buildDir, config, configPath, functionsDir, repositoryRoot }) => {
+export const saveNetlifyToml = async ({
+  baseDir,
+  buildCmd,
+  buildDir,
+  config,
+  configPath,
+  functionsDir,
+  repositoryRoot,
+}) => {
   const tomlPathParts = [repositoryRoot, baseDir, 'netlify.toml'].filter(Boolean)
   const tomlPath = path.join(...tomlPathParts)
-  if (existsSync(tomlPath)) {
+  if (await fileExistsAsync(tomlPath)) {
     return
   }
 
   // We don't want to create a `netlify.toml` file that overrides existing configuration
   // In a monorepo the configuration can come from a repo level netlify.toml
   // so we make sure it doesn't by checking `configPath === undefined`
-  if (configPath === undefined && !isEmpty(cleanDeep(config))) {
+  if (configPath === undefined && Object.keys(cleanDeep(config)).length !== 0) {
     return
   }
 
@@ -188,14 +194,14 @@ const saveNetlifyToml = async ({ baseDir, buildCmd, buildDir, config, configPath
   }
 }
 
-const formatErrorMessage = ({ error, message }) => {
+export const formatErrorMessage = ({ error, message }) => {
   const errorMessage = error.json ? `${error.message} - ${JSON.stringify(error.json)}` : error.message
   return `${message} with error: ${chalk.red(errorMessage)}`
 }
 
 const formatTitle = (title) => chalk.cyan(title)
 
-const createDeployKey = async ({ api }) => {
+export const createDeployKey = async ({ api }) => {
   try {
     const deployKey = await api.createDeployKey()
     return deployKey
@@ -205,7 +211,7 @@ const createDeployKey = async ({ api }) => {
   }
 }
 
-const updateSite = async ({ api, options, siteId }) => {
+export const updateSite = async ({ api, options, siteId }) => {
   try {
     const updatedSite = await api.updateSite({ siteId, body: options })
     return updatedSite
@@ -215,7 +221,7 @@ const updateSite = async ({ api, options, siteId }) => {
   }
 }
 
-const setupSite = async ({ api, configPlugins, pluginsToInstall, repo, siteId }) => {
+export const setupSite = async ({ api, configPlugins, pluginsToInstall, repo, siteId }) => {
   const updatedSite = await updateSite({
     siteId,
     api,
@@ -225,5 +231,3 @@ const setupSite = async ({ api, configPlugins, pluginsToInstall, repo, siteId })
 
   return updatedSite
 }
-
-module.exports = { getBuildSettings, saveNetlifyToml, formatErrorMessage, createDeployKey, updateSite, setupSite }

package/src/utils/live-tunnel.mjs

@@ -4,11 +4,11 @@ import process from 'process'
 import fetch from 'node-fetch'
 import pWaitFor from 'p-wait-for'
 
-import { fetchLatestVersion, shouldFetchLatestVersion } from '../lib/exec-fetcher.cjs'
+import { fetchLatestVersion, shouldFetchLatestVersion } from '../lib/exec-fetcher.mjs'
 import { getPathInHome } from '../lib/settings.cjs'
 
-import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log } from './command-helpers.cjs'
-import execa from './execa.cjs'
+import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log } from './command-helpers.mjs'
+import execa from './execa.mjs'
 
 const PACKAGE_NAME = 'live-tunnel-client'
 const EXEC_NAME = PACKAGE_NAME

package/src/utils/lm/install.mjs

@@ -10,11 +10,11 @@ import hasbin from 'hasbin'
 import Listr from 'listr'
 import pathKey from 'path-key'
 
-import { fetchLatestVersion, shouldFetchLatestVersion } from '../../lib/exec-fetcher.cjs'
+import { fetchLatestVersion, shouldFetchLatestVersion } from '../../lib/exec-fetcher.mjs'
 import { fileExistsAsync, rmdirRecursiveAsync } from '../../lib/fs.cjs'
-import { normalizeBackslash } from '../../lib/path.cjs'
+import { normalizeBackslash } from '../../lib/path.mjs'
 import { getLegacyPathInHome, getPathInHome } from '../../lib/settings.cjs'
-import { chalk } from '../command-helpers.cjs'
+import { chalk } from '../command-helpers.mjs'
 
 import { checkGitLFSVersionStep, checkGitVersionStep, checkLFSFiltersStep } from './steps.mjs'
 

package/src/utils/lm/requirements.mjs

@@ -1,7 +1,7 @@
 // @ts-check
 import semver from 'semver'
 
-import execa from '../execa.cjs'
+import execa from '../execa.mjs'
 
 export const checkLFSFilters = async function () {
   try {

package/src/utils/lm/steps.mjs

@@ -1,4 +1,4 @@
-import { chalk } from '../command-helpers.cjs'
+import { chalk } from '../command-helpers.mjs'
 
 import { checkGitVersion, checkHelperVersion, checkLFSFilters, checkLFSVersion } from './requirements.mjs'
 

package/src/utils/lm/ui.mjs

@@ -2,7 +2,7 @@ import os from 'os'
 
 import boxen from 'boxen'
 
-import { chalk, log } from '../command-helpers.cjs'
+import { chalk, log } from '../command-helpers.mjs'
 
 import { getShellInfo, isBinInPath } from './install.mjs'
 

package/src/utils/{open-browser.cjs → open-browser.mjs}

@@ -1,9 +1,9 @@
-const process = require('process')
+import process from 'process'
 
-const open = require('better-opn')
-const isDockerContainer = require('is-docker')
+import open from 'better-opn'
+import isDockerContainer from 'is-docker'
 
-const { chalk, log } = require('./command-helpers.cjs')
+import { chalk, log } from './command-helpers.mjs'
 
 const unableToOpenBrowserMessage = function ({ message, url }) {
   log('---------------------------')
@@ -39,4 +39,4 @@ const openBrowser = async function ({ silentBrowserNoneError, url }) {
   }
 }
 
-module.exports = { openBrowser }
+export default openBrowser

package/src/utils/{parse-raw-flags.cjs → parse-raw-flags.mjs}

@@ -10,7 +10,7 @@
 // // rawFlags = {stuff: yay!}
 //
 
-const parseRawFlags = function (raw) {
+export const parseRawFlags = function (raw) {
   const rawFlags = raw.reduce((acc, curr, index, array) => {
     if (/^-{1,2}/.test(curr)) {
       const key = curr.replace(/^-{1,2}/, '')
@@ -28,7 +28,7 @@ const parseRawFlags = function (raw) {
   return rawFlags
 }
 
-const aggressiveJSONParse = function (value) {
+export const aggressiveJSONParse = function (value) {
   if (value === 'true') {
     return true
   }
@@ -47,8 +47,3 @@ const aggressiveJSONParse = function (value) {
   }
   return parsed
 }
-
-module.exports = {
-  parseRawFlags,
-  aggressiveJSONParse,
-}