@netlify/config 20.18.0 → 20.19.1

package/lib/api/site_info.js

@@ -16,7 +16,11 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
     const useV2Endpoint = !!accountId && featureFlags.cli_integration_installations_meta;
     if (useV2Endpoint) {
         if (api === undefined || mode === 'buildbot' || testEnv) {
-            const siteInfo = siteId === undefined ? {} : { id: siteId };
+            const siteInfo = {};
+            if (siteId !== undefined)
+                siteInfo.id = siteId;
+            if (accountId !== undefined)
+                siteInfo.account_id = accountId;
             const integrations = mode === 'buildbot' && !offline
                 ? await getIntegrations({ siteId, testOpts, offline, useV2Endpoint, accountId })
                 : [];
@@ -36,7 +40,11 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
         return { siteInfo, accounts, addons, integrations };
     }
     if (api === undefined || mode === 'buildbot' || testEnv) {
-        const siteInfo = siteId === undefined ? {} : { id: siteId };
+        const siteInfo = {};
+        if (siteId !== undefined)
+            siteInfo.id = siteId;
+        if (accountId !== undefined)
+            siteInfo.account_id = accountId;
         const integrations = mode === 'buildbot' && !offline ? await getIntegrations({ siteId, testOpts, offline }) : [];
         return { siteInfo, accounts: [], addons: [], integrations };
     }

package/lib/base.d.ts

@@ -4,9 +4,7 @@
 export declare const getInitialBase: ({ repositoryRoot, defaultConfig: { build: { base: defaultBase } }, inlineConfig: { build: { base: initialBase } }, }: {
     repositoryRoot: any;
     defaultConfig: {
-        build?: {
-            base: any;
-        } | undefined;
+        build?: {} | undefined;
     };
     inlineConfig: {
         build?: {

package/lib/env/envelope.js

@@ -4,10 +4,10 @@ export const getEnvelope = async function ({ api, accountId, siteId, context, })
     }
     try {
         const environmentVariables = await api.getEnvVars({ accountId, siteId, context_name: context });
-        const sortedEnvVarsFromDevContext = environmentVariables
+        const sortedEnvVarsFromContext = environmentVariables
             .sort((left, right) => (left.key.toLowerCase() < right.key.toLowerCase() ? -1 : 1))
             .reduce((acc, cur) => {
-            const envVar = cur.values.find((val) => ['dev', 'all'].includes(val.context));
+            const envVar = cur.values.find((val) => ['all', context].includes(val.context));
             if (envVar && envVar.value) {
                 return {
                     ...acc,
@@ -16,7 +16,7 @@ export const getEnvelope = async function ({ api, accountId, siteId, context, })
             }
             return acc;
         }, {});
-        return sortedEnvVarsFromDevContext;
+        return sortedEnvVarsFromContext;
     }
     catch {
         return {};

package/lib/env/main.js

@@ -122,7 +122,7 @@ const getUserEnv = async function ({ api, config, siteInfo, accounts, addons, co
 // Account-wide environment variables
 const getAccountEnv = async function ({ api, siteInfo, accounts, context, }) {
     if (siteInfo.use_envelope) {
-        const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, context });
+        const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId: siteInfo.site_id, context });
         return envelope;
     }
     const { site_env: siteEnv = {} } = accounts.find(({ slug }) => slug === siteInfo.account_slug) || {};

package/lib/log/cleanup.d.ts

@@ -1,18 +1,10 @@
 export function cleanupConfig({ build: { base, command, commandOrigin, environment, edge_functions: edgeFunctions, ignore, processing, publish, publishOrigin, }, headers, headersOrigin, plugins, redirects, redirectsOrigin, baseRelDir, functions, functionsDirectory, }: {
     build?: {
-        base: any;
-        command: any;
-        commandOrigin: any;
         environment?: {} | undefined;
-        edge_functions: any;
-        ignore: any;
-        processing: any;
-        publish: any;
-        publishOrigin: any;
     } | undefined;
     headers: any;
     headersOrigin: any;
-    plugins?: any[] | undefined;
+    plugins?: never[] | undefined;
     redirects: any;
     redirectsOrigin: any;
     baseRelDir: any;

package/lib/log/logger.d.ts

@@ -5,9 +5,7 @@ export function getBufferLogs({ buffer }: {
     stdout: never[];
     stderr: never[];
 } | undefined;
-export function log(logs: any, string: any, { color }?: {
-    color: any;
-}): void;
+export function log(logs: any, string: any, { color }?: {}): void;
 export function logWarning(logs: any, string: any, opts: any): void;
 export function logObject(logs: any, object: any, opts: any): void;
 export function logSubHeader(logs: any, string: any, opts: any): void;

package/lib/merge.d.ts

@@ -1,3 +1 @@
-export function mergeConfigs(configs: any, { concatenateArrays }?: {
-    concatenateArrays: any;
-}): object;
+export function mergeConfigs(configs: any, { concatenateArrays }?: {}): object;

package/lib/origin.js

@@ -21,7 +21,7 @@ const addBuildPublishOrigin = function ({ config, config: { build = {} }, origin
     return isTruthy(build.publish) ? { ...config, build: { ...build, publishOrigin: origin } } : config;
 };
 const addConfigPluginOrigin = function ({ config, config: { plugins }, origin }) {
-    return Array.isArray(plugins) ? { ...config, plugins: plugins.map((plugin) => ({ ...plugin, origin })) } : config;
+    return Array.isArray(plugins) ? { ...config, plugins: plugins.map((plugin) => ({ origin, ...plugin })) } : config;
 };
 const addHeadersOrigin = function ({ config, config: { headers }, origin }) {
     return isTruthy(headers) ? { ...config, headersOrigin: origin } : config;

package/lib/simplify.d.ts

@@ -1,14 +1,7 @@
 export function simplifyConfig({ build: { environment, processing: { css, html, images, js, ...processing }, services, ...build }, functions, plugins, headers, redirects, context, ...config }: {
     [x: string]: any;
     build?: {
-        environment: any;
-        processing?: {
-            css: any;
-            html: any;
-            images: any;
-            js: any;
-        } | undefined;
-        services: any;
+        processing?: {} | undefined;
     } | undefined;
     functions: any;
     plugins: any;

package/lib/validate/helpers.d.ts

@@ -6,9 +6,7 @@ export function validProperties(propNames: any, legacyPropNames: any): {
     message: string;
 };
 export namespace functionsDirectoryCheck {
-    function formatInvalid({ functionsDirectory }?: {
-        functionsDirectory: any;
-    }): {
+    function formatInvalid({ functionsDirectory }?: {}): {
         functions: {
             directory: any;
         };

package/lib/validate/identical.d.ts

@@ -1,3 +1,3 @@
 export function validateIdenticalPlugins({ plugins }: {
-    plugins?: any[] | undefined;
+    plugins?: never[] | undefined;
 }): void;

package/lib/validate/validations.d.ts

@@ -276,9 +276,7 @@ export const POST_NORMALIZE_VALIDATIONS: ({
             directory: string;
         };
     };
-    formatInvalid: ({ functionsDirectory }?: {
-        functionsDirectory: any;
-    }) => {
+    formatInvalid: ({ functionsDirectory }?: {}) => {
         functions: {
             directory: any;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.18.0",
+  "version": "20.19.1",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -72,7 +72,7 @@
     "is-plain-obj": "^4.0.0",
     "js-yaml": "^4.0.0",
     "map-obj": "^5.0.0",
-    "netlify": "^13.1.20",
+    "netlify": "^13.1.21",
     "netlify-headers-parser": "^7.1.4",
     "netlify-redirect-parser": "^14.3.0",
     "node-fetch": "^3.3.1",
@@ -95,5 +95,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "507a010535ba4028153a755b397501109fa872c9"
+  "gitHead": "319d6b39f8382f114b1f7d138b3ea3a312a7b55c"
 }