@netlify/config 16.0.6 → 17.0.2

package/src/options/repository_root.js

@@ -1,14 +1,12 @@
-'use strict'
+import { dirname } from 'path'
 
-const { dirname } = require('path')
-
-const findUp = require('find-up')
+import findUp from 'find-up'
 
 // Find out repository root among (in priority order):
 //  - `repositoryRoot` option
 //  - find a `.git` directory up from `cwd`
 //  - `cwd` (fallback)
-const getRepositoryRoot = async function ({ repositoryRoot, cwd }) {
+export const getRepositoryRoot = async function ({ repositoryRoot, cwd }) {
   if (repositoryRoot !== undefined) {
     return repositoryRoot
   }
@@ -21,5 +19,3 @@ const getRepositoryRoot = async function ({ repositoryRoot, cwd }) {
 
   return dirname(repositoryRootA)
 }
-
-module.exports = { getRepositoryRoot }

package/src/origin.js

@@ -1,16 +1,14 @@
-'use strict'
-
-const { isTruthy } = require('./utils/remove_falsy')
+import { isTruthy } from './utils/remove_falsy.js'
 
 // `build.commandOrigin`, `build.publishOrigin` and `plugins[*].origin` constants
-const UI_ORIGIN = 'ui'
-const CONFIG_ORIGIN = 'config'
-const DEFAULT_ORIGIN = 'default'
-const INLINE_ORIGIN = 'inline'
+export const UI_ORIGIN = 'ui'
+export const CONFIG_ORIGIN = 'config'
+export const DEFAULT_ORIGIN = 'default'
+export const INLINE_ORIGIN = 'inline'
 
 // Add `build.commandOrigin`, `build.publishOrigin` and `plugins[*].origin`.
 // This shows whether those properties came from the `ui` or from the `config`.
-const addOrigins = function (config, origin) {
+export const addOrigins = function (config, origin) {
   const configA = addBuildCommandOrigin({ config, origin })
   const configB = addBuildPublishOrigin({ config: configA, origin })
   const configC = addConfigPluginOrigin({ config: configB, origin })
@@ -38,5 +36,3 @@ const addHeadersOrigin = function ({ config, config: { headers }, origin }) {
 const addRedirectsOrigin = function ({ config, config: { redirects }, origin }) {
   return isTruthy(redirects) ? { ...config, redirectsOrigin: origin } : config
 }
-
-module.exports = { addOrigins, UI_ORIGIN, CONFIG_ORIGIN, DEFAULT_ORIGIN, INLINE_ORIGIN }

package/src/parse.js

@@ -1,18 +1,16 @@
-'use strict'
+import { readFile } from 'fs'
+import { promisify } from 'util'
 
-const { readFile } = require('fs')
-const { promisify } = require('util')
+import pathExists from 'path-exists'
 
-const pathExists = require('path-exists')
-
-const { throwUserError } = require('./error')
-const { throwOnInvalidTomlSequence } = require('./log/messages')
-const { parseToml } = require('./utils/toml')
+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)
-const parseConfig = async function (configPath) {
+export const parseConfig = async function (configPath) {
   if (configPath === undefined) {
     return {}
   }
@@ -26,7 +24,7 @@ const parseConfig = async function (configPath) {
 
 // Same but `configPath` is required and `configPath` might point to a
 // non-existing file.
-const parseOptionalConfig = async function (configPath) {
+export const parseOptionalConfig = async function (configPath) {
   if (!(await pathExists(configPath))) {
     return {}
   }
@@ -72,5 +70,3 @@ const validateTomlBlackslashes = function (configString) {
 // Also, """ strings can use trailing backslashes.
 const INVALID_TOML_BLACKSLASH =
   /\n[a-zA-Z]+ *= *(?:(?:""".*(?<!\\)(\\[^"\\btnfruU\n]).*""")|(?:"(?!")[^\n]*(?<!\\)(\\[^"\\btnfruU])[^\n]*"))/su
-
-module.exports = { parseConfig, parseOptionalConfig }

package/src/path.js

@@ -1,17 +1,15 @@
-'use strict'
+import { resolve } from 'path'
 
-const { resolve } = require('path')
-
-const findUp = require('find-up')
-const pLocate = require('p-locate')
-const pathExists = require('path-exists')
+import findUp from 'find-up'
+import pLocate from 'p-locate'
+import pathExists from 'path-exists'
 
 // Configuration location can be:
 //  - a local path with the --config CLI flag
 //  - a `netlify.*` file in the `repositoryRoot/{base}`
 //  - a `netlify.*` file in the `repositoryRoot`
 //  - a `netlify.*` file in the current directory or any parent
-const getConfigPath = async function ({ configOpt, cwd, repositoryRoot, configBase }) {
+export const getConfigPath = async function ({ configOpt, cwd, repositoryRoot, configBase }) {
   const configPath = await pLocate(
     [
       searchConfigOpt(cwd, configOpt),
@@ -52,5 +50,3 @@ const searchConfigFile = async function (cwd) {
 }
 
 const FILENAME = 'netlify.toml'
-
-module.exports = { getConfigPath }

package/src/redirects.js

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

package/src/simplify.js

@@ -1,12 +1,10 @@
-'use strict'
+import isPlainObj from 'is-plain-obj'
+import mapObj from 'map-obj'
 
-const isPlainObj = require('is-plain-obj')
-const mapObj = require('map-obj')
-
-const { removeFalsy } = require('./utils/remove_falsy')
+import { removeFalsy } from './utils/remove_falsy.js'
 
 // Removes default values (empty objects and arrays) from the configuration.
-const simplifyConfig = function ({
+export const simplifyConfig = function ({
   build: { environment, processing: { css, html, images, js, ...processing } = {}, services, ...build } = {},
   functions,
   plugins,
@@ -87,7 +85,7 @@ const removeDefaultValue = function (value, propName, defaultValue) {
   return value === defaultValue ? {} : { [propName]: value }
 }
 
-const removeEmptyObject = function (object, propName) {
+export const removeEmptyObject = function (object, propName) {
   if (!isPlainObj(object)) {
     return {}
   }
@@ -96,12 +94,10 @@ const removeEmptyObject = function (object, propName) {
   return Object.keys(objectA).length === 0 ? {} : { [propName]: objectA }
 }
 
-const removeEmptyArray = function (array, propName) {
+export const removeEmptyArray = function (array, propName) {
   if (!Array.isArray(array)) {
     return {}
   }
 
   return array.length === 0 ? {} : { [propName]: array }
 }
-
-module.exports = { simplifyConfig, removeEmptyObject, removeEmptyArray }

package/src/utils/group.js

@@ -1,8 +1,6 @@
-'use strict'
-
 // Group objects according to a key attribute.
 // The key must exist in each object and be a string.
-const groupBy = function (objects, keyName) {
+export const groupBy = function (objects, keyName) {
   const keys = [...new Set(objects.map((object) => object[keyName]))]
   return keys.map((key) => groupObjects(objects, keyName, key))
 }
@@ -10,5 +8,3 @@ const groupBy = function (objects, keyName) {
 const groupObjects = function (objects, keyName, key) {
   return objects.filter((object) => object[keyName] === key)
 }
-
-module.exports = { groupBy }

package/src/utils/remove_falsy.js

@@ -1,22 +1,18 @@
-'use strict'
-
-const filterObj = require('filter-obj')
+import filterObj from 'filter-obj'
 
 // Remove falsy values from object
-const removeFalsy = function (obj) {
+export const removeFalsy = function (obj) {
   return filterObj(obj, (key, value) => isTruthy(value))
 }
 
-const removeUndefined = function (obj) {
+export const removeUndefined = function (obj) {
   return filterObj(obj, (key, value) => isDefined(value))
 }
 
-const isTruthy = function (value) {
+export const isTruthy = function (value) {
   return isDefined(value) && (typeof value !== 'string' || value.trim() !== '')
 }
 
-const isDefined = function (value) {
+export const isDefined = function (value) {
   return value !== undefined && value !== null
 }
-
-module.exports = { removeFalsy, removeUndefined, isTruthy, isDefined }

package/src/utils/set.js

@@ -1,13 +1,11 @@
-'use strict'
-
-const isPlainObj = require('is-plain-obj')
+import isPlainObj from 'is-plain-obj'
 
 // Set a property deeply using an array of `keys` which can be either strings
 // (object properties) or integers (array indices).
 // Adds default values when intermediary properties are undefined or have the
 // wrong type. Also extends arrays when they are too small for a given index.
 // Does not mutate.
-const setProp = function (parent, keys, value) {
+export const setProp = function (parent, keys, value) {
   if (keys.length === 0) {
     return value
   }
@@ -33,5 +31,3 @@ const setObjectProp = function (parent, [key, ...keys], value) {
   const newValue = setProp(objectParent[key], keys, value)
   return { ...objectParent, [key]: newValue }
 }
-
-module.exports = { setProp }

package/src/utils/toml.js

@@ -1,10 +1,8 @@
-'use strict'
-
-const { parse: loadToml } = require('toml')
-const tomlify = require('tomlify-j0.4')
+import { parse as loadToml } from 'toml'
+import tomlify from 'tomlify-j0.4'
 
 // Parse from TOML to JavaScript
-const parseToml = function (configString) {
+export const parseToml = function (configString) {
   const config = loadToml(configString)
   // `toml.parse()` returns a object with `null` prototype deeply, which can
   // sometimes create problems with some utilities. We convert it.
@@ -14,7 +12,7 @@ const parseToml = function (configString) {
 }
 
 // Serialize JavaScript object to TOML
-const serializeToml = function (object) {
+export const serializeToml = function (object) {
   return tomlify.toToml(object, { space: 2, replace: replaceTomlValue })
 }
 
@@ -23,5 +21,3 @@ const serializeToml = function (object) {
 const replaceTomlValue = function (key, value) {
   return Number.isInteger(value) ? String(value) : false
 }
-
-module.exports = { parseToml, serializeToml }

package/src/validate/context.js

@@ -1,7 +1,5 @@
-'use strict'
-
-const { warnContextPluginConfig, throwContextPluginsConfig } = require('../log/messages')
-const { UI_ORIGIN } = require('../origin')
+import { warnContextPluginConfig, throwContextPluginsConfig } from '../log/messages.js'
+import { UI_ORIGIN } from '../origin.js'
 
 // The only reason to specify both `[[plugins]]` and
 // `[[contexts.{context}.plugins]]` is to configure context-specific plugin
@@ -14,7 +12,7 @@ const { UI_ORIGIN } = require('../origin')
 //  - `package` is the only property in `[[contexts.{context}.plugins]]`, i.e.
 //    there are no context-specific `inputs`
 //  - The current build is not in `context`
-const validateContextsPluginsConfig = function ({ contextProps, plugins, contexts, logs }) {
+export const validateContextsPluginsConfig = function ({ contextProps, plugins, contexts, logs }) {
   Object.entries(contextProps).forEach(([givenContext, givenContextProps]) => {
     validateContextPluginsConfig({ givenContextProps, plugins, givenContext, contexts, logs })
   })
@@ -57,5 +55,3 @@ const isContextFreePlugin = function (plugins, packageName) {
 const isPluginConfigError = function (contexts, givenContext, inputs) {
   return contexts.every((context) => context !== givenContext) && Object.keys(inputs).length === 0
 }
-
-module.exports = { validateContextsPluginsConfig }

package/src/validate/example.js

@@ -1,12 +1,10 @@
-'use strict'
+import indentString from 'indent-string'
 
-const indentString = require('indent-string')
-
-const { THEME } = require('../log/theme')
-const { serializeToml } = require('../utils/toml')
+import { THEME } from '../log/theme.js'
+import { serializeToml } from '../utils/toml.js'
 
 // Print invalid value and example netlify.toml
-const getExample = function ({ value, key, prevPath, example, formatInvalid }) {
+export const getExample = function ({ value, key, prevPath, example, formatInvalid }) {
   const exampleA = typeof example === 'function' ? example(value, key, prevPath) : example
   return `
 ${THEME.errorSubHeader('Invalid syntax')}
@@ -37,5 +35,3 @@ const setInvalidValuePart = function (value, part) {
 
   return value === undefined ? {} : { [part]: value }
 }
-
-module.exports = { getExample }

package/src/validate/helpers.js

@@ -1,21 +1,19 @@
-'use strict'
+import isPlainObj from 'is-plain-obj'
 
-const isPlainObj = require('is-plain-obj')
-
-const isArrayOfObjects = function (value) {
+export const isArrayOfObjects = function (value) {
   return Array.isArray(value) && value.every(isPlainObj)
 }
 
-const isArrayOfStrings = function (value) {
+export const isArrayOfStrings = function (value) {
   return Array.isArray(value) && value.every(isString)
 }
 
-const isString = function (value) {
+export const isString = function (value) {
   return typeof value === 'string'
 }
 
 // Check an object valid properties, including legacy ones
-const validProperties = function (propNames, legacyPropNames) {
+export const validProperties = function (propNames, legacyPropNames) {
   return {
     check: (value) => checkValidProperty(value, [...propNames, ...legacyPropNames]),
     message: `has unknown properties. Valid properties are:
@@ -27,15 +25,7 @@ const checkValidProperty = function (value, propNames) {
   return Object.keys(value).every((propName) => propNames.includes(propName))
 }
 
-const functionsDirectoryCheck = {
+export const functionsDirectoryCheck = {
   formatInvalid: ({ functionsDirectory } = {}) => ({ functions: { directory: functionsDirectory } }),
   propertyName: 'functions.directory',
 }
-
-module.exports = {
-  isArrayOfObjects,
-  isArrayOfStrings,
-  isString,
-  validProperties,
-  functionsDirectoryCheck,
-}

package/src/validate/identical.js

@@ -1,13 +1,11 @@
-'use strict'
-
-const { throwUserError } = require('../error')
+import { throwUserError } from '../error.js'
 
 // Validate that plugin are configured only once per origin
 // (`netlify.toml` or UI).
 // Exception: context-specific configuration since we allow context-specific
 // overrides. This does not validate them since contexts have not been merged
 // yet.
-const validateIdenticalPlugins = function ({ plugins = [] }) {
+export const validateIdenticalPlugins = function ({ plugins = [] }) {
   plugins.filter(hasIdenticalPlugin).forEach(throwIndenticalPlugin)
 }
 
@@ -20,5 +18,3 @@ const throwIndenticalPlugin = function ({ package: packageName, origin }) {
 }
 
 const ORIGINS = { config: 'netlify.toml', ui: 'the app' }
-
-module.exports = { validateIdenticalPlugins }

package/src/validate/main.js

@@ -1,39 +1,37 @@
-'use strict'
+import { throwUserError } from '../error.js'
+import { THEME } from '../log/theme.js'
 
-const { throwUserError } = require('../error')
-const { THEME } = require('../log/theme')
-
-const { getExample } = require('./example')
-const {
+import { getExample } from './example.js'
+import {
   PRE_CASE_NORMALIZE_VALIDATIONS,
   PRE_MERGE_VALIDATIONS,
   PRE_CONTEXT_VALIDATIONS,
   PRE_NORMALIZE_VALIDATIONS,
   POST_NORMALIZE_VALIDATIONS,
-} = require('./validations')
+} from './validations.js'
 
 // Validate the configuration file, before case normalization.
-const validatePreCaseNormalize = function (config) {
+export const validatePreCaseNormalize = function (config) {
   validateConfig(config, PRE_CASE_NORMALIZE_VALIDATIONS)
 }
 
 // Validate the configuration file, before `defaultConfig` merge.
-const validatePreMergeConfig = function (config) {
+export const validatePreMergeConfig = function (config) {
   validateConfig(config, PRE_MERGE_VALIDATIONS)
 }
 
 // Validate the configuration file, before context merge.
-const validatePreContextConfig = function (config) {
+export const validatePreContextConfig = function (config) {
   validateConfig(config, PRE_CONTEXT_VALIDATIONS)
 }
 
 // Validate the configuration file, before normalization.
-const validatePreNormalizeConfig = function (config) {
+export const validatePreNormalizeConfig = function (config) {
   validateConfig(config, PRE_NORMALIZE_VALIDATIONS)
 }
 
 // Validate the configuration file, after normalization.
-const validatePostNormalizeConfig = function (config) {
+export const validatePostNormalizeConfig = function (config) {
   validateConfig(config, POST_NORMALIZE_VALIDATIONS)
 }
 
@@ -143,11 +141,3 @@ const validateChildProp = function ({ childProp, value, nextPath, propPath, prev
     key: childProp,
   })
 }
-
-module.exports = {
-  validatePreCaseNormalize,
-  validatePreMergeConfig,
-  validatePreContextConfig,
-  validatePreNormalizeConfig,
-  validatePostNormalizeConfig,
-}

package/src/validate/validations.js

@@ -1,13 +1,12 @@
 /* eslint-disable max-lines */
-'use strict'
 
-const CronParser = require('cron-parser')
-const isPlainObj = require('is-plain-obj')
-const validateNpmPackageName = require('validate-npm-package-name')
+import CronParser from 'cron-parser'
+import isPlainObj from 'is-plain-obj'
+import validateNpmPackageName from 'validate-npm-package-name'
 
-const { bundlers, WILDCARD_ALL: FUNCTIONS_CONFIG_WILDCARD_ALL } = require('../functions_config')
+import { bundlers, WILDCARD_ALL as FUNCTIONS_CONFIG_WILDCARD_ALL } from '../functions_config.js'
 
-const { functionsDirectoryCheck, isArrayOfObjects, isArrayOfStrings, isString, validProperties } = require('./helpers')
+import { functionsDirectoryCheck, isArrayOfObjects, isArrayOfStrings, isString, validProperties } from './helpers.js'
 
 /**
  * @param {string} cron
@@ -38,7 +37,7 @@ const isValidCronExpression = (cron) => {
 // We use this instead of JSON schema (or others) to get nicer error messages.
 
 // Validations done before case normalization
-const PRE_CASE_NORMALIZE_VALIDATIONS = [
+export const PRE_CASE_NORMALIZE_VALIDATIONS = [
   {
     property: 'build',
     check: isPlainObj,
@@ -66,10 +65,10 @@ const ORIGIN_VALIDATIONS = [
 ]
 
 // Validations done before `defaultConfig` merge
-const PRE_MERGE_VALIDATIONS = [...ORIGIN_VALIDATIONS]
+export const PRE_MERGE_VALIDATIONS = [...ORIGIN_VALIDATIONS]
 
 // Validations done before context merge
-const PRE_CONTEXT_VALIDATIONS = [
+export const PRE_CONTEXT_VALIDATIONS = [
   {
     property: 'context',
     check: isPlainObj,
@@ -85,7 +84,7 @@ const PRE_CONTEXT_VALIDATIONS = [
 ]
 
 // Validations done before normalization
-const PRE_NORMALIZE_VALIDATIONS = [
+export const PRE_NORMALIZE_VALIDATIONS = [
   ...ORIGIN_VALIDATIONS,
   {
     property: 'functions',
@@ -108,7 +107,7 @@ const PRE_NORMALIZE_VALIDATIONS = [
 const EXAMPLE_PORT = 80
 
 // Validations done after normalization
-const POST_NORMALIZE_VALIDATIONS = [
+export const POST_NORMALIZE_VALIDATIONS = [
   {
     property: 'plugins.*',
     ...validProperties(['package', 'pinned_version', 'inputs'], ['origin']),
@@ -244,12 +243,4 @@ const POST_NORMALIZE_VALIDATIONS = [
     }),
   },
 ]
-
-module.exports = {
-  PRE_CASE_NORMALIZE_VALIDATIONS,
-  PRE_MERGE_VALIDATIONS,
-  PRE_CONTEXT_VALIDATIONS,
-  PRE_NORMALIZE_VALIDATIONS,
-  POST_NORMALIZE_VALIDATIONS,
-}
 /* eslint-enable max-lines */