@netlify/config 16.0.6 → 17.0.2

package/src/log/logger.js

@@ -1,13 +1,11 @@
-'use strict'
+import figures from 'figures'
 
-const { pointer } = require('figures')
-
-const { serializeObject } = require('./serialize')
-const { THEME } = require('./theme')
+import { serializeObject } from './serialize.js'
+import { THEME } from './theme.js'
 
 // When the `buffer` option is true, we return logs instead of printing them
 // on the console. The logs are accumulated in a `logs` array variable.
-const getBufferLogs = function ({ buffer }) {
+export const getBufferLogs = function ({ buffer }) {
   if (!buffer) {
     return
   }
@@ -17,7 +15,7 @@ const getBufferLogs = function ({ buffer }) {
 
 // This should be used instead of `console.log()`
 // Printed on stderr because stdout is reserved for the JSON output
-const log = function (logs, string, { color } = {}) {
+export const log = function (logs, string, { color } = {}) {
   const stringA = String(string).replace(EMPTY_LINES_REGEXP, EMPTY_LINE)
   const stringB = color === undefined ? stringA : color(stringA)
 
@@ -36,16 +34,14 @@ const log = function (logs, string, { color } = {}) {
 const EMPTY_LINES_REGEXP = /^\s*$/gm
 const EMPTY_LINE = '\u{200B}'
 
-const logWarning = function (logs, string, opts) {
+export const logWarning = function (logs, string, opts) {
   log(logs, string, { color: THEME.warningLine, ...opts })
 }
 
-const logObject = function (logs, object, opts) {
+export const logObject = function (logs, object, opts) {
   log(logs, serializeObject(object), opts)
 }
 
-const logSubHeader = function (logs, string, opts) {
-  log(logs, `\n${pointer} ${string}`, { color: THEME.subHeader, ...opts })
+export const logSubHeader = function (logs, string, opts) {
+  log(logs, `\n${figures.pointer} ${string}`, { color: THEME.subHeader, ...opts })
 }
-
-module.exports = { getBufferLogs, log, logWarning, logObject, logSubHeader }

package/src/log/main.js

@@ -1,11 +1,9 @@
-'use strict'
-
-const { cleanupConfig, cleanupEnvironment } = require('./cleanup')
-const { logObject, logSubHeader } = require('./logger')
-const { cleanupConfigOpts } = require('./options')
+import { cleanupConfig, cleanupEnvironment } from './cleanup.js'
+import { logObject, logSubHeader } from './logger.js'
+import { cleanupConfigOpts } from './options.js'
 
 // Log options in debug mode.
-const logOpts = function (opts, { logs, debug, cachedConfig, cachedConfigPath }) {
+export const logOpts = function (opts, { logs, debug, cachedConfig, cachedConfigPath }) {
   // In production, print those in the first call to `@netlify/config`, not the
   // second one done inside `@netlify/build`
   if (!debug || cachedConfig !== undefined || cachedConfigPath !== undefined) {
@@ -17,7 +15,7 @@ const logOpts = function (opts, { logs, debug, cachedConfig, cachedConfigPath })
 }
 
 // Log `defaultConfig` option in debug mode
-const logDefaultConfig = function (defaultConfig, { logs, debug, baseRelDir }) {
+export const logDefaultConfig = function (defaultConfig, { logs, debug, baseRelDir }) {
   if (!debug || defaultConfig === undefined) {
     return
   }
@@ -27,7 +25,7 @@ const logDefaultConfig = function (defaultConfig, { logs, debug, baseRelDir }) {
 }
 
 // Log `inlineConfig` option in debug mode
-const logInlineConfig = function (initialConfig, { logs, debug }) {
+export const logInlineConfig = function (initialConfig, { logs, debug }) {
   if (!debug || Object.keys(initialConfig).length === 0) {
     return
   }
@@ -37,7 +35,7 @@ const logInlineConfig = function (initialConfig, { logs, debug }) {
 }
 
 // Log return value of `@netlify/config` in debug mode
-const logResult = function ({ configPath, buildDir, config, context, branch, env }, { logs, debug }) {
+export const logResult = function ({ configPath, buildDir, config, context, branch, env }, { logs, debug }) {
   if (!debug) {
     return
   }
@@ -48,5 +46,3 @@ const logResult = function ({ configPath, buildDir, config, context, branch, env
   logSubHeader(logs, 'Resolved config')
   logObject(logs, cleanupConfig(config))
 }
-
-module.exports = { logOpts, logDefaultConfig, logInlineConfig, logResult }

package/src/log/messages.js

@@ -1,17 +1,15 @@
-'use strict'
+import { throwUserError } from '../error.js'
 
-const { throwUserError } = require('../error')
+import { logWarning } from './logger.js'
 
-const { logWarning } = require('./logger')
-
-const throwOnInvalidTomlSequence = function (invalidSequence) {
+export const throwOnInvalidTomlSequence = function (invalidSequence) {
   throwUserError(
     `In netlify.toml, the following backslash should be escaped: ${invalidSequence}
 The following should be used instead: \\${invalidSequence}`,
   )
 }
 
-const warnLegacyFunctionsDirectory = ({ config = {}, logs }) => {
+export const warnLegacyFunctionsDirectory = ({ config = {}, logs }) => {
   const { functionsDirectory, functionsDirectoryOrigin } = config
 
   if (functionsDirectoryOrigin !== 'config-v1') {
@@ -29,7 +27,7 @@ We recommend updating netlify.toml to set the functions directory under [functio
   )
 }
 
-const warnContextPluginConfig = function (logs, packageName, context) {
+export const warnContextPluginConfig = function (logs, packageName, context) {
   logWarning(
     logs,
     `
@@ -38,7 +36,7 @@ To run "${packageName}" in the ${context} context only, uninstall the plugin fro
   )
 }
 
-const throwContextPluginsConfig = function (packageName, context) {
+export const throwContextPluginsConfig = function (packageName, context) {
   throwUserError(
     `
 "${packageName}" is installed in the UI, which means that it runs in all deploy contexts, regardless of file-based configuration.
@@ -51,7 +49,7 @@ To run "${packageName}" in all contexts, please remove the following section fro
   )
 }
 
-const warnHeadersParsing = function (logs, errors) {
+export const warnHeadersParsing = function (logs, errors) {
   if (errors.length === 0) {
     return
   }
@@ -69,7 +67,7 @@ ${errorMessage}`,
 // Headers with different cases are not currently the way users probably
 // intend them to be, so we print a warning message.
 // See issue at https://github.com/netlify/build/issues/2290
-const warnHeadersCaseSensitivity = function (logs, headers) {
+export const warnHeadersCaseSensitivity = function (logs, headers) {
   const headersA = headers.flatMap(getHeaderNames).filter(isNotDuplicateHeaderName).map(addHeaderLowerCase)
   const differentCaseHeader = headersA.find(hasHeaderCaseDuplicate)
   if (differentCaseHeader === undefined) {
@@ -106,7 +104,7 @@ const isHeaderCaseDuplicate = function ({ headerName, lowerHeaderName }, differe
   return differentCaseHeader.headerName !== headerName && differentCaseHeader.lowerHeaderName === lowerHeaderName
 }
 
-const warnRedirectsParsing = function (logs, errors) {
+export const warnRedirectsParsing = function (logs, errors) {
   if (errors.length === 0) {
     return
   }
@@ -124,13 +122,3 @@ ${errorMessage}`,
 const getErrorMessage = function ({ message }) {
   return message
 }
-
-module.exports = {
-  throwOnInvalidTomlSequence,
-  warnLegacyFunctionsDirectory,
-  warnContextPluginConfig,
-  throwContextPluginsConfig,
-  warnHeadersParsing,
-  warnHeadersCaseSensitivity,
-  warnRedirectsParsing,
-}

package/src/log/options.js

@@ -1,11 +1,9 @@
-'use strict'
-
-const { DEFAULT_FEATURE_FLAGS } = require('../options/feature_flags')
-const { removeEmptyArray } = require('../simplify')
-const { removeFalsy } = require('../utils/remove_falsy')
+import { DEFAULT_FEATURE_FLAGS } from '../options/feature_flags.js'
+import { removeEmptyArray } from '../simplify.js'
+import { removeFalsy } from '../utils/remove_falsy.js'
 
 // Use an allowlist to prevent printing confidential values.
-const cleanupConfigOpts = function ({
+export const cleanupConfigOpts = function ({
   config,
   cwd,
   context,
@@ -43,5 +41,3 @@ const cleanFeatureFlags = function (featureFlags) {
 const shouldPrintFeatureFlag = function ([featureFlagName, enabled]) {
   return enabled && featureFlagName in DEFAULT_FEATURE_FLAGS
 }
-
-module.exports = { cleanupConfigOpts }

package/src/log/serialize.js

@@ -1,9 +1,5 @@
-'use strict'
+import { dump } from 'js-yaml'
 
-const { dump } = require('js-yaml')
-
-const serializeObject = function (object) {
+export const serializeObject = function (object) {
   return dump(object, { noRefs: true, sortKeys: true, lineWidth: Number.POSITIVE_INFINITY }).trimRight()
 }
-
-module.exports = { serializeObject }

package/src/log/theme.js

@@ -1,23 +1,14 @@
-'use strict'
-
-const {
-  cyan: { bold: cyanBold },
-  cyan,
-  red: { bold: redBold },
-  yellowBright,
-} = require('chalk')
+import chalk from 'chalk'
 
 // Color theme. Please use this instead of requiring chalk directly, to ensure
 // consistent colors.
-const THEME = {
+export const THEME = {
   // Single lines used as subheaders
-  subHeader: cyanBold,
+  subHeader: chalk.cyan.bold,
   // Single lines used as subheaders indicating an error
-  errorSubHeader: redBold,
+  errorSubHeader: chalk.red.bold,
   // Same for warnings
-  warningLine: yellowBright,
+  warningLine: chalk.yellowBright,
   // One of several words that should be highlighted inside a line
-  highlightWords: cyan,
+  highlightWords: chalk.cyan,
 }
-
-module.exports = { THEME }

package/src/main.js

@@ -1,38 +1,37 @@
 /* eslint-disable max-lines */
-'use strict'
+import { getApiClient } from './api/client.js'
+import { getSiteInfo } from './api/site_info.js'
+import { getInitialBase, getBase, addBase } from './base.js'
+import { getBuildDir } from './build_dir.js'
+import { getCachedConfig } from './cached_config.js'
+import { normalizeContextProps, mergeContext } from './context.js'
+import { parseDefaultConfig } from './default.js'
+import { getEnv } from './env/main.js'
+import { resolveConfigPaths } from './files.js'
+import { getHeadersPath, addHeaders } from './headers.js'
+import { getInlineConfig } from './inline_config.js'
+import { logResult } from './log/main.js'
+import { mergeConfigs } from './merge.js'
+import { normalizeBeforeConfigMerge, normalizeAfterConfigMerge } from './merge_normalize.js'
+import { addDefaultOpts, normalizeOpts } from './options/main.js'
+import { UI_ORIGIN, CONFIG_ORIGIN, INLINE_ORIGIN } from './origin.js'
+import { parseConfig } from './parse.js'
+import { getConfigPath } from './path.js'
+import { getRedirectsPath, addRedirects } from './redirects.js'
 
-const { getApiClient } = require('./api/client')
-const { getSiteInfo } = require('./api/site_info')
-const { getInitialBase, getBase, addBase } = require('./base')
-const { getBuildDir } = require('./build_dir')
-const { getCachedConfig } = require('./cached_config')
-const { normalizeContextProps, mergeContext } = require('./context')
-const { parseDefaultConfig } = require('./default')
-const { getEnv } = require('./env/main')
-const { EVENTS } = require('./events')
-const { resolveConfigPaths } = require('./files')
-const { getHeadersPath, addHeaders } = require('./headers')
-const { getInlineConfig } = require('./inline_config')
-const { cleanupConfig } = require('./log/cleanup')
-const { logResult } = require('./log/main')
-const { mergeConfigs } = require('./merge')
-const { normalizeBeforeConfigMerge, normalizeAfterConfigMerge } = require('./merge_normalize')
-const { updateConfig, restoreConfig } = require('./mutations/update')
-const { addDefaultOpts, normalizeOpts } = require('./options/main')
-const { UI_ORIGIN, CONFIG_ORIGIN, INLINE_ORIGIN } = require('./origin')
-const { parseConfig } = require('./parse')
-const { getConfigPath } = require('./path')
+export { EVENTS } from './events.js'
+export { cleanupConfig } from './log/cleanup.js'
 // eslint-disable-next-line import/max-dependencies
-const { getRedirectsPath, addRedirects } = require('./redirects')
+export { updateConfig, restoreConfig } from './mutations/update.js'
 
 // Load the configuration file.
 // Takes an optional configuration file path as input and return the resolved
 // `config` together with related properties such as the `configPath`.
-const resolveConfig = async function (opts) {
+export const resolveConfig = async function (opts) {
   const { cachedConfig, cachedConfigPath, host, scheme, pathPrefix, testOpts, token, offline, ...optsA } =
     addDefaultOpts(opts)
   // `api` is not JSON-serializable, so we cannot cache it inside `cachedConfig`
-  const api = await getApiClient({ token, offline, host, scheme, pathPrefix, testOpts })
+  const api = getApiClient({ token, offline, host, scheme, pathPrefix, testOpts })
 
   const parsedCachedConfig = await getCachedConfig({ cachedConfig, cachedConfigPath, token, api })
   if (parsedCachedConfig !== undefined) {
@@ -278,12 +277,4 @@ const resolveFiles = async function ({ config, repositoryRoot, base, baseRelDir
   const configB = addBase(configA, baseA)
   return { config: configB, buildDir, base: baseA }
 }
-
-module.exports = resolveConfig
-// TODO: on next major release, export a single object instead of mutating the
-// top-level function
-module.exports.cleanupConfig = cleanupConfig
-module.exports.updateConfig = updateConfig
-module.exports.restoreConfig = restoreConfig
-module.exports.EVENTS = EVENTS
 /* eslint-enable max-lines */

package/src/merge.js

@@ -1,16 +1,14 @@
-'use strict'
+import deepmerge from 'deepmerge'
+import isPlainObj from 'is-plain-obj'
 
-const deepmerge = require('deepmerge')
-const isPlainObj = require('is-plain-obj')
-
-const { groupBy } = require('./utils/group')
-const { removeUndefined } = require('./utils/remove_falsy')
+import { groupBy } from './utils/group.js'
+import { removeUndefined } from './utils/remove_falsy.js'
 
 // Merge an array of configuration objects.
 // Last items have higher priority.
 // Configuration objects are deeply merged.
 //   - Arrays are overridden, not concatenated.
-const mergeConfigs = function (configs) {
+export const mergeConfigs = function (configs) {
   const cleanedConfigs = configs.map(removeUndefinedProps)
   return deepmerge.all(cleanedConfigs, { arrayMerge })
 }
@@ -53,5 +51,3 @@ const mergePluginConfigs = function (plugins) {
 const mergePluginsPair = function (pluginA, pluginB) {
   return deepmerge(pluginA, pluginB, { arrayMerge })
 }
-
-module.exports = { mergeConfigs }

package/src/merge_normalize.js

@@ -1,21 +1,19 @@
-'use strict'
-
-const { normalizeConfigCase } = require('./case')
-const { normalizeConfig } = require('./normalize')
-const { addOrigins } = require('./origin')
-const { validateIdenticalPlugins } = require('./validate/identical')
-const {
+import { normalizeConfigCase } from './case.js'
+import { normalizeConfig } from './normalize.js'
+import { addOrigins } from './origin.js'
+import { validateIdenticalPlugins } from './validate/identical.js'
+import {
   validatePreCaseNormalize,
   validatePreMergeConfig,
   validatePreNormalizeConfig,
   validatePostNormalizeConfig,
-} = require('./validate/main')
+} from './validate/main.js'
 
 // Perform validation and normalization logic to apply to all of:
 //  - config, defaultConfig, inlineConfig
 //  - context-specific configs
 // Therefore, this is performing before merging those together.
-const normalizeBeforeConfigMerge = function (config, origin) {
+export const normalizeBeforeConfigMerge = function (config, origin) {
   validatePreCaseNormalize(config)
   const configA = normalizeConfigCase(config)
   validatePreMergeConfig(configA)
@@ -25,14 +23,9 @@ const normalizeBeforeConfigMerge = function (config, origin) {
 }
 
 // Validation and normalization logic performed after merging
-const normalizeAfterConfigMerge = function (config) {
+export const normalizeAfterConfigMerge = function (config) {
   validatePreNormalizeConfig(config)
   const configA = normalizeConfig(config)
   validatePostNormalizeConfig(configA)
   return configA
 }
-
-module.exports = {
-  normalizeBeforeConfigMerge,
-  normalizeAfterConfigMerge,
-}

package/src/mutations/apply.js

@@ -1,11 +1,9 @@
-'use strict'
+import { throwUserError } from '../error.js'
+import { EVENTS } from '../events.js'
+import { WILDCARD_ALL, FUNCTION_CONFIG_PROPERTIES } from '../functions_config.js'
+import { setProp } from '../utils/set.js'
 
-const { throwUserError } = require('../error')
-const { EVENTS } = require('../events')
-const { WILDCARD_ALL, FUNCTION_CONFIG_PROPERTIES } = require('../functions_config')
-const { setProp } = require('../utils/set')
-
-const { getPropName } = require('./config_prop_name')
+import { getPropName } from './config_prop_name.js'
 
 // Apply a series of mutations to `inlineConfig`.
 // Meant to be used to apply configuration changes at build time.
@@ -13,7 +11,7 @@ const { getPropName } = require('./config_prop_name')
 // normalization. Therefore, this function also denormalizes (reverts that
 // normalization) so that the final `config` object can be serialized back to
 // a `netlify.toml`.
-const applyMutations = function (inlineConfig, configMutations) {
+export const applyMutations = function (inlineConfig, configMutations) {
   return configMutations.reduce(applyMutation, inlineConfig)
 }
 
@@ -78,5 +76,3 @@ const MUTABLE_PROPS = {
   headers: { lastEvent: 'onPostBuild' },
   redirects: { lastEvent: 'onPostBuild' },
 }
-
-module.exports = { applyMutations }

package/src/mutations/config_prop_name.js

@@ -1,7 +1,5 @@
-'use strict'
-
 // Retrieve normalized property name
-const getPropName = function (keys) {
+export const getPropName = function (keys) {
   return keys.reduce(normalizeDynamicProp, '')
 }
 
@@ -16,5 +14,3 @@ const normalizeDynamicProp = function (propName, key) {
 
 // Properties with dynamic children
 const DYNAMIC_OBJECT_PROPS = new Set(['build.services', 'build.environment', 'functions', 'functions.*'])
-
-module.exports = { getPropName }

package/src/mutations/update.js

@@ -1,20 +1,18 @@
-'use strict'
+import { writeFile, unlink, copyFile } from 'fs'
+import { promisify } from 'util'
 
-const { writeFile, unlink, copyFile } = require('fs')
-const { promisify } = require('util')
+import makeDir from 'make-dir'
+import pathExists from 'path-exists'
 
-const makeDir = require('make-dir')
-const pathExists = require('path-exists')
+import { ensureConfigPriority } from '../context.js'
+import { addHeaders } from '../headers.js'
+import { mergeConfigs } from '../merge.js'
+import { parseOptionalConfig } from '../parse.js'
+import { addRedirects } from '../redirects.js'
+import { simplifyConfig } from '../simplify.js'
+import { serializeToml } from '../utils/toml.js'
 
-const { ensureConfigPriority } = require('../context')
-const { addHeaders } = require('../headers')
-const { mergeConfigs } = require('../merge')
-const { parseOptionalConfig } = require('../parse')
-const { addRedirects } = require('../redirects')
-const { simplifyConfig } = require('../simplify')
-const { serializeToml } = require('../utils/toml')
-
-const { applyMutations } = require('./apply')
+import { applyMutations } from './apply.js'
 
 const pWriteFile = promisify(writeFile)
 const pUnlink = promisify(unlink)
@@ -22,7 +20,7 @@ const pCopyFile = promisify(copyFile)
 
 // Persist configuration changes to `netlify.toml`.
 // If `netlify.toml` does not exist, creates it. Otherwise, merges the changes.
-const updateConfig = async function (
+export const updateConfig = async function (
   configMutations,
   { buildDir, configPath, headersPath, redirectsPath, context, branch, logs },
 ) {
@@ -81,7 +79,7 @@ const backupConfig = async function ({ buildDir, configPath, headersPath, redire
   ])
 }
 
-const restoreConfig = async function (configMutations, { buildDir, configPath, headersPath, redirectsPath }) {
+export const restoreConfig = async function (configMutations, { buildDir, configPath, headersPath, redirectsPath }) {
   if (configMutations.length === 0) {
     return
   }
@@ -123,5 +121,3 @@ const copyOrDelete = async function (src, dest) {
 
   await deleteNoError(dest)
 }
-
-module.exports = { updateConfig, restoreConfig }

package/src/normalize.js

@@ -1,12 +1,10 @@
-'use strict'
-
-const { normalizeFunctionsProps, WILDCARD_ALL } = require('./functions_config')
-const { mergeConfigs } = require('./merge')
-const { DEFAULT_ORIGIN } = require('./origin')
-const { removeFalsy } = require('./utils/remove_falsy')
+import { normalizeFunctionsProps, WILDCARD_ALL } from './functions_config.js'
+import { mergeConfigs } from './merge.js'
+import { DEFAULT_ORIGIN } from './origin.js'
+import { removeFalsy } from './utils/remove_falsy.js'
 
 // Normalize configuration object
-const normalizeConfig = function (config) {
+export const normalizeConfig = function (config) {
   const configA = removeEmpty(config)
   const { build, functions, plugins, ...configB } = mergeConfigs([DEFAULT_CONFIG, configA])
   const { build: buildA, functions: functionsA, functionsDirectoryProps } = normalizeFunctionsProps(build, functions)
@@ -36,5 +34,3 @@ const DEFAULT_CONFIG = {
 const normalizePlugin = function ({ inputs = {}, ...plugin }) {
   return removeFalsy({ ...plugin, inputs })
 }
-
-module.exports = { normalizeConfig }

package/src/options/base.js

@@ -1,10 +1,8 @@
-'use strict'
+import { realpath } from 'fs'
+import { dirname, relative, sep } from 'path'
+import { promisify } from 'util'
 
-const { realpath } = require('fs')
-const { dirname, relative, sep } = require('path')
-const { promisify } = require('util')
-
-const pathExists = require('path-exists')
+import pathExists from 'path-exists'
 
 const pRealpath = promisify(realpath)
 
@@ -13,7 +11,7 @@ const pRealpath = promisify(realpath)
 // `cwd` that has a `.netlify` or `netlify.toml`. This allows Netlify CLI users
 // to `cd` into monorepo directories to change their base and build directories.
 // Do all checks in parallel for speed
-const getBaseOverride = async function ({ repositoryRoot, cwd }) {
+export const getBaseOverride = async function ({ repositoryRoot, cwd }) {
   // Performance optimization
   if (repositoryRoot === cwd) {
     return {}
@@ -69,5 +67,3 @@ const returnIfExists = async function (path) {
 
   return path
 }
-
-module.exports = { getBaseOverride }

package/src/options/branch.js

@@ -1,6 +1,4 @@
-'use strict'
-
-const execa = require('execa')
+import execa from 'execa'
 
 // Find out git branch among (in priority order):
 //   - `branch` option
@@ -8,7 +6,7 @@ const execa = require('execa')
 //   - `HEAD` branch (using `git`)
 //   - `main` (using `git`)
 //   - 'master' (fallback)
-const getBranch = async function ({ branch, repositoryRoot }) {
+export const getBranch = async function ({ branch, repositoryRoot }) {
   if (branch) {
     return branch
   }
@@ -34,5 +32,3 @@ const getGitBranch = async function (repositoryRoot, gitRef) {
 }
 
 const FALLBACK_BRANCH = 'master'
-
-module.exports = { getBranch }

package/src/options/feature_flags.js

@@ -1,7 +1,5 @@
-'use strict'
-
 // From CLI `--featureFlags=a,b,c` to programmatic `{ a: true, b: true, c: true }`
-const normalizeCliFeatureFlags = function (cliFeatureFlags) {
+export const normalizeCliFeatureFlags = function (cliFeatureFlags) {
   return Object.assign({}, ...cliFeatureFlags.split(',').filter(isNotEmpty).map(getFeatureFlag))
 }
 
@@ -14,6 +12,4 @@ const getFeatureFlag = function (name) {
 }
 
 // Default values for feature flags
-const DEFAULT_FEATURE_FLAGS = {}
-
-module.exports = { normalizeCliFeatureFlags, DEFAULT_FEATURE_FLAGS }
+export const DEFAULT_FEATURE_FLAGS = {}

package/src/options/main.js

@@ -1,22 +1,20 @@
-'use strict'
+import { resolve } from 'path'
+import process from 'process'
 
-const { resolve } = require('path')
-const process = require('process')
+import { isDirectory } from 'path-type'
 
-const { isDirectory } = require('path-type')
+import { throwUserError } from '../error.js'
+import { getBufferLogs } from '../log/logger.js'
+import { logOpts } from '../log/main.js'
+import { removeFalsy } from '../utils/remove_falsy.js'
 
-const { throwUserError } = require('../error')
-const { getBufferLogs } = require('../log/logger')
-const { logOpts } = require('../log/main')
-const { removeFalsy } = require('../utils/remove_falsy')
-
-const { getBaseOverride } = require('./base')
-const { getBranch } = require('./branch')
-const { DEFAULT_FEATURE_FLAGS } = require('./feature_flags')
-const { getRepositoryRoot } = require('./repository_root')
+import { getBaseOverride } from './base.js'
+import { getBranch } from './branch.js'
+import { DEFAULT_FEATURE_FLAGS } from './feature_flags.js'
+import { getRepositoryRoot } from './repository_root.js'
 
 // Assign default options
-const addDefaultOpts = function (opts = {}) {
+export const addDefaultOpts = function (opts = {}) {
   const rawOpts = removeFalsy(opts)
 
   const defaultOpts = getDefaultOpts(rawOpts)
@@ -74,7 +72,7 @@ const getDefaultCwd = function (cwdOpt) {
 }
 
 // Normalize options
-const normalizeOpts = async function (opts) {
+export const normalizeOpts = async function (opts) {
   const repositoryRoot = await getRepositoryRoot(opts)
   const optsA = { ...opts, repositoryRoot }
 
@@ -106,5 +104,3 @@ const normalizeDir = async function (opts, optName) {
   }
   return { [optName]: resolvedPath }
 }
-
-module.exports = { addDefaultOpts, normalizeOpts }