@netlify/zip-it-and-ship-it 5.12.0 → 5.13.2

package/README.md

@@ -129,7 +129,7 @@ The following properties are accepted:
 - `nodeVersion`
 
   - _Type_: `string`\
-  - _Default value_: `12.x`
+  - _Default value_: `16.x`
 
   The version of Node.js to use as the compilation target. Possible values:
 
@@ -137,6 +137,7 @@ The following properties are accepted:
   - `10.x` (or `nodejs10.x`)
   - `12.x` (or `nodejs12.x`)
   - `14.x` (or `nodejs14.x`)
+  - `16.x` (or `nodejs16.x`)
 
 - `rustTargetDirectory`
 
@@ -441,9 +442,9 @@ need to be the same as the one used when installing those native modules.
 
 In Netlify, this is done by ensuring that the following Node.js versions are the same:
 
-- Build-time Node.js version: this defaults to Node `12`, but can be
+- Build-time Node.js version: this defaults to Node `16`, but can be
   [overridden with a `.nvmrc` or `NODE_VERSION` environment variable](https://docs.netlify.com/configure-builds/manage-dependencies/#node-js-and-javascript).
-- Function runtime Node.js version: this defaults to `nodejs12.x` but can be
+- Function runtime Node.js version: this defaults to `nodejs16.x` but can be
   [overridden with a `AWS_LAMBDA_JS_RUNTIME` environment variable](https://docs.netlify.com/functions/build-with-javascript/#runtime-settings).
 
 Note that this problem might not apply for Node.js native modules using the [N-API](https://nodejs.org/api/n-api.html).

package/dist/config.d.ts

@@ -1,5 +1,5 @@
 import { FunctionSource } from './function.js';
-import type { NodeBundlerName } from './runtimes/node/bundlers/index.js';
+import type { NodeBundlerName } from './runtimes/node/bundlers/types.js';
 import type { NodeVersionString } from './runtimes/node/index.js';
 export interface FunctionConfig {
     externalNodeModules?: string[];

package/dist/main.js

@@ -14,7 +14,7 @@ const augmentWithISC = async (func) => {
     if (func.runtime.name !== 'js') {
         return func;
     }
-    const inSourceConfig = await (0, index_js_2.findISCDeclarationsInPath)(func.mainFile);
+    const inSourceConfig = await (0, index_js_2.findISCDeclarationsInPath)(func.mainFile, func.name);
     return { ...func, inSourceConfig };
 };
 // List all Netlify Functions main entry files for a specific directory

package/dist/runtimes/go/builder.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const error_js_1 = require("../../utils/error.js");
 const shell_js_1 = require("../../utils/shell.js");
 const build = async ({ destPath, mainFile, srcDir }) => {
     const functionName = (0, path_1.basename)(srcDir);
@@ -17,10 +18,8 @@ const build = async ({ destPath, mainFile, srcDir }) => {
         });
     }
     catch (error) {
-        const runtime = 'go';
-        error.customErrorInfo = { type: 'functionsBundling', location: { functionName, runtime } };
         console.error(`Could not compile Go function ${functionName}:\n`);
-        throw error;
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName, runtime: 'go' });
     }
     const stat = await fs_1.promises.lstat(destPath);
     return {

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

@@ -4,6 +4,7 @@ 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 error_js_1 = require("../../../../utils/error.js");
 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");
@@ -94,13 +95,7 @@ const bundleJsFile = async function ({ additionalModulePaths, basePath, config,
         };
     }
     catch (error) {
-        const bundler = 'esbuild';
-        const runtime = 'js';
-        error.customErrorInfo = {
-            type: 'functionsBundling',
-            location: { bundler, functionName: name, runtime },
-        };
-        throw error;
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName: name, runtime: 'js', bundler: 'esbuild' });
     }
 };
 exports.bundleJsFile = bundleJsFile;

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

@@ -5,6 +5,7 @@ declare const versionMap: {
     readonly '10.x': "node10";
     readonly '12.x': "node12";
     readonly '14.x': "node14";
+    readonly '16.x': "node16";
 };
 declare type VersionKeys = keyof typeof versionMap;
 declare type VersionValues = typeof versionMap[VersionKeys];

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

@@ -8,6 +8,7 @@ const versionMap = {
     '10.x': 'node10',
     '12.x': 'node12',
     '14.x': 'node14',
+    '16.x': 'node16',
 };
 const getBundlerTarget = (suppliedVersion) => {
     const version = normalizeVersion(suppliedVersion);

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

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

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

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

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

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

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

@@ -1,50 +1,8 @@
-import type { Message } from '@netlify/esbuild';
-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>;
-export declare type NativeNodeModules = Record<string, Record<string, string | undefined>>;
-export declare type BundleFunction = (args: {
-    basePath?: string;
-    config: FunctionConfig;
-    featureFlags: Record<FeatureFlag, boolean>;
-    pluginsModulesPath?: string;
-    repositoryRoot?: string;
-} & FunctionSource) => Promise<{
-    aliases?: Map<string, string>;
-    rewrites?: Map<string, string>;
-    basePath: string;
-    bundlerWarnings?: BundlerWarning[];
-    cleanupFunction?: CleanupFunction;
-    includedFiles: string[];
-    inputs: string[];
-    mainFile: string;
-    moduleFormat: ModuleFormat;
-    nativeNodeModules?: NativeNodeModules;
-    nodeModulesWithDynamicImports?: string[];
-    srcFiles: string[];
-}>;
-export declare type GetSrcFilesFunction = (args: {
-    basePath?: string;
-    config: FunctionConfig;
-    featureFlags: FeatureFlags;
-    pluginsModulesPath?: string;
-    repositoryRoot?: string;
-} & FunctionSource) => Promise<{
-    srcFiles: string[];
-    includedFiles: string[];
-}>;
-interface NodeBundler {
-    bundle: BundleFunction;
-    getSrcFiles: GetSrcFilesFunction;
-}
+import { FeatureFlags } from '../../../feature_flags.js';
+import type { NodeBundler, NodeBundlerName } from './types.js';
 export declare const getBundler: (name: NodeBundlerName) => NodeBundler;
 export declare const getDefaultBundler: ({ extension, mainFile, featureFlags, }: {
     extension: string;
     mainFile: string;
     featureFlags: FeatureFlags;
 }) => Promise<NodeBundlerName>;
-export {};

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

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

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transpile = void 0;
 const esbuild_1 = require("@netlify/esbuild");
+const error_js_1 = require("../../../../utils/error.js");
 const bundler_target_js_1 = require("../esbuild/bundler_target.js");
 const transpile = async (path, config, functionName) => {
     // The version of ECMAScript to use as the build target. This will determine
@@ -21,13 +22,7 @@ const transpile = async (path, config, functionName) => {
         return transpiled.outputFiles[0].text;
     }
     catch (error) {
-        const bundler = 'nft';
-        const runtime = 'js';
-        error.customErrorInfo = {
-            type: 'functionsBundling',
-            location: { bundler, functionName, runtime },
-        };
-        throw error;
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName, runtime: 'js', bundler: 'nft' });
     }
 };
 exports.transpile = transpile;

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

@@ -0,0 +1,44 @@
+import type { Message } from '@netlify/esbuild';
+import type { FunctionConfig } from '../../../config.js';
+import type { FeatureFlag, FeatureFlags } from '../../../feature_flags.js';
+import type { FunctionSource } from '../../../function.js';
+import type { ModuleFormat } from '../utils/module_format.js';
+export declare type NodeBundlerName = 'esbuild' | 'esbuild_zisi' | 'nft' | 'zisi';
+declare type BundlerWarning = Message;
+declare type CleanupFunction = () => Promise<void>;
+export declare type NativeNodeModules = Record<string, Record<string, string | undefined>>;
+export declare type BundleFunction = (args: {
+    basePath?: string;
+    config: FunctionConfig;
+    featureFlags: Record<FeatureFlag, boolean>;
+    pluginsModulesPath?: string;
+    repositoryRoot?: string;
+} & FunctionSource) => Promise<{
+    aliases?: Map<string, string>;
+    rewrites?: Map<string, string>;
+    basePath: string;
+    bundlerWarnings?: BundlerWarning[];
+    cleanupFunction?: CleanupFunction;
+    includedFiles: string[];
+    inputs: string[];
+    mainFile: string;
+    moduleFormat: ModuleFormat;
+    nativeNodeModules?: NativeNodeModules;
+    nodeModulesWithDynamicImports?: string[];
+    srcFiles: string[];
+}>;
+export declare type GetSrcFilesFunction = (args: {
+    basePath?: string;
+    config: FunctionConfig;
+    featureFlags: FeatureFlags;
+    pluginsModulesPath?: string;
+    repositoryRoot?: string;
+} & FunctionSource) => Promise<{
+    srcFiles: string[];
+    includedFiles: string[];
+}>;
+export interface NodeBundler {
+    bundle: BundleFunction;
+    getSrcFiles: GetSrcFilesFunction;
+}
+export {};

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

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

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

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

package/dist/runtimes/node/bundlers/zisi/list_imports.js

@@ -30,6 +30,7 @@ exports.listImports = void 0;
 const esbuild = __importStar(require("@netlify/esbuild"));
 const is_builtin_module_1 = __importDefault(require("is-builtin-module"));
 const tmp_promise_1 = require("tmp-promise");
+const error_js_1 = require("../../../../utils/error.js");
 const fs_js_1 = require("../../../../utils/fs.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
@@ -73,13 +74,7 @@ const listImports = async ({ functionName, path, }) => {
         });
     }
     catch (error) {
-        const bundler = 'zisi';
-        const runtime = 'js';
-        error.customErrorInfo = {
-            type: 'functionsBundling',
-            location: { bundler, functionName, runtime },
-        };
-        throw error;
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName, runtime: 'js', bundler: 'zisi' });
     }
     finally {
         await (0, fs_js_1.safeUnlink)(targetPath);

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

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

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

@@ -2,7 +2,7 @@ import { ArgumentPlaceholder, Expression, SpreadElement, JSXNamespacedName } fro
 import { parse as parseSchedule } from './properties/schedule.js';
 export declare const IN_SOURCE_CONFIG_MODULE = "@netlify/functions";
 export declare type ISCValues = Partial<ReturnType<typeof parseSchedule>>;
-export declare const findISCDeclarationsInPath: (sourcePath: string) => Promise<ISCValues>;
+export declare const findISCDeclarationsInPath: (sourcePath: string, functionName: string) => Promise<ISCValues>;
 export declare type ISCHandlerArg = ArgumentPlaceholder | Expression | SpreadElement | JSXNamespacedName;
 export interface ISCExport {
     local: string;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findISCDeclarationsInPath = exports.IN_SOURCE_CONFIG_MODULE = void 0;
+const error_js_1 = require("../../../utils/error.js");
 const non_nullable_js_1 = require("../../../utils/non_nullable.js");
 const bindings_js_1 = require("../parser/bindings.js");
 const exports_js_1 = require("../parser/exports.js");
@@ -8,17 +9,26 @@ const imports_js_1 = require("../parser/imports.js");
 const index_js_1 = require("../parser/index.js");
 const schedule_js_1 = require("./properties/schedule.js");
 exports.IN_SOURCE_CONFIG_MODULE = '@netlify/functions';
+const validateScheduleFunction = (functionFound, scheduleFound, functionName) => {
+    if (!functionFound) {
+        throw new error_js_1.FunctionBundlingUserError("The `schedule` helper was imported but we couldn't find any usages. If you meant to schedule a function, please check that `schedule` is invoked and `handler` correctly exported.", { functionName, runtime: 'js' });
+    }
+    if (!scheduleFound) {
+        throw new error_js_1.FunctionBundlingUserError('Unable to find cron expression for scheduled function. The cron expression (first argument) for the `schedule` helper needs to be accessible inside the file and cannot be imported.', { functionName, runtime: 'js' });
+    }
+};
 // Parses a JS/TS file and looks for in-source config declarations. It returns
 // an array of all declarations found, with `property` indicating the name of
 // the property and `data` its value.
-const findISCDeclarationsInPath = async (sourcePath) => {
+const findISCDeclarationsInPath = async (sourcePath, functionName) => {
     const ast = await (0, index_js_1.safelyParseFile)(sourcePath);
     if (ast === null) {
         return {};
     }
     const imports = ast.body.flatMap((node) => (0, imports_js_1.getImports)(node, exports.IN_SOURCE_CONFIG_MODULE));
-    const scheduledFuncsExpected = imports.filter(({ imported }) => imported === 'schedule').length;
-    let scheduledFuncsFound = 0;
+    const scheduledFunctionExpected = imports.some(({ imported }) => imported === 'schedule');
+    let scheduledFunctionFound = false;
+    let scheduleFound = false;
     const getAllBindings = (0, bindings_js_1.createBindingsMethod)(ast.body);
     const mainExports = (0, exports_js_1.getMainExport)(ast.body, getAllBindings);
     const iscExports = mainExports
@@ -30,8 +40,9 @@ const findISCDeclarationsInPath = async (sourcePath) => {
         switch (matchingImport.imported) {
             case 'schedule': {
                 const parsed = (0, schedule_js_1.parse)({ args }, getAllBindings);
+                scheduledFunctionFound = true;
                 if (parsed.schedule) {
-                    scheduledFuncsFound += 1;
+                    scheduleFound = true;
                 }
                 return parsed;
             }
@@ -41,8 +52,8 @@ const findISCDeclarationsInPath = async (sourcePath) => {
         return null;
     })
         .filter(non_nullable_js_1.nonNullable);
-    if (scheduledFuncsFound < scheduledFuncsExpected) {
-        throw new Error('Warning: unable to find cron expression for scheduled function. `schedule` imported but not called or exported. If you meant to schedule a function, please check that `schedule` is invoked with an appropriate cron expression.');
+    if (scheduledFunctionExpected) {
+        validateScheduleFunction(scheduledFunctionFound, scheduleFound, functionName);
     }
     const mergedExports = iscExports.reduce((acc, obj) => ({ ...acc, ...obj }), {});
     return mergedExports;

package/dist/runtimes/node/index.js

@@ -50,7 +50,7 @@ const zipFunction = async function ({ archiveFormat, basePath, config = {}, dest
         srcPath,
         stat,
     });
-    const inSourceConfig = await (0, index_js_2.findISCDeclarationsInPath)(mainFile);
+    const inSourceConfig = await (0, index_js_2.findISCDeclarationsInPath)(mainFile, name);
     (0, plugin_modules_path_js_1.createAliases)(srcFiles, pluginsModulesPath, aliases, finalBasePath);
     const zipPath = await (0, zip_js_1.zipNodeJs)({
         aliases,

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

@@ -3,7 +3,7 @@ export declare type NodeVersionString = `${SupportedVersionNumbers}.x` | `nodejs
 export interface NodeVersionSupport {
     esm: boolean;
 }
-export declare const DEFAULT_NODE_VERSION = 14;
+export declare const DEFAULT_NODE_VERSION = 16;
 export declare const getNodeVersion: (configVersion?: string) => number;
 export declare const getNodeSupportMatrix: (configVersion?: string) => NodeVersionSupport;
 export declare const parseVersion: (input: string | undefined) => number | undefined;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseVersion = exports.getNodeSupportMatrix = exports.getNodeVersion = exports.DEFAULT_NODE_VERSION = void 0;
 // Must match the default version used in Bitballoon.
-exports.DEFAULT_NODE_VERSION = 14;
+exports.DEFAULT_NODE_VERSION = 16;
 const VERSION_REGEX = /(nodejs)?(\d+)\.x/;
 const getNodeVersion = (configVersion) => { var _a; return (_a = (0, exports.parseVersion)(configVersion)) !== null && _a !== void 0 ? _a : exports.DEFAULT_NODE_VERSION; };
 exports.getNodeVersion = getNodeVersion;

package/dist/runtimes/runtime.d.ts

@@ -3,7 +3,7 @@ import { FunctionConfig } from '../config.js';
 import { FeatureFlags } from '../feature_flags.js';
 import { FunctionSource, SourceFile } from '../function.js';
 import { FsCache } from '../utils/fs.js';
-import type { NodeBundlerName } from './node/bundlers/index.js';
+import type { NodeBundlerName } from './node/bundlers/types.js';
 import type { ISCValues } from './node/in_source_config/index.js';
 export declare type RuntimeName = 'go' | 'js' | 'rs';
 export declare type FindFunctionsInPathsFunction = (args: {

package/dist/runtimes/rust/builder.js

@@ -8,17 +8,16 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const tmp_promise_1 = __importDefault(require("tmp-promise"));
 const toml_1 = __importDefault(require("toml"));
+const error_js_1 = require("../../utils/error.js");
 const shell_js_1 = require("../../utils/shell.js");
 const constants_js_1 = require("./constants.js");
-const runtimeName = 'rs';
 const build = async ({ config, name, srcDir }) => {
     const functionName = (0, path_1.basename)(srcDir);
     try {
         await installToolchainOnce();
     }
     catch (error) {
-        error.customErrorInfo = { type: 'functionsBundling', location: { functionName, runtime: runtimeName } };
-        throw error;
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName, runtime: 'rs' });
     }
     const targetDirectory = await getTargetDirectory({ config, name });
     await cargoBuild({ functionName, srcDir, targetDirectory });
@@ -54,8 +53,7 @@ const cargoBuild = async ({ functionName, srcDir, targetDirectory, }) => {
             error.message =
                 'There is no Rust toolchain installed. Visit https://ntl.fyi/missing-rust-toolchain for more information.';
         }
-        error.customErrorInfo = { type: 'functionsBundling', location: { functionName, runtime: runtimeName } };
-        throw error;
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName, runtime: 'rs' });
     }
 };
 const checkRustToolchain = async () => {

package/dist/utils/error.d.ts

@@ -0,0 +1,19 @@
+import type { NodeBundlerName } from '../runtimes/node/bundlers/types.js';
+import type { RuntimeName } from '../runtimes/runtime';
+interface CustomErrorLocation {
+    functionName: string;
+    runtime: RuntimeName;
+    bundler?: NodeBundlerName;
+}
+interface CustomErrorInfo {
+    type: 'functionsBundling';
+    location: CustomErrorLocation;
+}
+declare type UserError = Error & {
+    customErrorInfo: CustomErrorInfo;
+};
+export declare class FunctionBundlingUserError extends Error {
+    constructor(message: string, customErrorInfo: CustomErrorLocation);
+    static addCustomErrorInfo(error: Error, customErrorInfo: CustomErrorLocation): UserError;
+}
+export {};

package/dist/utils/error.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FunctionBundlingUserError = void 0;
+class FunctionBundlingUserError extends Error {
+    constructor(message, customErrorInfo) {
+        super(message);
+        Object.setPrototypeOf(this, new.target.prototype);
+        this.name = 'FunctionBundlingUserError';
+        Error.captureStackTrace(this, FunctionBundlingUserError);
+        FunctionBundlingUserError.addCustomErrorInfo(this, customErrorInfo);
+    }
+    static addCustomErrorInfo(error, customErrorInfo) {
+        const info = {
+            type: 'functionsBundling',
+            location: customErrorInfo,
+        };
+        error.customErrorInfo = info;
+        return error;
+    }
+}
+exports.FunctionBundlingUserError = FunctionBundlingUserError;
+//# sourceMappingURL=error.js.map

package/dist/utils/fs.d.ts

@@ -13,6 +13,5 @@ export declare const cachedReadFile: (cache: FsCache, path: string, options?: Bu
 export declare const getPathWithExtension: (path: string, extension: string) => string;
 export declare const safeUnlink: (path: string) => Promise<void>;
 export declare const listFunctionsDirectories: (srcFolders: string[]) => Promise<string[]>;
-export declare const listFunctionsDirectory: (srcFolder: string) => Promise<string[]>;
 export declare const resolveFunctionsDirectories: (input: string | string[]) => string[];
 export declare const mkdirAndWriteFile: typeof fs.writeFile;

package/dist/utils/fs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mkdirAndWriteFile = exports.resolveFunctionsDirectories = exports.listFunctionsDirectory = exports.listFunctionsDirectories = exports.safeUnlink = exports.getPathWithExtension = exports.cachedReadFile = exports.cachedReaddir = exports.cachedLstat = void 0;
+exports.mkdirAndWriteFile = exports.resolveFunctionsDirectories = exports.listFunctionsDirectories = exports.safeUnlink = exports.getPathWithExtension = exports.cachedReadFile = exports.cachedReaddir = exports.cachedLstat = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const non_nullable_js_1 = require("./non_nullable.js");
@@ -34,32 +34,33 @@ exports.safeUnlink = safeUnlink;
 // filenames within those directories, if at least one of the directories
 // exists. If not, an error is thrown.
 const listFunctionsDirectories = async function (srcFolders) {
-    const filenamesByDirectory = await Promise.all(srcFolders.map(async (srcFolder) => {
-        try {
-            const filenames = await (0, exports.listFunctionsDirectory)(srcFolder);
-            return filenames;
+    const filenamesByDirectory = await Promise.allSettled(srcFolders.map((srcFolder) => listFunctionsDirectory(srcFolder)));
+    const errorMessages = [];
+    const validDirectories = filenamesByDirectory
+        .map((result) => {
+        if (result.status === 'rejected') {
+            // If the error is about `ENOENT` (FileNotFound) then we only throw later if this happens
+            // for all directories.
+            if (result.reason instanceof Error && result.reason.code === 'ENOENT') {
+                return null;
+            }
+            // In any other error case besides `ENOENT` throw immediately
+            throw result.reason;
         }
-        catch {
-            return null;
-        }
-    }));
-    const validDirectories = filenamesByDirectory.filter(non_nullable_js_1.nonNullable);
+        return result.value;
+    })
+        .filter(non_nullable_js_1.nonNullable);
     if (validDirectories.length === 0) {
-        throw new Error(`Functions folder does not exist: ${srcFolders.join(', ')}`);
+        throw new Error(`Functions folders do not exist: ${srcFolders.join(', ')}
+${errorMessages.join('\n')}`);
     }
     return validDirectories.flat();
 };
 exports.listFunctionsDirectories = listFunctionsDirectories;
 const listFunctionsDirectory = async function (srcFolder) {
-    try {
-        const filenames = await fs_1.promises.readdir(srcFolder);
-        return filenames.map((name) => (0, path_1.join)(srcFolder, name));
-    }
-    catch {
-        throw new Error(`Functions folder does not exist: ${srcFolder}`);
-    }
+    const filenames = await fs_1.promises.readdir(srcFolder);
+    return filenames.map((name) => (0, path_1.join)(srcFolder, name));
 };
-exports.listFunctionsDirectory = listFunctionsDirectory;
 const resolveFunctionsDirectories = (input) => {
     const directories = Array.isArray(input) ? input : [input];
     const absoluteDirectories = directories.map((srcFolder) => (0, path_1.resolve)(srcFolder));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "5.12.0",
+  "version": "5.13.2",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "bin": {