.release-please-manifest.json

@@ -1,11 +1,11 @@
 {
   "packages/build-info": "7.13.2",
-  "packages/build": "29.45.0",
+  "packages/build": "29.46.0",
   "packages/edge-bundler": "12.0.1",
   "packages/cache-utils": "5.1.5",
-  "packages/config": "20.12.6",
+  "packages/config": "20.13.0",
   "packages/framework-info": "9.8.13",
-  "packages/functions-utils": "5.2.59",
+  "packages/functions-utils": "5.2.60",
   "packages/git-utils": "5.1.1",
   "packages/headers-parser": "7.1.4",
   "packages/js-client": "13.1.16",
@@ -14,5 +14,5 @@
   "packages/run-utils": "5.1.1",
   "packages/opentelemetry-sdk-setup": "1.1.3",
   "packages/opentelemetry-utils": "1.2.1",
-  "packages/zip-it-and-ship-it": "9.33.2"
+  "packages/zip-it-and-ship-it": "9.34.0"
 }

packages/build/CHANGELOG.md

@@ -105,6 +105,22 @@
   * dependencies
     * @netlify/config bumped from ^20.8.0 to ^20.8.1
 
+## [29.46.0](https://github.com/netlify/build/compare/build-v29.45.0...build-v29.46.0) (2024-05-29)
+
+
+### Features
+
+* log plugin initialisation error on single line ([#5684](https://github.com/netlify/build/issues/5684)) ([3aecbfc](https://github.com/netlify/build/commit/3aecbfccd2a3eef5cf4889432550423fd594e876))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @netlify/config bumped from ^20.12.6 to ^20.13.0
+    * @netlify/functions-utils bumped from ^5.2.59 to ^5.2.60
+    * @netlify/zip-it-and-ship-it bumped from 9.33.2 to 9.34.0
+
 ## [29.45.0](https://github.com/netlify/build/compare/build-v29.44.0...build-v29.45.0) (2024-05-29)
 
 

packages/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.45.0",
+  "version": "29.46.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -70,15 +70,15 @@
     "@bugsnag/js": "^7.0.0",
     "@netlify/blobs": "^7.3.0",
     "@netlify/cache-utils": "^5.1.5",
-    "@netlify/config": "^20.12.6",
+    "@netlify/config": "^20.13.0",
     "@netlify/edge-bundler": "12.0.1",
     "@netlify/framework-info": "^9.8.13",
-    "@netlify/functions-utils": "^5.2.59",
+    "@netlify/functions-utils": "^5.2.60",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/opentelemetry-utils": "^1.2.1",
     "@netlify/plugins-list": "^6.80.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.33.2",
+    "@netlify/zip-it-and-ship-it": "9.34.0",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
     "chalk": "^5.0.0",

packages/build/src/plugins/system_log.ts

@@ -15,22 +15,20 @@ export const captureStandardError = (
     }
   }
 
-  let receivedChunks = false
+  let buffer = ''
 
   const listener = (chunk: Buffer) => {
-    if (!receivedChunks) {
-      receivedChunks = true
-
-      systemLog(`Plugin failed to initialize during the "${eventName}" phase`)
-    }
-
-    systemLog(chunk.toString().trimEnd())
+    buffer += chunk.toString()
   }
 
   childProcess.stderr?.on('data', listener)
 
   const cleanup = () => {
     childProcess.stderr?.removeListener('data', listener)
+
+    if (buffer.length !== 0) {
+      systemLog(`Plugin failed to initialize during the "${eventName}" phase: ${buffer.trim()}`)
+    }
   }
 
   return cleanup

packages/build/tests/plugins/tests.js

@@ -360,10 +360,8 @@ test('Plugin errors that occur during the loading phase are piped to system logs
 
   if (platform !== 'win32') {
     const systemLog = await fs.readFile(systemLogFile.path, { encoding: 'utf8' })
-    const lines = systemLog.split('\n')
 
-    t.is(lines[0].trim(), 'Plugin failed to initialize during the "load" phase')
-    t.is(lines[1].trim(), 'An error message thrown by Node.js')
+    t.is(systemLog.trim(), `Plugin failed to initialize during the "load" phase: An error message thrown by Node.js`)
   }
 
   t.snapshot(normalizeOutput(output))

packages/config/CHANGELOG.md

@@ -76,6 +76,13 @@
   * dependencies
     * netlify bumped from ^13.1.8 to ^13.1.9
 
+## [20.13.0](https://github.com/netlify/build/compare/config-v20.12.6...config-v20.13.0) (2024-05-29)
+
+
+### Features
+
+* retrieve integration meta data from new endpoint ([#5647](https://github.com/netlify/build/issues/5647)) ([b8899e0](https://github.com/netlify/build/commit/b8899e06a31f5615ef41d8a4ab251bcc96717837))
+
 ## [20.12.6](https://github.com/netlify/build/compare/config-v20.12.5...config-v20.12.6) (2024-05-23)
 
 

packages/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.12.6",
+  "version": "20.13.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",

packages/config/src/api/site_info.ts

@@ -14,7 +14,6 @@ type GetSiteInfoOpts = {
   offline?: boolean
   api?: NetlifyAPI
   context?: string
-  featureFlags?: Record<string, boolean>
   testOpts?: TestOptions
 }
 /**
@@ -37,22 +36,49 @@ export const getSiteInfo = async function ({
 }: GetSiteInfoOpts) {
   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<any[]>(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 })
@@ -72,7 +98,7 @@ const getSite = async function (api: NetlifyAPI, siteId: string, siteFeatureFlag
     const site = await (api as any).getSite({ siteId, feature_flags: siteFeatureFlagPrefix })
     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}`)
   }
 }
 
@@ -81,7 +107,7 @@ const getAccounts = async function (api: NetlifyAPI) {
     const accounts = await (api as any).listAccountsForUser()
     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}`)
   }
 }
 
@@ -94,20 +120,24 @@ const getAddons = async function (api: NetlifyAPI, siteId: string) {
     const addons = await (api as any).listServiceInstancesForSite({ 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}`)
   }
 }
 
 type GetIntegrationsOpts = {
   siteId?: string
+  accountId?: string
   testOpts: TestOptions
   offline: boolean
+  featureFlags?: Record<string, boolean>
 }
 
 const getIntegrations = async function ({
   siteId,
+  accountId,
   testOpts,
   offline,
+  featureFlags,
 }: GetIntegrationsOpts): Promise<IntegrationResponse[]> {
   if (!siteId || offline) {
     return []
@@ -117,13 +147,21 @@ const getIntegrations = async function ({
 
   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 []
   }
 }

packages/config/src/error.ts

@@ -1,6 +1,6 @@
 // We distinguish between errors thrown intentionally and uncaught exceptions
 // (such as bugs) with a `customErrorInfo.type` property.
-export const throwUserError = function (messageOrError: string | Error, error?: Error) {
+export const throwUserError = function (messageOrError: string | Error, error?: Error): never {
   const errorA = getError(messageOrError, error)
   errorA[CUSTOM_ERROR_KEY] = { type: USER_ERROR_TYPE }
   throw errorA

packages/config/src/main.ts

@@ -73,7 +73,6 @@ export const resolveConfig = async function (opts) {
     mode,
     offline,
     siteFeatureFlagPrefix,
-    featureFlags,
     testOpts,
   })