@netlify/zip-it-and-ship-it 9.9.0 → 9.10.0

package/dist/runtimes/go/index.js

@@ -94,7 +94,7 @@ const zipFunction = async function ({ config, destFolder, filename, mainFile, sr
             runtime,
         };
         await zipBinary({ ...zipOptions, srcPath: binary.path, stat: binary.stat });
-        return { config, path: zipPath };
+        return { config, path: zipPath, entryFilename: zipOptions.filename };
     }
     // We don't need to zip the binary, so we can just copy it to the right path.
     // We do this only if we're not building from source, as otherwise the build
@@ -105,6 +105,7 @@ const zipFunction = async function ({ config, destFolder, filename, mainFile, sr
     return {
         config,
         path: destPath,
+        entryFilename: '',
         displayName: config?.name,
         generator: config?.generator || getInternalValue(isInternal),
     };

package/dist/runtimes/node/index.js

@@ -31,7 +31,7 @@ const zipFunction = async function ({ archiveFormat, basePath, cache, config = {
     if (extension === '.zip') {
         const destPath = join(destFolder, filename);
         await copyFile(srcPath, destPath);
-        return { config, path: destPath };
+        return { config, path: destPath, entryFilename: '' };
     }
     const inSourceConfig = await findISCDeclarationsInPath(mainFile, name, featureFlags);
     const runtimeAPIVersion = inSourceConfig.runtimeAPIVersion === 2 ? 2 : 1;
@@ -96,7 +96,8 @@ const zipFunction = async function ({ archiveFormat, basePath, cache, config = {
         invocationMode,
         nativeNodeModules,
         nodeModulesWithDynamicImports,
-        path: zipPath,
+        path: zipPath.path,
+        entryFilename: zipPath.entryFilename,
         runtimeVersion: getNodeRuntime(config.nodeVersion),
         displayName: config?.name,
         generator: config?.generator || getInternalValue(isInternal),

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

@@ -18,5 +18,8 @@ interface ZipNodeParameters {
 }
 export declare const zipNodeJs: ({ archiveFormat, ...options }: ZipNodeParameters & {
     archiveFormat: ArchiveFormat;
-}) => Promise<string>;
+}) => Promise<{
+    path: string;
+    entryFilename: string;
+}>;
 export {};

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

@@ -1,7 +1,7 @@
 import { Buffer } from 'buffer';
 import { mkdir, rm, writeFile } from 'fs/promises';
 import os from 'os';
-import { basename, join } from 'path';
+import { basename, extname, join } from 'path';
 import { getPath as getV2APIPath } from '@netlify/serverless-functions-api';
 import { copyFile } from 'cp-file';
 import pMap from 'p-map';
@@ -55,7 +55,7 @@ const createDirectory = async function ({ aliases = new Map(), basePath, destFol
         }
         return copyFile(srcFile, absoluteDestPath);
     }, { concurrency: COPY_FILE_CONCURRENCY });
-    return functionFolder;
+    return { path: functionFolder, entryFilename };
 };
 const createZipArchive = async function ({ aliases = new Map(), basePath, cache, destFolder, extension, featureFlags, filename, mainFile, moduleFormat, rewrites, runtimeAPIVersion, srcFiles, }) {
     const destPath = join(destFolder, `${basename(filename, extension)}.zip`);
@@ -80,6 +80,7 @@ const createZipArchive = async function ({ aliases = new Map(), basePath, cache,
     // If there is a naming conflict, we move all user files (everything other
     // than the entry file) to its own sub-directory.
     const userNamespace = hasEntryFileConflict ? DEFAULT_USER_SUBDIRECTORY : '';
+    let entryFilename = `${basename(filename, extname(filename))}.js`;
     if (needsEntryFile) {
         const entryFile = getEntryFile({
             commonPrefix: basePath,
@@ -90,6 +91,7 @@ const createZipArchive = async function ({ aliases = new Map(), basePath, cache,
             featureFlags,
             runtimeAPIVersion,
         });
+        entryFilename = entryFile.filename;
         addEntryFileToZip(archive, entryFile);
     }
     if (runtimeAPIVersion === 2) {
@@ -110,7 +112,7 @@ const createZipArchive = async function ({ aliases = new Map(), basePath, cache,
         });
     });
     await endZip(archive, output);
-    return destPath;
+    return { path: destPath, entryFilename };
 };
 export const zipNodeJs = function ({ archiveFormat, ...options }) {
     if (archiveFormat === ARCHIVE_FORMAT.ZIP) {

package/dist/runtimes/runtime.d.ts

@@ -45,6 +45,7 @@ export interface ZipFunctionResult {
     nodeModulesWithDynamicImports?: string[];
     path: string;
     runtimeVersion?: string;
+    entryFilename: string;
 }
 export type ZipFunction = (args: {
     archiveFormat: ArchiveFormat;

package/dist/runtimes/rust/index.js

@@ -103,6 +103,7 @@ const zipFunction = async function ({ cache, config, destFolder, filename, mainF
     return {
         config,
         path: destPath,
+        entryFilename: '',
         displayName: config?.name,
         generator: config?.generator || getInternalValue(isInternal),
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.9.0",
+  "version": "9.10.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -57,7 +57,7 @@
     "@babel/parser": "^7.22.5",
     "@netlify/binary-info": "^1.0.0",
     "@netlify/esbuild": "0.14.39",
-    "@netlify/serverless-functions-api": "^1.5.0",
+    "@netlify/serverless-functions-api": "^1.5.1",
     "@vercel/nft": "^0.22.0",
     "archiver": "^5.3.0",
     "common-path-prefix": "^3.0.0",
@@ -92,14 +92,14 @@
     "@types/archiver": "5.3.2",
     "@types/glob": "8.1.0",
     "@types/is-ci": "3.0.0",
-    "@types/node": "14.18.48",
+    "@types/node": "14.18.51",
     "@types/normalize-path": "3.0.0",
     "@types/resolve": "1.20.2",
     "@types/semver": "7.5.0",
     "@types/tmp": "0.2.3",
     "@types/unixify": "1.0.0",
     "@types/yargs": "17.0.24",
-    "@vitest/coverage-v8": "0.32.0",
+    "@vitest/coverage-v8": "0.32.2",
     "cpy": "9.0.1",
     "deepmerge": "4.3.1",
     "get-stream": "6.0.1",
@@ -108,7 +108,7 @@
     "npm-run-all": "4.1.5",
     "source-map-support": "0.5.21",
     "typescript": "5.1.3",
-    "vitest": "0.32.0"
+    "vitest": "0.32.2"
   },
   "engines": {
     "node": "^14.18.0 || >=16.0.0"