@netlify/zip-it-and-ship-it 9.0.0 → 9.2.0-test

package/dist/feature_flags.js

@@ -12,10 +12,12 @@ export const defaultFlags = {
     // Output pure (i.e. untranspiled) ESM files when the function file has a
     // `.mjs` extension.
     zisi_pure_esm_mjs: false,
-    // Output CJS file extension
+    // Output CJS file extension.
     zisi_output_cjs_extension: false,
-    // Do not allow ___netlify-entry-point as function or file name
+    // Do not allow ___netlify-entry-point as function or file name.
     zisi_disallow_new_entry_name: false,
+    // Inject the compatibility layer required for the v2 runtime API to work.
+    zisi_functions_api_v2: 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/bundlers/esbuild/bundler.js

@@ -17,7 +17,6 @@ export const ESBUILD_LOG_LIMIT = 10;
 // When resolving imports with no extension (e.g. require('./foo')), these are
 // the extensions that esbuild will look for, in this order.
 const RESOLVE_EXTENSIONS = ['.js', '.jsx', '.mjs', '.cjs', '.ts', '.tsx', '.mts', '.cts', '.json'];
-// eslint-disable-next-line max-statements
 export const bundleJsFile = async function ({ additionalModulePaths, basePath, config, externalModules = [], featureFlags, ignoredModules = [], mainFile, name, srcDir, srcFile, }) {
     // We use a temporary directory as the destination for esbuild files to avoid
     // any naming conflicts with files generated by other functions.

package/dist/runtimes/node/bundlers/esbuild/plugin_native_modules.js

@@ -16,7 +16,6 @@ export const getNativeModulesPlugin = (externalizedModules) => ({
     name: 'external-native-modules',
     setup(build) {
         const cache = {};
-        // eslint-disable-next-line max-statements
         build.onResolve({ filter: packageFilter }, async (args) => {
             const pkg = packageName.exec(args.path);
             if (!pkg)

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

@@ -1,6 +1,7 @@
 import type { FeatureFlags } from '../../../feature_flags.js';
 import { ModuleFormat } from './module_format.js';
 export declare const ENTRY_FILE_NAME = "___netlify-entry-point";
+export declare const BOOTSTRAP_FILE_NAME = "___netlify-bootstrap.js";
 export interface EntryFile {
     contents: string;
     filename: string;

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

@@ -4,8 +4,16 @@ import { RUNTIME } from '../../runtime.js';
 import { getFileExtensionForFormat, MODULE_FILE_EXTENSION, MODULE_FORMAT, } from './module_format.js';
 import { normalizeFilePath } from './normalize_path.js';
 export const ENTRY_FILE_NAME = '___netlify-entry-point';
-const getEntryFileContents = (mainPath, moduleFormat) => {
+export const BOOTSTRAP_FILE_NAME = '___netlify-bootstrap.js';
+const getEntryFileContents = (mainPath, moduleFormat, featureFlags) => {
     const importPath = `.${mainPath.startsWith('/') ? mainPath : `/${mainPath}`}`;
+    if (featureFlags.zisi_functions_api_v2) {
+        return [
+            `import func from '${importPath}'`,
+            `import { getLambdaHandler } from './${BOOTSTRAP_FILE_NAME}'`,
+            `export const handler = getLambdaHandler(func)`,
+        ].join(';\n');
+    }
     if (moduleFormat === MODULE_FORMAT.COMMONJS) {
         return `module.exports = require('${importPath}')`;
     }
@@ -47,7 +55,7 @@ export const getEntryFile = ({ commonPrefix, featureFlags, filename, mainFile, m
     const mainPath = normalizeFilePath({ commonPrefix, path: mainFile, userNamespace });
     const extension = getFileExtensionForFormat(moduleFormat, featureFlags);
     const entryFilename = getEntryFileName({ extension, filename });
-    const contents = getEntryFileContents(mainPath, moduleFormat);
+    const contents = getEntryFileContents(mainPath, moduleFormat, featureFlags);
     return {
         contents,
         filename: entryFilename,

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

@@ -2,12 +2,13 @@ import { Buffer } from 'buffer';
 import { promises as fs } from 'fs';
 import os from 'os';
 import { basename, join } from 'path';
+import { getPath as getV2APIPath } from '@netlify/serverless-functions-api';
 import { copyFile } from 'cp-file';
 import { deleteAsync as deleteFiles } from 'del';
 import pMap from 'p-map';
 import { startZip, addZipFile, addZipContent, endZip, ARCHIVE_FORMAT, } from '../../../archive.js';
 import { cachedLstat, mkdirAndWriteFile } from '../../../utils/fs.js';
-import { conflictsWithEntryFile, getEntryFile, isNamedLikeEntryFile } from './entry_file.js';
+import { BOOTSTRAP_FILE_NAME, conflictsWithEntryFile, getEntryFile, isNamedLikeEntryFile, } from './entry_file.js';
 import { normalizeFilePath } from './normalize_path.js';
 // Taken from https://www.npmjs.com/package/cpy.
 const COPY_FILE_CONCURRENCY = os.cpus().length === 0 ? 2 : os.cpus().length * 2;
@@ -45,7 +46,7 @@ const createDirectory = async function ({ aliases = new Map(), basePath, destFol
     }, { concurrency: COPY_FILE_CONCURRENCY });
     return functionFolder;
 };
-const createZipArchive = async function ({ aliases, basePath, cache, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites, srcFiles, }) {
+const createZipArchive = async function ({ aliases = new Map(), basePath, cache, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites, srcFiles, }) {
     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
@@ -75,6 +76,14 @@ const createZipArchive = async function ({ aliases, basePath, cache, destFolder,
         });
         addEntryFileToZip(archive, entryFile);
     }
+    if (featureFlags.zisi_functions_api_v2) {
+        // This is the path to the file that contains all the code for the v2
+        // functions API. We add it to the list of source files and create an
+        // alias so that it's written as `BOOTSTRAP_FILE_NAME` in the ZIP.
+        const v2APIPath = getV2APIPath();
+        srcFiles.push(v2APIPath);
+        aliases.set(v2APIPath, BOOTSTRAP_FILE_NAME);
+    }
     const srcFilesInfos = await Promise.all(srcFiles.map((file) => addStat(cache, file)));
     // We ensure this is not async, so that the archive's checksum is
     // deterministic. Otherwise it depends on the order the files were added.

package/dist/zip.js

@@ -84,7 +84,6 @@ export const zipFunctions = async function (relativeSrcFolders, destFolder, { ar
     }
     return formattedResults;
 };
-// eslint-disable-next-line max-statements
 export const zipFunction = async function (relativeSrcPath, destFolder, { archiveFormat = ARCHIVE_FORMAT.ZIP, basePath, config: inputConfig = {}, featureFlags: inputFeatureFlags, repositoryRoot = basePath, systemLog, debug, internalSrcFolder, } = {}) {
     validateArchiveFormat(archiveFormat);
     const logger = getLogger(systemLog, debug);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.0.0",
+  "version": "9.2.0-test",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -48,7 +48,7 @@
   ],
   "author": "Netlify, Inc",
   "license": "MIT",
-  "repository": "netlify/zip-it-and-ship-it",
+  "repository": "https://github.com/netlify/zip-it-and-ship-it",
   "homepage": "https://github.com/netlify/zip-it-and-ship-it#README",
   "bugs": {
     "url": "https://github.com/netlify/zip-it-and-ship-it/issues"
@@ -57,6 +57,7 @@
     "@babel/parser": "7.16.8",
     "@netlify/binary-info": "^1.0.0",
     "@netlify/esbuild": "0.14.39",
+    "@netlify/serverless-functions-api": "^1.2.0",
     "@vercel/nft": "^0.22.0",
     "archiver": "^5.3.0",
     "common-path-prefix": "^3.0.0",
@@ -104,6 +105,7 @@
     "deepmerge": "^4.2.2",
     "get-stream": "^6.0.0",
     "husky": "^8.0.0",
+    "lambda-local": "^2.0.3",
     "npm-run-all": "^4.1.5",
     "sort-on": "^5.0.0",
     "source-map-support": "^0.5.21",