@netlify/config 20.12.5 → 20.13.0

package/lib/api/site_info.js

@@ -13,18 +13,37 @@ import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
  */
 export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagPrefix, context, offline = false, testOpts = {}, }) {
     const { env: testEnv = false } = testOpts;
-    if (api === undefined || mode === 'buildbot' || testEnv) {
+    if (api === undefined || testEnv || offline) {
         const siteInfo = siteId === undefined ? {} : { id: siteId };
-        const integrations = mode === 'buildbot' && !offline ? await getIntegrations({ siteId, testOpts, offline }) : [];
+        return { siteInfo, accounts: [], addons: [], integrations: [] };
+    }
+    const siteInfo = await getSite(api, siteId, siteFeatureFlagPrefix);
+    const featureFlags = siteInfo.feature_flags;
+    const useV2Endpoint = featureFlags?.cli_integration_installations_meta;
+    if (useV2Endpoint) {
+        const promises = [
+            getAccounts(api),
+            getAddons(api, siteId),
+            getIntegrations({ siteId, testOpts, offline, accountId: siteInfo.account_id, featureFlags }),
+        ];
+        const [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 (mode === 'buildbot') {
+        const siteInfo = siteId === undefined ? {} : { id: siteId };
+        const integrations = await getIntegrations({ siteId, testOpts, offline, featureFlags });
         return { siteInfo, accounts: [], addons: [], integrations };
     }
     const promises = [
-        getSite(api, siteId, siteFeatureFlagPrefix),
         getAccounts(api),
         getAddons(api, siteId),
-        getIntegrations({ siteId, testOpts, offline }),
+        getIntegrations({ siteId, testOpts, offline, featureFlags }),
     ];
-    const [siteInfo, accounts, addons, integrations] = await Promise.all(promises);
+    const [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;
@@ -40,7 +59,7 @@ const getSite = async function (api, siteId, siteFeatureFlagPrefix = null) {
         return { ...site, id: siteId };
     }
     catch (error) {
-        throwUserError(`Failed retrieving site data for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
+        return throwUserError(`Failed retrieving site data for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
 const getAccounts = async function (api) {
@@ -49,7 +68,7 @@ const getAccounts = async function (api) {
         return Array.isArray(accounts) ? accounts : [];
     }
     catch (error) {
-        throwUserError(`Failed retrieving user account: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
+        return throwUserError(`Failed retrieving user account: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
 const getAddons = async function (api, siteId) {
@@ -61,22 +80,28 @@ const getAddons = async function (api, siteId) {
         return Array.isArray(addons) ? addons : [];
     }
     catch (error) {
-        throwUserError(`Failed retrieving addons for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
+        return throwUserError(`Failed retrieving addons for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
-const getIntegrations = async function ({ siteId, testOpts, offline, }) {
+const getIntegrations = async function ({ siteId, accountId, testOpts, offline, featureFlags, }) {
     if (!siteId || offline) {
         return [];
     }
     const { host } = testOpts;
     const baseUrl = new URL(host ? `http://${host}` : `https://api.netlifysdk.com`);
+    const useV2Endpoint = featureFlags?.cli_integration_installations_meta;
+    const url = useV2Endpoint
+        ? `${baseUrl}team/${accountId}/integrations/installations/meta`
+        : `${baseUrl}site/${siteId}/integrations/safe`;
     try {
-        const response = await fetch(`${baseUrl}site/${siteId}/integrations/safe`);
+        const response = await fetch(url);
         const integrations = await response.json();
         return Array.isArray(integrations) ? integrations : [];
     }
     catch (error) {
-        // for now, we'll just ignore errors, as this is early days
+        // 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 [];
     }
 };

package/lib/bin/flags.js

@@ -5,6 +5,8 @@ import { hideBin } from 'yargs/helpers';
 import { normalizeCliFeatureFlags } from '../options/feature_flags.js';
 // Parse CLI flags
 export const parseFlags = function () {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore: `yargs` types are incorrect
     const { featureFlags: cliFeatureFlags = '', ...flags } = yargs(hideBin(process.argv))
         .options(FLAGS)
         .usage(USAGE)

package/lib/log/logger.js

@@ -1,6 +1,9 @@
 import figures from 'figures';
 import { serializeObject } from './serialize.js';
 import { THEME } from './theme.js';
+export const logsAreBuffered = (logs) => {
+    return logs !== undefined && 'stdout' in logs;
+};
 // When the `buffer` option is true, we return logs instead of printing them
 // on the console. The logs are accumulated in a `logs` array variable.
 export const getBufferLogs = function ({ buffer }) {
@@ -14,7 +17,10 @@ export const getBufferLogs = function ({ buffer }) {
 export const log = function (logs, string, { color } = {}) {
     const stringA = String(string).replace(EMPTY_LINES_REGEXP, EMPTY_LINE);
     const stringB = color === undefined ? stringA : color(stringA);
-    if (logs !== undefined) {
+    if (logs && logs.outputFlusher) {
+        logs.outputFlusher.flush();
+    }
+    if (logsAreBuffered(logs)) {
         // `logs` is a stateful variable
         logs.stderr.push(stringB);
         return;

package/lib/main.js

@@ -39,7 +39,6 @@ export const resolveConfig = async function (opts) {
         mode,
         offline,
         siteFeatureFlagPrefix,
-        featureFlags,
         testOpts,
     });
     const { defaultConfig: defaultConfigA, baseRelDir: baseRelDirA } = parseDefaultConfig({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.12.5",
+  "version": "20.13.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -94,5 +94,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "da347f8eeb873ba73faee6cfc99980eafdfedf5c"
+  "gitHead": "14419e3fd6fdeaba6d8f4460e5c13871db7f26ef"
 }