@netlify/zip-it-and-ship-it 4.29.1 → 4.29.5

package/dist/archive.d.ts

@@ -11,4 +11,5 @@ declare const addZipFile: (archive: Archiver, file: string, name: string, stat:
 declare const addZipContent: (archive: Archiver, content: Buffer | string, name: string) => void;
 declare const endZip: (archive: Archiver, output: Writable) => Promise<void>;
 export { startZip, addZipFile, addZipContent, endZip };
-export type { ArchiveFormat, Archiver as ZipArchive };
+export type { ArchiveFormat };
+export { Archiver as ZipArchive } from 'archiver';

package/dist/main.d.ts

@@ -2,7 +2,6 @@ import './utils/polyfills';
 import { Config } from './config';
 import { FeatureFlags } from './feature_flags';
 import { RuntimeName } from './runtimes/runtime';
-import { zipFunction, zipFunctions } from './zip';
 interface ListedFunction {
     name: string;
     mainFile: string;
@@ -21,4 +20,5 @@ declare const listFunctions: (relativeSrcFolders: string | string[], { featureFl
     featureFlags?: FeatureFlags;
 }) => Promise<ListedFunction[]>;
 declare const listFunctionsFiles: (relativeSrcFolders: string | string[], { basePath, config, featureFlags: inputFeatureFlags }?: ListFunctionsOptions) => Promise<ListedFunctionFile[]>;
-export { zipFunctions, zipFunction, listFunctions, listFunctionsFiles };
+export { listFunctions, listFunctionsFiles };
+export { zipFunction, zipFunctions } from './zip';

package/dist/main.js

@@ -20,15 +20,12 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listFunctionsFiles = exports.listFunctions = exports.zipFunction = exports.zipFunctions = void 0;
+exports.zipFunctions = exports.zipFunction = exports.listFunctionsFiles = exports.listFunctions = void 0;
 const path_1 = require("path");
 require("./utils/polyfills");
 const feature_flags_1 = require("./feature_flags");
 const runtimes_1 = require("./runtimes");
 const fs_1 = require("./utils/fs");
-const zip_1 = require("./zip");
-Object.defineProperty(exports, "zipFunction", { enumerable: true, get: function () { return zip_1.zipFunction; } });
-Object.defineProperty(exports, "zipFunctions", { enumerable: true, get: function () { return zip_1.zipFunctions; } });
 // List all Netlify Functions main entry files for a specific directory
 const listFunctions = function (relativeSrcFolders, { featureFlags: inputFeatureFlags } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -75,4 +72,7 @@ const getSrcFiles = function (_a) {
             srcPath }, args));
     });
 };
+var zip_1 = require("./zip");
+Object.defineProperty(exports, "zipFunction", { enumerable: true, get: function () { return zip_1.zipFunction; } });
+Object.defineProperty(exports, "zipFunctions", { enumerable: true, get: function () { return zip_1.zipFunctions; } });
 //# sourceMappingURL=main.js.map

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

@@ -17,6 +17,7 @@ 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");
 // 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.
@@ -45,6 +46,7 @@ const bundleJsFile = function ({ additionalModulePaths, basePath, config, extern
         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)({
                 basePath,

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

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

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNodeBuiltinPlugin = void 0;
+const getNodeBuiltinPlugin = () => ({
+    name: 'builtin-modules',
+    setup(build) {
+        build.onResolve({ filter: /^node:/ }, (args) => ({ path: args.path.slice('node:'.length), external: true }));
+    },
+});
+exports.getNodeBuiltinPlugin = getNodeBuiltinPlugin;
+//# sourceMappingURL=plugin_node_builtin.js.map

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

@@ -27,7 +27,7 @@ const patchESMPackage = (path, fsCache) => __awaiter(void 0, void 0, void 0, fun
     const patchedPackageJson = Object.assign(Object.assign({}, packageJson), { type: 'commonjs' });
     return JSON.stringify(patchedPackageJson);
 });
-const shouldTranspile = (path, cache, reasons) => {
+const shouldTranspile = (path, cache, esmPaths, reasons) => {
     if (cache.has(path)) {
         return cache.get(path);
     }
@@ -39,32 +39,33 @@ const shouldTranspile = (path, cache, reasons) => {
         return false;
     }
     const { parents } = reason;
-    // If the path doesn't have any parents, it's safe to transpile.
+    // If the path is an entrypoint, we transpile it only if it's an ESM file.
     if (parents.size === 0) {
-        cache.set(path, true);
-        return true;
+        const isESM = esmPaths.has(path);
+        cache.set(path, isESM);
+        return isESM;
     }
     // The path should be transpiled if every parent will also be transpiled, or
     // if there is no parent.
-    const shouldTranspilePath = [...parents].every((parentPath) => shouldTranspile(parentPath, cache, reasons));
+    const shouldTranspilePath = [...parents].every((parentPath) => shouldTranspile(parentPath, cache, esmPaths, reasons));
     cache.set(path, shouldTranspilePath);
     return shouldTranspilePath;
 };
 const transpileESM = ({ basePath, config, esmPaths, fsCache, reasons, }) => __awaiter(void 0, void 0, void 0, function* () {
     const cache = new Map();
-    const paths = [...esmPaths].filter((path) => shouldTranspile(path, cache, reasons));
-    const pathsSet = new Set(paths);
+    const pathsToTranspile = [...esmPaths].filter((path) => shouldTranspile(path, cache, esmPaths, reasons));
+    const pathsToTranspileSet = new Set(pathsToTranspile);
     const packageJsonPaths = [...reasons.entries()]
         .filter(([path, reason]) => {
         if ((0, path_1.basename)(path) !== 'package.json') {
             return false;
         }
-        const needsPatch = [...reason.parents].some((parentPath) => pathsSet.has(parentPath));
+        const needsPatch = [...reason.parents].some((parentPath) => pathsToTranspileSet.has(parentPath));
         return needsPatch;
     })
         .map(([path]) => (basePath ? (0, path_1.resolve)(basePath, path) : (0, path_1.resolve)(path)));
     const rewrites = yield getPatchedESMPackages(packageJsonPaths, fsCache);
-    yield Promise.all(paths.map((path) => __awaiter(void 0, void 0, void 0, function* () {
+    yield Promise.all(pathsToTranspile.map((path) => __awaiter(void 0, void 0, void 0, function* () {
         const absolutePath = basePath ? (0, path_1.resolve)(basePath, path) : (0, path_1.resolve)(path);
         const transpiled = yield (0, transpile_1.transpile)(absolutePath, config);
         rewrites.set(absolutePath, transpiled);

package/dist/runtimes/node/utils/package_json.d.ts

@@ -13,5 +13,6 @@ interface PackageJson {
     binary?: boolean;
     type?: string;
 }
+declare const sanitisePackageJson: (packageJson: Record<string, unknown>) => PackageJson;
 declare const getPackageJson: (srcDir: string) => Promise<PackageJson>;
-export { getPackageJson, PackageJson };
+export { getPackageJson, PackageJson, sanitisePackageJson };

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

@@ -12,8 +12,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageJson = void 0;
+exports.sanitisePackageJson = exports.getPackageJson = void 0;
 const pkg_dir_1 = __importDefault(require("pkg-dir"));
+const sanitiseFiles = (files) => {
+    if (!Array.isArray(files)) {
+        return undefined;
+    }
+    return files.filter((file) => typeof file === 'string');
+};
+const sanitisePackageJson = (packageJson) => (Object.assign(Object.assign({}, packageJson), { files: sanitiseFiles(packageJson.files) }));
+exports.sanitisePackageJson = sanitisePackageJson;
 // Retrieve the `package.json` of a specific project or module
 const getPackageJson = function (srcDir) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -24,8 +32,9 @@ const getPackageJson = function (srcDir) {
         const packageJsonPath = `${packageRoot}/package.json`;
         try {
             // The path depends on the user's build, i.e. must be dynamic
-            // eslint-disable-next-line import/no-dynamic-require, node/global-require
-            return require(packageJsonPath);
+            // eslint-disable-next-line import/no-dynamic-require, node/global-require, @typescript-eslint/no-var-requires
+            const packageJson = require(packageJsonPath);
+            return sanitisePackageJson(packageJson);
         }
         catch (error) {
             throw new Error(`${packageJsonPath} is invalid JSON: ${error.message}`);

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

@@ -36,6 +36,7 @@ const make_dir_1 = __importDefault(require("make-dir"));
 const p_map_1 = __importDefault(require("p-map"));
 const unixify_1 = __importDefault(require("unixify"));
 const archive_1 = require("../../../archive");
+const fs_2 = require("../../../utils/fs");
 const pStat = (0, util_1.promisify)(fs_1.default.stat);
 const pWriteFile = (0, util_1.promisify)(fs_1.default.writeFile);
 // Taken from https://www.npmjs.com/package/cpy.
@@ -67,7 +68,7 @@ const createDirectory = function ({ aliases = new Map(), basePath, destFolder, e
             });
             const absoluteDestPath = (0, path_1.join)(functionFolder, normalizedDestPath);
             if (rewrites.has(srcFile)) {
-                return pWriteFile(absoluteDestPath, rewrites.get(srcFile));
+                return (0, fs_2.mkdirAndWriteFile)(absoluteDestPath, rewrites.get(srcFile));
             }
             return (0, cp_file_1.default)(srcFile, absoluteDestPath);
         }, { concurrency: COPY_FILE_CONCURRENCY });

package/dist/utils/fs.d.ts

@@ -17,5 +17,6 @@ declare const safeUnlink: (path: string) => Promise<void>;
 declare const listFunctionsDirectories: (srcFolders: string[]) => Promise<string[]>;
 declare const listFunctionsDirectory: (srcFolder: string) => Promise<string[]>;
 declare const resolveFunctionsDirectories: (input: string | string[]) => string[];
-export { cachedLstat, cachedReaddir, cachedReadFile, pLstat as lstat, getPathWithExtension, listFunctionsDirectories, listFunctionsDirectory, resolveFunctionsDirectories, safeUnlink, pStat as stat, pWriteFile as writeFile, pReadFile as readFile, };
+declare const mkdirAndWriteFile: typeof pWriteFile;
+export { cachedLstat, cachedReaddir, cachedReadFile, pLstat as lstat, getPathWithExtension, listFunctionsDirectories, listFunctionsDirectory, resolveFunctionsDirectories, safeUnlink, pStat as stat, pWriteFile as writeFile, pReadFile as readFile, mkdirAndWriteFile, };
 export type { FsCache };

package/dist/utils/fs.js

@@ -8,11 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readFile = exports.writeFile = exports.stat = exports.safeUnlink = exports.resolveFunctionsDirectories = exports.listFunctionsDirectory = exports.listFunctionsDirectories = exports.getPathWithExtension = exports.lstat = exports.cachedReadFile = exports.cachedReaddir = exports.cachedLstat = void 0;
+exports.mkdirAndWriteFile = exports.readFile = exports.writeFile = exports.stat = exports.safeUnlink = exports.resolveFunctionsDirectories = exports.listFunctionsDirectory = exports.listFunctionsDirectories = exports.getPathWithExtension = exports.lstat = exports.cachedReadFile = exports.cachedReaddir = exports.cachedLstat = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const util_1 = require("util");
+const make_dir_1 = __importDefault(require("make-dir"));
 const non_nullable_1 = require("./non_nullable");
 const pLstat = (0, util_1.promisify)(fs_1.lstat);
 exports.lstat = pLstat;
@@ -93,4 +97,12 @@ const resolveFunctionsDirectories = (input) => {
     return absoluteDirectories;
 };
 exports.resolveFunctionsDirectories = resolveFunctionsDirectories;
+const mkdirAndWriteFile = (path, ...params) => __awaiter(void 0, void 0, void 0, function* () {
+    if (typeof path === 'string') {
+        const directory = (0, path_1.dirname)(path);
+        yield (0, make_dir_1.default)(directory);
+    }
+    return pWriteFile(path, ...params);
+});
+exports.mkdirAndWriteFile = mkdirAndWriteFile;
 //# sourceMappingURL=fs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "4.29.1",
+  "version": "4.29.5",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "bin": {
@@ -94,7 +94,7 @@
   },
   "devDependencies": {
     "@babel/types": "^7.15.6",
-    "@netlify/eslint-config-node": "^3.3.5",
+    "@netlify/eslint-config-node": "^3.3.7",
     "@types/archiver": "^5.1.1",
     "@types/end-of-stream": "^1.4.1",
     "@types/resolve": "^1.20.1",