@netlify/zip-it-and-ship-it 9.39.6 → 9.40.0

package/dist/feature_flags.d.ts

@@ -9,7 +9,7 @@ export declare const defaultFlags: {
     readonly zisi_esbuild_fail_double_glob: false;
     readonly zisi_fix_symlinks: false;
     readonly zisi_add_instrumentation_loader: true;
-    readonly zisi_add_version_file: false;
+    readonly zisi_add_metadata_file: false;
 };
 export type FeatureFlags = Partial<Record<keyof typeof defaultFlags, boolean>>;
 export declare const getFlags: (input?: Record<string, boolean>, flags?: {
@@ -23,5 +23,5 @@ export declare const getFlags: (input?: Record<string, boolean>, flags?: {
     readonly zisi_esbuild_fail_double_glob: false;
     readonly zisi_fix_symlinks: false;
     readonly zisi_add_instrumentation_loader: true;
-    readonly zisi_add_version_file: false;
+    readonly zisi_add_metadata_file: false;
 }) => FeatureFlags;

package/dist/feature_flags.js

@@ -22,8 +22,8 @@ export const defaultFlags = {
     zisi_fix_symlinks: false,
     // Adds the `___netlify-telemetry.mjs` file to the function bundle.
     zisi_add_instrumentation_loader: true,
-    // Adds a `___netlify-bootstrap-version` file to the function bundle.
-    zisi_add_version_file: false,
+    // Adds a `___netlify-metadata.json` file to the function bundle.
+    zisi_add_metadata_file: false,
 };
 // List of supported flags and their default value.
 export const getFlags = (input = {}, flags = defaultFlags) => Object.entries(flags).reduce((result, [key, defaultValue]) => ({

package/dist/runtimes/node/index.js

@@ -28,7 +28,7 @@ const getSrcFilesWithBundler = async (parameters) => {
     const result = await bundler.getSrcFiles({ ...parameters, pluginsModulesPath });
     return result.srcFiles;
 };
-const zipFunction = async function ({ archiveFormat, basePath, cache, config = {}, destFolder, extension, featureFlags, filename, isInternal, logger, mainFile, name, repositoryRoot, runtime, srcDir, srcPath, stat, }) {
+const zipFunction = async function ({ archiveFormat, basePath, branch, cache, config = {}, destFolder, extension, featureFlags, filename, isInternal, logger, mainFile, name, repositoryRoot, runtime, srcDir, srcPath, stat, }) {
     // If the file is a zip, we assume the function is bundled and ready to go.
     // We simply copy it to the destination path with no further processing.
     if (extension === '.zip') {
@@ -72,6 +72,7 @@ const zipFunction = async function ({ archiveFormat, basePath, cache, config = {
         aliases,
         archiveFormat,
         basePath: finalBasePath,
+        branch,
         cache,
         destFolder,
         extension,

package/dist/runtimes/node/utils/entry_file.d.ts

@@ -3,6 +3,7 @@ import { ModuleFormat } from './module_format.js';
 export declare const ENTRY_FILE_NAME = "___netlify-entry-point";
 export declare const BOOTSTRAP_FILE_NAME = "___netlify-bootstrap.mjs";
 export declare const BOOTSTRAP_VERSION_FILE_NAME = "___netlify-bootstrap-version";
+export declare const METADATA_FILE_NAME = "___netlify-metadata.json";
 export declare const TELEMETRY_FILE_NAME = "___netlify-telemetry.mjs";
 export interface EntryFile {
     contents: string;

package/dist/runtimes/node/utils/entry_file.js

@@ -8,6 +8,7 @@ import { normalizeFilePath } from './normalize_path.js';
 export const ENTRY_FILE_NAME = '___netlify-entry-point';
 export const BOOTSTRAP_FILE_NAME = '___netlify-bootstrap.mjs';
 export const BOOTSTRAP_VERSION_FILE_NAME = '___netlify-bootstrap-version';
+export const METADATA_FILE_NAME = '___netlify-metadata.json';
 export const TELEMETRY_FILE_NAME = '___netlify-telemetry.mjs';
 const require = createRequire(import.meta.url);
 /**

package/dist/runtimes/node/utils/metadata_file.d.ts

@@ -0,0 +1,6 @@
+export interface MetadataFile {
+    bootstrap_version?: string;
+    branch?: string;
+    version: number;
+}
+export declare const getMetadataFile: (bootstrapVersion?: string, branch?: string) => MetadataFile;

package/dist/runtimes/node/utils/metadata_file.js

@@ -0,0 +1,5 @@
+export const getMetadataFile = (bootstrapVersion, branch) => ({
+    bootstrap_version: bootstrapVersion,
+    branch,
+    version: 1,
+});

package/dist/runtimes/node/utils/zip.d.ts

@@ -5,6 +5,7 @@ import { ModuleFormat } from './module_format.js';
 interface ZipNodeParameters {
     aliases?: Map<string, string>;
     basePath: string;
+    branch?: string;
     cache: RuntimeCache;
     destFolder: string;
     extension: string;

package/dist/runtimes/node/utils/zip.js

@@ -7,7 +7,8 @@ import { copyFile } from 'cp-file';
 import pMap from 'p-map';
 import { addZipContent, addZipFile, ARCHIVE_FORMAT, endZip, startZip, } from '../../../archive.js';
 import { cachedLstat, mkdirAndWriteFile } from '../../../utils/fs.js';
-import { BOOTSTRAP_FILE_NAME, BOOTSTRAP_VERSION_FILE_NAME, conflictsWithEntryFile, getEntryFile, getTelemetryFile, isNamedLikeEntryFile, } from './entry_file.js';
+import { BOOTSTRAP_FILE_NAME, METADATA_FILE_NAME, conflictsWithEntryFile, getEntryFile, getTelemetryFile, isNamedLikeEntryFile, } from './entry_file.js';
+import { getMetadataFile } from './metadata_file.js';
 import { normalizeFilePath } from './normalize_path.js';
 import { getPackageJsonIfAvailable } from './package_json.js';
 // Taken from https://www.npmjs.com/package/cpy.
@@ -99,7 +100,7 @@ const createDirectory = async function ({ aliases = new Map(), basePath, cache,
     });
     return { path: functionFolder, entryFilename };
 };
-const createZipArchive = async function ({ aliases = new Map(), basePath, cache, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites, runtimeAPIVersion, srcFiles, generator, }) {
+const createZipArchive = async function ({ aliases = new Map(), basePath, branch, cache, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites, runtimeAPIVersion, srcFiles, generator, }) {
     const destPath = join(destFolder, `${basename(filename, extension)}.zip`);
     const { archive, output } = startZip(destPath);
     // There is a naming conflict with the entry file if one of the supporting
@@ -142,11 +143,10 @@ const createZipArchive = async function ({ aliases = new Map(), basePath, cache,
     }
     if (runtimeAPIVersion === 2) {
         const bootstrapPath = addBootstrapFile(srcFiles, aliases);
-        if (featureFlags.zisi_add_version_file === true) {
+        if (featureFlags.zisi_add_metadata_file === true) {
             const { version: bootstrapVersion } = await getPackageJsonIfAvailable(bootstrapPath);
-            if (bootstrapVersion) {
-                addZipContent(archive, bootstrapVersion, BOOTSTRAP_VERSION_FILE_NAME);
-            }
+            const payload = JSON.stringify(getMetadataFile(bootstrapVersion, branch));
+            addZipContent(archive, payload, METADATA_FILE_NAME);
         }
     }
     const deduplicatedSrcFiles = [...new Set(srcFiles)];

package/dist/runtimes/runtime.d.ts

@@ -55,6 +55,7 @@ export interface ZipFunctionResult {
 export type ZipFunction = (args: {
     archiveFormat: ArchiveFormat;
     basePath?: string;
+    branch?: string;
     cache: RuntimeCache;
     config: FunctionConfig;
     destFolder: string;

package/dist/zip.d.ts

@@ -1,10 +1,12 @@
 import { ArchiveFormat } from './archive.js';
 import { Config } from './config.js';
 import { FeatureFlags } from './feature_flags.js';
+import { FunctionResult } from './utils/format_result.js';
 import { LogFunction } from './utils/logger.js';
 export interface ZipFunctionOptions {
     archiveFormat?: ArchiveFormat;
     basePath?: string;
+    branch?: string;
     config?: Config;
     featureFlags?: FeatureFlags;
     repositoryRoot?: string;
@@ -19,11 +21,5 @@ export type ZipFunctionsOptions = ZipFunctionOptions & {
     parallelLimit?: number;
     internalSrcFolder?: string;
 };
-export declare const zipFunctions: (relativeSrcFolders: string | string[], destFolder: string, { archiveFormat, basePath, config, configFileDirectories, featureFlags: inputFeatureFlags, manifest, parallelLimit, repositoryRoot, systemLog, debug, internalSrcFolder, }?: ZipFunctionsOptions) => Promise<(Omit<import("./function.js").FunctionArchive, "runtime"> & {
-    routes?: import("./main.js").ExtendedRoute[];
-    excludedRoutes?: import("./main.js").Route[];
-    runtime: import("./main.js").RuntimeName;
-    schedule?: string;
-    runtimeAPIVersion?: number;
-})[]>;
-export declare const zipFunction: (relativeSrcPath: string, destFolder: string, { archiveFormat, basePath, config: inputConfig, featureFlags: inputFeatureFlags, repositoryRoot, systemLog, debug, internalSrcFolder, }?: ZipFunctionOptions) => Promise<import("./utils/format_result.js").FunctionResult | undefined>;
+export declare const zipFunctions: (relativeSrcFolders: string | string[], destFolder: string, { archiveFormat, basePath, branch, config, configFileDirectories, featureFlags: inputFeatureFlags, manifest, parallelLimit, repositoryRoot, systemLog, debug, internalSrcFolder, }?: ZipFunctionsOptions) => Promise<FunctionResult[]>;
+export declare const zipFunction: (relativeSrcPath: string, destFolder: string, { archiveFormat, basePath, config: inputConfig, featureFlags: inputFeatureFlags, repositoryRoot, systemLog, debug, internalSrcFolder, }?: ZipFunctionOptions) => Promise<FunctionResult | undefined>;

package/dist/zip.js

@@ -21,7 +21,7 @@ const validateArchiveFormat = (archiveFormat) => {
 };
 // Zip `srcFolder/*` (Node.js or Go files) to `destFolder/*.zip` so it can be
 // used by AWS Lambda
-export const zipFunctions = async function (relativeSrcFolders, destFolder, { archiveFormat = ARCHIVE_FORMAT.ZIP, basePath, config = {}, configFileDirectories, featureFlags: inputFeatureFlags, manifest, parallelLimit = DEFAULT_PARALLEL_LIMIT, repositoryRoot = basePath, systemLog, debug, internalSrcFolder, } = {}) {
+export const zipFunctions = async function (relativeSrcFolders, destFolder, { archiveFormat = ARCHIVE_FORMAT.ZIP, basePath, branch, config = {}, configFileDirectories, featureFlags: inputFeatureFlags, manifest, parallelLimit = DEFAULT_PARALLEL_LIMIT, repositoryRoot = basePath, systemLog, debug, internalSrcFolder, } = {}) {
     validateArchiveFormat(archiveFormat);
     const logger = getLogger(systemLog, debug);
     const cache = new RuntimeCache();
@@ -46,6 +46,7 @@ export const zipFunctions = async function (relativeSrcFolders, destFolder, { ar
         const zipResult = await func.runtime.zipFunction({
             archiveFormat,
             basePath,
+            branch,
             cache,
             config: func.config,
             destFolder,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.39.6",
+  "version": "9.40.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -44,7 +44,7 @@
     "@babel/parser": "^7.22.5",
     "@babel/types": "7.25.6",
     "@netlify/binary-info": "^1.0.0",
-    "@netlify/serverless-functions-api": "^1.28.0",
+    "@netlify/serverless-functions-api": "^1.29.0",
     "@vercel/nft": "^0.27.1",
     "archiver": "^7.0.0",
     "common-path-prefix": "^3.0.0",
@@ -105,5 +105,5 @@
   "engines": {
     "node": "^14.18.0 || >=16.0.0"
   },
-  "gitHead": "1947caec62b8a04c78e91647a4652598c9f28fbd"
+  "gitHead": "b7bfbacf3cf839a6d97057ee16ebd53fb319b4a2"
 }