@netlify/config 17.0.11 → 17.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "17.0.11",
+  "version": "17.0.14",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./src/main.js",
@@ -19,8 +19,8 @@
     "prepublishOnly": "cd ../../ && npm run prepublishOnly"
   },
   "keywords": [
-    "nodejs",
     "javascript",
+    "nodejs",
     "windows",
     "macos",
     "linux",
@@ -66,7 +66,7 @@
     "map-obj": "^5.0.0",
     "netlify": "^11.0.0",
     "netlify-headers-parser": "^6.0.2",
-    "netlify-redirect-parser": "^13.0.3",
+    "netlify-redirect-parser": "13.0.2",
     "omit.js": "^2.0.2",
     "p-locate": "^6.0.0",
     "path-exists": "^5.0.0",

package/src/headers.js

@@ -12,11 +12,17 @@ export const getHeadersPath = function ({ build: { publish } }) {
 const HEADERS_FILENAME = '_headers'
 
 // Add `config.headers`
-export const addHeaders = async function ({ headers: configHeaders, ...config }, headersPath, logs) {
+export const addHeaders = async function ({
+  config: { headers: configHeaders, ...config },
+  headersPath,
+  logs,
+  featureFlags,
+}) {
   const { headers, errors } = await parseAllHeaders({
     headersFiles: [headersPath],
     configHeaders,
     minimal: true,
+    featureFlags,
   })
   warnHeadersParsing(logs, errors)
   warnHeadersCaseSensitivity(logs, headers)

package/src/log/cleanup.js

@@ -48,7 +48,9 @@ export const cleanupConfig = function ({
     functions,
     functionsDirectory,
   })
-  return netlifyConfig
+  const netlifyConfigA = truncateArray(netlifyConfig, 'headers')
+  const netlifyConfigB = truncateArray(netlifyConfigA, 'redirects')
+  return netlifyConfigB
 }
 
 export const cleanupEnvironment = function (environment) {
@@ -77,3 +79,14 @@ const cleanupPlugin = function ({ package: packageName, origin, inputs = {} }) {
 const isPublicInput = function (key, input) {
   return typeof input === 'boolean'
 }
+
+// `headers` and `redirects` can be very long, which can take several minutes
+// to print in the build logs. We truncate them before logging.
+const truncateArray = function (netlifyConfig, propName) {
+  const array = netlifyConfig[propName]
+  return Array.isArray(array) && array.length > MAX_ARRAY_LENGTH
+    ? { ...netlifyConfig, [propName]: array.slice(0, MAX_ARRAY_LENGTH) }
+    : netlifyConfig
+}
+
+const MAX_ARRAY_LENGTH = 100

package/src/main.js

@@ -55,6 +55,7 @@ export const resolveConfig = async function (opts) {
     mode,
     debug,
     logs,
+    featureFlags,
   } = await normalizeOpts(optsA)
 
   const { siteInfo, accounts, addons } = await getSiteInfo({ api, siteId, mode, testOpts })
@@ -79,6 +80,7 @@ export const resolveConfig = async function (opts) {
     inlineConfig: inlineConfigA,
     baseRelDir: baseRelDirA,
     logs,
+    featureFlags,
   })
 
   const env = await getEnv({
@@ -147,6 +149,7 @@ const loadConfig = async function ({
   inlineConfig,
   baseRelDir,
   logs,
+  featureFlags,
 }) {
   const initialBase = getInitialBase({ repositoryRoot, defaultConfig, inlineConfig })
   const { configPath, config, buildDir, base, redirectsPath, headersPath } = await getFullConfig({
@@ -160,6 +163,7 @@ const loadConfig = async function ({
     baseRelDir,
     configBase: initialBase,
     logs,
+    featureFlags,
   })
 
   // No second pass needed if:
@@ -190,6 +194,7 @@ const loadConfig = async function ({
     configBase: base,
     base,
     logs,
+    featureFlags,
   })
   return {
     configPath: configPathA,
@@ -213,6 +218,7 @@ const getFullConfig = async function ({
   configBase,
   base,
   logs,
+  featureFlags,
 }) {
   const configPath = await getConfigPath({ configOpt, cwd, repositoryRoot, configBase })
 
@@ -232,9 +238,9 @@ const getFullConfig = async function ({
       base: baseA,
     } = await resolveFiles({ config: configA, repositoryRoot, base, baseRelDir })
     const headersPath = getHeadersPath(configB)
-    const configC = await addHeaders(configB, headersPath, logs)
+    const configC = await addHeaders({ config: configB, headersPath, logs, featureFlags })
     const redirectsPath = getRedirectsPath(configC)
-    const configD = await addRedirects(configC, redirectsPath, logs)
+    const configD = await addRedirects({ config: configC, redirectsPath, logs, featureFlags })
     return { configPath, config: configD, buildDir, base: baseA, redirectsPath, headersPath }
   } catch (error) {
     const configName = configPath === undefined ? '' : ` file ${configPath}`

package/src/mutations/update.js

@@ -16,7 +16,7 @@ import { applyMutations } from './apply.js'
 // If `netlify.toml` does not exist, creates it. Otherwise, merges the changes.
 export const updateConfig = async function (
   configMutations,
-  { buildDir, configPath, headersPath, redirectsPath, context, branch, logs },
+  { buildDir, configPath, headersPath, redirectsPath, context, branch, logs, featureFlags },
 ) {
   if (configMutations.length === 0) {
     return
@@ -25,8 +25,8 @@ export const updateConfig = async function (
   const inlineConfig = applyMutations({}, configMutations)
   const normalizedInlineConfig = ensureConfigPriority(inlineConfig, context, branch)
   const updatedConfig = await mergeWithConfig(normalizedInlineConfig, configPath)
-  const configWithHeaders = await addHeaders(updatedConfig, headersPath, logs)
-  const finalConfig = await addRedirects(configWithHeaders, redirectsPath, logs)
+  const configWithHeaders = await addHeaders({ config: updatedConfig, headersPath, logs, featureFlags })
+  const finalConfig = await addRedirects({ config: configWithHeaders, redirectsPath, logs, featureFlags })
   const simplifiedConfig = simplifyConfig(finalConfig)
   await backupConfig({ buildDir, configPath, headersPath, redirectsPath })
   await Promise.all([

package/src/redirects.js

@@ -12,11 +12,17 @@ export const getRedirectsPath = function ({ build: { publish } }) {
 const REDIRECTS_FILENAME = '_redirects'
 
 // Add `config.redirects`
-export const addRedirects = async function ({ redirects: configRedirects, ...config }, redirectsPath, logs) {
+export const addRedirects = async function ({
+  config: { redirects: configRedirects, ...config },
+  redirectsPath,
+  logs,
+  featureFlags,
+}) {
   const { redirects, errors } = await parseAllRedirects({
     redirectsFiles: [redirectsPath],
     configRedirects,
     minimal: true,
+    featureFlags,
   })
   warnRedirectsParsing(logs, errors)
   return { ...config, redirects }

package/src/simplify.js

@@ -33,8 +33,8 @@ export const simplifyConfig = function ({
     ...removeEmptyObject(simplifyFunctions(functions), 'functions'),
     ...removeEmptyObject(buildA, 'build'),
     ...removeEmptyArray(plugins, 'plugins'),
-    ...removeEmptyArray(truncateArray(headers), 'headers'),
-    ...removeEmptyArray(simplifyRedirects(truncateArray(redirects)), 'redirects'),
+    ...removeEmptyArray(headers, 'headers'),
+    ...removeEmptyArray(simplifyRedirects(redirects), 'redirects'),
     ...removeEmptyObject(simplifyContexts(context), 'context'),
   })
 }
@@ -85,14 +85,6 @@ const removeDefaultValue = function (value, propName, defaultValue) {
   return value === defaultValue ? {} : { [propName]: value }
 }
 
-// `headers` and `redirects` can be very long, which can take several minutes
-// to print in the build logs. We truncate them before logging.
-const truncateArray = function (array) {
-  return !Array.isArray(array) || array.length < MAX_ARRAY_LENGTH ? array : array.slice(0, MAX_ARRAY_LENGTH)
-}
-
-const MAX_ARRAY_LENGTH = 100
-
 export const removeEmptyObject = function (object, propName) {
   if (!isPlainObj(object)) {
     return {}