@netlify/zip-it-and-ship-it 5.13.1 → 5.13.4

package/dist/runtimes/go/builder.js

@@ -19,7 +19,7 @@ const build = async ({ destPath, mainFile, srcDir }) => {
     }
     catch (error) {
         console.error(`Could not compile Go function ${functionName}:\n`);
-        throw new error_js_1.FunctionBundlingUserError(error, { functionName, runtime: 'go' });
+        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

@@ -95,7 +95,7 @@ const bundleJsFile = async function ({ additionalModulePaths, basePath, config,
         };
     }
     catch (error) {
-        throw new error_js_1.FunctionBundlingUserError(error, { functionName: name, runtime: 'js', bundler: 'esbuild' });
+        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

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

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

@@ -20,7 +20,6 @@ const getDynamicImportsPlugin = ({ basePath, includedPaths, moduleNames, process
     name: 'dynamic-imports',
     setup(build) {
         const cache = new Map();
-        // eslint-disable-next-line complexity
         build.onDynamicImport({ filter: /.*/ }, async (args) => {
             const { expression, resolveDir } = args;
             // Don't attempt to parse the expression if the base path isn't defined,

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

@@ -22,7 +22,7 @@ const getNativeModulesPlugin = (externalizedModules) => ({
     name: 'external-native-modules',
     setup(build) {
         const cache = {};
-        // eslint-disable-next-line complexity, max-statements
+        // eslint-disable-next-line max-statements
         build.onResolve({ filter: packageFilter }, async (args) => {
             const pkg = packageName.exec(args.path);
             if (!pkg)

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

@@ -22,7 +22,7 @@ const transpile = async (path, config, functionName) => {
         return transpiled.outputFiles[0].text;
     }
     catch (error) {
-        throw new error_js_1.FunctionBundlingUserError(error, { functionName, runtime: 'js', bundler: 'nft' });
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName, runtime: 'js', bundler: 'nft' });
     }
 };
 exports.transpile = transpile;

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

@@ -74,7 +74,7 @@ const listImports = async ({ functionName, path, }) => {
         });
     }
     catch (error) {
-        throw new error_js_1.FunctionBundlingUserError(error, { functionName, runtime: 'js', bundler: 'zisi' });
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName, runtime: 'js', bundler: 'zisi' });
     }
     finally {
         await (0, fs_js_1.safeUnlink)(targetPath);

package/dist/runtimes/node/parser/bindings.js

@@ -8,7 +8,6 @@ const getBindingFromVariableDeclaration = function (node, bindings) {
         }
     });
 };
-// eslint-disable-next-line complexity
 const getBindingsFromNode = function (node, bindings) {
     var _a;
     if (node.type === 'VariableDeclaration') {

package/dist/runtimes/node/parser/helpers.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRequire = exports.isModuleExports = exports.isImport = void 0;
-// eslint-disable-next-line complexity
 const isDotExpression = (node, expression) => {
     if (node.type !== 'MemberExpression') {
         return false;

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

@@ -51,7 +51,6 @@ const getWildcardFromASTNode = (node) => {
 // Tries to parse an expression, returning an object with:
 // - `includedPathsGlob`: A glob with the files to be included in the bundle
 // - `type`: The expression type (e.g. "require", "import")
-// eslint-disable-next-line complexity
 const parseExpression = ({ basePath, expression: rawExpression, resolveDir, }) => {
     const { program } = (0, parser_1.parse)(rawExpression, {
         sourceType: 'module',

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

@@ -1,5 +1,6 @@
-declare type SupportedVersionNumbers = 8 | 10 | 12 | 14;
-export declare type NodeVersionString = `${SupportedVersionNumbers}.x` | `nodejs${SupportedVersionNumbers}.x`;
+declare type SupportedVersionNumbers = 8 | 10 | 12 | 14 | 16;
+export declare type ShortNodeVersionString = `${SupportedVersionNumbers}.x`;
+export declare type NodeVersionString = ShortNodeVersionString | `nodejs${SupportedVersionNumbers}.x`;
 export interface NodeVersionSupport {
     esm: boolean;
 }

package/dist/runtimes/rust/builder.js

@@ -17,7 +17,7 @@ const build = async ({ config, name, srcDir }) => {
         await installToolchainOnce();
     }
     catch (error) {
-        throw new error_js_1.FunctionBundlingUserError(error, { functionName, runtime: 'rs' });
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName, runtime: 'rs' });
     }
     const targetDirectory = await getTargetDirectory({ config, name });
     await cargoBuild({ functionName, srcDir, targetDirectory });
@@ -53,7 +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.';
         }
-        throw new error_js_1.FunctionBundlingUserError(error, { functionName, runtime: 'rs' });
+        throw error_js_1.FunctionBundlingUserError.addCustomErrorInfo(error, { functionName, runtime: 'rs' });
     }
 };
 const checkRustToolchain = async () => {

package/dist/utils/error.d.ts

@@ -9,8 +9,11 @@ interface CustomErrorInfo {
     type: 'functionsBundling';
     location: CustomErrorLocation;
 }
-export declare class FunctionBundlingUserError extends Error {
+declare type UserError = Error & {
     customErrorInfo: CustomErrorInfo;
-    constructor(messageOrError: string | Error, customErrorInfo: CustomErrorLocation);
+};
+export declare class FunctionBundlingUserError extends Error {
+    constructor(message: string, customErrorInfo: CustomErrorLocation);
+    static addCustomErrorInfo(error: Error, customErrorInfo: CustomErrorLocation): UserError;
 }
 export {};

package/dist/utils/error.js

@@ -2,18 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionBundlingUserError = void 0;
 class FunctionBundlingUserError extends Error {
-    constructor(messageOrError, customErrorInfo) {
-        const isError = messageOrError instanceof Error;
-        super(isError ? messageOrError.message : messageOrError);
+    constructor(message, customErrorInfo) {
+        super(message);
         Object.setPrototypeOf(this, new.target.prototype);
         this.name = 'FunctionBundlingUserError';
-        if (isError) {
-            this.stack = messageOrError.stack;
-        }
-        else {
-            Error.captureStackTrace(this, FunctionBundlingUserError);
-        }
-        this.customErrorInfo = { type: 'functionsBundling', location: customErrorInfo };
+        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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "5.13.1",
+  "version": "5.13.4",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "bin": {
@@ -55,13 +55,13 @@
     "@babel/parser": "7.16.8",
     "@netlify/binary-info": "^1.0.0",
     "@netlify/esbuild": "0.14.25",
-    "@vercel/nft": "^0.20.0",
+    "@vercel/nft": "^0.21.0",
     "archiver": "^5.3.0",
     "common-path-prefix": "^3.0.0",
     "cp-file": "^9.0.0",
     "del": "^6.0.0",
     "end-of-stream": "^1.4.4",
-    "es-module-lexer": "^0.10.0",
+    "es-module-lexer": "^1.0.0",
     "execa": "^5.0.0",
     "filter-obj": "^2.0.1",
     "find-up": "^5.0.0",
@@ -86,7 +86,7 @@
   },
   "devDependencies": {
     "@babel/types": "^7.15.6",
-    "@netlify/eslint-config-node": "^6.0.0",
+    "@netlify/eslint-config-node": "^7.0.0",
     "@types/archiver": "^5.1.1",
     "@types/end-of-stream": "^1.4.1",
     "@types/normalize-path": "^3.0.0",