@netlify/zip-it-and-ship-it 9.3.0 → 9.3.1

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 { transpile } from './transpile.js';
 const getPatchedESMPackages = async (packages, cache) => {
     const patchedPackages = await Promise.all(packages.map((path) => patchESMPackage(path, cache)));
@@ -30,24 +33,41 @@ export const processESM = async ({ basePath, cache, config, esmPaths, featureFla
     const extension = extname(mainFile);
     // If this is a .mjs file and we want to output pure ESM files, we don't need
     // to transpile anything.
-    if (extension === MODULE_FILE_EXTENSION.MJS && featureFlags.zisi_pure_esm_mjs) {
+    if (extension === MODULE_FILE_EXTENSION.MJS &&
+        (featureFlags.zisi_pure_esm_mjs || featureFlags.zisi_functions_api_v2)) {
         return {
             moduleFormat: MODULE_FORMAT.ESM,
         };
     }
     const entrypointIsESM = isEntrypointESM({ basePath, esmPaths, mainFile });
     if (!entrypointIsESM) {
+        if (featureFlags.zisi_functions_api_v2) {
+            throw new FunctionBundlingUserError(`The function '${name}' must use the ES module syntax. To learn more, visit https://ntl.fyi/esm.`, {
+                functionName: name,
+                runtime: RUNTIME.JAVASCRIPT,
+                bundler: NODE_BUNDLER.NFT,
+            });
+        }
         return {
             moduleFormat: MODULE_FORMAT.COMMONJS,
         };
     }
     const packageJson = await getPackageJsonIfAvailable(dirname(mainFile));
     const nodeSupport = getNodeSupportMatrix(config.nodeVersion);
-    if (featureFlags.zisi_pure_esm && packageJson.type === 'module' && nodeSupport.esm) {
+    if ((featureFlags.zisi_pure_esm || featureFlags.zisi_functions_api_v2) &&
+        packageJson.type === 'module' &&
+        nodeSupport.esm) {
         return {
             moduleFormat: MODULE_FORMAT.ESM,
         };
     }
+    if (featureFlags.zisi_functions_api_v2) {
+        throw new FunctionBundlingUserError(`The function '${name}' must use the ES module syntax. To learn more, visit https://ntl.fyi/esm.`, {
+            functionName: name,
+            runtime: RUNTIME.JAVASCRIPT,
+            bundler: NODE_BUNDLER.NFT,
+        });
+    }
     const rewrites = await transpileESM({ basePath, cache, config, esmPaths, reasons, name });
     return {
         moduleFormat: MODULE_FORMAT.COMMONJS,

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

@@ -9,7 +9,7 @@ const getEntryFileContents = (mainPath, moduleFormat, featureFlags) => {
     const importPath = `.${mainPath.startsWith('/') ? mainPath : `/${mainPath}`}`;
     if (featureFlags.zisi_functions_api_v2) {
         return [
-            `import func from '${importPath}'`,
+            `import * as func from '${importPath}'`,
             `import { getLambdaHandler } from './${BOOTSTRAP_FILE_NAME}'`,
             `export const handler = getLambdaHandler(func)`,
         ].join(';');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.3.0",
+  "version": "9.3.1",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -78,7 +78,7 @@
     "normalize-path": "^3.0.0",
     "p-map": "^5.0.0",
     "path-exists": "^5.0.0",
-    "precinct": "^10.0.0",
+    "precinct": "^11.0.0",
     "require-package-name": "^2.0.1",
     "resolve": "^2.0.0-next.1",
     "semver": "^7.0.0",