@netlify/zip-it-and-ship-it 9.35.0 → 9.35.1

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

@@ -115,7 +115,43 @@ export declare const parseFile: (sourcePath: string, { functionName }: FindISCDe
  * other metadata.
  */
 export declare const parseSource: (source: string, { functionName }: FindISCDeclarationsOptions) => StaticAnalysisResult;
-export declare const augmentFunctionConfig: (tomlConfig: FunctionConfig, inSourceConfig?: InSourceConfig) => FunctionConfig & InSourceConfig;
+export declare const augmentFunctionConfig: (mainFile: string, tomlConfig: FunctionConfig, inSourceConfig?: InSourceConfig) => {
+    name?: string | undefined;
+    externalNodeModules?: string[] | undefined;
+    generator?: string | undefined;
+    includedFiles?: string[] | undefined;
+    includedFilesBasePath?: string | undefined;
+    ignoredNodeModules?: string[] | undefined;
+    nodeBundler?: "none" | "esbuild" | "esbuild_zisi" | "nft" | "zisi" | undefined;
+    nodeSourcemap?: boolean | undefined;
+    nodeVersion?: string | undefined;
+    rustTargetDirectory?: string | undefined;
+    schedule?: string | undefined;
+    timeout?: number | undefined;
+    zipGo?: boolean | undefined;
+    nodeModuleFormat?: "cjs" | "esm" | undefined;
+} & {
+    name?: string | undefined;
+    path?: any[] | undefined;
+    externalNodeModules?: string[] | undefined;
+    generator?: string | undefined;
+    includedFiles?: string[] | undefined;
+    ignoredNodeModules?: string[] | undefined;
+    nodeBundler?: "none" | "esbuild" | "esbuild_zisi" | "nft" | "zisi" | undefined;
+    nodeVersion?: string | undefined;
+    schedule?: string | undefined;
+    timeout?: number | undefined;
+    preferStatic?: boolean | undefined;
+    method?: any[] | undefined;
+    rateLimit?: {
+        windowLimit: number;
+        windowSize: number;
+        to?: string | undefined;
+        action?: "rate_limit" | "rewrite" | undefined;
+        aggregateBy?: "domain" | "ip" | ("domain" | "ip")[] | undefined;
+        algorithm?: "sliding_window" | undefined;
+    } | undefined;
+};
 export type ISCHandlerArg = ArgumentPlaceholder | Expression | SpreadElement | JSXNamespacedName;
 export type ISCExportWithCallExpression = {
     type: 'call-expression';

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

@@ -1,3 +1,4 @@
+import { dirname } from 'path';
 import mergeOptions from 'merge-options';
 import { z } from 'zod';
 import { functionConfig } from '../../../config.js';
@@ -149,6 +150,18 @@ export const parseSource = (source, { functionName }) => {
     }
     return result;
 };
-export const augmentFunctionConfig = (tomlConfig, inSourceConfig = {}) => {
-    return mergeOptions.call({ concatArrays: true }, tomlConfig, inSourceConfig);
+export const augmentFunctionConfig = (mainFile, tomlConfig, inSourceConfig = {}) => {
+    const mergedConfig = mergeOptions.call({ concatArrays: true }, tomlConfig, inSourceConfig);
+    // We can't simply merge included files from the TOML and from in-source
+    // configuration because their globs are relative to different base paths.
+    // In the future, we could shift things around so we resolve each glob
+    // relative to the right base, but for now we say that included files in
+    // the source override any files defined in the TOML. It doesn't make a lot
+    // of sense to be defining include files for a framework-generated function
+    // in the TOML anyway.
+    if (inSourceConfig?.includedFiles && inSourceConfig.includedFiles.length !== 0) {
+        mergedConfig.includedFiles = inSourceConfig.includedFiles;
+        mergedConfig.includedFilesBasePath = dirname(mainFile);
+    }
+    return mergedConfig;
 };

package/dist/runtimes/node/index.js

@@ -38,7 +38,7 @@ const zipFunction = async function ({ archiveFormat, basePath, cache, config = {
     }
     const staticAnalysisResult = await parseFile(mainFile, { functionName: name });
     const runtimeAPIVersion = staticAnalysisResult.runtimeAPIVersion === 2 ? 2 : 1;
-    const mergedConfig = augmentFunctionConfig(config, staticAnalysisResult.config);
+    const mergedConfig = augmentFunctionConfig(mainFile, config, staticAnalysisResult.config);
     const pluginsModulesPath = await getPluginsModulesPath(srcDir);
     const bundlerName = await getBundlerName({
         config: mergedConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "9.35.0",
+  "version": "9.35.1",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -105,5 +105,5 @@
   "engines": {
     "node": "^14.18.0 || >=16.0.0"
   },
-  "gitHead": "69cdd54c620f9c522748b70e8e9d51f0af5e9599"
+  "gitHead": "e4464a74add778cb61ff06702ef3a43367a930c3"
 }