@netlify/zip-it-and-ship-it 9.6.0 → 9.8.0

package/README.md

@@ -128,7 +128,7 @@ The following properties are accepted:
 - `nodeVersion`
 
   - _Type_: `string`\
-  - _Default value_: `16`
+  - _Default value_: `18`
 
   The version of Node.js to use as the compilation target for bundlers. This is also used to determine the runtime
   reported in the manifest. Any valid and supported Node.js version is accepted. Examples:
@@ -478,9 +478,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 `16`, but can be
+- Build-time Node.js version: this defaults to Node `18`, 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 `nodejs16.x` but can be
+- Function runtime Node.js version: this defaults to `nodejs18.x` but can be
   [overridden with a `AWS_LAMBDA_JS_RUNTIME` environment variable](https://docs.netlify.com/functions/optional-configuration/?fn-language=js#node-js-version-for-runtime-2).
 
 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/feature_flags.d.ts

@@ -3,6 +3,7 @@ export declare const defaultFlags: {
     readonly parseWithEsbuild: false;
     readonly traceWithNft: false;
     readonly functions_inherit_build_nodejs_version: false;
+    readonly zisi_log_dynamic_imports: false;
     readonly zisi_pure_esm: false;
     readonly zisi_pure_esm_mjs: false;
     readonly zisi_output_cjs_extension: false;
@@ -16,6 +17,7 @@ export declare const getFlags: (input?: Record<string, boolean>, flags?: {
     readonly parseWithEsbuild: false;
     readonly traceWithNft: false;
     readonly functions_inherit_build_nodejs_version: false;
+    readonly zisi_log_dynamic_imports: false;
     readonly zisi_pure_esm: false;
     readonly zisi_pure_esm_mjs: false;
     readonly zisi_output_cjs_extension: false;

package/dist/feature_flags.js

@@ -8,6 +8,9 @@ export const defaultFlags = {
     traceWithNft: false,
     // Should Lambda functions inherit the build Node.js version
     functions_inherit_build_nodejs_version: false,
+    // Emit a system log for every path that has been included in the bundle due
+    // to the parsing of a dynamic import.
+    zisi_log_dynamic_imports: false,
     // Output pure (i.e. untranspiled) ESM files when the function file has ESM
     // syntax and the parent `package.json` file has `{"type": "module"}`.
     zisi_pure_esm: false,

package/dist/main.d.ts

@@ -27,13 +27,13 @@ interface ListFunctionsOptions {
     parseISC?: boolean;
 }
 export declare const listFunctions: (relativeSrcFolders: string | string[], { featureFlags: inputFeatureFlags, config, configFileDirectories, parseISC, }?: {
-    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "functions_inherit_build_nodejs_version" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_functions_api_v2" | "zisi_unique_entry_file" | "zisi_use_latest_babel_version", boolean>> | undefined;
+    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "functions_inherit_build_nodejs_version" | "zisi_log_dynamic_imports" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_functions_api_v2" | "zisi_unique_entry_file" | "zisi_use_latest_babel_version", boolean>> | undefined;
     config?: Config | undefined;
     configFileDirectories?: string[] | undefined;
     parseISC?: boolean | undefined;
 }) => Promise<ListedFunction[]>;
 export declare const listFunction: (path: string, { featureFlags: inputFeatureFlags, config, configFileDirectories, parseISC, }?: {
-    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "functions_inherit_build_nodejs_version" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_functions_api_v2" | "zisi_unique_entry_file" | "zisi_use_latest_babel_version", boolean>> | undefined;
+    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "functions_inherit_build_nodejs_version" | "zisi_log_dynamic_imports" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_functions_api_v2" | "zisi_unique_entry_file" | "zisi_use_latest_babel_version", boolean>> | undefined;
     config?: Config | undefined;
     configFileDirectories?: string[] | undefined;
     parseISC?: boolean | undefined;

package/dist/runtimes/index.d.ts

@@ -11,7 +11,7 @@ export declare const getFunctionsFromPaths: (paths: string[], { cache, config, c
     config?: Config | undefined;
     configFileDirectories?: string[] | undefined;
     dedupe?: boolean | undefined;
-    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "functions_inherit_build_nodejs_version" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_functions_api_v2" | "zisi_unique_entry_file" | "zisi_use_latest_babel_version", boolean>> | undefined;
+    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "functions_inherit_build_nodejs_version" | "zisi_log_dynamic_imports" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_functions_api_v2" | "zisi_unique_entry_file" | "zisi_use_latest_babel_version", boolean>> | undefined;
 }) => Promise<FunctionMap>;
 /**
  * Gets a list of functions found in a list of paths.
@@ -20,6 +20,6 @@ export declare const getFunctionFromPath: (path: string, { cache, config, config
     cache: RuntimeCache;
     config?: Config | undefined;
     configFileDirectories?: string[] | undefined;
-    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "functions_inherit_build_nodejs_version" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_functions_api_v2" | "zisi_unique_entry_file" | "zisi_use_latest_babel_version", boolean>> | undefined;
+    featureFlags?: Partial<Record<"buildRustSource" | "parseWithEsbuild" | "traceWithNft" | "functions_inherit_build_nodejs_version" | "zisi_log_dynamic_imports" | "zisi_pure_esm" | "zisi_pure_esm_mjs" | "zisi_output_cjs_extension" | "zisi_functions_api_v2" | "zisi_unique_entry_file" | "zisi_use_latest_babel_version", boolean>> | undefined;
 }) => Promise<FunctionSource | undefined>;
 export {};

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

@@ -1,13 +1,15 @@
 import type { FunctionConfig } from '../../../../config.js';
 import { FeatureFlags } from '../../../../feature_flags.js';
+import { Logger } from '../../../../utils/logger.js';
 export declare const ESBUILD_LOG_LIMIT = 10;
-export declare const bundleJsFile: ({ additionalModulePaths, basePath, config, externalModules, featureFlags, ignoredModules, mainFile, name, srcDir, srcFile, }: {
+export declare const bundleJsFile: ({ additionalModulePaths, basePath, config, externalModules, featureFlags, ignoredModules, logger, mainFile, name, srcDir, srcFile, }: {
     additionalModulePaths?: string[] | undefined;
     basePath?: string | undefined;
     config: FunctionConfig;
     externalModules: string[];
     featureFlags: FeatureFlags;
     ignoredModules: string[];
+    logger: Logger;
     mainFile: string;
     name: string;
     srcDir: string;

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

@@ -17,7 +17,7 @@ export const ESBUILD_LOG_LIMIT = 10;
 // When resolving imports with no extension (e.g. require('./foo')), these are
 // the extensions that esbuild will look for, in this order.
 const RESOLVE_EXTENSIONS = ['.js', '.jsx', '.mjs', '.cjs', '.ts', '.tsx', '.mts', '.cts', '.json'];
-export const bundleJsFile = async function ({ additionalModulePaths, basePath, config, externalModules = [], featureFlags, ignoredModules = [], mainFile, name, srcDir, srcFile, }) {
+export const bundleJsFile = async function ({ additionalModulePaths, basePath, config, externalModules = [], featureFlags, ignoredModules = [], logger, mainFile, 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 tmpName();
@@ -98,6 +98,11 @@ export const bundleJsFile = async function ({ additionalModulePaths, basePath, c
         const inputs = Object.keys(metafile.inputs).map((path) => resolve(path));
         const cleanTempFiles = getCleanupFunction([...bundlePaths.keys()]);
         const additionalPaths = [...dynamicImportsIncludedPaths, ...includedFilesFromModuleDetection];
+        if (featureFlags.zisi_log_dynamic_imports && dynamicImportsIncludedPaths.size !== 0) {
+            // Capping the number of paths to avoid large log volumes.
+            const paths = [...dynamicImportsIncludedPaths].slice(0, 20).join(', ');
+            logger.system(`Functions bundling included paths by parsing dynamic import: ${paths}`);
+        }
         return {
             additionalPaths,
             bundlePaths,

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

@@ -26,7 +26,7 @@ const getExternalAndIgnoredModules = async ({ config, srcDir }) => {
     const ignoredModules = [...ignoredModulesFromConfig, ...ignoredModulesFromSpecialCases];
     return { externalModules, ignoredModules };
 };
-const bundle = async ({ basePath, config = {}, extension, featureFlags, filename, mainFile, name, pluginsModulesPath, repositoryRoot, runtime, srcDir, srcPath, stat, }) => {
+const bundle = async ({ basePath, config = {}, extension, featureFlags, filename, logger, mainFile, name, pluginsModulesPath, repositoryRoot, runtime, srcDir, srcPath, stat, }) => {
     const { externalModules, ignoredModules } = await getExternalAndIgnoredModules({ config, srcDir });
     const { additionalPaths, bundlePaths, cleanTempFiles, inputs, moduleFormat, nativeNodeModules = {}, nodeModulesWithDynamicImports, outputExtension, warnings, } = await bundleJsFile({
         additionalModulePaths: pluginsModulesPath ? [pluginsModulesPath] : [],
@@ -35,6 +35,7 @@ const bundle = async ({ basePath, config = {}, extension, featureFlags, filename
         externalModules,
         featureFlags,
         ignoredModules,
+        logger,
         mainFile,
         name,
         srcDir,

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

@@ -4,6 +4,7 @@ import type { FeatureFlags } from '../../../feature_flags.js';
 import type { FunctionSource } from '../../../function.js';
 import { ObjectValues } from '../../../types/utils.js';
 import type { RuntimeCache } from '../../../utils/cache.js';
+import { Logger } from '../../../utils/logger.js';
 import type { ModuleFormat } from '../utils/module_format.js';
 export declare const NODE_BUNDLER: {
     readonly ESBUILD: "esbuild";
@@ -21,6 +22,7 @@ export type BundleFunction = (args: {
     cache: RuntimeCache;
     config: FunctionConfig;
     featureFlags: FeatureFlags;
+    logger: Logger;
     pluginsModulesPath?: string;
     repositoryRoot?: string;
     runtimeAPIVersion: number;

package/dist/runtimes/node/index.js

@@ -25,7 +25,7 @@ const getSrcFilesWithBundler = async (parameters) => {
     const result = await bundler.getSrcFiles({ ...parameters, pluginsModulesPath });
     return result.srcFiles;
 };
-const zipFunction = async function ({ archiveFormat, basePath, cache, config = {}, destFolder, extension, featureFlags, filename, mainFile, name, repositoryRoot, runtime, srcDir, srcPath, stat, isInternal, }) {
+const zipFunction = async function ({ archiveFormat, basePath, cache, config = {}, destFolder, extension, featureFlags, filename, logger, mainFile, name, repositoryRoot, runtime, srcDir, srcPath, stat, isInternal, }) {
     // If the file is a zip, we assume the function is bundled and ready to go.
     // We simply copy it to the destination path with no further processing.
     if (extension === '.zip') {
@@ -51,6 +51,7 @@ const zipFunction = async function ({ archiveFormat, basePath, cache, config = {
         extension,
         featureFlags,
         filename,
+        logger,
         mainFile,
         name,
         pluginsModulesPath,

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

@@ -1,7 +1,7 @@
 export interface NodeVersionSupport {
     esm: boolean;
 }
-export declare const DEFAULT_NODE_VERSION = 16;
+export declare const DEFAULT_NODE_VERSION = 18;
 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

@@ -1,6 +1,6 @@
 import semver from 'semver';
 // Must match the default version used in Bitballoon.
-export const DEFAULT_NODE_VERSION = 16;
+export const DEFAULT_NODE_VERSION = 18;
 export const getNodeVersion = (configVersion) => parseVersion(configVersion) ?? DEFAULT_NODE_VERSION;
 export const getNodeSupportMatrix = (configVersion) => {
     const versionNumber = getNodeVersion(configVersion);

package/dist/runtimes/runtime.d.ts

@@ -4,6 +4,7 @@ import type { FeatureFlags } from '../feature_flags.js';
 import type { FunctionSource, InvocationMode, SourceFile } from '../function.js';
 import { ObjectValues } from '../types/utils.js';
 import type { RuntimeCache } from '../utils/cache.js';
+import { Logger } from '../utils/logger.js';
 import type { NodeBundlerName } from './node/bundlers/types.js';
 import type { ISCValues } from './node/in_source_config/index.js';
 export declare const RUNTIME: {
@@ -52,6 +53,7 @@ export type ZipFunction = (args: {
     config: FunctionConfig;
     destFolder: string;
     featureFlags: FeatureFlags;
+    logger: Logger;
     repositoryRoot?: string;
     generator?: string;
     isInternal: boolean;

package/dist/zip.js

@@ -13,7 +13,6 @@ import { formatZipResult } from './utils/format_result.js';
 import { listFunctionsDirectories, resolveFunctionsDirectories } from './utils/fs.js';
 import { getLogger } from './utils/logger.js';
 import { nonNullable } from './utils/non_nullable.js';
-import { endTimer, startTimer } from './utils/timer.js';
 const DEFAULT_PARALLEL_LIMIT = 5;
 const validateArchiveFormat = (archiveFormat) => {
     if (!Object.values(ARCHIVE_FORMAT).includes(archiveFormat)) {
@@ -44,7 +43,6 @@ export const zipFunctions = async function (relativeSrcFolders, destFolder, { ar
             // extend the feature flags with `zisi_pure_esm_mjs` enabled.
             ...(func.config.nodeModuleFormat === MODULE_FORMAT.ESM ? { zisi_pure_esm_mjs: true } : {}),
         };
-        const startIntervalTime = startTimer();
         const zipResult = await func.runtime.zipFunction({
             archiveFormat,
             basePath,
@@ -54,6 +52,7 @@ export const zipFunctions = async function (relativeSrcFolders, destFolder, { ar
             extension: func.extension,
             featureFlags: functionFlags,
             filename: func.filename,
+            logger,
             mainFile: func.mainFile,
             name: func.name,
             repositoryRoot,
@@ -63,14 +62,6 @@ export const zipFunctions = async function (relativeSrcFolders, destFolder, { ar
             stat: func.stat,
             isInternal: Boolean(internalFunctionsPath && isPathInside(func.srcPath, internalFunctionsPath)),
         });
-        const durationNs = endTimer(startIntervalTime);
-        const logObject = {
-            name: func.name,
-            config: func.config,
-            featureFlags: functionFlags,
-            durationNs,
-        };
-        logger.system(`Function details: ${JSON.stringify(logObject, null, 2)}`);
         return { ...zipResult, mainFile: func.mainFile, name: func.name, runtime: func.runtime };
     }, {
         concurrency: parallelLimit,
@@ -103,7 +94,6 @@ export const zipFunction = async function (relativeSrcPath, destFolder, { archiv
         // extend the feature flags with `zisi_pure_esm_mjs` enabled.
         ...(config.nodeModuleFormat === MODULE_FORMAT.ESM ? { zisi_pure_esm_mjs: true } : {}),
     };
-    const startIntervalTime = startTimer();
     const zipResult = await runtime.zipFunction({
         archiveFormat,
         basePath,
@@ -113,6 +103,7 @@ export const zipFunction = async function (relativeSrcPath, destFolder, { archiv
         extension,
         featureFlags: functionFlags,
         filename,
+        logger,
         mainFile,
         name,
         repositoryRoot,
@@ -122,14 +113,6 @@ export const zipFunction = async function (relativeSrcPath, destFolder, { archiv
         stat: stats,
         isInternal: Boolean(internalFunctionsPath && isPathInside(srcPath, internalFunctionsPath)),
     });
-    const durationNs = endTimer(startIntervalTime);
-    const logObject = {
-        name,
-        config,
-        featureFlags: functionFlags,
-        durationNs,
-    };
-    logger.system(`Function details: ${JSON.stringify(logObject, null, 2)}`);
     return formatZipResult({ ...zipResult, mainFile, name, runtime });
 };
 //# sourceMappingURL=zip.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.6.0",
+  "version": "9.8.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -54,7 +54,7 @@
     "url": "https://github.com/netlify/zip-it-and-ship-it/issues"
   },
   "dependencies": {
-    "@babel/parser_latest": "npm:@babel/parser@7.21.8",
+    "@babel/parser_latest": "npm:@babel/parser@7.22.4",
     "@babel/parser": "7.16.8",
     "@netlify/binary-info": "^1.0.0",
     "@netlify/esbuild": "0.14.39",
@@ -80,7 +80,7 @@
     "precinct": "^11.0.0",
     "require-package-name": "^2.0.1",
     "resolve": "^2.0.0-next.1",
-    "semver": "^7.0.0",
+    "semver": "^7.3.8",
     "tmp-promise": "^3.0.2",
     "toml": "^3.0.0",
     "unixify": "^1.0.0",