@netlify/config 17.0.0 → 17.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "17.0.0",
+  "version": "17.0.4",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./src/main.js",
@@ -63,11 +63,10 @@
     "indent-string": "^4.0.0",
     "is-plain-obj": "^3.0.0",
     "js-yaml": "^4.0.0",
-    "make-dir": "^3.1.0",
     "map-obj": "^4.0.0",
-    "netlify": "^10.0.0",
-    "netlify-headers-parser": "^6.0.0",
-    "netlify-redirect-parser": "^13.0.0",
+    "netlify": "^10.1.2",
+    "netlify-headers-parser": "^6.0.1",
+    "netlify-redirect-parser": "^13.0.1",
     "omit.js": "^2.0.2",
     "p-locate": "^5.0.0",
     "path-exists": "^4.0.0",
@@ -75,11 +74,11 @@
     "toml": "^3.0.0",
     "tomlify-j0.4": "^3.0.0",
     "validate-npm-package-name": "^3.0.0",
-    "yargs": "^15.3.0"
+    "yargs": "^16.0.0"
   },
   "devDependencies": {
     "ava": "^3.15.0",
-    "del": "^5.1.0",
+    "del": "^6.0.0",
     "has-ansi": "^4.0.0",
     "is-ci": "^3.0.0",
     "tmp-promise": "^3.0.2"

package/src/api/client.js

@@ -1,17 +1,15 @@
-import { removeUndefined } from '../utils/remove_falsy.js'
+import { NetlifyAPI } from 'netlify'
 
-// TODO: use static `import` after migrating `@netlify/config` to pure ES modules
-const jsClient = import('netlify')
+import { removeUndefined } from '../utils/remove_falsy.js'
 
 // Retrieve Netlify API client, if an access token was passed
-export const getApiClient = async function ({ token, offline, testOpts = {}, host, scheme, pathPrefix }) {
+export const getApiClient = function ({ token, offline, testOpts = {}, host, scheme, pathPrefix }) {
   if (!token || offline) {
     return
   }
 
   // TODO: find less intrusive way to mock HTTP requests
   const parameters = removeUndefined({ scheme: testOpts.scheme || scheme, host: testOpts.host || host, pathPrefix })
-  const { NetlifyAPI } = await jsClient
   const api = new NetlifyAPI(token, parameters)
   return api
 }

package/src/bin/flags.js

@@ -1,13 +1,19 @@
 /* eslint-disable max-lines */
 
+import process from 'process'
+
 import filterObj from 'filter-obj'
 import yargs from 'yargs'
+import { hideBin } from 'yargs/helpers'
 
 import { normalizeCliFeatureFlags } from '../options/feature_flags.js'
 
 // Parse CLI flags
 export const parseFlags = function () {
-  const { featureFlags: cliFeatureFlags = '', ...flags } = yargs.options(FLAGS).usage(USAGE).parse()
+  const { featureFlags: cliFeatureFlags = '', ...flags } = yargs(hideBin(process.argv))
+    .options(FLAGS)
+    .usage(USAGE)
+    .parse()
   const featureFlags = normalizeCliFeatureFlags(cliFeatureFlags)
   const flagsA = { ...flags, featureFlags }
   const flagsB = filterObj(flagsA, isUserFlag)

package/src/bin/main.js

@@ -1,12 +1,10 @@
 #!/usr/bin/env node
 
-import { writeFile } from 'fs'
+import { promises as fs } from 'fs'
 import { dirname } from 'path'
 import process from 'process'
-import { promisify } from 'util'
 
 import fastSafeStringify from 'fast-safe-stringify'
-import makeDir from 'make-dir'
 import omit from 'omit.js'
 
 import { isUserError } from '../error.js'
@@ -14,8 +12,6 @@ import { resolveConfig } from '../main.js'
 
 import { parseFlags } from './flags.js'
 
-const pWriteFile = promisify(writeFile)
-
 // CLI entry point
 const runCli = async function () {
   try {
@@ -45,8 +41,8 @@ const outputResult = async function (resultJson, output) {
     return
   }
 
-  await makeDir(dirname(output))
-  await pWriteFile(output, resultJson)
+  await fs.mkdir(dirname(output), { recursive: true })
+  await fs.writeFile(output, resultJson)
 }
 
 // `api` is not JSON-serializable, so we remove it

package/src/cached_config.js

@@ -1,7 +1,4 @@
-import { readFile } from 'fs'
-import { promisify } from 'util'
-
-const pReadFile = promisify(readFile)
+import { promises as fs } from 'fs'
 
 // Performance optimization when @netlify/config caller has already previously
 // called it and cached the result.
@@ -27,6 +24,6 @@ const parseCachedConfig = async function (cachedConfig, cachedConfigPath) {
   }
 
   if (cachedConfigPath !== undefined) {
-    return JSON.parse(await pReadFile(cachedConfigPath, 'utf8'))
+    return JSON.parse(await fs.readFile(cachedConfigPath))
   }
 }

package/src/env/git.js

@@ -19,5 +19,5 @@ const git = async function (args, cwd) {
   try {
     const { stdout } = await execa('git', args, { cwd })
     return stdout
-  } catch (error) {}
+  } catch {}
 }

package/src/headers.js

@@ -1,9 +1,8 @@
 import { resolve } from 'path'
 
-import { warnHeadersParsing, warnHeadersCaseSensitivity } from './log/messages.js'
+import { parseAllHeaders } from 'netlify-headers-parser'
 
-// TODO: use static `import` after migrating this repository to pure ES modules
-const netlifyHeadersParser = import('netlify-headers-parser')
+import { warnHeadersParsing, warnHeadersCaseSensitivity } from './log/messages.js'
 
 // Retrieve path to `_headers` file (even if it does not exist yet)
 export const getHeadersPath = function ({ build: { publish } }) {
@@ -14,7 +13,6 @@ const HEADERS_FILENAME = '_headers'
 
 // Add `config.headers`
 export const addHeaders = async function ({ headers: configHeaders, ...config }, headersPath, logs) {
-  const { parseAllHeaders } = await netlifyHeadersParser
   const { headers, errors } = await parseAllHeaders({
     headersFiles: [headersPath],
     configHeaders,

package/src/log/serialize.js

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

package/src/main.js

@@ -31,7 +31,7 @@ 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) {

package/src/mutations/update.js

@@ -1,7 +1,5 @@
-import { writeFile, unlink, copyFile } from 'fs'
-import { promisify } from 'util'
+import { promises as fs } from 'fs'
 
-import makeDir from 'make-dir'
 import pathExists from 'path-exists'
 
 import { ensureConfigPriority } from '../context.js'
@@ -14,10 +12,6 @@ import { serializeToml } from '../utils/toml.js'
 
 import { applyMutations } from './apply.js'
 
-const pWriteFile = promisify(writeFile)
-const pUnlink = promisify(unlink)
-const pCopyFile = promisify(copyFile)
-
 // Persist configuration changes to `netlify.toml`.
 // If `netlify.toml` does not exist, creates it. Otherwise, merges the changes.
 export const updateConfig = async function (
@@ -52,7 +46,7 @@ const mergeWithConfig = async function (normalizedInlineConfig, configPath) {
 // Serialize the changes to `netlify.toml`
 const saveConfig = async function (configPath, simplifiedConfig) {
   const serializedConfig = serializeToml(simplifiedConfig)
-  await pWriteFile(configPath, serializedConfig)
+  await fs.writeFile(configPath, serializedConfig)
 }
 
 // Deletes `_headers/_redirects` since they are merged to `netlify.toml`,
@@ -62,7 +56,7 @@ const deleteSideFile = async function (filePath) {
     return
   }
 
-  await pUnlink(filePath)
+  await fs.unlink(filePath)
 }
 
 // Modifications to `netlify.toml` and `_headers/_redirects` are only meant for
@@ -71,7 +65,7 @@ const deleteSideFile = async function (filePath) {
 // We do this by backing them up inside some sibling directory.
 const backupConfig = async function ({ buildDir, configPath, headersPath, redirectsPath }) {
   const tempDir = getTempDir(buildDir)
-  await makeDir(tempDir)
+  await fs.mkdir(tempDir, { recursive: true })
   await Promise.all([
     backupFile(configPath, `${tempDir}/netlify.toml`),
     backupFile(headersPath, `${tempDir}/_headers`),
@@ -104,18 +98,18 @@ const backupFile = async function (original, backup) {
     return
   }
 
-  await pCopyFile(original, backup)
+  await fs.copyFile(original, backup)
 }
 
 const deleteNoError = async (path) => {
   try {
-    await pUnlink(path)
-  } catch (_) {}
+    await fs.unlink(path)
+  } catch {}
 }
 
 const copyOrDelete = async function (src, dest) {
   if (await pathExists(src)) {
-    await pCopyFile(src, dest)
+    await fs.copyFile(src, dest)
     return
   }
 

package/src/options/base.js

@@ -1,11 +1,8 @@
-import { realpath } from 'fs'
+import { promises as fs } from 'fs'
 import { dirname, relative, sep } from 'path'
-import { promisify } from 'util'
 
 import pathExists from 'path-exists'
 
-const pRealpath = promisify(realpath)
-
 // Retrieve `base` override.
 // This uses any directory below `repositoryRoot` and above (or equal to)
 // `cwd` that has a `.netlify` or `netlify.toml`. This allows Netlify CLI users
@@ -17,7 +14,7 @@ export const getBaseOverride = async function ({ repositoryRoot, cwd }) {
     return {}
   }
 
-  const [repositoryRootA, cwdA] = await Promise.all([pRealpath(repositoryRoot), pRealpath(cwd)])
+  const [repositoryRootA, cwdA] = await Promise.all([fs.realpath(repositoryRoot), fs.realpath(cwd)])
   const basePaths = getBasePaths(repositoryRootA, cwdA)
   const basePath = await locatePath(basePaths)
 

package/src/options/branch.js

@@ -28,7 +28,7 @@ const getGitBranch = async function (repositoryRoot, gitRef) {
   try {
     const { stdout } = await execa.command(`git rev-parse --abbrev-ref ${gitRef}`, { cwd: repositoryRoot })
     return stdout
-  } catch (error) {}
+  } catch {}
 }
 
 const FALLBACK_BRANCH = 'master'

package/src/parse.js

@@ -1,5 +1,4 @@
-import { readFile } from 'fs'
-import { promisify } from 'util'
+import { promises as fs } from 'fs'
 
 import pathExists from 'path-exists'
 
@@ -7,8 +6,6 @@ import { throwUserError } from './error.js'
 import { throwOnInvalidTomlSequence } from './log/messages.js'
 import { parseToml } from './utils/toml.js'
 
-const pReadFile = promisify(readFile)
-
 // Load the configuration file and parse it (TOML)
 export const parseConfig = async function (configPath) {
   if (configPath === undefined) {
@@ -47,7 +44,7 @@ const readConfigPath = async function (configPath) {
 // Reach the configuration file's raw content
 const readConfig = async function (configPath) {
   try {
-    return await pReadFile(configPath, 'utf8')
+    return await fs.readFile(configPath, 'utf8')
   } catch (error) {
     throwUserError('Could not read configuration file', error)
   }

package/src/redirects.js

@@ -1,9 +1,8 @@
 import { resolve } from 'path'
 
-import { warnRedirectsParsing } from './log/messages.js'
+import { parseAllRedirects } from 'netlify-redirect-parser'
 
-// TODO: use static `import` after migrating this repository to pure ES modules
-const netlifyRedirectParser = import('netlify-redirect-parser')
+import { warnRedirectsParsing } from './log/messages.js'
 
 // Retrieve path to `_redirects` file (even if it does not exist yet)
 export const getRedirectsPath = function ({ build: { publish } }) {
@@ -14,7 +13,6 @@ const REDIRECTS_FILENAME = '_redirects'
 
 // Add `config.redirects`
 export const addRedirects = async function ({ redirects: configRedirects, ...config }, redirectsPath, logs) {
-  const { parseAllRedirects } = await netlifyRedirectParser
   const { redirects, errors } = await parseAllRedirects({
     redirectsFiles: [redirectsPath],
     configRedirects,

package/src/validate/validations.js

@@ -16,7 +16,7 @@ const isValidCronExpression = (cron) => {
   try {
     CronParser.parseExpression(cron)
     return true
-  } catch (error) {
+  } catch {
     return false
   }
 }