Merge branch 'main' into jake/efs

Author: JakeChampion

.release-please-manifest.json

@@ -1,14 +1,14 @@
 {
  "packages/build-info": "9.0.2",
- "packages/build": "30.0.6",
- "packages/edge-bundler": "12.3.3",
+ "packages/build": "30.1.1",
+ "packages/edge-bundler": "12.4.0",
  "packages/cache-utils": "5.2.0",
- "packages/config": "21.0.4",
+ "packages/config": "21.0.6",
  "packages/framework-info": "9.9.2",
  "packages/functions-utils": "5.3.13",
  "packages/git-utils": "5.2.0",
  "packages/headers-parser": "8.0.0",
- "packages/js-client": "13.3.3",
+ "packages/js-client": "13.3.4",
  "packages/nock-udp": "4.0.0",
  "packages/redirect-parser": "14.5.1",
  "packages/run-utils": "5.2.0",

package-lock.json

@@ -105,6 +105,30 @@
  * dependencies
  * @netlify/config bumped from ^20.8.0 to ^20.8.1
 
+## [30.1.1](https://github.com/netlify/build/compare/build-v30.1.0...build-v30.1.1) (2025-04-01)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+ * dependencies
+ * @netlify/config bumped from ^21.0.5 to ^21.0.6
+
+## [30.1.0](https://github.com/netlify/build/compare/build-v30.0.6...build-v30.1.0) (2025-03-28)
+
+
+### Features
+
+* update deno version range to include v2 ([#6118](https://github.com/netlify/build/issues/6118)) ([297177f](https://github.com/netlify/build/commit/297177f56ac64c27ac3393f12d1129ce73d8177c))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+ * dependencies
+ * @netlify/config bumped from ^21.0.4 to ^21.0.5
+ * @netlify/edge-bundler bumped from 12.3.3 to 12.4.0
+
 ## [30.0.6](https://github.com/netlify/build/compare/build-v30.0.5...build-v30.0.6) (2025-03-24)
 
 

packages/build/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
  "name": "@netlify/build",
- "version": "30.0.6",
+ "version": "30.1.1",
  "description": "Netlify build module",
  "type": "module",
  "exports": "./lib/index.js",
@@ -69,8 +69,8 @@
  "@bugsnag/js": "^7.0.0",
  "@netlify/blobs": "^8.1.2",
  "@netlify/cache-utils": "^5.2.0",
- "@netlify/config": "^21.0.4",
- "@netlify/edge-bundler": "12.3.3",
+ "@netlify/config": "^21.0.6",
+ "@netlify/edge-bundler": "12.4.0",
  "@netlify/framework-info": "^9.9.2",
  "@netlify/functions-utils": "^5.3.13",
  "@netlify/git-utils": "^5.2.0",

packages/build/package.json

@@ -76,6 +76,22 @@
  * dependencies
  * netlify bumped from ^13.1.8 to ^13.1.9
 
+## [21.0.6](https://github.com/netlify/build/compare/config-v21.0.5...config-v21.0.6) (2025-04-01)
+
+
+### Bug Fixes
+
+* ensure extension api is always called with the right host ([#6168](https://github.com/netlify/build/issues/6168)) ([6b34ebf](https://github.com/netlify/build/commit/6b34ebf300dc45606cf787e7127b5b376b69e574))
+
+## [21.0.5](https://github.com/netlify/build/compare/config-v21.0.4...config-v21.0.5) (2025-03-28)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+ * dependencies
+ * netlify bumped from ^13.3.3 to ^13.3.4
+
 ## [21.0.4](https://github.com/netlify/build/compare/config-v21.0.3...config-v21.0.4) (2025-03-24)
 
 

packages/config/CHANGELOG.md

@@ -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",
@@ -72,7 +72,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",
  "@netlify/headers-parser": "^8.0.0",
  "@netlify/redirect-parser": "^14.5.1",
  "node-fetch": "^3.3.1",

packages/config/package.json

@@ -4,6 +4,12 @@ import type { RequestInit } 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'
 import { IntegrationResponse } from '../types/api.js'
 import { ModeOption, TestOptions } from '../types/options.js'
@@ -53,7 +59,16 @@ export const getSiteInfo = async function ({
 
  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 }
@@ -63,7 +78,7 @@ export const getSiteInfo = async function ({
  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)
@@ -120,6 +135,7 @@ type GetIntegrationsOpts = {
  token?: string
  featureFlags?: Record<string, boolean>
  extensionApiBaseUrl: string
+ mode: ModeOption
 }
 
 const getIntegrations = async function ({
@@ -130,19 +146,36 @@ const getIntegrations = async function ({
  token,
  featureFlags,
  extensionApiBaseUrl,
+ mode,
 }: GetIntegrationsOpts): Promise<IntegrationResponse[]> {
  if (!siteId || offline) {
  return []
  }
  const sendBuildBotTokenToJigsaw = featureFlags?.send_build_bot_token_to_jigsaw
- const { host, setBaseUrl } = testOpts
+ 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)
  }
-
- 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}`
@@ -151,8 +184,14 @@ const getIntegrations = async function ({
  try {
  const requestOptions = {} as RequestInit
 
+ // 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,
  }
  }

packages/config/src/api/site_info.ts

@@ -4,6 +4,7 @@ import { Integration } from './types/integrations.js'
 import { TestOptions } from './types/options.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'
 

packages/config/src/integrations.ts

@@ -55,8 +55,9 @@ export const resolveConfig = async function (opts) {
  }
 
  // TODO(kh): remove this mapping and get the extensionApiHost from the opts
- const extensionApiBaseUrl =
- host === NETLIFY_API_STAGING_BASE_URL ? EXTENSION_API_STAGING_BASE_URL : EXTENSION_API_BASE_URL
+ const extensionApiBaseUrl = host?.includes(NETLIFY_API_STAGING_BASE_URL)
+ ? EXTENSION_API_STAGING_BASE_URL
+ : EXTENSION_API_BASE_URL
 
  const {
  config: configOpt,

packages/config/src/main.ts

@@ -425,7 +425,7 @@ test('Integrations are returned if accountId is present and mode is dev', async
  t.assert(config.integrations[0].has_build === true)
 })
 
-test('Integrations are returned and called with a netlify-sdk-build-bot-token', async (t) => {
+test('Integrations are returned and called with a netlify-sdk-build-bot-token header', async (t) => {
  const { output, requests } = await new Fixture('./fixtures/base')
  .withFlags({
  siteId: 'test',
@@ -451,6 +451,32 @@ test('Integrations are returned and called with a netlify-sdk-build-bot-token',
  t.assert(config.integrations[0].has_build === true)
 })
 
+test('Integrations are returned and called with a netlify-config-mode header', async (t) => {
+ const { output, requests } = await new Fixture('./fixtures/base')
+ .withFlags({
+ siteId: 'test',
+ mode: 'dev',
+ token: 'test',
+ accountId: 'account1',
+ featureFlags: {
+ send_build_bot_token_to_jigsaw: true,
+ },
+ })
+ .runConfigServer([SITE_INFO_DATA, TEAM_INSTALLATIONS_META_RESPONSE, FETCH_INTEGRATIONS_EMPTY_RESPONSE])
+
+ const config = JSON.parse(output)
+ const installationsHeaders = requests.find(
+ (request) => request.url === TEAM_INSTALLATIONS_META_RESPONSE.path,
+ )?.headers
+
+ t.assert(installationsHeaders.includes('netlify-config-mode'))
+ t.assert(config.integrations)
+ t.assert(config.integrations.length === 1)
+ t.assert(config.integrations[0].slug === 'test')
+ t.assert(config.integrations[0].version === 'so-cool-v2')
+ t.assert(config.integrations[0].has_build === true)
+})
+
 test('Integrations are not returned if failed to fetch integrations', async (t) => {
  const { output } = await new Fixture('./fixtures/base')
  .withFlags({