@netlify/zip-it-and-ship-it 12.0.2 → 12.1.0

package/dist/feature_flags.d.ts

@@ -5,10 +5,9 @@ export declare const defaultFlags: {
     readonly zisi_pure_esm: false;
     readonly zisi_pure_esm_mjs: false;
     readonly zisi_output_cjs_extension: false;
-    readonly zisi_unique_entry_file: false;
     readonly zisi_esbuild_fail_double_glob: false;
     readonly zisi_add_instrumentation_loader: true;
-    readonly zisi_dynamic_import_function_handler: false;
+    readonly zisi_dynamic_import_function_handler_entry_point: false;
 };
 export type FeatureFlags = Partial<Record<keyof typeof defaultFlags, boolean>>;
 export declare const getFlags: (input?: Record<string, boolean>, flags?: {
@@ -18,8 +17,7 @@ export declare const getFlags: (input?: Record<string, boolean>, flags?: {
     readonly zisi_pure_esm: false;
     readonly zisi_pure_esm_mjs: false;
     readonly zisi_output_cjs_extension: false;
-    readonly zisi_unique_entry_file: false;
     readonly zisi_esbuild_fail_double_glob: false;
     readonly zisi_add_instrumentation_loader: true;
-    readonly zisi_dynamic_import_function_handler: false;
+    readonly zisi_dynamic_import_function_handler_entry_point: false;
 }) => FeatureFlags;

package/dist/feature_flags.js

@@ -14,14 +14,12 @@ export const defaultFlags = {
     zisi_pure_esm_mjs: false,
     // Output CJS file extension.
     zisi_output_cjs_extension: false,
-    // Create unique entry file instead of a file that is based on the function name.
-    zisi_unique_entry_file: false,
     // If multiple glob stars are in includedFiles, fail the build instead of warning.
     zisi_esbuild_fail_double_glob: false,
     // Adds the `___netlify-telemetry.mjs` file to the function bundle.
     zisi_add_instrumentation_loader: true,
     // Dynamically import the function handler.
-    zisi_dynamic_import_function_handler: false,
+    zisi_dynamic_import_function_handler_entry_point: false,
 };
 // List of supported flags and their default value.
 export const getFlags = (input = {}, flags = defaultFlags) => Object.entries(flags).reduce((result, [key, defaultValue]) => ({

package/dist/main.d.ts

@@ -2,6 +2,7 @@ import { Config } from './config.js';
 import { FeatureFlags } from './feature_flags.js';
 import { ModuleFormat } from './runtimes/node/utils/module_format.js';
 import { RuntimeName } from './runtimes/runtime.js';
+import type { ExtendedRoute, Route } from './utils/routes.js';
 export { Config, FunctionConfig } from './config.js';
 export { zipFunction, zipFunctions, ZipFunctionOptions, ZipFunctionsOptions } from './zip.js';
 export { ArchiveFormat, ARCHIVE_FORMAT } from './archive.js';
@@ -23,6 +24,8 @@ export interface ListedFunction {
     generator?: string;
     timeout?: number;
     inputModuleFormat?: ModuleFormat;
+    excludedRoutes?: Route[];
+    routes?: ExtendedRoute[];
 }
 type ListedFunctionFile = ListedFunction & {
     srcFile: string;

package/dist/main.js

@@ -61,10 +61,12 @@ const getListedFunction = function ({ config, extension, staticAnalysisResult, m
     return {
         displayName: config.name,
         extension,
+        excludedRoutes: staticAnalysisResult?.excludedRoutes,
         generator: config.generator,
         timeout: config.timeout,
         mainFile,
         name,
+        routes: staticAnalysisResult?.routes,
         runtime: runtime.name,
         runtimeAPIVersion: staticAnalysisResult ? (staticAnalysisResult?.runtimeAPIVersion ?? 1) : undefined,
         schedule: staticAnalysisResult?.config?.schedule ?? config.schedule,

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

@@ -15,16 +15,14 @@ export interface EntryFile {
  * As DataDog has a special handling for the service name, we need to make sure it is kebab-case.
  */
 export declare const kebabCase: (input: string) => string;
-export declare const isNamedLikeEntryFile: (file: string, { basePath, featureFlags, filename, runtimeAPIVersion, }: {
+export declare const isNamedLikeEntryFile: (file: string, { basePath, filename, runtimeAPIVersion, }: {
     basePath: string;
-    featureFlags: FeatureFlags;
     filename: string;
     runtimeAPIVersion: number;
 }) => boolean;
-export declare const conflictsWithEntryFile: (srcFiles: string[], { basePath, extension, featureFlags, filename, mainFile, runtimeAPIVersion, }: {
+export declare const conflictsWithEntryFile: (srcFiles: string[], { basePath, extension, filename, mainFile, runtimeAPIVersion, }: {
     basePath: string;
     extension: string;
-    featureFlags: FeatureFlags;
     filename: string;
     mainFile: string;
     runtimeAPIVersion: number;

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

@@ -26,7 +26,7 @@ export const kebabCase = (input) => input
 const getEntryFileContents = (mainPath, moduleFormat, featureFlags, runtimeAPIVersion) => {
     const importPath = `.${mainPath.startsWith('/') ? mainPath : `/${mainPath}`}`;
     if (runtimeAPIVersion === 2) {
-        if (featureFlags.zisi_dynamic_import_function_handler) {
+        if (featureFlags.zisi_dynamic_import_function_handler_entry_point) {
             return [
                 `import * as bootstrap from './${BOOTSTRAP_FILE_NAME}'`,
                 `export const handler = bootstrap.getLambdaHandler('${importPath}')`,
@@ -40,10 +40,6 @@ const getEntryFileContents = (mainPath, moduleFormat, featureFlags, runtimeAPIVe
             `export const handler = bootstrap.getLambdaHandler(funcModule)`,
         ].join(';');
     }
-    if (featureFlags.zisi_unique_entry_file) {
-        // we use dynamic import because we do not know if the user code is cjs or esm
-        return [`const { handler } = await import('${importPath}')`, 'export { handler }'].join(';');
-    }
     if (moduleFormat === MODULE_FORMAT.COMMONJS) {
         return `module.exports = require('${importPath}')`;
     }
@@ -56,13 +52,13 @@ const POSSIBLE_LAMBDA_ENTRY_EXTENSIONS = [
     MODULE_FILE_EXTENSION.CJS,
 ];
 // checks if the file is considered a entry-file in AWS Lambda
-export const isNamedLikeEntryFile = (file, { basePath, featureFlags, filename, runtimeAPIVersion, }) => POSSIBLE_LAMBDA_ENTRY_EXTENSIONS.some((extension) => {
-    const entryFilename = getEntryFileName({ extension, featureFlags, filename, runtimeAPIVersion });
+export const isNamedLikeEntryFile = (file, { basePath, filename, runtimeAPIVersion, }) => POSSIBLE_LAMBDA_ENTRY_EXTENSIONS.some((extension) => {
+    const entryFilename = getEntryFileName({ extension, filename, runtimeAPIVersion });
     const entryFilePath = resolve(basePath, entryFilename);
     return entryFilePath === file;
 });
 // Check if any src file (except the mainFile) is considered an entry file for AWS Lambda
-export const conflictsWithEntryFile = (srcFiles, { basePath, extension, featureFlags, filename, mainFile, runtimeAPIVersion, }) => {
+export const conflictsWithEntryFile = (srcFiles, { basePath, extension, filename, mainFile, runtimeAPIVersion, }) => {
     let hasConflict = false;
     srcFiles.forEach((srcFile) => {
         if (srcFile.includes(ENTRY_FILE_NAME)) {
@@ -73,11 +69,11 @@ export const conflictsWithEntryFile = (srcFiles, { basePath, extension, featureF
         }
         // If we're generating a unique entry file, we know we don't have a conflict
         // at this point.
-        if (featureFlags.zisi_unique_entry_file || runtimeAPIVersion === 2) {
+        if (runtimeAPIVersion === 2) {
             return;
         }
         if (!hasConflict &&
-            isNamedLikeEntryFile(srcFile, { basePath, featureFlags, filename, runtimeAPIVersion }) &&
+            isNamedLikeEntryFile(srcFile, { basePath, filename, runtimeAPIVersion }) &&
             srcFile !== mainFile) {
             hasConflict = true;
         }
@@ -87,8 +83,8 @@ export const conflictsWithEntryFile = (srcFiles, { basePath, extension, featureF
 // Returns the name for the AWS Lambda entry file
 // We do set the handler in AWS Lambda to `<func-name>.handler` and because of
 // this it considers `<func-name>.(c|m)?js` as possible entry-points
-const getEntryFileName = ({ extension, featureFlags, filename, runtimeAPIVersion, }) => {
-    if (featureFlags.zisi_unique_entry_file || runtimeAPIVersion === 2) {
+const getEntryFileName = ({ extension, filename, runtimeAPIVersion, }) => {
+    if (runtimeAPIVersion === 2) {
         return `${ENTRY_FILE_NAME}.mjs`;
     }
     return `${basename(filename, extname(filename))}${extension}`;
@@ -127,7 +123,7 @@ ${readFileSync(filePath, 'utf8')}
 export const getEntryFile = ({ commonPrefix, featureFlags, filename, mainFile, moduleFormat, userNamespace, runtimeAPIVersion, }) => {
     const mainPath = normalizeFilePath({ commonPrefix, path: mainFile, userNamespace });
     const extension = getFileExtensionForFormat(moduleFormat, featureFlags, runtimeAPIVersion);
-    const entryFilename = getEntryFileName({ extension, featureFlags, filename, runtimeAPIVersion });
+    const entryFilename = getEntryFileName({ extension, filename, runtimeAPIVersion });
     const contents = getEntryFileContents(mainPath, moduleFormat, featureFlags, runtimeAPIVersion);
     return {
         contents,

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

@@ -32,7 +32,6 @@ const createDirectory = async function ({ aliases = new Map(), basePath, cache,
     const hasEntryFileConflict = conflictsWithEntryFile(srcFiles, {
         basePath,
         extension,
-        featureFlags,
         filename,
         mainFile,
         runtimeAPIVersion,
@@ -109,17 +108,15 @@ const createZipArchive = async function ({ aliases = new Map(), basePath, branch
     const hasEntryFileConflict = conflictsWithEntryFile(srcFiles, {
         basePath,
         extension,
-        featureFlags,
         filename,
         mainFile,
         runtimeAPIVersion,
     });
     // We don't need an entry file if it would end up with the same path as the
     // function's main file. Unless we have a file conflict and need to move everything into a subfolder
-    const needsEntryFile = featureFlags.zisi_unique_entry_file ||
-        runtimeAPIVersion === 2 ||
+    const needsEntryFile = runtimeAPIVersion === 2 ||
         hasEntryFileConflict ||
-        !isNamedLikeEntryFile(mainFile, { basePath, featureFlags, filename, runtimeAPIVersion });
+        !isNamedLikeEntryFile(mainFile, { basePath, filename, runtimeAPIVersion });
     // 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 : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "12.0.2",
+  "version": "12.1.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -45,7 +45,7 @@
     "@babel/types": "7.27.1",
     "@netlify/binary-info": "^1.0.0",
     "@netlify/serverless-functions-api": "^1.41.2",
-    "@vercel/nft": "0.27.7",
+    "@vercel/nft": "0.29.3",
     "archiver": "^7.0.0",
     "common-path-prefix": "^3.0.0",
     "copy-file": "^11.0.0",
@@ -53,7 +53,7 @@
     "esbuild": "0.25.4",
     "execa": "^8.0.0",
     "fast-glob": "^3.3.2",
-    "filter-obj": "^5.0.0",
+    "filter-obj": "^6.0.0",
     "find-up": "^7.0.0",
     "glob": "^8.0.3",
     "is-builtin-module": "^3.1.0",
@@ -65,7 +65,7 @@
     "normalize-path": "^3.0.0",
     "p-map": "^7.0.0",
     "path-exists": "^5.0.0",
-    "precinct": "^11.0.0",
+    "precinct": "^12.0.0",
     "require-package-name": "^2.0.1",
     "resolve": "^2.0.0-next.1",
     "semver": "^7.3.8",
@@ -83,7 +83,7 @@
     "@types/node": "20.12.11",
     "@types/normalize-path": "3.0.2",
     "@types/resolve": "1.20.6",
-    "@types/semver": "7.5.8",
+    "@types/semver": "7.7.0",
     "@types/unixify": "1.0.2",
     "@types/yargs": "17.0.33",
     "@vitest/coverage-v8": "0.34.6",
@@ -92,7 +92,7 @@
     "cpy": "11.1.0",
     "decompress": "4.2.1",
     "deepmerge": "^4.3.1",
-    "get-stream": "6.0.1",
+    "get-stream": "9.0.1",
     "is-ci": "4.1.0",
     "lambda-local": "2.2.0",
     "source-map-support": "0.5.21",
@@ -102,5 +102,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "992493d32e1d68d165c4ceb78f93abb52bf24150"
+  "gitHead": "8eb0a2d3736eb5b24304fac146ae57ca6ef48a79"
 }