@netlify/zip-it-and-ship-it 5.7.4 → 5.9.0

package/dist/feature_flags.js

@@ -5,9 +5,9 @@ const process_1 = require("process");
 exports.defaultFlags = {
     buildGoSource: Boolean(process_1.env.NETLIFY_EXPERIMENTAL_BUILD_GO_SOURCE),
     buildRustSource: Boolean(process_1.env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE),
-    defaultEsModulesToEsbuild: Boolean(process_1.env.NETLIFY_EXPERIMENTAL_DEFAULT_ES_MODULES_TO_ESBUILD),
     parseWithEsbuild: false,
     traceWithNft: false,
+    zisi_detect_esm: false,
     zisi_pure_esm: false,
 };
 // List of supported flags and their default value.

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

@@ -1,10 +1,12 @@
 import type { FunctionConfig } from '../../../../config.js';
+import { FeatureFlags } from '../../../../feature_flags.js';
 export declare const ESBUILD_LOG_LIMIT = 10;
-export declare const bundleJsFile: ({ additionalModulePaths, basePath, config, externalModules, ignoredModules, name, srcDir, srcFile, }: {
+export declare const bundleJsFile: ({ additionalModulePaths, basePath, config, externalModules, featureFlags, ignoredModules, name, srcDir, srcFile, }: {
     additionalModulePaths?: string[] | undefined;
     basePath?: string | undefined;
     config: FunctionConfig;
     externalModules: string[];
+    featureFlags: FeatureFlags;
     ignoredModules: string[];
     name: string;
     srcDir: string;
@@ -14,6 +16,7 @@ export declare const bundleJsFile: ({ additionalModulePaths, basePath, config, e
     bundlePaths: Map<string, string>;
     cleanTempFiles: () => Promise<void>;
     inputs: string[];
+    moduleFormat: import("../../utils/module_format.js").ModuleFormat;
     nativeNodeModules: {};
     nodeModulesWithDynamicImports: string[];
     warnings: import("@netlify/esbuild").Message[];

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

@@ -17,7 +17,7 @@ exports.ESBUILD_LOG_LIMIT = 10;
 // 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)();
@@ -52,11 +52,16 @@ const bundleJsFile = async function ({ additionalModulePaths, basePath, config,
     // 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: exports.ESBUILD_LOG_LIMIT,
             metafile: true,
@@ -76,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,

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";
@@ -6,5 +8,9 @@ declare const versionMap: {
 };
 declare type VersionKeys = keyof typeof versionMap;
 declare type VersionValues = typeof versionMap[VersionKeys];
-export declare const getBundlerTarget: (suppliedVersion?: string | undefined) => VersionValues;
-export {};
+declare const getBundlerTarget: (suppliedVersion?: string | undefined) => VersionValues;
+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.js

@@ -30,11 +30,12 @@ const getExternalAndIgnoredModules = async ({ config, srcDir }) => {
 };
 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_js_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,
@@ -78,7 +79,7 @@ const bundle = async ({ basePath, config = {}, extension, featureFlags, filename
         bundlerWarnings,
         inputs,
         mainFile: normalizedMainFile,
-        moduleFormat: 'cjs',
+        moduleFormat,
         nativeNodeModules,
         nodeModulesWithDynamicImports,
         srcFiles: [...supportingSrcFiles, ...bundlePaths.keys()],

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

@@ -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_js_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/utils/package_json.d.ts

@@ -13,6 +13,11 @@ export interface PackageJson {
     binary?: boolean;
     type?: string;
 }
-export declare const sanitisePackageJson: (packageJson: Record<string, unknown>) => PackageJson;
+export interface PackageJsonFile {
+    contents: PackageJson;
+    path: string;
+}
+export declare const getClosestPackageJson: (resolveDir: string) => Promise<PackageJsonFile | null>;
 export declare const getPackageJson: (srcDir: string) => Promise<PackageJson>;
 export declare const getPackageJsonIfAvailable: (srcDir: string) => Promise<PackageJson>;
+export declare const sanitisePackageJson: (packageJson: Record<string, unknown>) => PackageJson;

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

@@ -3,35 +3,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageJsonIfAvailable = exports.getPackageJson = exports.sanitisePackageJson = void 0;
+exports.sanitisePackageJson = exports.getPackageJsonIfAvailable = exports.getPackageJson = exports.getClosestPackageJson = void 0;
 const fs_1 = require("fs");
+const path_1 = require("path");
+const find_up_1 = __importDefault(require("find-up"));
 const pkg_dir_1 = __importDefault(require("pkg-dir"));
-const sanitiseFiles = (files) => {
-    if (!Array.isArray(files)) {
-        return undefined;
+const getClosestPackageJson = async (resolveDir) => {
+    const packageJsonPath = await (0, find_up_1.default)(async (directory) => {
+        // We stop traversing if we're about to leave the boundaries of any
+        // node_modules directory.
+        if ((0, path_1.basename)(directory) === 'node_modules') {
+            return find_up_1.default.stop;
+        }
+        const path = (0, path_1.join)(directory, 'package.json');
+        const hasPackageJson = await find_up_1.default.exists(path);
+        return hasPackageJson ? path : undefined;
+    }, { cwd: resolveDir });
+    if (packageJsonPath === undefined) {
+        return null;
     }
-    return files.filter((file) => typeof file === 'string');
+    const packageJson = await readPackageJson(packageJsonPath);
+    return {
+        contents: packageJson,
+        path: packageJsonPath,
+    };
 };
-const sanitisePackageJson = (packageJson) => ({
-    ...packageJson,
-    files: sanitiseFiles(packageJson.files),
-});
-exports.sanitisePackageJson = sanitisePackageJson;
+exports.getClosestPackageJson = getClosestPackageJson;
 // Retrieve the `package.json` of a specific project or module
 const getPackageJson = async function (srcDir) {
     const packageRoot = await (0, pkg_dir_1.default)(srcDir);
     if (packageRoot === undefined) {
         return {};
     }
-    const packageJsonPath = `${packageRoot}/package.json`;
-    try {
-        // The path depends on the user's build, i.e. must be dynamic
-        const packageJson = JSON.parse(await fs_1.promises.readFile(packageJsonPath, 'utf8'));
-        return (0, exports.sanitisePackageJson)(packageJson);
-    }
-    catch (error) {
-        throw new Error(`${packageJsonPath} is invalid JSON: ${error.message}`);
-    }
+    return readPackageJson(`${packageRoot}/package.json`);
 };
 exports.getPackageJson = getPackageJson;
 const getPackageJsonIfAvailable = async (srcDir) => {
@@ -44,4 +48,25 @@ const getPackageJsonIfAvailable = async (srcDir) => {
     }
 };
 exports.getPackageJsonIfAvailable = getPackageJsonIfAvailable;
+const readPackageJson = async (path) => {
+    try {
+        // The path depends on the user's build, i.e. must be dynamic
+        const packageJson = JSON.parse(await fs_1.promises.readFile(path, 'utf8'));
+        return (0, exports.sanitisePackageJson)(packageJson);
+    }
+    catch (error) {
+        throw new Error(`${path} is invalid JSON: ${error.message}`);
+    }
+};
+const sanitiseFiles = (files) => {
+    if (!Array.isArray(files)) {
+        return undefined;
+    }
+    return files.filter((file) => typeof file === 'string');
+};
+const sanitisePackageJson = (packageJson) => ({
+    ...packageJson,
+    files: sanitiseFiles(packageJson.files),
+});
+exports.sanitisePackageJson = sanitisePackageJson;
 //# sourceMappingURL=package_json.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "5.7.4",
+  "version": "5.9.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "bin": {
@@ -53,7 +53,7 @@
   },
   "dependencies": {
     "@babel/parser": "7.16.8",
-    "@netlify/esbuild": "^0.13.6",
+    "@netlify/esbuild": "0.13.6",
     "@vercel/nft": "^0.17.0",
     "archiver": "^5.3.0",
     "common-path-prefix": "^3.0.0",
@@ -70,7 +70,7 @@
     "junk": "^3.1.0",
     "locate-path": "^6.0.0",
     "merge-options": "^3.0.4",
-    "minimatch": "^3.0.4",
+    "minimatch": "^4.0.0",
     "p-map": "^4.0.0",
     "path-exists": "^4.0.0",
     "pkg-dir": "^5.0.0",
@@ -81,13 +81,12 @@
     "semver": "^7.0.0",
     "tmp-promise": "^3.0.2",
     "toml": "^3.0.0",
-    "typescript": "^4.6.0-beta",
     "unixify": "^1.0.0",
     "yargs": "^16.0.0"
   },
   "devDependencies": {
     "@babel/types": "^7.15.6",
-    "@netlify/eslint-config-node": "^5.1.4",
+    "@netlify/eslint-config-node": "^5.1.5",
     "@types/archiver": "^5.1.1",
     "@types/end-of-stream": "^1.4.1",
     "@types/resolve": "^1.20.1",
@@ -105,7 +104,8 @@
     "sinon": "^13.0.0",
     "sort-on": "^4.1.1",
     "source-map-support": "^0.5.20",
-    "throat": "^6.0.1"
+    "throat": "^6.0.1",
+    "typescript": "^4.6.0-beta"
   },
   "engines": {
     "node": "^12.20.0 || ^14.14.0 || >=16.0.0"