@netlify/config 20.6.4 → 20.7.0

package/lib/api/site_info.js

@@ -2,28 +2,26 @@ import fetch from 'node-fetch';
 import { getEnvelope } from '../env/envelope.js';
 import { throwUserError } from '../error.js';
 import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
-// Retrieve Netlify Site information, if available.
-// Used to retrieve local build environment variables and UI build settings.
-// This is not used in production builds since the buildbot passes this
-// information instead.
-// Requires knowing the `siteId` and having the access `token`.
-// 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, mode, siteFeatureFlagPrefix, featureFlags = {}, testOpts = {}, }) {
+/**
+ * Retrieve Netlify Site information, if available.
+ * Used to retrieve local build environment variables and UI build settings.
+ * This is not used in production builds since the buildbot passes this
+ * information instead.
+ * Requires knowing the `siteId` and having the access `token`.
+ * 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, mode, siteFeatureFlagPrefix, offline = false, featureFlags = {}, testOpts = {}, }) {
     const { env: testEnv = false } = testOpts;
     const fetchIntegrations = featureFlags.buildbot_fetch_integrations;
     if (api === undefined || mode === 'buildbot' || testEnv) {
         const siteInfo = siteId === undefined ? {} : { id: siteId };
-        let integrations = [];
-        if (fetchIntegrations && api !== undefined && !testEnv) {
-            // we still want to fetch integrations within buildbot
-            integrations = await getIntegrations({ api, ownerType: 'site', ownerId: siteId, testOpts });
-        }
+        const integrations = fetchIntegrations && mode === 'buildbot' && !offline ? await getIntegrations({ siteId, testOpts }) : [];
         return { siteInfo, accounts: [], addons: [], integrations };
     }
     const promises = [getSite(api, siteId, siteFeatureFlagPrefix), getAccounts(api), getAddons(api, siteId)];
     if (fetchIntegrations) {
-        promises.push(getIntegrations({ api, ownerType: 'site', ownerId: siteId, testOpts }));
+        promises.push(getIntegrations({ siteId, testOpts }));
     }
     const [siteInfo, accounts, addons, integrations = []] = await Promise.all(promises);
     if (siteInfo.use_envelope) {
@@ -65,19 +63,14 @@ const getAddons = async function (api, siteId) {
         throwUserError(`Failed retrieving addons for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
-const getIntegrations = async function ({ api, ownerType, ownerId, testOpts }) {
-    if (ownerId === undefined) {
+const getIntegrations = async function ({ siteId, testOpts }) {
+    if (!siteId) {
         return [];
     }
     const { host } = testOpts;
-    const baseUrl = host ? `http://${host}` : `https://api.netlifysdk.com`;
+    const baseUrl = new URL(host ? `http://${host}` : `https://api.netlifysdk.com`);
     try {
-        const token = api.accessToken;
-        const response = await fetch(`${baseUrl}/${ownerType}/${ownerId}/integrations`, {
-            headers: {
-                Authorization: `Bearer ${token}`,
-            },
-        });
+        const response = await fetch(`${baseUrl}site/${siteId}/integrations/safe`);
         const integrations = await response.json();
         return Array.isArray(integrations) ? integrations : [];
     }

package/lib/main.js

@@ -33,9 +33,10 @@ export const resolveConfig = async function (opts) {
         api,
         siteId,
         mode,
-        testOpts,
+        offline,
         siteFeatureFlagPrefix,
         featureFlags,
+        testOpts,
     });
     const { defaultConfig: defaultConfigA, baseRelDir: baseRelDirA } = parseDefaultConfig({
         defaultConfig,

package/lib/types/api.js

@@ -0,0 +1 @@
+export {};

package/lib/types/options.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.6.4",
+  "version": "20.7.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -94,5 +94,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "5e684d0509bb094d0e11ff89559abf7eb2d806fc"
+  "gitHead": "a20207ec7cdc1101a875d9411355bd48f12733a3"
 }