@netlify/config 20.22.0 → 21.0.1

package/lib/api/integrations.d.ts

@@ -7,6 +7,7 @@ type AvailableIntegration = {
 type GetAvailableIntegrationsOpts = {
     testOpts: TestOptions;
     offline: boolean;
+    extensionApiBaseUrl: string;
 };
-export declare const getAvailableIntegrations: ({ testOpts, offline, }: GetAvailableIntegrationsOpts) => Promise<AvailableIntegration[]>;
+export declare const getAvailableIntegrations: ({ testOpts, offline, extensionApiBaseUrl, }: GetAvailableIntegrationsOpts) => Promise<AvailableIntegration[]>;
 export {};

package/lib/api/integrations.js

@@ -1,10 +1,10 @@
 import fetch from 'node-fetch';
-export const getAvailableIntegrations = async function ({ testOpts, offline, }) {
+export const getAvailableIntegrations = async function ({ testOpts, offline, extensionApiBaseUrl, }) {
     if (offline) {
         return [];
     }
     const { host } = testOpts;
-    const baseUrl = new URL(host ? `http://${host}/` : `https://api.netlifysdk.com/`);
+    const baseUrl = new URL(host ? `http://${host}/` : extensionApiBaseUrl);
     try {
         const response = await fetch(`${baseUrl}integrations`);
         if (response.ok) {

package/lib/api/site_info.d.ts

@@ -11,6 +11,7 @@ type GetSiteInfoOpts = {
     testOpts?: TestOptions;
     siteFeatureFlagPrefix: string;
     token: string;
+    extensionApiBaseUrl: string;
 };
 /**
  * Retrieve Netlify Site information, if available.
@@ -21,7 +22,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, siteFeatureFlagPrefix, token, featureFlags, }: GetSiteInfoOpts) => Promise<{
+export declare const getSiteInfo: ({ api, siteId, accountId, mode, context, offline, testOpts, siteFeatureFlagPrefix, token, featureFlags, extensionApiBaseUrl, }: GetSiteInfoOpts) => Promise<{
     siteInfo: any;
     accounts: any;
     addons: any;

package/lib/api/site_info.js

@@ -11,7 +11,7 @@ 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 = {}, siteFeatureFlagPrefix, token, featureFlags = {}, }) {
+export const getSiteInfo = async function ({ api, siteId, accountId, mode, context, offline = false, testOpts = {}, siteFeatureFlagPrefix, token, featureFlags = {}, extensionApiBaseUrl, }) {
     const { env: testEnv = false } = testOpts;
     if (api === undefined || mode === 'buildbot' || testEnv) {
         const siteInfo = {};
@@ -20,7 +20,7 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
         if (accountId !== undefined)
             siteInfo.account_id = accountId;
         const integrations = mode === 'buildbot' && !offline
-            ? await getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags })
+            ? await getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, extensionApiBaseUrl })
             : [];
         return { siteInfo, accounts: [], addons: [], integrations };
     }
@@ -28,7 +28,7 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
         getSite(api, siteId, siteFeatureFlagPrefix),
         getAccounts(api),
         getAddons(api, siteId),
-        getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags }),
+        getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, extensionApiBaseUrl }),
     ];
     const [siteInfo, accounts, addons, integrations] = await Promise.all(promises);
     if (siteInfo.use_envelope) {
@@ -70,13 +70,13 @@ 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, token, featureFlags, }) {
+const getIntegrations = async function ({ siteId, accountId, testOpts, offline, token, featureFlags, extensionApiBaseUrl, }) {
     if (!siteId || offline) {
         return [];
     }
     const sendBuildBotTokenToJigsaw = featureFlags?.send_build_bot_token_to_jigsaw;
     const { host } = testOpts;
-    const baseUrl = new URL(host ? `http://${host}` : `https://api.netlifysdk.com`);
+    const baseUrl = new URL(host ? `http://${host}` : extensionApiBaseUrl);
     // if accountId isn't present, use safe v1 endpoint
     const url = accountId
         ? `${baseUrl}team/${accountId}/integrations/installations/meta/${siteId}`

package/lib/env/main.js

@@ -66,7 +66,7 @@ const convertToString = (value) => {
 };
 // Environment variables not set by users, but meant to mimic the production
 // environment.
-const getGeneralEnv = async function ({ siteInfo, siteInfo: { id, name }, buildDir, branch, deployId, buildId, context, }) {
+const getGeneralEnv = async function ({ siteInfo, siteInfo: { id, name, account_id: accountId }, buildDir, branch, deployId, buildId, context, }) {
     const gitEnv = await getGitEnv(buildDir, branch);
     const deployUrls = getDeployUrls({ siteInfo: siteInfo, branch, deployId });
     return removeFalsy({
@@ -74,6 +74,7 @@ const getGeneralEnv = async function ({ siteInfo, siteInfo: { id, name }, buildD
         SITE_NAME: name,
         DEPLOY_ID: deployId,
         BUILD_ID: buildId,
+        ACCOUNT_ID: accountId,
         ...deployUrls,
         CONTEXT: context,
         NETLIFY_LOCAL: 'true',

package/lib/headers.d.ts

@@ -3,14 +3,13 @@ export function getHeadersPath({ build: { publish } }: {
         publish: any;
     };
 }): string;
-export function addHeaders({ config: { headers: configHeaders, ...config }, headersPath, logs, featureFlags, }: {
+export function addHeaders({ config: { headers: configHeaders, ...config }, headersPath, logs }: {
     config: {
         [x: string]: any;
         headers: any;
     };
     headersPath: any;
     logs: any;
-    featureFlags: any;
 }): Promise<{
-    headers: import("packages/headers-parser/lib/types.js").Header[];
+    headers: (import("@netlify/headers-parser").MinimalHeader | import("@netlify/headers-parser").Header)[];
 }>;

package/lib/headers.js

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

package/lib/integrations.d.ts

@@ -13,6 +13,7 @@ type MergeIntegrationsOpts = {
     context: string;
     testOpts?: TestOptions;
     offline: boolean;
+    extensionApiBaseUrl: string;
 };
-export declare const mergeIntegrations: ({ configIntegrations, apiIntegrations, context, testOpts, offline, }: MergeIntegrationsOpts) => Promise<Integration[]>;
+export declare const mergeIntegrations: ({ configIntegrations, apiIntegrations, context, testOpts, offline, extensionApiBaseUrl, }: MergeIntegrationsOpts) => Promise<Integration[]>;
 export {};

package/lib/integrations.js

@@ -1,6 +1,6 @@
 import { getAvailableIntegrations } from './api/integrations.js';
-export const mergeIntegrations = async function ({ configIntegrations = [], apiIntegrations, context, testOpts = {}, offline, }) {
-    const availableIntegrations = await getAvailableIntegrations({ testOpts, offline });
+export const mergeIntegrations = async function ({ configIntegrations = [], apiIntegrations, context, testOpts = {}, offline, extensionApiBaseUrl, }) {
+    const availableIntegrations = await getAvailableIntegrations({ testOpts, offline, extensionApiBaseUrl });
     // Include all API integrations, unless they have a `dev` property and we are in the `dev` context
     const resolvedApiIntegrations = apiIntegrations.filter((integration) => !configIntegrations.some((configIntegration) => configIntegration.name === integration.slug &&
         typeof configIntegration.dev !== 'undefined' &&

package/lib/main.js

@@ -34,6 +34,8 @@ export const resolveConfig = async function (opts) {
     if (parsedCachedConfig !== undefined && opts.defaultConfig === undefined) {
         return parsedCachedConfig;
     }
+    // TODO(kh): remove this mapping and get the extensionApiHost from the opts
+    const extensionApiBaseUrl = host === 'api-staging.netlify.com' ? 'https://api-staging.netlifysdk.com' : 'https://api.netlifysdk.com';
     const { config: configOpt, defaultConfig, inlineConfig, configMutations, cwd, context, repositoryRoot, base, branch, siteId, accountId, deployId, buildId, baseRelDir, mode, debug, logs, featureFlags, } = await normalizeOpts(optsA);
     const { siteInfo, accounts, addons, integrations } = await getSiteInfo({
         api,
@@ -46,6 +48,7 @@ export const resolveConfig = async function (opts) {
         featureFlags,
         testOpts,
         token,
+        extensionApiBaseUrl,
     });
     const { defaultConfig: defaultConfigA, baseRelDir: baseRelDirA } = parseDefaultConfig({
         defaultConfig,
@@ -91,6 +94,7 @@ export const resolveConfig = async function (opts) {
         context: context,
         testOpts,
         offline,
+        extensionApiBaseUrl,
     });
     const result = {
         siteInfo,
@@ -205,7 +209,7 @@ const getFullConfig = async function ({ configOpt, cwd, context, repositoryRoot,
         });
         const { config: configB, buildDir, base: baseA, } = await resolveFiles({ packagePath, config: configA, repositoryRoot, base, baseRelDir });
         const headersPath = getHeadersPath(configB);
-        const configC = await addHeaders({ config: configB, headersPath, logs, featureFlags });
+        const configC = await addHeaders({ config: configB, headersPath, logs });
         const redirectsPath = getRedirectsPath(configC);
         const configD = await addRedirects({ config: configC, redirectsPath, logs, featureFlags });
         return { configPath, config: configD, buildDir, base: baseA, redirectsPath, headersPath };

package/lib/mutations/update.js

@@ -16,7 +16,7 @@ export const updateConfig = async function (configMutations, { buildDir, configP
     const inlineConfig = applyMutations({}, configMutations);
     const normalizedInlineConfig = ensureConfigPriority(inlineConfig, context, branch);
     const updatedConfig = await mergeWithConfig(normalizedInlineConfig, configPath);
-    const configWithHeaders = await addHeaders({ config: updatedConfig, headersPath, logs, featureFlags });
+    const configWithHeaders = await addHeaders({ config: updatedConfig, headersPath, logs });
     const finalConfig = await addRedirects({ config: configWithHeaders, redirectsPath, logs, featureFlags });
     const simplifiedConfig = simplifyConfig(finalConfig);
     await backupConfig({ buildDir, configPath, headersPath, redirectsPath });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.22.0",
+  "version": "21.0.1",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -59,7 +59,7 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@netlify/headers-parser": "^7.3.0",
+    "@netlify/headers-parser": "^8.0.0",
     "@netlify/redirect-parser": "^14.5.0",
     "chalk": "^5.0.0",
     "cron-parser": "^4.1.0",
@@ -95,5 +95,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "b1de419113daee962ab37b1e75bcfc0d32f778e7"
+  "gitHead": "8e40ace9314f5a549797f753389962ca22eab87d"
 }