@netlify/zip-it-and-ship-it 16.4.0 → 16.5.0

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

@@ -94,6 +94,7 @@ export declare const inSourceConfig: z.ZodObject<{
 export type InSourceConfig = z.infer<typeof inSourceConfig>;
 export declare const serverConfig: z.ZodObject<{
     excludedPath: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>, z.ZodTransform<string[], string | string[]>>>;
+    includedFiles: z.ZodOptional<z.ZodArray<z.ZodString>>;
     path: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>, z.ZodTransform<string[], string | string[]>>>;
     region: z.ZodOptional<z.ZodPreprocess<z.ZodEnum<{
         cmh: "cmh";
@@ -106,21 +107,6 @@ export declare const serverConfig: z.ZodObject<{
     }>>>;
 }, z.core.$strict>;
 export type ServerConfig = z.infer<typeof serverConfig>;
-export declare const serverInSourceConfig: z.ZodObject<{
-    excludedPath: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>, z.ZodTransform<string[], string | string[]>>>;
-    path: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>, z.ZodTransform<string[], string | string[]>>>;
-    region: z.ZodOptional<z.ZodPreprocess<z.ZodEnum<{
-        cmh: "cmh";
-        fra: "fra";
-    }>>>;
-    size: z.ZodOptional<z.ZodPreprocess<z.ZodEnum<{
-        small: "small";
-        medium: "medium";
-        large: "large";
-    }>>>;
-    includedFiles: z.ZodOptional<z.ZodArray<z.ZodString>>;
-}, z.core.$strict>;
-export type ServerInSourceConfig = z.infer<typeof serverInSourceConfig>;
 /**
  * Loads a file at a given path, parses it into an AST, and returns a series of
  * data points, such as in-source configuration properties and other metadata.

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

@@ -59,16 +59,12 @@ export const inSourceConfig = functionConfigShape
 export const serverConfig = z
     .object({
     excludedPath: paths,
+    includedFiles: z.array(z.string()).optional(),
     path: paths,
     region: serverRegion.optional(),
     size: serverSize.optional(),
 })
     .strict();
-export const serverInSourceConfig = serverConfig
-    .extend({
-    includedFiles: z.array(z.string()).optional(),
-})
-    .strict();
 /**
  * Resolves the default export expression to an ObjectExpression if possible,
  * following identifier bindings when needed.
@@ -184,7 +180,7 @@ const getWrappedConfigExport = (nodes, getAllBindings) => {
     }
 };
 const parseServerConfig = (config, functionName) => {
-    const { data, error, success } = serverInSourceConfig.safeParse(config);
+    const { data, error, success } = serverConfig.safeParse(config);
     if (success) {
         return data;
     }

package/dist/server.d.ts

@@ -14,6 +14,7 @@ export declare const findServerEntry: (directory: string) => Promise<string | un
  */
 export interface NetlifyServerConfig {
     excludedPath?: string | string[];
+    includedFiles?: string[];
     path?: string | string[];
     region?: string;
     size?: string;

package/dist/server.js

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs';
 import { extname, join, resolve } from 'path';
 import { ARCHIVE_FORMAT } from './archive.js';
 import { getFunctionFromPath } from './runtimes/index.js';
-import { parseFile, serverConfig, } from './runtimes/node/in_source_config/index.js';
+import { parseFile, serverConfig } from './runtimes/node/in_source_config/index.js';
 import { RUNTIME } from './runtimes/runtime.js';
 import { FunctionBundlingUserError } from './utils/error.js';
 import { formatZipResult } from './utils/format_result.js';
@@ -88,11 +88,19 @@ export const bundleServer = async (server, destFolder, { basePath, cache, featur
     const fromNetlifyConfig = parseNetlifyServerConfig(server.config);
     const srcPath = resolve(server.path);
     const source = await readServerSource(srcPath, { cache, featureFlags });
+    if (fromNetlifyConfig.includedFiles !== undefined && basePath === undefined) {
+        throw new Error('Netlify Server includedFiles from the [server] block need a basePath to resolve from');
+    }
+    // Included files from the [server] block resolve from the base path.
+    // In-source ones resolve from the entry file and replace them.
+    const functionConfig = fromNetlifyConfig.includedFiles === undefined
+        ? source.config
+        : { ...source.config, includedFiles: fromNetlifyConfig.includedFiles, includedFilesBasePath: basePath };
     const zipResult = await source.runtime.zipFunction({
         archiveFormat: ARCHIVE_FORMAT.ZIP,
         basePath,
         cache,
-        config: source.config,
+        config: functionConfig,
         destFolder,
         extension: source.extension,
         featureFlags,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/zip-it-and-ship-it",
-  "version": "16.4.0",
+  "version": "16.5.0",
   "description": "Zip it and ship it",
   "main": "./dist/main.js",
   "type": "module",
@@ -77,7 +77,7 @@
   },
   "devDependencies": {
     "@netlify/types": "3.1.0",
-    "@opentelemetry/sdk-trace-base": "~2.8.0",
+    "@opentelemetry/sdk-trace-base": "~2.12.0",
     "@types/archiver": "8.0.0",
     "@types/node": "^22.12.0",
     "@types/normalize-path": "3.0.2",
@@ -99,5 +99,5 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "gitHead": "19447a3826a8d26af1bcdc704754e8a8586597f1"
+  "gitHead": "d21ff03cab97f189702f9900e48eb988cdd104cc"
 }