@netlify/config 20.19.0 → 20.20.0

package/lib/api/site_info.d.ts

@@ -20,7 +20,7 @@ type GetSiteInfoOpts = {
  * Silently ignore API errors. For example the network connection might be down,
  * but local builds should still work regardless.
  */
-export declare const getSiteInfo: ({ api, siteId, accountId, mode, context, offline, testOpts, featureFlags, siteFeatureFlagPrefix, }: GetSiteInfoOpts) => Promise<{
+export declare const getSiteInfo: ({ api, siteId, accountId, mode, context, offline, testOpts, siteFeatureFlagPrefix, }: GetSiteInfoOpts) => Promise<{
     siteInfo: any;
     accounts: any;
     addons: any;

package/lib/api/site_info.js

@@ -11,48 +11,22 @@ import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
  * Silently ignore API errors. For example the network connection might be down,
  * but local builds should still work regardless.
  */
-export const getSiteInfo = async function ({ api, siteId, accountId, mode, context, offline = false, testOpts = {}, featureFlags = {}, siteFeatureFlagPrefix, }) {
+export const getSiteInfo = async function ({ api, siteId, accountId, mode, context, offline = false, testOpts = {}, siteFeatureFlagPrefix, }) {
     const { env: testEnv = false } = testOpts;
-    const useV2Endpoint = !!accountId && featureFlags.cli_integration_installations_meta;
-    if (useV2Endpoint) {
-        if (api === undefined || mode === 'buildbot' || testEnv) {
-            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 })
-                : [];
-            return { siteInfo, accounts: [], addons: [], integrations };
-        }
-        const promises = [
-            getSite(api, siteId, siteFeatureFlagPrefix),
-            getAccounts(api),
-            getAddons(api, siteId),
-            getIntegrations({ siteId, testOpts, offline, useV2Endpoint, accountId }),
-        ];
-        const [siteInfo, accounts, addons, integrations] = await Promise.all(promises);
-        if (siteInfo.use_envelope) {
-            const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId, context });
-            siteInfo.build_settings.env = envelope;
-        }
-        return { siteInfo, accounts, addons, integrations };
-    }
     if (api === undefined || mode === 'buildbot' || testEnv) {
         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 }) : [];
+        const integrations = mode === 'buildbot' && !offline ? await getIntegrations({ siteId, testOpts, offline, accountId }) : [];
         return { siteInfo, accounts: [], addons: [], integrations };
     }
     const promises = [
         getSite(api, siteId, siteFeatureFlagPrefix),
         getAccounts(api),
         getAddons(api, siteId),
-        getIntegrations({ siteId, testOpts, offline }),
+        getIntegrations({ siteId, testOpts, offline, accountId }),
     ];
     const [siteInfo, accounts, addons, integrations] = await Promise.all(promises);
     if (siteInfo.use_envelope) {
@@ -94,25 +68,33 @@ const getAddons = async function (api, siteId) {
         throwUserError(`Failed retrieving addons for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
-const getIntegrations = async function ({ siteId, accountId, testOpts, offline, useV2Endpoint, }) {
+const getIntegrations = async function ({ siteId, accountId, testOpts, offline, }) {
     if (!siteId || offline) {
         return [];
     }
     const { host } = testOpts;
     const baseUrl = new URL(host ? `http://${host}` : `https://api.netlifysdk.com`);
-    // use future state feature flag
-    const url = useV2Endpoint
+    // if accountId isn't present, use safe v1 endpoint
+    const url = accountId
         ? `${baseUrl}team/${accountId}/integrations/installations/meta/${siteId}`
         : `${baseUrl}site/${siteId}/integrations/safe`;
+    let response;
     try {
-        const response = await fetch(url);
-        const integrations = await response.json();
-        return Array.isArray(integrations) ? integrations : [];
+        response = await fetch(url);
+        if (response.status !== 200) {
+            throw new Error(`Unexpected status code ${response.status} from fetching extensions`);
+        }
     }
     catch (error) {
-        // Integrations should not block the build if they fail to load
-        // TODO: We should consider blocking the build as integrations are a critical part of the build process
-        // https://linear.app/netlify/issue/CT-1214/implement-strategy-in-builds-to-deal-with-integrations-that-we-fail-to
-        return [];
+        throwUserError(`Failed retrieving extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
+    }
+    try {
+        if (Number(response.headers.get(`content-length`)) === 0)
+            return [];
+        const responseBody = await response.json();
+        return Array.isArray(responseBody) ? responseBody : [];
+    }
+    catch (error) {
+        throwUserError(`Failed to parse extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };

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/case.d.ts

@@ -1,16 +1,5 @@
-export function normalizeConfigCase({ Build, build, ...config }: {
-    [x: string]: any;
-    Build: any;
-    build?: any;
-}): {
-    build: {
-        base: any;
-        command: any;
-        edge_functions: any;
-        environment: any;
-        functions: any;
-        ignore: any;
-        processing: any;
-        publish: any;
-    };
-};
+export declare const normalizeConfigCase: ({ Build, build, ...config }: {
+    Build: Record<string, unknown>;
+    build: Record<string, unknown>;
+    [key: string]: unknown;
+}) => Record<string, unknown>;

package/lib/case.js

@@ -3,7 +3,7 @@ export const normalizeConfigCase = function ({ Build, build = Build, ...config }
     const buildA = normalizeBuildCase(build);
     return { ...config, build: buildA };
 };
-const normalizeBuildCase = function ({ Base, base = Base, Command, command = Command, Edge_functions: EdgeFunctions, edge_functions: edgeFunctions = EdgeFunctions, Environment, environment = Environment, Functions, functions = Functions, Ignore, ignore = Ignore, Processing, processing = Processing, Publish, publish = Publish, ...build } = {}) {
+const normalizeBuildCase = ({ Base, base = Base, Command, command = Command, Edge_functions: EdgeFunctions, edge_functions: edgeFunctions = EdgeFunctions, Environment, environment = Environment, Functions, functions = Functions, Ignore, ignore = Ignore, Processing, processing = Processing, Publish, publish = Publish, ...build } = {}) => {
     return {
         ...build,
         base,

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/headers.js

@@ -1,5 +1,5 @@
 import { resolve } from 'path';
-import { parseAllHeaders } from 'netlify-headers-parser';
+import { parseAllHeaders } from '@netlify/headers-parser';
 import { warnHeadersParsing, warnHeadersCaseSensitivity } from './log/messages.js';
 // Retrieve path to `_headers` file (even if it does not exist yet)
 export const getHeadersPath = function ({ build: { publish } }) {

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/redirects.js

@@ -1,5 +1,5 @@
 import { resolve } from 'path';
-import { parseAllRedirects } from 'netlify-redirect-parser';
+import { parseAllRedirects } from '@netlify/redirect-parser';
 import { warnRedirectsParsing } from './log/messages.js';
 // Retrieve path to `_redirects` file (even if it does not exist yet)
 export const getRedirectsPath = function ({ build: { publish } }) {

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/types/integrations.d.ts

@@ -5,4 +5,5 @@ export type Integration = {
     dev?: {
         path: string;
     };
+    author?: string;
 };

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.19.0",
+  "version": "20.20.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -59,6 +59,8 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "^2.2.5",
+    "@netlify/headers-parser": "^7.2.0",
+    "@netlify/redirect-parser": "^14.4.0",
     "chalk": "^5.0.0",
     "cron-parser": "^4.1.0",
     "deepmerge": "^4.2.2",
@@ -72,9 +74,7 @@
     "is-plain-obj": "^4.0.0",
     "js-yaml": "^4.0.0",
     "map-obj": "^5.0.0",
-    "netlify": "^13.1.21",
-    "netlify-headers-parser": "^7.1.4",
-    "netlify-redirect-parser": "^14.3.0",
+    "netlify": "^13.2.0",
     "node-fetch": "^3.3.1",
     "omit.js": "^2.0.2",
     "p-locate": "^6.0.0",
@@ -95,5 +95,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "4ae7f95ca7b31f392956894d5cd6ecf781349b55"
+  "gitHead": "131a644bfde5205f730f3369b778d8914c7c0382"
 }