@netlify/config 25.2.4 → 25.2.6

package/lib/main.js

@@ -39,7 +39,7 @@ export const resolveConfig = async function (opts) {
     const extensionApiBaseUrl = host?.includes(NETLIFY_API_STAGING_HOSTNAME)
         ? EXTENSION_API_STAGING_BASE_URL
         : EXTENSION_API_BASE_URL;
-    const { config: configOpt, defaultConfig, inlineConfig, configMutations, cwd, context, repositoryRoot, base, branch, siteId, accountId, deployId, skewProtectionToken, buildId, baseRelDir, mode, debug, logs, featureFlags, } = await normalizeOpts(optsA);
+    const { config: configOpt, defaultConfig, inlineConfig, configMutations, configMutationsOrigin, cwd, context, repositoryRoot, base, branch, siteId, accountId, deployId, skewProtectionToken, buildId, baseRelDir, mode, debug, logs, featureFlags, } = await normalizeOpts(optsA);
     let { siteInfo, accounts, integrations: extensions } = parsedCachedConfig || {};
     // If we have cached site info, we don't need to fetch it again
     const useCachedSiteInfo = Boolean(featureFlags?.use_cached_site_info && siteInfo && accounts && extensions);
@@ -83,6 +83,7 @@ export const resolveConfig = async function (opts) {
         branch,
         defaultConfig: defaultConfigA,
         inlineConfig: inlineConfigA,
+        configMutationsOrigin,
         baseRelDir: baseRelDirA,
         logs,
         featureFlags,
@@ -157,7 +158,7 @@ const addLegacyFunctionsDirectory = (config) => {
  * The first pass uses the `defaultConfig`'s `build.base` (if defined).
  * The second pass uses the `build.base` from the first pass (if defined).
  */
-const loadConfig = async function ({ configOpt, cwd, context, repositoryRoot, packagePath, branch, defaultConfig, inlineConfig, baseRelDir, logs, featureFlags, }) {
+const loadConfig = async function ({ configOpt, cwd, context, repositoryRoot, packagePath, branch, defaultConfig, inlineConfig, configMutationsOrigin, baseRelDir, logs, featureFlags, }) {
     const initialBase = getInitialBase({ repositoryRoot, defaultConfig, inlineConfig });
     const { configPath, config, buildDir, base, redirectsPath, headersPath } = await getFullConfig({
         configOpt,
@@ -167,6 +168,7 @@ const loadConfig = async function ({ configOpt, cwd, context, repositoryRoot, pa
         branch,
         defaultConfig,
         inlineConfig,
+        configMutationsOrigin,
         baseRelDir,
         packagePath,
         configBase: initialBase,
@@ -190,6 +192,7 @@ const loadConfig = async function ({ configOpt, cwd, context, repositoryRoot, pa
         branch,
         defaultConfig,
         inlineConfig,
+        configMutationsOrigin,
         baseRelDir,
         configBase: base,
         base,
@@ -207,7 +210,7 @@ const loadConfig = async function ({ configOpt, cwd, context, repositoryRoot, pa
 /**
  * Load configuration file and normalize it, merge contexts, etc.
  */
-const getFullConfig = async function ({ configOpt, cwd, context, repositoryRoot, packagePath, branch, defaultConfig, inlineConfig, baseRelDir, configBase, base, logs, featureFlags, }) {
+const getFullConfig = async function ({ configOpt, cwd, context, repositoryRoot, packagePath, branch, defaultConfig, inlineConfig, configMutationsOrigin, baseRelDir, configBase, base, logs, featureFlags, }) {
     const configPath = await getConfigPath({ configOpt, cwd, repositoryRoot, packagePath, configBase });
     try {
         const config = await parseConfig(configPath);
@@ -221,7 +224,11 @@ const getFullConfig = async function ({ configOpt, cwd, context, repositoryRoot,
     }
     catch (error) {
         const configName = configPath === undefined ? '' : ` file ${configPath}`;
-        error.message = `When resolving config${configName}:\n${error.message}`;
+        // The invalid value is not in the config file when it came from a mutation.
+        const stage = configMutationsOrigin === undefined
+            ? `resolving config${configName}`
+            : `applying configuration from ${configMutationsOrigin}`;
+        error.message = `When ${stage}:\n${error.message}`;
         throw error;
     }
 };

package/lib/validate/validations.d.ts

@@ -299,7 +299,7 @@ export const POST_NORMALIZE_VALIDATIONS: ({
     };
 } | {
     property: string;
-    check: (value: any) => value is string | number;
+    check: (value: any) => boolean;
     message: string;
     example: (value: any, key: any, prevPath: any) => {
         functions: {

package/lib/validate/validations.js

@@ -17,6 +17,20 @@ const isValidCronExpression = (cron) => {
         return false;
     }
 };
+const FUNCTION_MEMORY_PATTERN = /^(\d+(?:\.\d+)?)\s*(mb|gb)?$/i;
+const FUNCTION_MEMORY_MIN_MB = 1024;
+const FUNCTION_MEMORY_MAX_MB = 4096;
+const isValidFunctionMemory = (value) => {
+    let megabytes = value;
+    if (isString(value)) {
+        const match = FUNCTION_MEMORY_PATTERN.exec(value.trim());
+        if (!match) {
+            return false;
+        }
+        megabytes = Number.parseFloat(match[1]) * (match[2]?.toLowerCase() === 'gb' ? 1024 : 1);
+    }
+    return Number.isInteger(megabytes) && megabytes >= FUNCTION_MEMORY_MIN_MB && megabytes <= FUNCTION_MEMORY_MAX_MB;
+};
 // List of validations performed on the configuration file.
 // Validation are performed in order: parent should be before children.
 // Each validation is an object with the following properties:
@@ -273,8 +287,8 @@ export const POST_NORMALIZE_VALIDATIONS = [
     },
     {
         property: 'functions.*.memory',
-        check: (value) => typeof value === 'number' || isString(value),
-        message: 'must be a number (in MB) or a string with a unit (e.g. "2gb").',
+        check: isValidFunctionMemory,
+        message: 'must be between 1024 and 4096 MB, as a number (in MB) or a string with a unit (e.g. "2gb").',
         example: (value, key, prevPath) => ({
             functions: { [prevPath[1]]: { memory: '2gb' } },
         }),
@@ -295,6 +309,14 @@ export const POST_NORMALIZE_VALIDATIONS = [
             functions: { [prevPath[1]]: { vcpu: 1.5 } },
         }),
     },
+    {
+        property: 'functions.*',
+        check: (functionConfig) => !(functionConfig.memory !== undefined && functionConfig.vcpu !== undefined),
+        message: '"memory" and "vcpu" are mutually exclusive.',
+        example: (value, key, prevPath) => ({
+            functions: { [prevPath[1]]: { memory: '2gb' } },
+        }),
+    },
     {
         property: 'functions.*.schedule',
         check: isValidCronExpression,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "25.2.4",
+  "version": "25.2.6",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -94,5 +94,5 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "gitHead": "d30dc9ad0c79ea23f01354f2487187d3398f5de2"
+  "gitHead": "227492a17c9821682390f6b7554bd69dfa282d9e"
 }