@netlify/zip-it-and-ship-it 9.12.2 → 9.13.1

package/dist/main.js

@@ -5,6 +5,7 @@ import { findISCDeclarationsInPath } from './runtimes/node/in_source_config/inde
 import { RUNTIME } from './runtimes/runtime.js';
 import { RuntimeCache } from './utils/cache.js';
 import { listFunctionsDirectories, resolveFunctionsDirectories } from './utils/fs.js';
+import { getLogger } from './utils/logger.js';
 export { zipFunction, zipFunctions } from './zip.js';
 export { ARCHIVE_FORMAT } from './archive.js';
 export { NODE_BUNDLER } from './runtimes/node/bundlers/types.js';
@@ -16,7 +17,11 @@ const augmentWithISC = async (func, featureFlags) => {
     if (func.runtime.name !== RUNTIME.JAVASCRIPT) {
         return func;
     }
-    const inSourceConfig = await findISCDeclarationsInPath(func.mainFile, func.name, featureFlags);
+    const inSourceConfig = await findISCDeclarationsInPath(func.mainFile, {
+        functionName: func.name,
+        featureFlags,
+        logger: getLogger(),
+    });
     return { ...func, inSourceConfig };
 };
 // List all Netlify Functions main entry files for a specific directory

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

@@ -1,16 +1,23 @@
 import type { ArgumentPlaceholder, Expression, SpreadElement, JSXNamespacedName } from '@babel/types';
 import type { FeatureFlags } from '../../../feature_flags.js';
 import { InvocationMode } from '../../../function.js';
+import { Logger } from '../../../utils/logger.js';
 export declare const IN_SOURCE_CONFIG_MODULE = "@netlify/functions";
 export type ISCValues = {
     invocationMode?: InvocationMode;
     runtimeAPIVersion?: number;
     schedule?: string;
 };
-export declare const findISCDeclarationsInPath: (sourcePath: string, functionName: string, featureFlags: FeatureFlags) => Promise<ISCValues>;
-export declare const findISCDeclarations: (source: string, functionName: string, featureFlags: FeatureFlags) => ISCValues;
+interface FindISCDeclarationsOptions {
+    functionName: string;
+    featureFlags: FeatureFlags;
+    logger: Logger;
+}
+export declare const findISCDeclarationsInPath: (sourcePath: string, { functionName, featureFlags, logger }: FindISCDeclarationsOptions) => Promise<ISCValues>;
+export declare const findISCDeclarations: (source: string, { functionName, featureFlags, logger }: FindISCDeclarationsOptions) => ISCValues;
 export type ISCHandlerArg = ArgumentPlaceholder | Expression | SpreadElement | JSXNamespacedName;
 export interface ISCExport {
     local: string;
     args: ISCHandlerArg[];
 }
+export {};

package/dist/runtimes/node/in_source_config/index.js

@@ -19,14 +19,14 @@ const validateScheduleFunction = (functionFound, scheduleFound, functionName) =>
 // Parses a JS/TS file and looks for in-source config declarations. It returns
 // an array of all declarations found, with `property` indicating the name of
 // the property and `data` its value.
-export const findISCDeclarationsInPath = async (sourcePath, functionName, featureFlags) => {
+export const findISCDeclarationsInPath = async (sourcePath, { functionName, featureFlags, logger }) => {
     const source = await safelyReadSource(sourcePath);
     if (source === null) {
         return {};
     }
-    return findISCDeclarations(source, functionName, featureFlags);
+    return findISCDeclarations(source, { functionName, featureFlags, logger });
 };
-export const findISCDeclarations = (source, functionName, featureFlags) => {
+export const findISCDeclarations = (source, { functionName, featureFlags, logger }) => {
     const ast = safelyParseSource(source);
     if (ast === null) {
         return {};
@@ -42,6 +42,7 @@ export const findISCDeclarations = (source, functionName, featureFlags) => {
         const config = {
             runtimeAPIVersion: 2,
         };
+        logger.system('detected v2 function');
         if (typeof configExport.schedule === 'string') {
             config.schedule = configExport.schedule;
         }

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, logger, mainFile, name, repositoryRoot, runtime, srcDir, srcPath, stat, isInternal, }) {
+const zipFunction = async function ({ archiveFormat, basePath, cache, config = {}, destFolder, extension, featureFlags, filename, isInternal, logger, mainFile, name, repositoryRoot, runtime, srcDir, srcPath, stat, }) {
     // 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') {
@@ -33,7 +33,7 @@ const zipFunction = async function ({ archiveFormat, basePath, cache, config = {
         await copyFile(srcPath, destPath);
         return { config, path: destPath, entryFilename: '' };
     }
-    const inSourceConfig = await findISCDeclarationsInPath(mainFile, name, featureFlags);
+    const inSourceConfig = await findISCDeclarationsInPath(mainFile, { functionName: name, featureFlags, logger });
     const runtimeAPIVersion = inSourceConfig.runtimeAPIVersion === 2 ? 2 : 1;
     const pluginsModulesPath = await getPluginsModulesPath(srcDir);
     const bundlerName = await getBundlerName({

package/dist/runtimes/runtime.d.ts

@@ -54,10 +54,10 @@ export type ZipFunction = (args: {
     config: FunctionConfig;
     destFolder: string;
     featureFlags: FeatureFlags;
-    logger: Logger;
-    repositoryRoot?: string;
     generator?: string;
     isInternal: boolean;
+    logger: Logger;
+    repositoryRoot?: string;
 } & FunctionSource) => Promise<ZipFunctionResult>;
 export interface Runtime {
     findFunctionsInPaths: FindFunctionsInPathsFunction;

package/dist/zip.js

@@ -52,6 +52,7 @@ export const zipFunctions = async function (relativeSrcFolders, destFolder, { ar
             extension: func.extension,
             featureFlags: functionFlags,
             filename: func.filename,
+            isInternal: Boolean(internalFunctionsPath && isPathInside(func.srcPath, internalFunctionsPath)),
             logger,
             mainFile: func.mainFile,
             name: func.name,
@@ -60,7 +61,6 @@ export const zipFunctions = async function (relativeSrcFolders, destFolder, { ar
             srcDir: func.srcDir,
             srcPath: func.srcPath,
             stat: func.stat,
-            isInternal: Boolean(internalFunctionsPath && isPathInside(func.srcPath, internalFunctionsPath)),
         });
         return { ...zipResult, mainFile: func.mainFile, name: func.name, runtime: func.runtime };
     }, {
@@ -103,6 +103,7 @@ export const zipFunction = async function (relativeSrcPath, destFolder, { archiv
         extension,
         featureFlags: functionFlags,
         filename,
+        isInternal: Boolean(internalFunctionsPath && isPathInside(srcPath, internalFunctionsPath)),
         logger,
         mainFile,
         name,
@@ -111,7 +112,6 @@ export const zipFunction = async function (relativeSrcPath, destFolder, { archiv
         srcDir,
         srcPath,
         stat: stats,
-        isInternal: Boolean(internalFunctionsPath && isPathInside(srcPath, internalFunctionsPath)),
     });
     return formatZipResult({ ...zipResult, mainFile, name, runtime });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.12.2",
+  "version": "9.13.1",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -57,8 +57,8 @@
     "@babel/parser": "^7.22.5",
     "@netlify/binary-info": "^1.0.0",
     "@netlify/esbuild": "0.14.39",
-    "@netlify/serverless-functions-api": "^1.5.1",
-    "@vercel/nft": "^0.22.0",
+    "@netlify/serverless-functions-api": "^1.5.2",
+    "@vercel/nft": "^0.23.0",
     "archiver": "^5.3.0",
     "common-path-prefix": "^3.0.0",
     "cp-file": "^10.0.0",
@@ -99,7 +99,7 @@
     "@types/tmp": "0.2.3",
     "@types/unixify": "1.0.0",
     "@types/yargs": "17.0.24",
-    "@vitest/coverage-v8": "0.32.2",
+    "@vitest/coverage-v8": "0.33.0",
     "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.6",
-    "vitest": "0.32.2"
+    "vitest": "0.33.0"
   },
   "engines": {
     "node": "^14.18.0 || >=16.0.0"