Merge branch 'main' into fix/pass-env-and-cwd-to-integration-build-context-dev

ndhoule · web-flow · commit 254489ac6b62 · 2024-10-21T08:54:26.000-07:00
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,11 +1,11 @@
 {
   "packages/build-info": "7.15.1",
-  "packages/build": "29.55.2",
+  "packages/build": "29.55.3",
   "packages/edge-bundler": "12.2.3",
   "packages/cache-utils": "5.1.6",
   "packages/config": "20.19.0",
   "packages/framework-info": "9.8.13",
-  "packages/functions-utils": "5.2.91",
+  "packages/functions-utils": "5.2.92",
   "packages/git-utils": "5.1.1",
   "packages/headers-parser": "7.1.4",
   "packages/js-client": "13.1.21",
@@ -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.40.2"
+  "packages/zip-it-and-ship-it": "9.41.0"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/build/CHANGELOG.md b/packages/build/CHANGELOG.md
@@ -105,6 +105,16 @@
   * dependencies
     * @netlify/config bumped from ^20.8.0 to ^20.8.1
 
+## [29.55.3](https://github.com/netlify/build/compare/build-v29.55.2...build-v29.55.3) (2024-10-21)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @netlify/functions-utils bumped from ^5.2.91 to ^5.2.92
+    * @netlify/zip-it-and-ship-it bumped from 9.40.2 to 9.41.0
+
 ## [29.55.2](https://github.com/netlify/build/compare/build-v29.55.1...build-v29.55.2) (2024-10-11)
 
 
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.55.2",
+  "version": "29.55.3",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -73,12 +73,12 @@
     "@netlify/config": "^20.19.0",
     "@netlify/edge-bundler": "12.2.3",
     "@netlify/framework-info": "^9.8.13",
-    "@netlify/functions-utils": "^5.2.91",
+    "@netlify/functions-utils": "^5.2.92",
     "@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.40.2",
+    "@netlify/zip-it-and-ship-it": "9.41.0",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
     "chalk": "^5.0.0",
diff --git a/packages/functions-utils/CHANGELOG.md b/packages/functions-utils/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [5.2.92](https://github.com/netlify/build/compare/functions-utils-v5.2.91...functions-utils-v5.2.92) (2024-10-21)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @netlify/zip-it-and-ship-it bumped from 9.40.2 to 9.41.0
+
 ## [5.2.91](https://github.com/netlify/build/compare/functions-utils-v5.2.90...functions-utils-v5.2.91) (2024-10-11)
 
 
diff --git a/packages/functions-utils/package.json b/packages/functions-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netlify/functions-utils",
-  "version": "5.2.91",
+  "version": "5.2.92",
   "description": "Utility for adding Functions files in Netlify Build",
   "type": "module",
   "exports": "./lib/main.js",
@@ -50,7 +50,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@netlify/zip-it-and-ship-it": "9.40.2",
+    "@netlify/zip-it-and-ship-it": "9.41.0",
     "cpy": "^9.0.0",
     "path-exists": "^5.0.0"
   },
diff --git a/packages/zip-it-and-ship-it/CHANGELOG.md b/packages/zip-it-and-ship-it/CHANGELOG.md
@@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [9.41.0](https://github.com/netlify/build/compare/zip-it-and-ship-it-v9.40.2...zip-it-and-ship-it-v9.41.0) (2024-10-21)
+
+
+### Features
+
+* add `bootstrapVersion` field to manifest ([#5890](https://github.com/netlify/build/issues/5890)) ([46de664](https://github.com/netlify/build/commit/46de664d2815c430f7d1b45c8bd92d42a5cc4502))
+
 ## [9.40.2](https://github.com/netlify/build/compare/zip-it-and-ship-it-v9.40.1...zip-it-and-ship-it-v9.40.2) (2024-10-11)
 
 
diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.40.2",
+  "version": "9.41.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
diff --git a/packages/zip-it-and-ship-it/src/manifest.ts b/packages/zip-it-and-ship-it/src/manifest.ts
@@ -9,20 +9,20 @@ import type { ExtendedRoute, Route } from './utils/routes.js'
 
 interface ManifestFunction {
   buildData?: Record<string, unknown>
+  bundler?: string
+  displayName?: string
+  excludedRoutes?: Route[]
+  generator?: string
   invocationMode?: InvocationMode
   mainFile: string
   name: string
   path: string
+  priority?: number
   routes?: ExtendedRoute[]
-  excludedRoutes?: Route[]
   runtime: string
   runtimeVersion?: string
   schedule?: string
-  displayName?: string
-  bundler?: string
-  generator?: string
   timeout?: number
-  priority?: number
   trafficRules?: TrafficRules
 }
 
@@ -51,6 +51,7 @@ export const createManifest = async ({ functions, path }: { functions: FunctionR
 }
 
 const formatFunctionForManifest = ({
+  bootstrapVersion,
   bundler,
   displayName,
   excludedRoutes,
@@ -74,7 +75,7 @@ const formatFunctionForManifest = ({
     generator,
     timeout,
     invocationMode,
-    buildData: { runtimeAPIVersion },
+    buildData: { bootstrapVersion, runtimeAPIVersion },
     mainFile,
     name,
     priority,
diff --git a/packages/zip-it-and-ship-it/src/runtimes/node/index.ts b/packages/zip-it-and-ship-it/src/runtimes/node/index.ts
@@ -110,7 +110,7 @@ const zipFunction: ZipFunction = async function ({
   createPluginsModulesPathAliases(srcFiles, pluginsModulesPath, aliases, finalBasePath)
 
   const generator = mergedConfig?.generator || getInternalValue(isInternal)
-  const zipPath = await zipNodeJs({
+  const zipResult = await zipNodeJs({
     aliases,
     archiveFormat,
     basePath: finalBasePath,
@@ -152,11 +152,12 @@ const zipFunction: ZipFunction = async function ({
   const trafficRules = mergedConfig?.rateLimit ? getTrafficRulesConfig(mergedConfig.rateLimit) : undefined
 
   return {
+    bootstrapVersion: zipResult.bootstrapVersion,
     bundler: bundlerName,
     bundlerWarnings,
     config: mergedConfig,
     displayName: mergedConfig?.name,
-    entryFilename: zipPath.entryFilename,
+    entryFilename: zipResult.entryFilename,
     generator,
     timeout: mergedConfig?.timeout,
     inputs,
@@ -165,7 +166,7 @@ const zipFunction: ZipFunction = async function ({
     invocationMode,
     outputModuleFormat,
     nativeNodeModules,
-    path: zipPath.path,
+    path: zipResult.path,
     priority,
     trafficRules,
     runtimeVersion:
diff --git a/packages/zip-it-and-ship-it/src/runtimes/node/utils/zip.ts b/packages/zip-it-and-ship-it/src/runtimes/node/utils/zip.ts
@@ -229,6 +229,7 @@ const createZipArchive = async function ({
   const userNamespace = hasEntryFileConflict ? DEFAULT_USER_SUBDIRECTORY : ''
 
   let entryFilename = `${basename(filename, extname(filename))}.js`
+  let bootstrapVersion: string | undefined
 
   if (needsEntryFile) {
     const entryFile = getEntryFile({
@@ -255,8 +256,10 @@ const createZipArchive = async function ({
     const bootstrapPath = addBootstrapFile(srcFiles, aliases)
 
     if (featureFlags.zisi_add_metadata_file === true) {
-      const { version: bootstrapVersion } = await getPackageJsonIfAvailable(bootstrapPath)
-      const payload = JSON.stringify(getMetadataFile(bootstrapVersion, branch))
+      const { version } = await getPackageJsonIfAvailable(bootstrapPath)
+      const payload = JSON.stringify(getMetadataFile(version, branch))
+
+      bootstrapVersion = version
 
       addZipContent(archive, payload, METADATA_FILE_NAME)
     }
@@ -281,16 +284,19 @@ const createZipArchive = async function ({
 
   await endZip(archive, output)
 
-  return { path: destPath, entryFilename }
+  return { path: destPath, entryFilename, bootstrapVersion }
+}
+
+interface ZipNodeJsResult {
+  bootstrapVersion?: string
+  entryFilename: string
+  path: string
 }
 
 export const zipNodeJs = function ({
   archiveFormat,
   ...options
-}: ZipNodeParameters & { archiveFormat: ArchiveFormat }): Promise<{
-  path: string
-  entryFilename: string
-}> {
+}: ZipNodeParameters & { archiveFormat: ArchiveFormat }): Promise<ZipNodeJsResult> {
   if (archiveFormat === ARCHIVE_FORMAT.ZIP) {
     return createZipArchive(options)
   }
diff --git a/packages/zip-it-and-ship-it/src/utils/format_result.ts b/packages/zip-it-and-ship-it/src/utils/format_result.ts
@@ -5,6 +5,7 @@ import { removeUndefined } from './remove_undefined.js'
 import type { ExtendedRoute, Route } from './routes.js'
 
 export type FunctionResult = Omit<FunctionArchive, 'runtime'> & {
+  bootstrapVersion?: string
   routes?: ExtendedRoute[]
   excludedRoutes?: Route[]
   runtime: RuntimeName
diff --git a/packages/zip-it-and-ship-it/tests/v2api.test.ts b/packages/zip-it-and-ship-it/tests/v2api.test.ts
@@ -753,4 +753,35 @@ describe.runIf(semver.gte(nodeVersion, '18.13.0'))('V2 functions API', () => {
       })
     })
   })
+
+  test('Adds a `buildData` object to each function entry in the manifest file', async () => {
+    const bootstrapPath = getBootstrapPath()
+    const bootstrapPackageJson = await readFile(resolve(bootstrapPath, '..', '..', 'package.json'), 'utf8')
+    const { version: bootstrapVersion } = JSON.parse(bootstrapPackageJson)
+
+    const { path: tmpDir } = await getTmpDir({ prefix: 'zip-it-test' })
+    const manifestPath = join(tmpDir, 'manifest.json')
+
+    const { files } = await zipFixture('v2-api', {
+      fixtureDir: FIXTURES_ESM_DIR,
+      opts: {
+        featureFlags: {
+          zisi_add_metadata_file: true,
+        },
+        manifest: manifestPath,
+      },
+    })
+
+    expect(files.length).toBe(1)
+    expect(files[0].name).toBe('function')
+    expect(files[0].bootstrapVersion).toBe(bootstrapVersion)
+    expect(files[0].runtimeAPIVersion).toBe(2)
+
+    const manifestString = await readFile(manifestPath, { encoding: 'utf8' })
+    const manifest = JSON.parse(manifestString)
+
+    expect(manifest.functions.length).toBe(1)
+    expect(manifest.functions[0].name).toBe('function')
+    expect(manifest.functions[0].buildData).toEqual({ bootstrapVersion, runtimeAPIVersion: 2 })
+  })
 })

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@netlify/zip-it-and-ship-it",`
`3`		`- "version": "9.40.2",`
	`3`	`+ "version": "9.41.0",`
`4`	`4`	`"description": "Zip it and ship it",`
`5`	`5`	`"main": "./dist/main.js",`
`6`	`6`	`"type": "module",`