@netlify/zip-it-and-ship-it 15.4.2 → 15.5.1

package/dist/feature_flags.d.ts

@@ -5,6 +5,7 @@ export declare const defaultFlags: {
     readonly zisi_pure_esm_mjs: false;
     readonly zisi_output_cjs_extension: false;
     readonly zisi_esbuild_fail_double_glob: false;
+    readonly zisi_error_cjs_in_esm_scope: false;
     readonly zisi_add_instrumentation_loader: true;
     readonly zisi_netlify_play: false;
     readonly zisi_container_functions: false;
@@ -17,6 +18,7 @@ export declare const getFlags: (input?: Record<string, boolean>, flags?: {
     readonly zisi_pure_esm_mjs: false;
     readonly zisi_output_cjs_extension: false;
     readonly zisi_esbuild_fail_double_glob: false;
+    readonly zisi_error_cjs_in_esm_scope: false;
     readonly zisi_add_instrumentation_loader: true;
     readonly zisi_netlify_play: false;
     readonly zisi_container_functions: false;

package/dist/feature_flags.js

@@ -14,6 +14,9 @@ export const defaultFlags = {
     zisi_output_cjs_extension: false,
     // If multiple glob stars are in includedFiles, fail the build instead of warning.
     zisi_esbuild_fail_double_glob: false,
+    // Fail the build when a CommonJS function file sits inside a `"type": "module"`
+    // package scope, instead of producing a bundle that fails at runtime.
+    zisi_error_cjs_in_esm_scope: false,
     // Adds the `___netlify-telemetry.mjs` file to the function bundle.
     zisi_add_instrumentation_loader: true,
     zisi_netlify_play: false,

package/dist/runtimes/node/bundlers/nft/es_modules.js

@@ -1,8 +1,11 @@
 import { basename, dirname, extname, resolve } from 'path';
+import { FunctionBundlingUserError } from '../../../../utils/error.js';
 import { cachedReadFile } from '../../../../utils/fs.js';
+import { RUNTIME } from '../../../runtime.js';
 import { MODULE_FILE_EXTENSION, MODULE_FORMAT } from '../../utils/module_format.js';
 import { getNodeSupportMatrix } from '../../utils/node_version.js';
 import { getPackageJsonIfAvailable } from '../../utils/package_json.js';
+import { NODE_BUNDLER } from '../types.js';
 import { transpileESMToCJS } from './transpile.js';
 const getPatchedESMPackages = async (packages, cache) => {
     const patchedPackages = await Promise.all(packages.map((path) => patchESMPackage(path, cache)));
@@ -36,6 +39,16 @@ export const processESM = async ({ basePath, cache, config, esmPaths, featureFla
         };
     }
     if (!isEntrypointESM({ basePath, esmPaths, mainFile })) {
+        // The entrypoint is a `.js` file with no ESM syntax. If it lives inside a
+        // `"type": "module"` package scope, the `package.json` is traced into the
+        // bundle verbatim and Node.js will load the file as an ES module at
+        // runtime, where its CommonJS globals are not defined.
+        if (featureFlags.zisi_error_cjs_in_esm_scope && extension === MODULE_FILE_EXTENSION.JS) {
+            const scopePackageJson = await getPackageJsonIfAvailable(dirname(mainFile));
+            if (scopePackageJson.type === 'module') {
+                throw new FunctionBundlingUserError(`The function file '${mainFile}' is a CommonJS module, but the closest 'package.json' declares '"type": "module"', so Node.js will fail to load it at runtime. Either use ESM syntax ('import'/'export'), rename the file extension to '.cjs', or remove '"type": "module"' from the 'package.json'.`, { functionName: name, runtime: RUNTIME.JAVASCRIPT, bundler: NODE_BUNDLER.NFT });
+            }
+        }
         return {
             moduleFormat: MODULE_FORMAT.COMMONJS,
         };

package/dist/utils/error.d.ts

@@ -13,6 +13,7 @@ type UserError = Error & {
     customErrorInfo: CustomErrorInfo;
 };
 export declare class FunctionBundlingUserError extends Error {
+    customErrorInfo: CustomErrorInfo;
     constructor(message: string, customErrorInfo: CustomErrorLocation);
     static addCustomErrorInfo(error: Error, customErrorInfo: CustomErrorLocation): UserError;
 }

package/dist/utils/error.js

@@ -1,17 +1,19 @@
+const createFunctionsBundlingErrorInfo = (location) => ({
+    type: 'functionsBundling',
+    location,
+});
 export class FunctionBundlingUserError extends Error {
+    customErrorInfo;
     constructor(message, customErrorInfo) {
         super(message);
         Object.setPrototypeOf(this, new.target.prototype);
         this.name = 'FunctionBundlingUserError';
         Error.captureStackTrace(this, FunctionBundlingUserError);
-        FunctionBundlingUserError.addCustomErrorInfo(this, customErrorInfo);
+        this.customErrorInfo = createFunctionsBundlingErrorInfo(customErrorInfo);
     }
     static addCustomErrorInfo(error, customErrorInfo) {
-        const info = {
-            type: 'functionsBundling',
-            location: customErrorInfo,
-        };
-        error.customErrorInfo = info;
+        ;
+        error.customErrorInfo = createFunctionsBundlingErrorInfo(customErrorInfo);
         return error;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "15.4.2",
+  "version": "15.5.1",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -69,7 +69,7 @@
     "resolve": "^2.0.0-next.1",
     "semver": "^7.3.8",
     "tmp-promise": "^3.0.2",
-    "toml": "^3.0.0",
+    "toml": "^4.2.0",
     "unixify": "^1.0.0",
     "urlpattern-polyfill": "8.0.2",
     "yargs": "^17.0.0",
@@ -86,7 +86,7 @@
     "@types/unixify": "1.0.2",
     "@types/yargs": "17.0.35",
     "@vitest/coverage-v8": "^3.0.0",
-    "browserslist": "4.28.1",
+    "browserslist": "4.28.7",
     "cardinal": "2.1.1",
     "cpy": "11.1.0",
     "decompress": "4.2.1",
@@ -100,5 +100,5 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "gitHead": "7eef4fb1841e2ebed2c91b7daf11cd989226ebfb"
+  "gitHead": "d30dc9ad0c79ea23f01354f2487187d3398f5de2"
 }