@netlify/zip-it-and-ship-it 7.1.2 → 7.1.3

package/dist/feature_flags.js

@@ -17,6 +17,8 @@ exports.defaultFlags = {
     zisi_pure_esm_mjs: false,
     // Load configuration from per-function JSON files.
     project_deploy_configuration_api_use_per_function_configuration_files: false,
+    // Provide banner to esbuild which allows requires in ESM output
+    zisi_esbuild_require_banner: false,
 };
 // List of supported flags and their default value.
 const getFlags = (input = {}, flags = exports.defaultFlags) => Object.entries(flags).reduce((result, [key, defaultValue]) => ({

package/dist/main.d.ts

@@ -21,14 +21,14 @@ interface ListFunctionsOptions {
     featureFlags?: FeatureFlags;
     parseISC?: boolean;
 }
-export declare const listFunctions: (relativeSrcFolders: string | string[], { featureFlags, config, parseISC, }?: {
+export declare const listFunctions: (relativeSrcFolders: string | string[], { featureFlags: inputFeatureFlags, config, parseISC, }?: {
     featureFlags?: FeatureFlags | undefined;
     config?: Config | undefined;
     parseISC?: boolean | undefined;
 }) => Promise<ListedFunction[]>;
-export declare const listFunction: (path: string, { featureFlags, config, parseISC, }?: {
+export declare const listFunction: (path: string, { featureFlags: inputFeatureFlags, config, parseISC, }?: {
     featureFlags?: FeatureFlags | undefined;
     config?: Config | undefined;
     parseISC?: boolean | undefined;
 }) => Promise<ListedFunction | undefined>;
-export declare const listFunctionsFiles: (relativeSrcFolders: string | string[], { basePath, config, featureFlags, parseISC }?: ListFunctionsOptions) => Promise<ListedFunctionFile[]>;
+export declare const listFunctionsFiles: (relativeSrcFolders: string | string[], { basePath, config, featureFlags: inputFeatureFlags, parseISC }?: ListFunctionsOptions) => Promise<ListedFunctionFile[]>;

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

@@ -62,8 +62,19 @@ const bundleJsFile = async function ({ additionalModulePaths, basePath, config,
     const extension = (0, module_format_js_1.getFileExtensionForFormat)(moduleFormat, featureFlags);
     // When outputting an ESM file, configure esbuild to produce a `.mjs` file.
     const outExtension = moduleFormat === "esm" /* ModuleFormat.ESM */ ? { [".js" /* ModuleFileExtension.JS */]: ".mjs" /* ModuleFileExtension.MJS */ } : undefined;
+    // We add this banner so that calls to require() still work in ESM modules, especially when importing node built-ins
+    // We have to do this until this is fixed in esbuild: https://github.com/evanw/esbuild/pull/2067
+    const esmJSBanner = `
+    import {createRequire as ___nfyCreateRequire} from "module";
+    import {fileURLToPath as ___nfyFileURLToPath} from "url";
+    import {dirname as ___nfyPathDirname} from "path";
+    let __filename=___nfyFileURLToPath(import.meta.url);
+    let __dirname=___nfyPathDirname(___nfyFileURLToPath(import.meta.url));
+    let require=___nfyCreateRequire(import.meta.url);
+  `;
     try {
         const { metafile = { inputs: {}, outputs: {} }, warnings } = await (0, esbuild_1.build)({
+            banner: moduleFormat === "esm" /* ModuleFormat.ESM */ && featureFlags.zisi_esbuild_require_banner ? { js: esmJSBanner } : undefined,
             bundle: true,
             entryPoints: [srcFile],
             external,

package/dist/runtimes/node/parser/index.d.ts

@@ -1,4 +1,4 @@
-export declare const parseExpression: ({ basePath, expression, resolveDir, }: {
+export declare const parseExpression: ({ basePath, expression: rawExpression, resolveDir, }: {
     basePath: string;
     expression: string;
     resolveDir: string;

package/dist/zip.d.ts

@@ -14,9 +14,9 @@ declare type ZipFunctionsOptions = ZipFunctionOptions & {
     manifest?: string;
     parallelLimit?: number;
 };
-export declare const zipFunctions: (relativeSrcFolders: string | string[], destFolder: string, { archiveFormat, basePath, config, configFileDirectories, featureFlags, manifest, parallelLimit, repositoryRoot, }?: ZipFunctionsOptions) => Promise<(Omit<import("./function.js").FunctionArchive, "runtime"> & {
+export declare const zipFunctions: (relativeSrcFolders: string | string[], destFolder: string, { archiveFormat, basePath, config, configFileDirectories, featureFlags: inputFeatureFlags, manifest, parallelLimit, repositoryRoot, }?: ZipFunctionsOptions) => Promise<(Omit<import("./function.js").FunctionArchive, "runtime"> & {
     runtime: import("./main.js").RuntimeType;
     schedule?: string | undefined;
 })[]>;
-export declare const zipFunction: (relativeSrcPath: string, destFolder: string, { archiveFormat, basePath, config, featureFlags, repositoryRoot, }?: ZipFunctionOptions) => Promise<import("./utils/format_result.js").FunctionResult | undefined>;
+export declare const zipFunction: (relativeSrcPath: string, destFolder: string, { archiveFormat, basePath, config: inputConfig, featureFlags: inputFeatureFlags, repositoryRoot, }?: ZipFunctionOptions) => Promise<import("./utils/format_result.js").FunctionResult | undefined>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "7.1.2",
+  "version": "7.1.3",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "bin": {