@netlify/config 21.0.4 → 21.0.6

package/lib/api/site_info.js

@@ -1,6 +1,7 @@
 import fetch from 'node-fetch';
 import { getEnvelope } from '../env/envelope.js';
 import { throwUserError } from '../error.js';
+import { EXTENSION_API_BASE_URL, EXTENSION_API_STAGING_BASE_URL, NETLIFY_API_BASE_URL, NETLIFY_API_STAGING_BASE_URL, } from '../integrations.js';
 import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
 /**
  * Retrieve Netlify Site information, if available.
@@ -20,7 +21,16 @@ 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, extensionApiBaseUrl })
+            ? await getIntegrations({
+                siteId,
+                testOpts,
+                offline,
+                accountId,
+                token,
+                featureFlags,
+                extensionApiBaseUrl,
+                mode,
+            })
             : [];
         return { siteInfo, accounts: [], addons: [], integrations };
     }
@@ -28,7 +38,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, extensionApiBaseUrl }),
+        getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, extensionApiBaseUrl, mode }),
     ];
     const [siteInfo, accounts, addons, integrations] = await Promise.all(promises);
     if (siteInfo.use_envelope) {
@@ -70,21 +80,47 @@ 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, extensionApiBaseUrl, }) {
+const getIntegrations = async function ({ siteId, accountId, testOpts, offline, token, featureFlags, extensionApiBaseUrl, mode, }) {
     if (!siteId || offline) {
         return [];
     }
     const sendBuildBotTokenToJigsaw = featureFlags?.send_build_bot_token_to_jigsaw;
-    const { host } = testOpts;
-    const baseUrl = new URL(host ? `http://${host}` : extensionApiBaseUrl);
+    const { host: originalHost, setBaseUrl } = testOpts;
+    // TODO(kh): I am adding this purely for local staging development.
+    // We should remove this once we have fixed https://github.com/netlify/cli/blob/b5a5c7525edd28925c5c2e3e5f0f00c4261eaba5/src/lib/build.ts#L125
+    let host = originalHost;
+    // If there is a host, we use it to fetch the integrations
+    // we check if the host is staging or production and set the host accordingly,
+    // sadly necessary because of https://github.com/netlify/cli/blob/b5a5c7525edd28925c5c2e3e5f0f00c4261eaba5/src/lib/build.ts#L125
+    if (originalHost) {
+        if (originalHost?.includes(NETLIFY_API_STAGING_BASE_URL)) {
+            host = EXTENSION_API_STAGING_BASE_URL;
+        }
+        else if (originalHost?.includes(NETLIFY_API_BASE_URL)) {
+            host = EXTENSION_API_BASE_URL;
+        }
+        else {
+            host = `http://${originalHost}`;
+        }
+    }
+    const baseUrl = new URL(host ?? extensionApiBaseUrl);
+    // We only use this for testing
+    if (host && setBaseUrl) {
+        setBaseUrl(extensionApiBaseUrl);
+    }
     // if accountId isn't present, use safe v1 endpoint
     const url = accountId
         ? `${baseUrl}team/${accountId}/integrations/installations/meta/${siteId}`
         : `${baseUrl}site/${siteId}/integrations/safe`;
     try {
         const requestOptions = {};
+        // This is used to identify where the request is coming from
+        requestOptions.headers = {
+            'netlify-config-mode': mode,
+        };
         if (sendBuildBotTokenToJigsaw && token) {
             requestOptions.headers = {
+                ...requestOptions.headers,
                 'netlify-sdk-build-bot-token': token,
             };
         }

package/lib/integrations.d.ts

@@ -1,6 +1,10 @@
 import { IntegrationResponse } from './types/api.js';
 import { Integration } from './types/integrations.js';
 import { TestOptions } from './types/options.js';
+export declare const NETLIFY_API_STAGING_BASE_URL = "api-staging.netlify.com";
+export declare const NETLIFY_API_BASE_URL = "api.netlify.com";
+export declare const EXTENSION_API_BASE_URL = "https://api.netlifysdk.com";
+export declare const EXTENSION_API_STAGING_BASE_URL = "https://api-staging.netlifysdk.com";
 type MergeIntegrationsOpts = {
     configIntegrations?: {
         name: string;

package/lib/integrations.js

@@ -1,4 +1,8 @@
 import { getAvailableIntegrations } from './api/integrations.js';
+export const NETLIFY_API_STAGING_BASE_URL = 'api-staging.netlify.com';
+export const NETLIFY_API_BASE_URL = 'api.netlify.com';
+export const EXTENSION_API_BASE_URL = 'https://api.netlifysdk.com';
+export const EXTENSION_API_STAGING_BASE_URL = 'https://api-staging.netlifysdk.com';
 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
@@ -23,11 +27,7 @@ export const mergeIntegrations = async function ({ configIntegrations = [], apiI
         if (!integration) {
             return undefined;
         }
-        return {
-            slug: integration.slug,
-            version: integration.hostSiteUrl,
-            has_build: !!integration.hasBuild,
-        };
+        return { slug: integration.slug, version: integration.hostSiteUrl, has_build: !!integration.hasBuild };
     })
         .filter((i) => typeof i !== 'undefined');
     return [...resolvedApiIntegrations, ...resolvedConfigIntegrations];

package/lib/main.js

@@ -9,7 +9,7 @@ import { getEnv } from './env/main.js';
 import { resolveConfigPaths } from './files.js';
 import { getHeadersPath, addHeaders } from './headers.js';
 import { getInlineConfig } from './inline_config.js';
-import { mergeIntegrations } from './integrations.js';
+import { EXTENSION_API_BASE_URL, EXTENSION_API_STAGING_BASE_URL, mergeIntegrations, NETLIFY_API_STAGING_BASE_URL, } from './integrations.js';
 import { logResult } from './log/main.js';
 import { mergeConfigs } from './merge.js';
 import { normalizeBeforeConfigMerge, normalizeAfterConfigMerge } from './merge_normalize.js';
@@ -35,7 +35,9 @@ export const resolveConfig = async function (opts) {
         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 extensionApiBaseUrl = host?.includes(NETLIFY_API_STAGING_BASE_URL)
+        ? EXTENSION_API_STAGING_BASE_URL
+        : EXTENSION_API_BASE_URL;
     const { config: configOpt, defaultConfig, inlineConfig, configMutations, cwd, context, repositoryRoot, base, branch, siteId, accountId, deployId, buildId, baseRelDir, mode, debug, logs, featureFlags, } = await normalizeOpts(optsA);
     let { siteInfo, accounts, addons, integrations } = parsedCachedConfig || {};
     // If we have cached site info, we don't need to fetch it again
@@ -138,13 +140,7 @@ const addLegacyFunctionsDirectory = (config) => {
     if (!config.functionsDirectory) {
         return config;
     }
-    return {
-        ...config,
-        build: {
-            ...config.build,
-            functions: config.functionsDirectory,
-        },
-    };
+    return { ...config, build: { ...config.build, functions: config.functionsDirectory } };
 };
 /**
  * Try to load the configuration file in two passes.
@@ -202,24 +198,10 @@ 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 configPath = await getConfigPath({
-        configOpt,
-        cwd,
-        repositoryRoot,
-        packagePath,
-        configBase,
-    });
+    const configPath = await getConfigPath({ configOpt, cwd, repositoryRoot, packagePath, configBase });
     try {
         const config = await parseConfig(configPath);
-        const configA = mergeAndNormalizeConfig({
-            config,
-            defaultConfig,
-            inlineConfig,
-            context,
-            branch,
-            logs,
-            packagePath,
-        });
+        const configA = mergeAndNormalizeConfig({ config, defaultConfig, inlineConfig, context, branch, logs, packagePath });
         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 });

package/lib/types/options.d.ts

@@ -2,4 +2,5 @@ export type ModeOption = 'buildbot' | 'cli' | 'require';
 export type TestOptions = {
     env?: boolean;
     host?: string;
+    setBaseUrl?: (url: string) => void;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "21.0.4",
+  "version": "21.0.6",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -74,7 +74,7 @@
     "is-plain-obj": "^4.0.0",
     "js-yaml": "^4.0.0",
     "map-obj": "^5.0.0",
-    "netlify": "^13.3.3",
+    "netlify": "^13.3.4",
     "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": "61c3b009c7b1e16b32e06e1f783a5717106bae10"
+  "gitHead": "761c1e087c92c4cf579050e686a5869da5b3ce00"
 }