@netlify/zip-it-and-ship-it 8.1.0 → 8.2.0

package/README.md

@@ -137,6 +137,7 @@ The following properties are accepted:
   - `12.x` (or `nodejs12.x`)
   - `14.x` (or `nodejs14.x`)
   - `16.x` (or `nodejs16.x`)
+  - `18.x` (or `nodejs18.x`)
 
 - `rustTargetDirectory`
 

package/dist/archive.d.ts

@@ -3,7 +3,7 @@ import { Stats } from 'fs';
 import { Writable } from 'stream';
 import { Archiver } from 'archiver';
 export { Archiver as ZipArchive } from 'archiver';
-export declare type ArchiveFormat = 'none' | 'zip';
+export type ArchiveFormat = 'none' | 'zip';
 export declare const startZip: (destPath: string) => {
     archive: Archiver;
     output: Writable;

package/dist/config.d.ts

@@ -17,9 +17,9 @@ interface FunctionConfig {
     zipGo?: boolean;
     nodeModuleFormat?: ModuleFormat;
 }
-declare type GlobPattern = string;
-declare type Config = Record<GlobPattern, FunctionConfig>;
-declare type FunctionWithoutConfig = Omit<FunctionSource, 'config'>;
+type GlobPattern = string;
+type Config = Record<GlobPattern, FunctionConfig>;
+type FunctionWithoutConfig = Omit<FunctionSource, 'config'>;
 declare const getConfigForFunction: ({ config, configFileDirectories, func, featureFlags, }: {
     config?: Config | undefined;
     configFileDirectories?: string[] | undefined;

package/dist/feature_flags.d.ts

@@ -1,4 +1,4 @@
 export declare const defaultFlags: Record<string, boolean>;
-export declare type FeatureFlag = keyof typeof defaultFlags;
-export declare type FeatureFlags = Record<FeatureFlag, boolean>;
+export type FeatureFlag = keyof typeof defaultFlags;
+export type FeatureFlags = Record<FeatureFlag, boolean>;
 export declare const getFlags: (input?: Record<string, boolean>, flags?: Record<string, boolean>) => FeatureFlags;

package/dist/function.d.ts

@@ -2,7 +2,7 @@
 import { Stats } from 'fs';
 import type { FunctionConfig } from './config.js';
 import type { Runtime, ZipFunctionResult } from './runtimes/runtime.js';
-export declare type FunctionArchive = ZipFunctionResult & {
+export type FunctionArchive = ZipFunctionResult & {
     mainFile: string;
     name: string;
     runtime: Runtime;
@@ -17,7 +17,7 @@ export interface SourceFile {
     srcPath: string;
     stat: Stats;
 }
-export declare type FunctionSource = SourceFile & {
+export type FunctionSource = SourceFile & {
     config: FunctionConfig;
     runtime: Runtime;
 };

package/dist/main.d.ts

@@ -12,7 +12,7 @@ export interface ListedFunction {
     extension: string;
     schedule?: string;
 }
-declare type ListedFunctionFile = ListedFunction & {
+type ListedFunctionFile = ListedFunction & {
     srcFile: string;
 };
 interface ListFunctionsOptions {

package/dist/runtimes/index.d.ts

@@ -2,7 +2,7 @@ import { Config } from '../config.js';
 import { FeatureFlags } from '../feature_flags.js';
 import { FunctionSource } from '../function.js';
 import type { RuntimeCache } from '../utils/cache.js';
-declare type FunctionMap = Map<string, FunctionSource>;
+type FunctionMap = Map<string, FunctionSource>;
 /**
  * Gets a list of functions found in a list of paths.
  */

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

@@ -7,8 +7,9 @@ declare const versionMap: {
     readonly '12.x': "node12";
     readonly '14.x': "node14";
     readonly '16.x': "node16";
+    readonly '18.x': "node18";
 };
-declare type VersionValues = typeof versionMap[keyof typeof versionMap];
+type VersionValues = typeof versionMap[keyof typeof versionMap];
 declare const getBundlerTarget: (suppliedVersion?: NodeVersionString) => VersionValues;
 declare const getModuleFormat: (srcDir: string, featureFlags: FeatureFlags, extension: string, configVersion?: string) => Promise<{
     includedFiles: string[];

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

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

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

@@ -1,15 +1,11 @@
 import { basename, dirname, join, normalize, resolve } from 'path';
 import { nodeFileTrace } from '@vercel/nft';
-import nftResolveDependency from '@vercel/nft/out/resolve-dependency.js';
+import resolveDependency from '@vercel/nft/out/resolve-dependency.js';
 import { cachedReadFile } from '../../../../utils/fs.js';
 import { minimatch } from '../../../../utils/matching.js';
 import { getBasePath } from '../../utils/base_path.js';
 import { filterExcludedPaths, getPathsOfIncludedFiles } from '../../utils/included_files.js';
 import { processESM } from './es_modules.js';
-// @ts-expect-error vitest with esbuild already resolves the default export, whereas Node.js does not
-const resolveDependency = nftResolveDependency.default
-    ? nftResolveDependency.default
-    : nftResolveDependency;
 // Paths that will be excluded from the tracing process.
 const ignore = ['node_modules/aws-sdk/**'];
 const appearsToBeModuleName = (name) => !name.startsWith('.');
@@ -65,7 +61,7 @@ const traceFilesAndTranspile = async function ({ basePath, cache, config, featur
         },
         resolve: async (specifier, parent, ...args) => {
             try {
-                return await resolveDependency(specifier, parent, ...args);
+                return await resolveDependency.default(specifier, parent, ...args);
             }
             catch (error) {
                 // If we get a `MODULE_NOT_FOUND` error for what appears to be a module
@@ -73,7 +69,7 @@ const traceFilesAndTranspile = async function ({ basePath, cache, config, featur
                 // as the base directory.
                 if (error.code === 'MODULE_NOT_FOUND' && pluginsModulesPath && appearsToBeModuleName(specifier)) {
                     const newParent = join(pluginsModulesPath, basename(parent));
-                    return await resolveDependency(specifier, newParent, ...args);
+                    return await resolveDependency.default(specifier, newParent, ...args);
                 }
                 throw error;
             }

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

@@ -11,10 +11,10 @@ export declare const enum NodeBundlerType {
     ZISI = "zisi",
     NONE = "none"
 }
-declare type BundlerWarning = Message;
-declare type CleanupFunction = () => Promise<void>;
-export declare type NativeNodeModules = Record<string, Record<string, string | undefined>>;
-export declare type BundleFunction = (args: {
+type BundlerWarning = Message;
+type CleanupFunction = () => Promise<void>;
+export type NativeNodeModules = Record<string, Record<string, string | undefined>>;
+export type BundleFunction = (args: {
     basePath?: string;
     cache: RuntimeCache;
     config: FunctionConfig;
@@ -35,7 +35,7 @@ export declare type BundleFunction = (args: {
     nodeModulesWithDynamicImports?: string[];
     srcFiles: string[];
 }>;
-export declare type GetSrcFilesFunction = (args: {
+export type GetSrcFilesFunction = (args: {
     basePath?: string;
     config: FunctionConfig;
     featureFlags: FeatureFlags;

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

@@ -1,4 +1,6 @@
-export declare const listImports: ({ functionName, path, }: {
+import { FeatureFlags } from '../../../../feature_flags.js';
+export declare const listImports: ({ featureFlags, ...args }: {
+    featureFlags: FeatureFlags;
     functionName: string;
     path: string;
 }) => Promise<string[]>;

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

@@ -1,5 +1,6 @@
 import * as esbuild from '@netlify/esbuild';
 import isBuiltinModule from 'is-builtin-module';
+import precinct from 'precinct';
 import { tmpName } from 'tmp-promise';
 import { FunctionBundlingUserError } from '../../../../utils/error.js';
 import { safeUnlink } from '../../../../utils/fs.js';
@@ -23,7 +24,7 @@ const getListImportsPlugin = ({ imports, path }) => ({
         });
     },
 });
-export const listImports = async ({ functionName, path, }) => {
+const listImportsWithESBuild = async ({ functionName, path, }) => {
     // We're not interested in the output that esbuild generates, we're just
     // using it for its parsing capabilities in order to find import/require
     // statements. However, if we don't give esbuild a path in `outfile`, it
@@ -56,4 +57,21 @@ export const listImports = async ({ functionName, path, }) => {
     }
     return [...imports];
 };
+const listImportsWithPrecinct = async ({ functionName, path }) => {
+    try {
+        return await precinct.paperwork(path, { includeCore: false });
+    }
+    catch (error) {
+        // Syntax errors from babel are user errors
+        if (error.code === 'BABEL_PARSER_SYNTAX_ERROR') {
+            throw FunctionBundlingUserError.addCustomErrorInfo(error, {
+                functionName,
+                runtime: "js" /* RuntimeType.JAVASCRIPT */,
+                bundler: "zisi" /* NodeBundlerType.ZISI */,
+            });
+        }
+        throw error;
+    }
+};
+export const listImports = async ({ featureFlags, ...args }) => (featureFlags.parseWithEsbuild ? await listImportsWithESBuild(args) : await listImportsWithPrecinct(args));
 //# sourceMappingURL=list_imports.js.map

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

@@ -1,6 +1,5 @@
 import { dirname, basename, normalize } from 'path';
-import { not as notJunk } from 'junk';
-import precinct from 'precinct';
+import { isNotJunk as notJunk } from 'junk';
 import { nonNullable } from '../../../../utils/non_nullable.js';
 import { filterExcludedPaths, getPathsOfIncludedFiles } from '../../utils/included_files.js';
 import { getPackageJson } from '../../utils/package_json.js';
@@ -58,9 +57,7 @@ const getFileDependencies = async function ({ featureFlags, functionName, path,
     }
     state.localFiles.add(path);
     const basedir = dirname(path);
-    const dependencies = featureFlags.parseWithEsbuild
-        ? await listImports({ functionName, path })
-        : await precinct.paperwork(path, { includeCore: false });
+    const dependencies = await listImports({ featureFlags, functionName, path });
     const depsPaths = await Promise.all(dependencies.filter(nonNullable).map((dependency) => getImportDependencies({
         dependency,
         basedir,

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

@@ -1,9 +1,9 @@
 import type { ArgumentPlaceholder, Expression, SpreadElement, JSXNamespacedName } from '@babel/types';
 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 type ISCValues = Partial<ReturnType<typeof parseSchedule>>;
 export declare const findISCDeclarationsInPath: (sourcePath: string, functionName: string) => Promise<ISCValues>;
-export declare type ISCHandlerArg = ArgumentPlaceholder | Expression | SpreadElement | JSXNamespacedName;
+export type ISCHandlerArg = ArgumentPlaceholder | Expression | SpreadElement | JSXNamespacedName;
 export interface ISCExport {
     local: string;
     args: ISCHandlerArg[];

package/dist/runtimes/node/parser/bindings.d.ts

@@ -1,5 +1,5 @@
 import type { Expression, Statement } from '@babel/types';
-declare type Bindings = Map<string, Expression>;
-export declare type BindingMethod = () => Bindings;
+type Bindings = Map<string, Expression>;
+export type BindingMethod = () => Bindings;
 export declare const createBindingsMethod: (nodes: Statement[]) => BindingMethod;
 export {};

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

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

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

@@ -1,7 +1,7 @@
 import type { FeatureFlags } from '../../../feature_flags.js';
 import type { RuntimeCache } from '../../../utils/cache.js';
 import { ModuleFormat } from './module_format.js';
-export declare type ArchiveFormat = 'none' | 'zip';
+export type ArchiveFormat = 'none' | 'zip';
 interface ZipNodeParameters {
     aliases?: Map<string, string>;
     basePath: string;

package/dist/runtimes/runtime.d.ts

@@ -10,17 +10,17 @@ export declare const enum RuntimeType {
     JAVASCRIPT = "js",
     RUST = "rs"
 }
-export declare type FindFunctionsInPathsFunction = (args: {
+export type FindFunctionsInPathsFunction = (args: {
     cache: RuntimeCache;
     featureFlags: FeatureFlags;
     paths: string[];
 }) => Promise<SourceFile[]>;
-export declare type FindFunctionInPathFunction = (args: {
+export type FindFunctionInPathFunction = (args: {
     cache: RuntimeCache;
     featureFlags: FeatureFlags;
     path: string;
 }) => Promise<SourceFile | undefined>;
-export declare type GetSrcFilesFunction = (args: {
+export type GetSrcFilesFunction = (args: {
     basePath?: string;
     config: FunctionConfig;
     featureFlags: FeatureFlags;
@@ -38,7 +38,7 @@ export interface ZipFunctionResult {
     nodeModulesWithDynamicImports?: string[];
     path: string;
 }
-export declare type ZipFunction = (args: {
+export type ZipFunction = (args: {
     archiveFormat: ArchiveFormat;
     basePath?: string;
     cache: RuntimeCache;

package/dist/utils/cache.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { Stats } from 'fs';
-export declare type FileCache = Map<string, Promise<string>>;
-export declare type LstatCache = Map<string, Promise<Stats>>;
-export declare type ReaddirCache = Map<string, Promise<string[]>>;
+export type FileCache = Map<string, Promise<string>>;
+export type LstatCache = Map<string, Promise<Stats>>;
+export type ReaddirCache = Map<string, Promise<string[]>>;
 interface NFTCache {
     fileCache: FileCache;
 }

package/dist/utils/error.d.ts

@@ -9,7 +9,7 @@ interface CustomErrorInfo {
     type: 'functionsBundling';
     location: CustomErrorLocation;
 }
-declare type UserError = Error & {
+type UserError = Error & {
     customErrorInfo: CustomErrorInfo;
 };
 export declare class FunctionBundlingUserError extends Error {

package/dist/utils/format_result.d.ts

@@ -1,6 +1,6 @@
 import { FunctionArchive } from '../function.js';
 import { RuntimeType } from '../runtimes/runtime.js';
-export declare type FunctionResult = Omit<FunctionArchive, 'runtime'> & {
+export type FunctionResult = Omit<FunctionArchive, 'runtime'> & {
     runtime: RuntimeType;
     schedule?: string;
 };

package/dist/utils/logger.d.ts

@@ -1,4 +1,4 @@
-declare type LogFunction = (...args: unknown[]) => void;
+type LogFunction = (...args: unknown[]) => void;
 interface Logger {
     system: LogFunction;
     user: LogFunction;

package/dist/utils/shell.d.ts

@@ -1,22 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-import execa from 'execa';
+import { execa } from 'execa';
 export declare const shellUtils: {
-    runCommand: {
-        (file: string, arguments?: readonly string[] | undefined, options?: execa.Options<string> | undefined): execa.ExecaChildProcess<string>;
-        (file: string, arguments?: readonly string[] | undefined, options?: execa.Options<null> | undefined): execa.ExecaChildProcess<Buffer>;
-        (file: string, options?: execa.Options<string> | undefined): execa.ExecaChildProcess<string>;
-        (file: string, options?: execa.Options<null> | undefined): execa.ExecaChildProcess<Buffer>;
-        sync(file: string, arguments?: readonly string[] | undefined, options?: execa.SyncOptions<string> | undefined): execa.ExecaSyncReturnValue<string>;
-        sync(file: string, arguments?: readonly string[] | undefined, options?: execa.SyncOptions<null> | undefined): execa.ExecaSyncReturnValue<Buffer>;
-        sync(file: string, options?: execa.SyncOptions<string> | undefined): execa.ExecaSyncReturnValue<string>;
-        sync(file: string, options?: execa.SyncOptions<null> | undefined): execa.ExecaSyncReturnValue<Buffer>;
-        command(command: string, options?: execa.Options<string> | undefined): execa.ExecaChildProcess<string>;
-        command(command: string, options?: execa.Options<null> | undefined): execa.ExecaChildProcess<Buffer>;
-        commandSync(command: string, options?: execa.SyncOptions<string> | undefined): execa.ExecaSyncReturnValue<string>;
-        commandSync(command: string, options?: execa.SyncOptions<null> | undefined): execa.ExecaSyncReturnValue<Buffer>;
-        node(scriptPath: string, arguments?: readonly string[] | undefined, options?: execa.NodeOptions<string> | undefined): execa.ExecaChildProcess<string>;
-        node(scriptPath: string, arguments?: readonly string[] | undefined, options?: execa.Options<null> | undefined): execa.ExecaChildProcess<Buffer>;
-        node(scriptPath: string, options?: execa.Options<string> | undefined): execa.ExecaChildProcess<string>;
-        node(scriptPath: string, options?: execa.Options<null> | undefined): execa.ExecaChildProcess<Buffer>;
-    };
+    runCommand: typeof execa;
 };

package/dist/utils/shell.js

@@ -1,3 +1,3 @@
-import execa from 'execa';
+import { execa } from 'execa';
 export const shellUtils = { runCommand: execa };
 //# sourceMappingURL=shell.js.map

package/dist/zip.d.ts

@@ -12,7 +12,7 @@ interface ZipFunctionOptions {
     systemLog?: LogFunction;
     debug?: boolean;
 }
-export declare type ZipFunctionsOptions = ZipFunctionOptions & {
+export type ZipFunctionsOptions = ZipFunctionOptions & {
     configFileDirectories?: string[];
     manifest?: string;
     parallelLimit?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -63,18 +63,18 @@
     "del": "^7.0.0",
     "end-of-stream": "^1.4.4",
     "es-module-lexer": "^1.0.0",
-    "execa": "^5.0.0",
+    "execa": "^6.0.0",
     "filter-obj": "^5.0.0",
     "find-up": "^6.0.0",
     "glob": "^8.0.3",
     "is-builtin-module": "^3.1.0",
-    "is-path-inside": "^3.0.3",
-    "junk": "^3.1.0",
+    "is-path-inside": "^4.0.0",
+    "junk": "^4.0.0",
     "locate-path": "^7.0.0",
     "merge-options": "^3.0.4",
     "minimatch": "^5.0.0",
     "normalize-path": "^3.0.0",
-    "p-map": "^4.0.0",
+    "p-map": "^5.0.0",
     "path-exists": "^5.0.0",
     "precinct": "^9.0.1",
     "require-package-name": "^2.0.1",
@@ -87,16 +87,17 @@
   },
   "devDependencies": {
     "@babel/types": "^7.15.6",
-    "@netlify/eslint-config-node": "^7.0.0",
+    "@netlify/eslint-config-node": "^7.0.1",
     "@types/archiver": "^5.1.1",
     "@types/end-of-stream": "^1.4.1",
     "@types/node": "^14.18.32",
     "@types/normalize-path": "^3.0.0",
     "@types/resolve": "^1.20.2",
     "@types/semver": "^7.3.8",
+    "@types/tmp": "^0.2.3",
     "@types/unixify": "^1.0.0",
     "@types/yargs": "^17.0.4",
-    "@vitest/coverage-c8": "^0.24.3",
+    "@vitest/coverage-c8": "^0.25.0",
     "cpy": "^9.0.0",
     "deepmerge": "^4.2.2",
     "get-stream": "^6.0.0",
@@ -106,8 +107,8 @@
     "source-map-support": "^0.5.21",
     "throat": "^6.0.1",
     "typescript": "^4.8.4",
-    "vite": "^3.1.8",
-    "vitest": "^0.24.3"
+    "vite": "^4.0.0",
+    "vitest": "^0.25.0"
   },
   "engines": {
     "node": "^14.16.0 || >=16.0.0"