@netlify/config 20.11.0 → 20.12.0

package/lib/index.js

@@ -1,5 +1,6 @@
 export { DEV_EVENTS, EVENTS } from './events.js';
 export { cleanupConfig } from './log/cleanup.js';
 export { resolveConfig } from './main.js';
+export { mergeConfigs } from './merge.js';
 export { applyMutations } from './mutations/apply.js';
 export { restoreConfig, updateConfig } from './mutations/update.js';

package/lib/merge.js

@@ -5,10 +5,11 @@ 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.
-export const mergeConfigs = function (configs) {
+//   - By default, Arrays are overridden, not concatenated. This behavior can
+//     be changed by setting the `concatenateArrays` property to `true`.
+export const mergeConfigs = function (configs, { concatenateArrays } = {}) {
     const cleanedConfigs = configs.map(removeUndefinedProps);
-    return deepmerge.all(cleanedConfigs, { arrayMerge });
+    return deepmerge.all(cleanedConfigs, { arrayMerge: concatenateArrays ? arrayConcatenate : arrayMerge });
 };
 const removeUndefinedProps = function ({ build = {}, ...config }) {
     return removeUndefined({ ...config, build: removeUndefined(build) });
@@ -22,6 +23,11 @@ const arrayMerge = function (arrayA, arrayB) {
     }
     return arrayB;
 };
+// Concatenate two arrays such that elements from array A come after elements
+// from array B.
+const arrayConcatenate = function (arrayA, arrayB) {
+    return [...arrayB, ...arrayA];
+};
 // `deepmerge` does not allow retrieving the name of the array property being
 // merged, so we need to do some heuristics.
 const isPluginsProperty = function (array) {

package/lib/utils/toml.js

@@ -1,4 +1,4 @@
-import { parse as loadToml } from 'toml';
+import { parse as loadToml } from '@iarna/toml';
 import tomlify from 'tomlify-j0.4';
 // Parse from TOML to JavaScript
 export const parseToml = function (configString) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.11.0",
+  "version": "20.12.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -57,6 +57,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@iarna/toml": "^2.2.5",
     "chalk": "^5.0.0",
     "cron-parser": "^4.1.0",
     "deepmerge": "^4.2.2",
@@ -71,13 +72,12 @@
     "js-yaml": "^4.0.0",
     "map-obj": "^5.0.0",
     "netlify": "^13.1.14",
-    "netlify-headers-parser": "^7.1.3",
-    "netlify-redirect-parser": "^14.2.1",
+    "netlify-headers-parser": "^7.1.4",
+    "netlify-redirect-parser": "^14.2.2",
     "node-fetch": "^3.3.1",
     "omit.js": "^2.0.2",
     "p-locate": "^6.0.0",
     "path-type": "^5.0.0",
-    "toml": "^3.0.0",
     "tomlify-j0.4": "^3.0.0",
     "validate-npm-package-name": "^4.0.0",
     "yargs": "^17.6.0"
@@ -94,5 +94,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "96d48f78b912d9d7491ca110480efa247a1ecfca"
+  "gitHead": "24f130e0d2e27091cd5998cb23f19718e3785824"
 }