@netlify/zip-it-and-ship-it 9.3.0 → 9.4.0

package/dist/archive.js

@@ -1,12 +1,9 @@
 import { createWriteStream, readlinkSync } from 'fs';
-import { promisify } from 'util';
 import archiver from 'archiver';
-import endOfStream from 'end-of-stream';
 export const ARCHIVE_FORMAT = {
     NONE: 'none',
     ZIP: 'zip',
 };
-const pEndOfStream = promisify(endOfStream);
 // Start zipping files
 export const startZip = function (destPath) {
     const output = createWriteStream(destPath);
@@ -36,7 +33,11 @@ export const addZipContent = function (archive, content, name) {
 };
 // End zipping files
 export const endZip = async function (archive, output) {
-    archive.finalize();
-    await pEndOfStream(output);
+    const result = new Promise((resolve, reject) => {
+        output.on('error', (error) => reject(error));
+        output.on('finish', () => resolve());
+    });
+    await archive.finalize();
+    return result;
 };
 //# sourceMappingURL=archive.js.map

package/dist/function.d.ts

@@ -2,6 +2,12 @@
 import { Stats } from 'fs';
 import type { FunctionConfig } from './config.js';
 import type { Runtime, ZipFunctionResult } from './runtimes/runtime.js';
+import { ObjectValues } from './types/utils.js';
+export declare const INVOCATION_MODE: {
+    readonly Buffer: "buffer";
+    readonly Stream: "stream";
+};
+export type InvocationMode = ObjectValues<typeof INVOCATION_MODE>;
 export type FunctionArchive = ZipFunctionResult & {
     mainFile: string;
     name: string;

package/dist/function.js

@@ -1,2 +1,5 @@
-export {};
+export const INVOCATION_MODE = {
+    Buffer: 'buffer',
+    Stream: 'stream',
+};
 //# sourceMappingURL=function.js.map

package/dist/manifest.d.ts

@@ -1,6 +1,8 @@
 import type { FeatureFlags } from './feature_flags.js';
+import type { InvocationMode } from './function.js';
 import type { FunctionResult } from './utils/format_result.js';
 interface ManifestFunction {
+    invocationMode?: InvocationMode;
     mainFile: string;
     name: string;
     path: string;

package/dist/manifest.js

@@ -12,10 +12,11 @@ export const createManifest = async ({ featureFlags, functions, path, }) => {
     };
     await fs.writeFile(path, JSON.stringify(payload));
 };
-const formatFunctionForManifest = ({ bundler, displayName, generator, mainFile, name, path, runtime, runtimeVersion, schedule }, featureFlags) => ({
+const formatFunctionForManifest = ({ bundler, displayName, generator, invocationMode, mainFile, name, path, runtime, runtimeVersion, schedule, }, featureFlags) => ({
     bundler,
     displayName,
     generator,
+    invocationMode,
     mainFile,
     name,
     runtimeVersion: featureFlags.functions_inherit_build_nodejs_version ? runtimeVersion : undefined,

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

@@ -1,8 +1,11 @@
 import { basename, dirname, extname, resolve } from 'path';
+import { FunctionBundlingUserError } from '../../../../utils/error.js';
 import { cachedReadFile } from '../../../../utils/fs.js';
+import { RUNTIME } from '../../../runtime.js';
 import { MODULE_FILE_EXTENSION, MODULE_FORMAT } from '../../utils/module_format.js';
 import { getNodeSupportMatrix } from '../../utils/node_version.js';
 import { getPackageJsonIfAvailable } from '../../utils/package_json.js';
+import { NODE_BUNDLER } from '../types.js';
 import { transpile } from './transpile.js';
 const getPatchedESMPackages = async (packages, cache) => {
     const patchedPackages = await Promise.all(packages.map((path) => patchESMPackage(path, cache)));
@@ -30,24 +33,41 @@ export const processESM = async ({ basePath, cache, config, esmPaths, featureFla
     const extension = extname(mainFile);
     // If this is a .mjs file and we want to output pure ESM files, we don't need
     // to transpile anything.
-    if (extension === MODULE_FILE_EXTENSION.MJS && featureFlags.zisi_pure_esm_mjs) {
+    if (extension === MODULE_FILE_EXTENSION.MJS &&
+        (featureFlags.zisi_pure_esm_mjs || featureFlags.zisi_functions_api_v2)) {
         return {
             moduleFormat: MODULE_FORMAT.ESM,
         };
     }
     const entrypointIsESM = isEntrypointESM({ basePath, esmPaths, mainFile });
     if (!entrypointIsESM) {
+        if (featureFlags.zisi_functions_api_v2) {
+            throw new FunctionBundlingUserError(`The function '${name}' must use the ES module syntax. To learn more, visit https://ntl.fyi/esm.`, {
+                functionName: name,
+                runtime: RUNTIME.JAVASCRIPT,
+                bundler: NODE_BUNDLER.NFT,
+            });
+        }
         return {
             moduleFormat: MODULE_FORMAT.COMMONJS,
         };
     }
     const packageJson = await getPackageJsonIfAvailable(dirname(mainFile));
     const nodeSupport = getNodeSupportMatrix(config.nodeVersion);
-    if (featureFlags.zisi_pure_esm && packageJson.type === 'module' && nodeSupport.esm) {
+    if ((featureFlags.zisi_pure_esm || featureFlags.zisi_functions_api_v2) &&
+        packageJson.type === 'module' &&
+        nodeSupport.esm) {
         return {
             moduleFormat: MODULE_FORMAT.ESM,
         };
     }
+    if (featureFlags.zisi_functions_api_v2) {
+        throw new FunctionBundlingUserError(`The function '${name}' must use the ES module syntax. To learn more, visit https://ntl.fyi/esm.`, {
+            functionName: name,
+            runtime: RUNTIME.JAVASCRIPT,
+            bundler: NODE_BUNDLER.NFT,
+        });
+    }
     const rewrites = await transpileESM({ basePath, cache, config, esmPaths, reasons, name });
     return {
         moduleFormat: MODULE_FORMAT.COMMONJS,

package/dist/runtimes/node/index.js

@@ -1,5 +1,6 @@
 import { join } from 'path';
 import { copyFile } from 'cp-file';
+import { INVOCATION_MODE } from '../../function.js';
 import getInternalValue from '../../utils/get_internal_value.js';
 import { RUNTIME } from '../runtime.js';
 import { getBundler, getBundlerName } from './bundlers/index.js';
@@ -72,6 +73,7 @@ const zipFunction = async function ({ archiveFormat, basePath, cache, config = {
         srcFiles,
     });
     await cleanupFunction?.();
+    const invocationMode = featureFlags.zisi_functions_api_v2 ? INVOCATION_MODE.Stream : INVOCATION_MODE.Buffer;
     return {
         bundler: bundlerName,
         bundlerWarnings,
@@ -79,6 +81,7 @@ const zipFunction = async function ({ archiveFormat, basePath, cache, config = {
         inputs,
         includedFiles,
         inSourceConfig,
+        invocationMode,
         nativeNodeModules,
         nodeModulesWithDynamicImports,
         path: zipPath,

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

@@ -9,7 +9,7 @@ const getEntryFileContents = (mainPath, moduleFormat, featureFlags) => {
     const importPath = `.${mainPath.startsWith('/') ? mainPath : `/${mainPath}`}`;
     if (featureFlags.zisi_functions_api_v2) {
         return [
-            `import func from '${importPath}'`,
+            `import * as func from '${importPath}'`,
             `import { getLambdaHandler } from './${BOOTSTRAP_FILE_NAME}'`,
             `export const handler = getLambdaHandler(func)`,
         ].join(';');

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

@@ -1,10 +1,9 @@
 import { Buffer } from 'buffer';
-import { promises as fs } from 'fs';
+import { mkdir, rm, writeFile } from 'fs/promises';
 import os from 'os';
 import { basename, join } from 'path';
 import { getPath as getV2APIPath } from '@netlify/serverless-functions-api';
 import { copyFile } from 'cp-file';
-import { deleteAsync as deleteFiles } from 'del';
 import pMap from 'p-map';
 import { startZip, addZipFile, addZipContent, endZip, ARCHIVE_FORMAT, } from '../../../archive.js';
 import { cachedLstat, mkdirAndWriteFile } from '../../../utils/fs.js';
@@ -26,10 +25,10 @@ const createDirectory = async function ({ aliases = new Map(), basePath, destFol
     });
     const functionFolder = join(destFolder, basename(filename, extension));
     // Deleting the functions directory in case it exists before creating it.
-    await deleteFiles(functionFolder, { force: true });
-    await fs.mkdir(functionFolder, { recursive: true });
+    await rm(functionFolder, { recursive: true, force: true, maxRetries: 3 });
+    await mkdir(functionFolder, { recursive: true });
     // Writing entry file.
-    await fs.writeFile(join(functionFolder, entryFilename), entryContents);
+    await writeFile(join(functionFolder, entryFilename), entryContents);
     // Copying source files.
     await pMap(srcFiles, (srcFile) => {
         const destPath = aliases.get(srcFile) || srcFile;

package/dist/runtimes/runtime.d.ts

@@ -1,7 +1,7 @@
 import type { ArchiveFormat } from '../archive.js';
 import type { FunctionConfig } from '../config.js';
 import type { FeatureFlags } from '../feature_flags.js';
-import type { FunctionSource, SourceFile } from '../function.js';
+import type { FunctionSource, InvocationMode, SourceFile } from '../function.js';
 import { ObjectValues } from '../types/utils.js';
 import type { RuntimeCache } from '../utils/cache.js';
 import type { NodeBundlerName } from './node/bundlers/types.js';
@@ -38,6 +38,7 @@ export interface ZipFunctionResult {
     inputs?: string[];
     includedFiles?: string[];
     inSourceConfig?: ISCValues;
+    invocationMode?: InvocationMode;
     nativeNodeModules?: object;
     nodeModulesWithDynamicImports?: string[];
     path: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -62,8 +62,6 @@
     "archiver": "^5.3.0",
     "common-path-prefix": "^3.0.0",
     "cp-file": "^10.0.0",
-    "del": "^7.0.0",
-    "end-of-stream": "^1.4.4",
     "es-module-lexer": "^1.0.0",
     "execa": "^6.0.0",
     "filter-obj": "^5.0.0",
@@ -78,7 +76,7 @@
     "normalize-path": "^3.0.0",
     "p-map": "^5.0.0",
     "path-exists": "^5.0.0",
-    "precinct": "^10.0.0",
+    "precinct": "^11.0.0",
     "require-package-name": "^2.0.1",
     "resolve": "^2.0.0-next.1",
     "semver": "^7.0.0",
@@ -91,8 +89,8 @@
     "@babel/types": "^7.15.6",
     "@netlify/eslint-config-node": "^7.0.1",
     "@types/archiver": "^5.1.1",
-    "@types/end-of-stream": "^1.4.1",
     "@types/glob": "^8.1.0",
+    "@types/is-ci": "^3.0.0",
     "@types/node": "^14.18.32",
     "@types/normalize-path": "^3.0.0",
     "@types/resolve": "^1.20.2",
@@ -105,11 +103,10 @@
     "deepmerge": "^4.2.2",
     "get-stream": "^6.0.0",
     "husky": "^8.0.0",
+    "is-ci": "^3.0.1",
     "lambda-local": "^2.0.3",
     "npm-run-all": "^4.1.5",
-    "sort-on": "^5.0.0",
     "source-map-support": "^0.5.21",
-    "throat": "^6.0.1",
     "typescript": "^5.0.0",
     "vite": "^4.0.0",
     "vitest": "^0.31.0"