@netlify/zip-it-and-ship-it 5.7.2 → 5.8.0

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

@@ -1,24 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ESBUILD_LOG_LIMIT = exports.bundleJsFile = void 0;
+exports.bundleJsFile = exports.ESBUILD_LOG_LIMIT = void 0;
 const path_1 = require("path");
 const esbuild_1 = require("@netlify/esbuild");
 const tmp_promise_1 = require("tmp-promise");
-const fs_1 = require("../../../../utils/fs");
-const bundler_target_1 = require("./bundler_target");
-const plugin_dynamic_imports_1 = require("./plugin_dynamic_imports");
-const plugin_native_modules_1 = require("./plugin_native_modules");
-const plugin_node_builtin_1 = require("./plugin_node_builtin");
+const fs_js_1 = require("../../../../utils/fs.js");
+const bundler_target_js_1 = require("./bundler_target.js");
+const plugin_dynamic_imports_js_1 = require("./plugin_dynamic_imports.js");
+const plugin_native_modules_js_1 = require("./plugin_native_modules.js");
+const plugin_node_builtin_js_1 = require("./plugin_node_builtin.js");
 // Maximum number of log messages that an esbuild instance will produce. This
 // limit is important to avoid out-of-memory errors due to too much data being
 // sent in the Go<>Node IPC channel.
-const ESBUILD_LOG_LIMIT = 10;
-exports.ESBUILD_LOG_LIMIT = ESBUILD_LOG_LIMIT;
+exports.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', '.json'];
 // eslint-disable-next-line max-statements
-const bundleJsFile = async function ({ additionalModulePaths, basePath, config, externalModules = [], ignoredModules = [], name, srcDir, srcFile, }) {
+const bundleJsFile = async function ({ additionalModulePaths, basePath, config, externalModules = [], featureFlags, ignoredModules = [], 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.
     const targetDirectory = await (0, tmp_promise_1.tmpName)();
@@ -36,9 +35,9 @@ const bundleJsFile = async function ({ additionalModulePaths, basePath, config,
     const dynamicImportsIncludedPaths = new Set();
     // The list of esbuild plugins to enable for this build.
     const plugins = [
-        (0, plugin_node_builtin_1.getNodeBuiltinPlugin)(),
-        (0, plugin_native_modules_1.getNativeModulesPlugin)(nativeNodeModules),
-        (0, plugin_dynamic_imports_1.getDynamicImportsPlugin)({
+        (0, plugin_node_builtin_js_1.getNodeBuiltinPlugin)(),
+        (0, plugin_native_modules_js_1.getNativeModulesPlugin)(nativeNodeModules),
+        (0, plugin_dynamic_imports_js_1.getDynamicImportsPlugin)({
             basePath,
             includedPaths: dynamicImportsIncludedPaths,
             moduleNames: nodeModulesWithDynamicImports,
@@ -48,18 +47,23 @@ const bundleJsFile = async function ({ additionalModulePaths, basePath, config,
     ];
     // The version of ECMAScript to use as the build target. This will determine
     // whether certain features are transpiled down or left untransformed.
-    const nodeTarget = (0, bundler_target_1.getBundlerTarget)(config.nodeVersion);
+    const nodeTarget = (0, bundler_target_js_1.getBundlerTarget)(config.nodeVersion);
     // esbuild will format `sources` relative to the sourcemap file, which lives
     // in `destFolder`. We use `sourceRoot` to establish that relation. They are
     // URLs, not paths, so even on Windows they should use forward slashes.
     const sourceRoot = targetDirectory.replace(/\\/g, '/');
+    // Configuring the output format of esbuild. The `includedFiles` array we get
+    // here contains additional paths to include with the bundle, like the path
+    // to a `package.json` with {"type": "module"} in case of an ESM function.
+    const { includedFiles: includedFilesFromModuleDetection, moduleFormat } = await (0, bundler_target_js_1.getModuleFormat)(srcDir, featureFlags, config.nodeVersion);
     try {
         const { metafile = { inputs: {}, outputs: {} }, warnings } = await (0, esbuild_1.build)({
             bundle: true,
             entryPoints: [srcFile],
             external,
+            format: moduleFormat,
             logLevel: 'warning',
-            logLimit: ESBUILD_LOG_LIMIT,
+            logLimit: exports.ESBUILD_LOG_LIMIT,
             metafile: true,
             nodePaths: additionalModulePaths,
             outdir: targetDirectory,
@@ -77,11 +81,13 @@ const bundleJsFile = async function ({ additionalModulePaths, basePath, config,
         });
         const inputs = Object.keys(metafile.inputs).map((path) => (0, path_1.resolve)(path));
         const cleanTempFiles = getCleanupFunction([...bundlePaths.keys()]);
+        const additionalPaths = [...dynamicImportsIncludedPaths, ...includedFilesFromModuleDetection];
         return {
-            additionalPaths: [...dynamicImportsIncludedPaths],
+            additionalPaths,
             bundlePaths,
             cleanTempFiles,
             inputs,
+            moduleFormat,
             nativeNodeModules,
             nodeModulesWithDynamicImports: [...nodeModulesWithDynamicImports],
             warnings,
@@ -117,7 +123,7 @@ const getBundlePaths = ({ destFolder, outputs, srcFile, }) => {
         const absolutePath = (0, path_1.join)(destFolder, filename);
         if (output.entryPoint && (0, path_1.basename)(output.entryPoint) === (0, path_1.basename)(srcFile)) {
             // Ensuring the main file has a `.js` extension.
-            const normalizedSrcFile = (0, fs_1.getPathWithExtension)(srcFile, '.js');
+            const normalizedSrcFile = (0, fs_js_1.getPathWithExtension)(srcFile, '.js');
             bundlePaths.set(absolutePath, normalizedSrcFile);
         }
         else if (extension === '.js' || filename === `${bundleFilename}.map`) {
@@ -127,6 +133,6 @@ const getBundlePaths = ({ destFolder, outputs, srcFile, }) => {
     return bundlePaths;
 };
 const getCleanupFunction = (paths) => async () => {
-    await Promise.all(paths.filter(Boolean).map(fs_1.safeUnlink));
+    await Promise.all(paths.filter(Boolean).map(fs_js_1.safeUnlink));
 };
 //# sourceMappingURL=bundler.js.map

package/dist/runtimes/node/bundlers/esbuild/bundler_target.d.ts

@@ -1,3 +1,5 @@
+import { FeatureFlags } from '../../../../feature_flags';
+import { ModuleFormat } from '../../utils/module_format';
 declare const versionMap: {
     readonly '8.x': "node8";
     readonly '10.x': "node10";
@@ -7,4 +9,8 @@ declare const versionMap: {
 declare type VersionKeys = keyof typeof versionMap;
 declare type VersionValues = typeof versionMap[VersionKeys];
 declare const getBundlerTarget: (suppliedVersion?: string | undefined) => VersionValues;
-export { getBundlerTarget };
+declare const getModuleFormat: (srcDir: string, featureFlags: FeatureFlags, configVersion?: string | undefined) => Promise<{
+    includedFiles: string[];
+    moduleFormat: ModuleFormat;
+}>;
+export { getBundlerTarget, getModuleFormat };

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBundlerTarget = void 0;
-const DEFAULT_VERSION = 'node12';
+exports.getModuleFormat = exports.getBundlerTarget = void 0;
+const node_version_1 = require("../../utils/node_version");
+const package_json_1 = require("../../utils/package_json");
 const versionMap = {
     '8.x': 'node8',
     '10.x': 'node10',
@@ -13,9 +14,24 @@ const getBundlerTarget = (suppliedVersion) => {
     if (version && version in versionMap) {
         return versionMap[version];
     }
-    return DEFAULT_VERSION;
+    return versionMap[`${node_version_1.DEFAULT_NODE_VERSION}.x`];
 };
 exports.getBundlerTarget = getBundlerTarget;
+const getModuleFormat = async (srcDir, featureFlags, configVersion) => {
+    const packageJsonFile = await (0, package_json_1.getClosestPackageJson)(srcDir);
+    const nodeSupport = (0, node_version_1.getNodeSupportMatrix)(configVersion);
+    if (featureFlags.zisi_pure_esm && (packageJsonFile === null || packageJsonFile === void 0 ? void 0 : packageJsonFile.contents.type) === 'module' && nodeSupport.esm) {
+        return {
+            includedFiles: [packageJsonFile.path],
+            moduleFormat: 'esm',
+        };
+    }
+    return {
+        includedFiles: [],
+        moduleFormat: 'cjs',
+    };
+};
+exports.getModuleFormat = getModuleFormat;
 const normalizeVersion = (version) => {
     const match = version && version.match(/^nodejs(.*)$/);
     return match ? match[1] : version;

package/dist/runtimes/node/bundlers/esbuild/index.d.ts

@@ -1,6 +1,6 @@
-import type { BundleFunction } from '..';
+import type { BundleFunction } from '../index.js';
 declare const bundler: {
     bundle: BundleFunction;
-    getSrcFiles: import("..").GetSrcFilesFunction;
+    getSrcFiles: import("../index.js").GetSrcFilesFunction;
 };
 export default bundler;

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

@@ -1,47 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
-const fs_1 = require("../../../../utils/fs");
-const non_nullable_1 = require("../../../../utils/non_nullable");
-const base_path_1 = require("../../utils/base_path");
-const bundler_1 = require("./bundler");
-const special_cases_1 = require("./special_cases");
-const src_files_1 = require("./src_files");
+const fs_js_1 = require("../../../../utils/fs.js");
+const non_nullable_js_1 = require("../../../../utils/non_nullable.js");
+const base_path_js_1 = require("../../utils/base_path.js");
+const bundler_js_1 = require("./bundler.js");
+const special_cases_js_1 = require("./special_cases.js");
+const src_files_js_1 = require("./src_files.js");
 const getFunctionBasePath = ({ basePathFromConfig, mainFile, repositoryRoot, supportingSrcFiles, }) => {
     // If there is a base path defined in the config, we use that. To account for
     // paths outside of `basePathFromConfig` but inside `repositoryRoot`, we use
     // the common path prefix between the two.
     if (basePathFromConfig !== undefined) {
-        return (0, base_path_1.getBasePath)([basePathFromConfig, repositoryRoot].filter(non_nullable_1.nonNullable));
+        return (0, base_path_js_1.getBasePath)([basePathFromConfig, repositoryRoot].filter(non_nullable_js_1.nonNullable));
     }
     // If not, the base path is the common path prefix between all the supporting
     // files and the main file.
     const dirnames = [...supportingSrcFiles, mainFile].map((filePath) => (0, path_1.normalize)((0, path_1.dirname)(filePath)));
-    return (0, base_path_1.getBasePath)(dirnames);
+    return (0, base_path_js_1.getBasePath)(dirnames);
 };
 // Convenience method for retrieving external and ignored modules from
 // different places and merging them together.
 const getExternalAndIgnoredModules = async ({ config, srcDir }) => {
     const { externalNodeModules: externalModulesFromConfig = [], ignoredNodeModules: ignoredModulesFromConfig = [] } = config;
-    const { externalModules: externalModulesFromSpecialCases, ignoredModules: ignoredModulesFromSpecialCases } = await (0, special_cases_1.getExternalAndIgnoredModulesFromSpecialCases)({ srcDir });
+    const { externalModules: externalModulesFromSpecialCases, ignoredModules: ignoredModulesFromSpecialCases } = await (0, special_cases_js_1.getExternalAndIgnoredModulesFromSpecialCases)({ srcDir });
     const externalModules = [...new Set([...externalModulesFromConfig, ...externalModulesFromSpecialCases])];
     const ignoredModules = [...ignoredModulesFromConfig, ...ignoredModulesFromSpecialCases];
     return { externalModules, ignoredModules };
 };
 const bundle = async ({ basePath, config = {}, extension, featureFlags, filename, mainFile, name, pluginsModulesPath, repositoryRoot, runtime, srcDir, srcPath, stat, }) => {
     const { externalModules, ignoredModules } = await getExternalAndIgnoredModules({ config, srcDir });
-    const { additionalPaths, bundlePaths, cleanTempFiles, inputs, nativeNodeModules = {}, nodeModulesWithDynamicImports, warnings, } = await (0, bundler_1.bundleJsFile)({
+    const { additionalPaths, bundlePaths, cleanTempFiles, inputs, moduleFormat, nativeNodeModules = {}, nodeModulesWithDynamicImports, warnings, } = await (0, bundler_js_1.bundleJsFile)({
         additionalModulePaths: pluginsModulesPath ? [pluginsModulesPath] : [],
         basePath,
         config,
         externalModules,
+        featureFlags,
         ignoredModules,
         name,
         srcDir,
         srcFile: mainFile,
     });
     const bundlerWarnings = warnings.length === 0 ? undefined : warnings;
-    const srcFiles = await (0, src_files_1.getSrcFiles)({
+    const srcFiles = await (0, src_files_js_1.getSrcFiles)({
         basePath,
         config: {
             ...config,
@@ -64,7 +65,7 @@ const bundle = async ({ basePath, config = {}, extension, featureFlags, filename
     // path of the original, pre-bundling function file. We'll add the actual
     // bundled file further below.
     const supportingSrcFiles = srcFiles.filter((path) => path !== mainFile);
-    const normalizedMainFile = (0, fs_1.getPathWithExtension)(mainFile, '.js');
+    const normalizedMainFile = (0, fs_js_1.getPathWithExtension)(mainFile, '.js');
     const functionBasePath = getFunctionBasePath({
         basePathFromConfig: basePath,
         mainFile,
@@ -78,12 +79,12 @@ const bundle = async ({ basePath, config = {}, extension, featureFlags, filename
         bundlerWarnings,
         inputs,
         mainFile: normalizedMainFile,
-        moduleFormat: 'cjs',
+        moduleFormat,
         nativeNodeModules,
         nodeModulesWithDynamicImports,
         srcFiles: [...supportingSrcFiles, ...bundlePaths.keys()],
     };
 };
-const bundler = { bundle, getSrcFiles: src_files_1.getSrcFiles };
+const bundler = { bundle, getSrcFiles: src_files_js_1.getSrcFiles };
 exports.default = bundler;
 //# sourceMappingURL=index.js.map

package/dist/runtimes/node/bundlers/esbuild/plugin_dynamic_imports.d.ts

@@ -1,9 +1,8 @@
 import type { Plugin } from '@netlify/esbuild';
-declare const getDynamicImportsPlugin: ({ basePath, includedPaths, moduleNames, processImports, srcDir, }: {
+export declare const getDynamicImportsPlugin: ({ basePath, includedPaths, moduleNames, processImports, srcDir, }: {
     basePath?: string | undefined;
     includedPaths: Set<string>;
     moduleNames: Set<string>;
     processImports: boolean;
     srcDir: string;
 }) => Plugin;
-export { getDynamicImportsPlugin };

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

@@ -8,7 +8,7 @@ const path_1 = require("path");
 const find_up_1 = __importDefault(require("find-up"));
 const read_package_json_fast_1 = __importDefault(require("read-package-json-fast"));
 const unixify_1 = __importDefault(require("unixify"));
-const parser_1 = require("../../parser");
+const index_js_1 = require("../../parser/index.js");
 // This plugin intercepts module imports using dynamic expressions and does a
 // couple of things with them. First of all, it figures out whether the call
 // is being made from within a Node module, and if so it adds the name of the
@@ -28,7 +28,7 @@ const getDynamicImportsPlugin = ({ basePath, includedPaths, moduleNames, process
             // Also don't parse the expression if we're not interested in processing
             // the dynamic import expressions.
             if (basePath && processImports) {
-                const { includedPathsGlob, type: expressionType } = (0, parser_1.parseExpression)({ basePath, expression, resolveDir }) || {};
+                const { includedPathsGlob, type: expressionType } = (0, index_js_1.parseExpression)({ basePath, expression, resolveDir }) || {};
                 if (includedPathsGlob) {
                     // The parser has found a glob of paths that should be included in the
                     // bundle to make this import work, so we add it to `includedPaths`.

package/dist/runtimes/node/bundlers/esbuild/plugin_native_modules.d.ts

@@ -1,4 +1,3 @@
 import type { Plugin } from '@netlify/esbuild';
-import type { NativeNodeModules } from '..';
-declare const getNativeModulesPlugin: (externalizedModules: NativeNodeModules) => Plugin;
-export { getNativeModulesPlugin };
+import type { NativeNodeModules } from '../index.js';
+export declare const getNativeModulesPlugin: (externalizedModules: NativeNodeModules) => Plugin;

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNativeModulesPlugin = void 0;
 const path_1 = __importDefault(require("path"));
 const read_package_json_fast_1 = __importDefault(require("read-package-json-fast"));
-const detect_native_module_1 = require("../../utils/detect_native_module");
+const detect_native_module_js_1 = require("../../utils/detect_native_module.js");
 // Filters out relative or absolute file paths.
 const packageFilter = /^([^./]*)$/;
 // Filters valid package names and extracts the base directory.
@@ -14,7 +14,7 @@ const packageName = /^([^@][^/]*|@[^/]*\/[^/]+)(?:\/|$)/;
 const findNativeModule = (packageJsonPath, cache) => {
     if (cache[packageJsonPath] === undefined) {
         // eslint-disable-next-line no-param-reassign, promise/prefer-await-to-then
-        cache[packageJsonPath] = (0, read_package_json_fast_1.default)(packageJsonPath).then((data) => [Boolean((0, detect_native_module_1.isNativeModule)(data)), data], () => [undefined, {}]);
+        cache[packageJsonPath] = (0, read_package_json_fast_1.default)(packageJsonPath).then((data) => [Boolean((0, detect_native_module_js_1.isNativeModule)(data)), data], () => [undefined, {}]);
     }
     return cache[packageJsonPath];
 };

package/dist/runtimes/node/bundlers/esbuild/plugin_node_builtin.d.ts

@@ -1,3 +1,2 @@
 import type { Plugin } from '@netlify/esbuild';
-declare const getNodeBuiltinPlugin: () => Plugin;
-export { getNodeBuiltinPlugin };
+export declare const getNodeBuiltinPlugin: () => Plugin;

package/dist/runtimes/node/bundlers/esbuild/special_cases.d.ts

@@ -1,7 +1,6 @@
-declare const getExternalAndIgnoredModulesFromSpecialCases: ({ srcDir }: {
+export declare const getExternalAndIgnoredModulesFromSpecialCases: ({ srcDir }: {
     srcDir: string;
 }) => Promise<{
     externalModules: string[];
     ignoredModules: string[];
 }>;
-export { getExternalAndIgnoredModulesFromSpecialCases };

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExternalAndIgnoredModulesFromSpecialCases = void 0;
-const package_json_1 = require("../../utils/package_json");
+const package_json_js_1 = require("../../utils/package_json.js");
 const EXTERNAL_MODULES = ['@prisma/client'];
 const IGNORED_MODULES = ['aws-sdk'];
 const getModulesForNextJs = ({ dependencies, devDependencies }) => {
@@ -14,7 +14,7 @@ const getModulesForNextJs = ({ dependencies, devDependencies }) => {
     };
 };
 const getExternalAndIgnoredModulesFromSpecialCases = async ({ srcDir }) => {
-    const { dependencies = {}, devDependencies = {} } = await (0, package_json_1.getPackageJsonIfAvailable)(srcDir);
+    const { dependencies = {}, devDependencies = {} } = await (0, package_json_js_1.getPackageJsonIfAvailable)(srcDir);
     const { externalModules: nextJsExternalModules, ignoredModules: nextJsIgnoredModules } = getModulesForNextJs({
         dependencies,
         devDependencies,

package/dist/runtimes/node/bundlers/esbuild/src_files.d.ts

@@ -1,3 +1,2 @@
-import type { GetSrcFilesFunction } from '..';
-declare const getSrcFiles: GetSrcFilesFunction;
-export { getSrcFiles };
+import type { GetSrcFilesFunction } from '../index.js';
+export declare const getSrcFiles: GetSrcFilesFunction;

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

@@ -1,27 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSrcFiles = void 0;
-const included_files_1 = require("../../utils/included_files");
-const package_json_1 = require("../../utils/package_json");
-const traversal_cache_1 = require("../../utils/traversal_cache");
-const traverse_1 = require("../zisi/traverse");
+const included_files_js_1 = require("../../utils/included_files.js");
+const package_json_js_1 = require("../../utils/package_json.js");
+const traversal_cache_js_1 = require("../../utils/traversal_cache.js");
+const traverse_js_1 = require("../zisi/traverse.js");
 const getSrcFiles = async ({ config, mainFile, pluginsModulesPath, srcDir }) => {
     const { externalNodeModules = [], includedFiles = [], includedFilesBasePath } = config;
-    const { exclude: excludedPaths, paths: includedFilePaths } = await (0, included_files_1.getPathsOfIncludedFiles)(includedFiles, includedFilesBasePath);
+    const { exclude: excludedPaths, paths: includedFilePaths } = await (0, included_files_js_1.getPathsOfIncludedFiles)(includedFiles, includedFilesBasePath);
     const dependencyPaths = await getSrcFilesForDependencies({
         dependencies: externalNodeModules,
         basedir: srcDir,
         pluginsModulesPath,
     });
-    const includedPaths = (0, included_files_1.filterExcludedPaths)([...dependencyPaths, ...includedFilePaths], excludedPaths);
+    const includedPaths = (0, included_files_js_1.filterExcludedPaths)([...dependencyPaths, ...includedFilePaths], excludedPaths);
     return [...includedPaths, mainFile];
 };
 exports.getSrcFiles = getSrcFiles;
-const getSrcFilesForDependencies = async function ({ dependencies: dependencyNames, basedir, state = (0, traversal_cache_1.getNewCache)(), pluginsModulesPath, }) {
+const getSrcFilesForDependencies = async function ({ dependencies: dependencyNames, basedir, state = (0, traversal_cache_js_1.getNewCache)(), pluginsModulesPath, }) {
     if (dependencyNames.length === 0) {
         return [];
     }
-    const packageJson = await (0, package_json_1.getPackageJson)(basedir);
+    const packageJson = await (0, package_json_js_1.getPackageJson)(basedir);
     const dependencies = await Promise.all(dependencyNames.map((dependencyName) => getSrcFilesForDependency({
         dependency: dependencyName,
         basedir,
@@ -32,9 +32,9 @@ const getSrcFilesForDependencies = async function ({ dependencies: dependencyNam
     const paths = new Set(dependencies.flat());
     return [...paths];
 };
-const getSrcFilesForDependency = async function ({ dependency, basedir, state = (0, traversal_cache_1.getNewCache)(), packageJson, pluginsModulesPath, }) {
+const getSrcFilesForDependency = async function ({ dependency, basedir, state = (0, traversal_cache_js_1.getNewCache)(), packageJson, pluginsModulesPath, }) {
     try {
-        const paths = await (0, traverse_1.getDependencyPathsForDependency)({ dependency, basedir, state, packageJson, pluginsModulesPath });
+        const paths = await (0, traverse_js_1.getDependencyPathsForDependency)({ dependency, basedir, state, packageJson, pluginsModulesPath });
         return paths;
     }
     catch (error) {

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

@@ -1,13 +1,13 @@
 import type { Message } from '@netlify/esbuild';
-import { FunctionConfig } from '../../../config';
-import { FeatureFlag, FeatureFlags } from '../../../feature_flags';
-import { FunctionSource } from '../../../function';
-import { ModuleFormat } from '../utils/module_format';
+import { FunctionConfig } from '../../../config.js';
+import { FeatureFlag, FeatureFlags } from '../../../feature_flags.js';
+import { FunctionSource } from '../../../function.js';
+import { ModuleFormat } from '../utils/module_format.js';
 export declare type NodeBundlerName = 'esbuild' | 'esbuild_zisi' | 'nft' | 'zisi';
 declare type BundlerWarning = Message;
 declare type CleanupFunction = () => Promise<void>;
-declare type NativeNodeModules = Record<string, Record<string, string | undefined>>;
-declare type BundleFunction = (args: {
+export declare type NativeNodeModules = Record<string, Record<string, string | undefined>>;
+export declare type BundleFunction = (args: {
     basePath?: string;
     config: FunctionConfig;
     featureFlags: Record<FeatureFlag, boolean>;
@@ -26,7 +26,7 @@ declare type BundleFunction = (args: {
     nodeModulesWithDynamicImports?: string[];
     srcFiles: string[];
 }>;
-declare type GetSrcFilesFunction = (args: {
+export declare type GetSrcFilesFunction = (args: {
     basePath?: string;
     config: FunctionConfig;
     featureFlags: FeatureFlags;
@@ -37,11 +37,10 @@ interface NodeBundler {
     bundle: BundleFunction;
     getSrcFiles: GetSrcFilesFunction;
 }
-declare const getBundler: (name: NodeBundlerName) => NodeBundler;
-declare const getDefaultBundler: ({ extension, mainFile, featureFlags, }: {
+export declare const getBundler: (name: NodeBundlerName) => NodeBundler;
+export declare const getDefaultBundler: ({ extension, mainFile, featureFlags, }: {
     extension: string;
     mainFile: string;
     featureFlags: FeatureFlags;
 }) => Promise<NodeBundlerName>;
-export { getBundler, getDefaultBundler };
-export type { BundleFunction, GetSrcFilesFunction, NativeNodeModules };
+export {};

package/dist/runtimes/node/bundlers/index.js

@@ -4,19 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultBundler = exports.getBundler = void 0;
-const detect_es_module_1 = require("../utils/detect_es_module");
-const esbuild_1 = __importDefault(require("./esbuild"));
-const nft_1 = __importDefault(require("./nft"));
-const zisi_1 = __importDefault(require("./zisi"));
+const detect_es_module_js_1 = require("../utils/detect_es_module.js");
+const index_js_1 = __importDefault(require("./esbuild/index.js"));
+const index_js_2 = __importDefault(require("./nft/index.js"));
+const index_js_3 = __importDefault(require("./zisi/index.js"));
 const getBundler = (name) => {
     switch (name) {
         case 'esbuild':
         case 'esbuild_zisi':
-            return esbuild_1.default;
+            return index_js_1.default;
         case 'nft':
-            return nft_1.default;
+            return index_js_2.default;
         case 'zisi':
-            return zisi_1.default;
+            return index_js_3.default;
         default:
             throw new Error(`Unsupported Node bundler: ${name}`);
     }
@@ -25,17 +25,16 @@ exports.getBundler = getBundler;
 // We use ZISI as the default bundler, except for certain extensions, for which
 // esbuild is the only option.
 const getDefaultBundler = async ({ extension, mainFile, featureFlags, }) => {
-    const { defaultEsModulesToEsbuild, traceWithNft } = featureFlags;
     if (['.mjs', '.ts'].includes(extension)) {
         return 'esbuild';
     }
-    if (traceWithNft) {
+    if (featureFlags.traceWithNft) {
         return 'nft';
     }
-    if (defaultEsModulesToEsbuild) {
-        const isEsModule = await (0, detect_es_module_1.detectEsModule)({ mainFile });
-        if (isEsModule) {
-            return 'esbuild';
+    if (featureFlags.zisi_detect_esm) {
+        const functionIsESM = await (0, detect_es_module_js_1.detectEsModule)({ mainFile });
+        if (functionIsESM) {
+            return 'nft';
         }
     }
     return 'zisi';

package/dist/runtimes/node/bundlers/nft/es_modules.d.ts

@@ -1,9 +1,9 @@
 import { NodeFileTraceReasons } from '@vercel/nft';
-import type { FunctionConfig } from '../../../../config';
-import { FeatureFlags } from '../../../../feature_flags';
-import { FsCache } from '../../../../utils/fs';
-import { ModuleFormat } from '../../utils/module_format';
-declare const processESM: ({ basePath, config, esmPaths, featureFlags, fsCache, mainFile, reasons, }: {
+import type { FunctionConfig } from '../../../../config.js';
+import { FeatureFlags } from '../../../../feature_flags.js';
+import { FsCache } from '../../../../utils/fs.js';
+import { ModuleFormat } from '../../utils/module_format.js';
+export declare const processESM: ({ basePath, config, esmPaths, featureFlags, fsCache, mainFile, reasons, }: {
     basePath: string | undefined;
     config: FunctionConfig;
     esmPaths: Set<string>;
@@ -15,4 +15,3 @@ declare const processESM: ({ basePath, config, esmPaths, featureFlags, fsCache,
     rewrites?: Map<string, string> | undefined;
     moduleFormat: ModuleFormat;
 }>;
-export { processESM };

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processESM = void 0;
 const path_1 = require("path");
-const fs_1 = require("../../../../utils/fs");
-const node_version_1 = require("../../utils/node_version");
-const package_json_1 = require("../../utils/package_json");
-const transpile_1 = require("./transpile");
+const fs_js_1 = require("../../../../utils/fs.js");
+const node_version_js_1 = require("../../utils/node_version.js");
+const package_json_js_1 = require("../../utils/package_json.js");
+const transpile_js_1 = require("./transpile.js");
 const getPatchedESMPackages = async (packages, fsCache) => {
     const patchedPackages = await Promise.all(packages.map((path) => patchESMPackage(path, fsCache)));
     const patchedPackagesMap = new Map();
@@ -20,7 +20,7 @@ const isEntrypointESM = ({ basePath, esmPaths, mainFile, }) => {
     return entrypointIsESM;
 };
 const patchESMPackage = async (path, fsCache) => {
-    const file = (await (0, fs_1.cachedReadFile)(fsCache, path, 'utf8'));
+    const file = (await (0, fs_js_1.cachedReadFile)(fsCache, path, 'utf8'));
     const packageJson = JSON.parse(file);
     const patchedPackageJson = {
         ...packageJson,
@@ -35,8 +35,8 @@ const processESM = async ({ basePath, config, esmPaths, featureFlags, fsCache, m
             moduleFormat: 'cjs',
         };
     }
-    const packageJson = await (0, package_json_1.getPackageJsonIfAvailable)((0, path_1.dirname)(mainFile));
-    const nodeSupport = (0, node_version_1.getNodeSupportMatrix)(config.nodeVersion);
+    const packageJson = await (0, package_json_js_1.getPackageJsonIfAvailable)((0, path_1.dirname)(mainFile));
+    const nodeSupport = (0, node_version_js_1.getNodeSupportMatrix)(config.nodeVersion);
     if (featureFlags.zisi_pure_esm && packageJson.type === 'module' && nodeSupport.esm) {
         return {
             moduleFormat: 'esm',
@@ -91,7 +91,7 @@ const transpileESM = async ({ basePath, config, esmPaths, fsCache, reasons, }) =
     const rewrites = await getPatchedESMPackages(packageJsonPaths, fsCache);
     await Promise.all(pathsToTranspile.map(async (path) => {
         const absolutePath = resolvePath(path, basePath);
-        const transpiled = await (0, transpile_1.transpile)(absolutePath, config);
+        const transpiled = await (0, transpile_js_1.transpile)(absolutePath, config);
         rewrites.set(absolutePath, transpiled);
     }));
     return rewrites;

package/dist/runtimes/node/bundlers/nft/index.d.ts

@@ -1,5 +1,5 @@
-import type { BundleFunction } from '..';
-import type { GetSrcFilesFunction } from '../../../runtime';
+import type { GetSrcFilesFunction } from '../../../runtime.js';
+import type { BundleFunction } from '../index.js';
 declare const bundler: {
     bundle: BundleFunction;
     getSrcFiles: GetSrcFilesFunction;