@netlify/dev 3.0.0 → 4.0.1

package/dist/main.cjs

@@ -38,7 +38,8 @@ var import_node_path2 = __toESM(require("path"), 1);
 var import_node_process2 = __toESM(require("process"), 1);
 var import_config = require("@netlify/config");
 var import_dev_utils = require("@netlify/dev-utils");
-var import_dev = require("@netlify/functions/dev");
+var import_dev = require("@netlify/edge-functions/dev");
+var import_dev2 = require("@netlify/functions/dev");
 var import_headers = require("@netlify/headers");
 var import_redirects = require("@netlify/redirects");
 var import_static = require("@netlify/static");
@@ -54,7 +55,7 @@ var injectEnvVariables = async ({
 }) => {
   const results = {};
   let variables = baseVariables;
-  if (netlifyAPI && accountSlug) {
+  if (netlifyAPI && siteID && accountSlug) {
     variables = await getEnvelopeEnv({
       accountId: accountSlug,
       api: netlifyAPI,
@@ -70,7 +71,8 @@ var injectEnvVariables = async ({
       isInternal,
       originalValue: envAPI.get(key),
       overriddenSources,
-      usedSource
+      usedSource,
+      value: variable.value
     };
     if (!existsInProcess || isInternal) {
       envAPI.set(key, variable.value);
@@ -195,6 +197,10 @@ var isFile = async (path3) => {
   return false;
 };
 
+// src/lib/request_id.ts
+var import_ulid = require("ulid");
+var generateRequestID = () => (0, import_ulid.ulid)();
+
 // src/lib/runtime.ts
 var import_node_path = __toESM(require("path"), 1);
 var import_node_process = __toESM(require("process"), 1);
@@ -261,93 +267,98 @@ var NetlifyDev = class {
   #apiHost;
   #apiScheme;
   #apiToken;
+  #cleanupJobs;
+  #edgeFunctionsHandler;
+  #functionsHandler;
+  #functionsServePath;
   #config;
   #features;
+  #headersHandler;
   #logger;
   #projectRoot;
-  #runtime;
+  #redirectsHandler;
+  #server;
   #siteID;
+  #staticHandler;
+  #staticHandlerAdditionalDirectories;
   constructor(options) {
     if (options.apiURL) {
       const apiURL = new URL(options.apiURL);
       this.#apiHost = apiURL.host;
       this.#apiScheme = apiURL.protocol.slice(0, -1);
     }
+    const projectRoot = options.projectRoot ?? import_node_process2.default.cwd();
     this.#apiToken = options.apiToken;
+    this.#cleanupJobs = [];
     this.#features = {
       blobs: options.blobs?.enabled !== false,
+      edgeFunctions: options.edgeFunctions?.enabled !== false,
       environmentVariables: options.environmentVariables?.enabled !== false,
       functions: options.functions?.enabled !== false,
       headers: options.headers?.enabled !== false,
       redirects: options.redirects?.enabled !== false,
       static: options.staticFiles?.enabled !== false
     };
+    this.#functionsServePath = import_node_path2.default.join(projectRoot, ".netlify", "functions-serve");
     this.#logger = options.logger ?? globalThis.console;
-    this.#projectRoot = options.projectRoot ?? import_node_process2.default.cwd();
+    this.#server = options.serverAddress;
+    this.#projectRoot = projectRoot;
+    this.#staticHandlerAdditionalDirectories = options.staticFiles?.directories ?? [];
   }
-  async handleInEphemeralDirectory(request, destPath) {
-    const userFunctionsPath = this.#config?.config.functionsDirectory ?? import_node_path2.default.join(this.#projectRoot, "netlify/functions");
-    const userFunctionsPathExists = await isDirectory(userFunctionsPath);
-    const functions = this.#features.functions ? new import_dev.FunctionsHandler({
-      config: this.#config,
-      destPath,
-      projectRoot: this.#projectRoot,
-      settings: {},
-      siteId: this.#siteID,
-      timeouts: {},
-      userFunctionsPath: userFunctionsPathExists ? userFunctionsPath : void 0
-    }) : null;
-    const headers = this.#features.headers ? new import_headers.HeadersHandler({
-      configPath: this.#config?.configPath,
-      configHeaders: this.#config?.config.headers,
-      projectDir: this.#projectRoot,
-      publishDir: this.#config?.config.build.publish ?? void 0,
-      logger: this.#logger
-    }) : { handle: async (_request, response) => response };
-    const redirects = this.#features.redirects ? new import_redirects.RedirectsHandler({
-      configPath: this.#config?.configPath,
-      configRedirects: this.#config?.config.redirects,
-      jwtRoleClaim: "",
-      jwtSecret: "",
-      notFoundHandler,
-      projectDir: this.#projectRoot
-    }) : null;
-    const staticFiles = this.#features.static ? new import_static.StaticHandler({
-      directory: this.#config?.config.build.publish ?? this.#projectRoot
-    }) : null;
-    const functionMatch = await functions?.match(request);
+  async handleInEphemeralDirectory(request, destPath, options = {}) {
+    const edgeFunctionResponse = await this.#edgeFunctionsHandler?.handle(request.clone());
+    if (edgeFunctionResponse) {
+      return { response: edgeFunctionResponse, type: "edge-function" };
+    }
+    const functionMatch = await this.#functionsHandler?.match(request, destPath);
     if (functionMatch) {
       if (functionMatch.preferStatic) {
-        const staticMatch2 = await staticFiles?.match(request);
+        const staticMatch2 = await this.#staticHandler?.match(request);
         if (staticMatch2) {
           const response = await staticMatch2.handle();
-          return headers.handle(request, response);
+          await this.#headersHandler?.apply(request, response, options.headersCollector);
+          return { response, type: "static" };
         }
       }
-      return functionMatch.handle(request);
+      return { response: await functionMatch.handle(request), type: "function" };
     }
-    const redirectMatch = await redirects?.match(request);
+    const redirectMatch = await this.#redirectsHandler?.match(request);
     if (redirectMatch) {
-      const functionMatch2 = await functions?.match(new Request(redirectMatch.target));
+      const functionMatch2 = await this.#functionsHandler?.match(new Request(redirectMatch.target), destPath);
       if (functionMatch2 && !functionMatch2.preferStatic) {
-        return functionMatch2.handle(request);
+        return { response: await functionMatch2.handle(request), type: "function" };
       }
-      const response = await redirects?.handle(request, redirectMatch, async (maybeStaticFile) => {
-        const staticMatch2 = await staticFiles?.match(maybeStaticFile);
-        if (!staticMatch2) return;
-        return async () => {
-          const response2 = await staticMatch2.handle();
-          return headers.handle(new Request(redirectMatch.target), response2);
-        };
-      });
+      const response = await this.#redirectsHandler?.handle(
+        request,
+        redirectMatch,
+        async (maybeStaticFile) => {
+          const staticMatch2 = await this.#staticHandler?.match(maybeStaticFile);
+          if (!staticMatch2) {
+            return;
+          }
+          return async () => {
+            const response2 = await staticMatch2.handle();
+            await this.#headersHandler?.apply(new Request(redirectMatch.target), response2, options.headersCollector);
+            return response2;
+          };
+        }
+      );
       if (response) {
-        return response;
+        return { response, type: "redirect" };
       }
     }
-    const staticMatch = await staticFiles?.match(request);
+    const { pathname } = new URL(request.url);
+    if (pathname.startsWith("/.netlify/images")) {
+      this.#logger.error(
+        "The Netlify Image CDN is currently only supported in the Netlify CLI. Run `npx netlify dev` to get started."
+      );
+      return;
+    }
+    const staticMatch = await this.#staticHandler?.match(request);
     if (staticMatch) {
       const response = await staticMatch.handle();
-      return headers.handle(request, response);
+      await this.#headersHandler?.apply(request, response, options.headersCollector);
+      return { response, type: "static" };
     }
   }
   async getConfig() {
@@ -367,12 +378,17 @@ var NetlifyDev = class {
     });
     return config;
   }
-  async handle(request) {
-    const servePath = import_node_path2.default.join(this.#projectRoot, ".netlify", "functions-serve");
-    await import_node_fs2.promises.mkdir(servePath, { recursive: true });
-    const destPath = await import_node_fs2.promises.mkdtemp(import_node_path2.default.join(servePath, "_"));
+  async handle(request, options = {}) {
+    const result = await this.handleAndIntrospect(request, options);
+    return result?.response;
+  }
+  async handleAndIntrospect(request, options = {}) {
+    const requestID = generateRequestID();
+    request.headers.set("x-nf-request-id", requestID);
+    await import_node_fs2.promises.mkdir(this.#functionsServePath, { recursive: true });
+    const destPath = await import_node_fs2.promises.mkdtemp(import_node_path2.default.join(this.#functionsServePath, `${requestID}_`));
     try {
-      return await this.handleInEphemeralDirectory(request, destPath);
+      return await this.handleInEphemeralDirectory(request, destPath, options);
     } finally {
       try {
         await import_node_fs2.promises.rm(destPath, { force: true, recursive: true });
@@ -397,9 +413,21 @@ var NetlifyDev = class {
       projectRoot: this.#projectRoot,
       siteID: siteID ?? "0"
     });
-    this.#runtime = runtime;
-    if (this.#features.environmentVariables && siteID) {
-      await injectEnvVariables({
+    this.#cleanupJobs.push(() => runtime.stop());
+    let serverAddress;
+    if (typeof this.#server === "string") {
+      serverAddress = this.#server;
+    } else if (this.#features.edgeFunctions) {
+      const passthroughServer = new import_dev_utils.HTTPServer(async (req) => {
+        const res = await this.handle(req);
+        return res ?? new Response(null, { status: 404 });
+      });
+      this.#cleanupJobs.push(() => passthroughServer.stop());
+      serverAddress = await passthroughServer.start();
+    }
+    let envVariables = {};
+    if (this.#features.environmentVariables) {
+      envVariables = await injectEnvVariables({
         accountSlug: config?.siteInfo?.account_slug,
         baseVariables: config?.env || {},
         envAPI: runtime.env,
@@ -407,9 +435,74 @@ var NetlifyDev = class {
         siteID
       });
     }
+    if (this.#features.edgeFunctions && serverAddress !== void 0) {
+      const env = Object.entries(envVariables).reduce((acc, [key, variable]) => {
+        if (variable.usedSource === "account" || variable.usedSource === "addons" || variable.usedSource === "internal" || variable.usedSource === "ui" || variable.usedSource.startsWith(".env")) {
+          return {
+            ...acc,
+            [key]: variable.value
+          };
+        }
+        return acc;
+      }, {});
+      this.#edgeFunctionsHandler = new import_dev.EdgeFunctionsHandler({
+        configDeclarations: this.#config?.config.edge_functions ?? [],
+        directories: [this.#config?.config.build.edge_functions].filter(Boolean),
+        env,
+        geolocation: import_dev_utils.mockLocation,
+        logger: this.#logger,
+        originServerAddress: serverAddress,
+        siteID,
+        siteName: config?.siteInfo.name
+      });
+    }
+    if (this.#features.functions) {
+      const userFunctionsPath = this.#config?.config.functionsDirectory ?? import_node_path2.default.join(this.#projectRoot, "netlify/functions");
+      const userFunctionsPathExists = await isDirectory(userFunctionsPath);
+      this.#functionsHandler = new import_dev2.FunctionsHandler({
+        config: this.#config,
+        destPath: this.#functionsServePath,
+        geolocation: import_dev_utils.mockLocation,
+        projectRoot: this.#projectRoot,
+        settings: {},
+        siteId: this.#siteID,
+        timeouts: {},
+        userFunctionsPath: userFunctionsPathExists ? userFunctionsPath : void 0
+      });
+    }
+    if (this.#features.headers) {
+      this.#headersHandler = new import_headers.HeadersHandler({
+        configPath: this.#config?.configPath,
+        configHeaders: this.#config?.config.headers,
+        projectDir: this.#projectRoot,
+        publishDir: this.#config?.config.build.publish ?? void 0,
+        logger: this.#logger
+      });
+    }
+    if (this.#features.redirects) {
+      this.#redirectsHandler = new import_redirects.RedirectsHandler({
+        configPath: this.#config?.configPath,
+        configRedirects: this.#config?.config.redirects,
+        jwtRoleClaim: "",
+        jwtSecret: "",
+        notFoundHandler,
+        projectDir: this.#projectRoot
+      });
+    }
+    if (this.#features.static) {
+      this.#staticHandler = new import_static.StaticHandler({
+        directory: [
+          this.#config?.config.build.publish ?? this.#projectRoot,
+          ...this.#staticHandlerAdditionalDirectories
+        ]
+      });
+    }
+    return {
+      serverAddress
+    };
   }
   async stop() {
-    await this.#runtime?.stop();
+    await Promise.allSettled(this.#cleanupJobs.map((task) => task()));
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/main.d.cts

@@ -1,4 +1,5 @@
 import { Logger } from '@netlify/dev-utils';
+import { HeadersCollector } from '@netlify/headers';
 
 interface Features {
     /**
@@ -7,7 +8,15 @@ interface Features {
      * {@link} https://docs.netlify.com/blobs/overview/
      */
     blobs?: {
-        enabled: boolean;
+        enabled?: boolean;
+    };
+    /**
+     * Configuration options for environment variables.
+     *
+     * {@link} https://docs.netlify.com/edge-functions/overview/
+     */
+    edgeFunctions?: {
+        enabled?: boolean;
     };
     /**
      * Configuration options for environment variables.
@@ -15,7 +24,7 @@ interface Features {
      * {@link} https://docs.netlify.com/environment-variables/overview/
      */
     environmentVariables?: {
-        enabled: boolean;
+        enabled?: boolean;
     };
     /**
      * Configuration options for Netlify Functions.
@@ -23,7 +32,7 @@ interface Features {
      * {@link} https://docs.netlify.com/functions/overview/
      */
     functions?: {
-        enabled: boolean;
+        enabled?: boolean;
     };
     /**
      * Configuration options for Netlify response headers.
@@ -31,7 +40,7 @@ interface Features {
      * {@link} https://docs.netlify.com/routing/headers/
      */
     headers?: {
-        enabled: boolean;
+        enabled?: boolean;
     };
     /**
      * Configuration options for Netlify redirects and rewrites.
@@ -39,13 +48,23 @@ interface Features {
      * {@link} https://docs.netlify.com/routing/redirects/
      */
     redirects?: {
-        enabled: boolean;
+        enabled?: boolean;
     };
+    /**
+     * If your local development setup has its own HTTP server (e.g. Vite), set
+     * its address here.
+     */
+    serverAddress?: string;
     /**
      * Configuration options for serving static files.
      */
     staticFiles?: {
-        enabled: boolean;
+        enabled?: boolean;
+        /**
+         * Additional list of directories where static files can be found. The
+         * `publish` directory configured on your site will be used automatically.
+         */
+        directories?: string[];
     };
 }
 interface NetlifyDevOptions extends Features {
@@ -54,15 +73,31 @@ interface NetlifyDevOptions extends Features {
     logger?: Logger;
     projectRoot?: string;
 }
+interface HandleOptions {
+    /**
+     * An optional callback that will be called with every header (key and value)
+     * coming from header rules.
+     *
+     * {@link} https://docs.netlify.com/routing/headers/
+     */
+    headersCollector?: HeadersCollector;
+}
+type ResponseType = 'edge-function' | 'function' | 'redirect' | 'static';
 declare class NetlifyDev {
     #private;
     constructor(options: NetlifyDevOptions);
     private handleInEphemeralDirectory;
     private getConfig;
-    handle(request: Request): Promise<Response | undefined>;
+    handle(request: Request, options?: HandleOptions): Promise<Response | undefined>;
+    handleAndIntrospect(request: Request, options?: HandleOptions): Promise<{
+        response: Response;
+        type: ResponseType;
+    } | undefined>;
     get siteIsLinked(): boolean;
-    start(): Promise<void>;
+    start(): Promise<{
+        serverAddress: string | undefined;
+    }>;
     stop(): Promise<void>;
 }
 
-export { type Features, NetlifyDev };
+export { type Features, NetlifyDev, type ResponseType };

package/dist/main.d.ts

@@ -1,4 +1,5 @@
 import { Logger } from '@netlify/dev-utils';
+import { HeadersCollector } from '@netlify/headers';
 
 interface Features {
     /**
@@ -7,7 +8,15 @@ interface Features {
      * {@link} https://docs.netlify.com/blobs/overview/
      */
     blobs?: {
-        enabled: boolean;
+        enabled?: boolean;
+    };
+    /**
+     * Configuration options for environment variables.
+     *
+     * {@link} https://docs.netlify.com/edge-functions/overview/
+     */
+    edgeFunctions?: {
+        enabled?: boolean;
     };
     /**
      * Configuration options for environment variables.
@@ -15,7 +24,7 @@ interface Features {
      * {@link} https://docs.netlify.com/environment-variables/overview/
      */
     environmentVariables?: {
-        enabled: boolean;
+        enabled?: boolean;
     };
     /**
      * Configuration options for Netlify Functions.
@@ -23,7 +32,7 @@ interface Features {
      * {@link} https://docs.netlify.com/functions/overview/
      */
     functions?: {
-        enabled: boolean;
+        enabled?: boolean;
     };
     /**
      * Configuration options for Netlify response headers.
@@ -31,7 +40,7 @@ interface Features {
      * {@link} https://docs.netlify.com/routing/headers/
      */
     headers?: {
-        enabled: boolean;
+        enabled?: boolean;
     };
     /**
      * Configuration options for Netlify redirects and rewrites.
@@ -39,13 +48,23 @@ interface Features {
      * {@link} https://docs.netlify.com/routing/redirects/
      */
     redirects?: {
-        enabled: boolean;
+        enabled?: boolean;
     };
+    /**
+     * If your local development setup has its own HTTP server (e.g. Vite), set
+     * its address here.
+     */
+    serverAddress?: string;
     /**
      * Configuration options for serving static files.
      */
     staticFiles?: {
-        enabled: boolean;
+        enabled?: boolean;
+        /**
+         * Additional list of directories where static files can be found. The
+         * `publish` directory configured on your site will be used automatically.
+         */
+        directories?: string[];
     };
 }
 interface NetlifyDevOptions extends Features {
@@ -54,15 +73,31 @@ interface NetlifyDevOptions extends Features {
     logger?: Logger;
     projectRoot?: string;
 }
+interface HandleOptions {
+    /**
+     * An optional callback that will be called with every header (key and value)
+     * coming from header rules.
+     *
+     * {@link} https://docs.netlify.com/routing/headers/
+     */
+    headersCollector?: HeadersCollector;
+}
+type ResponseType = 'edge-function' | 'function' | 'redirect' | 'static';
 declare class NetlifyDev {
     #private;
     constructor(options: NetlifyDevOptions);
     private handleInEphemeralDirectory;
     private getConfig;
-    handle(request: Request): Promise<Response | undefined>;
+    handle(request: Request, options?: HandleOptions): Promise<Response | undefined>;
+    handleAndIntrospect(request: Request, options?: HandleOptions): Promise<{
+        response: Response;
+        type: ResponseType;
+    } | undefined>;
     get siteIsLinked(): boolean;
-    start(): Promise<void>;
+    start(): Promise<{
+        serverAddress: string | undefined;
+    }>;
     stop(): Promise<void>;
 }
 
-export { type Features, NetlifyDev };
+export { type Features, NetlifyDev, type ResponseType };

package/dist/main.js

@@ -3,7 +3,8 @@ import { promises as fs2 } from "fs";
 import path2 from "path";
 import process2 from "process";
 import { resolveConfig } from "@netlify/config";
-import { ensureNetlifyIgnore, getAPIToken, LocalState } from "@netlify/dev-utils";
+import { ensureNetlifyIgnore, getAPIToken, mockLocation, LocalState, HTTPServer } from "@netlify/dev-utils";
+import { EdgeFunctionsHandler } from "@netlify/edge-functions/dev";
 import { FunctionsHandler } from "@netlify/functions/dev";
 import { HeadersHandler } from "@netlify/headers";
 import { RedirectsHandler } from "@netlify/redirects";
@@ -20,7 +21,7 @@ var injectEnvVariables = async ({
 }) => {
   const results = {};
   let variables = baseVariables;
-  if (netlifyAPI && accountSlug) {
+  if (netlifyAPI && siteID && accountSlug) {
     variables = await getEnvelopeEnv({
       accountId: accountSlug,
       api: netlifyAPI,
@@ -36,7 +37,8 @@ var injectEnvVariables = async ({
       isInternal,
       originalValue: envAPI.get(key),
       overriddenSources,
-      usedSource
+      usedSource,
+      value: variable.value
     };
     if (!existsInProcess || isInternal) {
       envAPI.set(key, variable.value);
@@ -161,6 +163,10 @@ var isFile = async (path3) => {
   return false;
 };
 
+// src/lib/request_id.ts
+import { ulid } from "ulid";
+var generateRequestID = () => ulid();
+
 // src/lib/runtime.ts
 import path from "path";
 import process from "process";
@@ -227,93 +233,98 @@ var NetlifyDev = class {
   #apiHost;
   #apiScheme;
   #apiToken;
+  #cleanupJobs;
+  #edgeFunctionsHandler;
+  #functionsHandler;
+  #functionsServePath;
   #config;
   #features;
+  #headersHandler;
   #logger;
   #projectRoot;
-  #runtime;
+  #redirectsHandler;
+  #server;
   #siteID;
+  #staticHandler;
+  #staticHandlerAdditionalDirectories;
   constructor(options) {
     if (options.apiURL) {
       const apiURL = new URL(options.apiURL);
       this.#apiHost = apiURL.host;
       this.#apiScheme = apiURL.protocol.slice(0, -1);
     }
+    const projectRoot = options.projectRoot ?? process2.cwd();
     this.#apiToken = options.apiToken;
+    this.#cleanupJobs = [];
     this.#features = {
       blobs: options.blobs?.enabled !== false,
+      edgeFunctions: options.edgeFunctions?.enabled !== false,
       environmentVariables: options.environmentVariables?.enabled !== false,
       functions: options.functions?.enabled !== false,
       headers: options.headers?.enabled !== false,
       redirects: options.redirects?.enabled !== false,
       static: options.staticFiles?.enabled !== false
     };
+    this.#functionsServePath = path2.join(projectRoot, ".netlify", "functions-serve");
     this.#logger = options.logger ?? globalThis.console;
-    this.#projectRoot = options.projectRoot ?? process2.cwd();
+    this.#server = options.serverAddress;
+    this.#projectRoot = projectRoot;
+    this.#staticHandlerAdditionalDirectories = options.staticFiles?.directories ?? [];
   }
-  async handleInEphemeralDirectory(request, destPath) {
-    const userFunctionsPath = this.#config?.config.functionsDirectory ?? path2.join(this.#projectRoot, "netlify/functions");
-    const userFunctionsPathExists = await isDirectory(userFunctionsPath);
-    const functions = this.#features.functions ? new FunctionsHandler({
-      config: this.#config,
-      destPath,
-      projectRoot: this.#projectRoot,
-      settings: {},
-      siteId: this.#siteID,
-      timeouts: {},
-      userFunctionsPath: userFunctionsPathExists ? userFunctionsPath : void 0
-    }) : null;
-    const headers = this.#features.headers ? new HeadersHandler({
-      configPath: this.#config?.configPath,
-      configHeaders: this.#config?.config.headers,
-      projectDir: this.#projectRoot,
-      publishDir: this.#config?.config.build.publish ?? void 0,
-      logger: this.#logger
-    }) : { handle: async (_request, response) => response };
-    const redirects = this.#features.redirects ? new RedirectsHandler({
-      configPath: this.#config?.configPath,
-      configRedirects: this.#config?.config.redirects,
-      jwtRoleClaim: "",
-      jwtSecret: "",
-      notFoundHandler,
-      projectDir: this.#projectRoot
-    }) : null;
-    const staticFiles = this.#features.static ? new StaticHandler({
-      directory: this.#config?.config.build.publish ?? this.#projectRoot
-    }) : null;
-    const functionMatch = await functions?.match(request);
+  async handleInEphemeralDirectory(request, destPath, options = {}) {
+    const edgeFunctionResponse = await this.#edgeFunctionsHandler?.handle(request.clone());
+    if (edgeFunctionResponse) {
+      return { response: edgeFunctionResponse, type: "edge-function" };
+    }
+    const functionMatch = await this.#functionsHandler?.match(request, destPath);
     if (functionMatch) {
       if (functionMatch.preferStatic) {
-        const staticMatch2 = await staticFiles?.match(request);
+        const staticMatch2 = await this.#staticHandler?.match(request);
         if (staticMatch2) {
           const response = await staticMatch2.handle();
-          return headers.handle(request, response);
+          await this.#headersHandler?.apply(request, response, options.headersCollector);
+          return { response, type: "static" };
         }
       }
-      return functionMatch.handle(request);
+      return { response: await functionMatch.handle(request), type: "function" };
     }
-    const redirectMatch = await redirects?.match(request);
+    const redirectMatch = await this.#redirectsHandler?.match(request);
     if (redirectMatch) {
-      const functionMatch2 = await functions?.match(new Request(redirectMatch.target));
+      const functionMatch2 = await this.#functionsHandler?.match(new Request(redirectMatch.target), destPath);
       if (functionMatch2 && !functionMatch2.preferStatic) {
-        return functionMatch2.handle(request);
+        return { response: await functionMatch2.handle(request), type: "function" };
       }
-      const response = await redirects?.handle(request, redirectMatch, async (maybeStaticFile) => {
-        const staticMatch2 = await staticFiles?.match(maybeStaticFile);
-        if (!staticMatch2) return;
-        return async () => {
-          const response2 = await staticMatch2.handle();
-          return headers.handle(new Request(redirectMatch.target), response2);
-        };
-      });
+      const response = await this.#redirectsHandler?.handle(
+        request,
+        redirectMatch,
+        async (maybeStaticFile) => {
+          const staticMatch2 = await this.#staticHandler?.match(maybeStaticFile);
+          if (!staticMatch2) {
+            return;
+          }
+          return async () => {
+            const response2 = await staticMatch2.handle();
+            await this.#headersHandler?.apply(new Request(redirectMatch.target), response2, options.headersCollector);
+            return response2;
+          };
+        }
+      );
       if (response) {
-        return response;
+        return { response, type: "redirect" };
       }
     }
-    const staticMatch = await staticFiles?.match(request);
+    const { pathname } = new URL(request.url);
+    if (pathname.startsWith("/.netlify/images")) {
+      this.#logger.error(
+        "The Netlify Image CDN is currently only supported in the Netlify CLI. Run `npx netlify dev` to get started."
+      );
+      return;
+    }
+    const staticMatch = await this.#staticHandler?.match(request);
     if (staticMatch) {
       const response = await staticMatch.handle();
-      return headers.handle(request, response);
+      await this.#headersHandler?.apply(request, response, options.headersCollector);
+      return { response, type: "static" };
     }
   }
   async getConfig() {
@@ -333,12 +344,17 @@ var NetlifyDev = class {
     });
     return config;
   }
-  async handle(request) {
-    const servePath = path2.join(this.#projectRoot, ".netlify", "functions-serve");
-    await fs2.mkdir(servePath, { recursive: true });
-    const destPath = await fs2.mkdtemp(path2.join(servePath, "_"));
+  async handle(request, options = {}) {
+    const result = await this.handleAndIntrospect(request, options);
+    return result?.response;
+  }
+  async handleAndIntrospect(request, options = {}) {
+    const requestID = generateRequestID();
+    request.headers.set("x-nf-request-id", requestID);
+    await fs2.mkdir(this.#functionsServePath, { recursive: true });
+    const destPath = await fs2.mkdtemp(path2.join(this.#functionsServePath, `${requestID}_`));
     try {
-      return await this.handleInEphemeralDirectory(request, destPath);
+      return await this.handleInEphemeralDirectory(request, destPath, options);
     } finally {
       try {
         await fs2.rm(destPath, { force: true, recursive: true });
@@ -363,9 +379,21 @@ var NetlifyDev = class {
       projectRoot: this.#projectRoot,
       siteID: siteID ?? "0"
     });
-    this.#runtime = runtime;
-    if (this.#features.environmentVariables && siteID) {
-      await injectEnvVariables({
+    this.#cleanupJobs.push(() => runtime.stop());
+    let serverAddress;
+    if (typeof this.#server === "string") {
+      serverAddress = this.#server;
+    } else if (this.#features.edgeFunctions) {
+      const passthroughServer = new HTTPServer(async (req) => {
+        const res = await this.handle(req);
+        return res ?? new Response(null, { status: 404 });
+      });
+      this.#cleanupJobs.push(() => passthroughServer.stop());
+      serverAddress = await passthroughServer.start();
+    }
+    let envVariables = {};
+    if (this.#features.environmentVariables) {
+      envVariables = await injectEnvVariables({
         accountSlug: config?.siteInfo?.account_slug,
         baseVariables: config?.env || {},
         envAPI: runtime.env,
@@ -373,9 +401,74 @@ var NetlifyDev = class {
         siteID
       });
     }
+    if (this.#features.edgeFunctions && serverAddress !== void 0) {
+      const env = Object.entries(envVariables).reduce((acc, [key, variable]) => {
+        if (variable.usedSource === "account" || variable.usedSource === "addons" || variable.usedSource === "internal" || variable.usedSource === "ui" || variable.usedSource.startsWith(".env")) {
+          return {
+            ...acc,
+            [key]: variable.value
+          };
+        }
+        return acc;
+      }, {});
+      this.#edgeFunctionsHandler = new EdgeFunctionsHandler({
+        configDeclarations: this.#config?.config.edge_functions ?? [],
+        directories: [this.#config?.config.build.edge_functions].filter(Boolean),
+        env,
+        geolocation: mockLocation,
+        logger: this.#logger,
+        originServerAddress: serverAddress,
+        siteID,
+        siteName: config?.siteInfo.name
+      });
+    }
+    if (this.#features.functions) {
+      const userFunctionsPath = this.#config?.config.functionsDirectory ?? path2.join(this.#projectRoot, "netlify/functions");
+      const userFunctionsPathExists = await isDirectory(userFunctionsPath);
+      this.#functionsHandler = new FunctionsHandler({
+        config: this.#config,
+        destPath: this.#functionsServePath,
+        geolocation: mockLocation,
+        projectRoot: this.#projectRoot,
+        settings: {},
+        siteId: this.#siteID,
+        timeouts: {},
+        userFunctionsPath: userFunctionsPathExists ? userFunctionsPath : void 0
+      });
+    }
+    if (this.#features.headers) {
+      this.#headersHandler = new HeadersHandler({
+        configPath: this.#config?.configPath,
+        configHeaders: this.#config?.config.headers,
+        projectDir: this.#projectRoot,
+        publishDir: this.#config?.config.build.publish ?? void 0,
+        logger: this.#logger
+      });
+    }
+    if (this.#features.redirects) {
+      this.#redirectsHandler = new RedirectsHandler({
+        configPath: this.#config?.configPath,
+        configRedirects: this.#config?.config.redirects,
+        jwtRoleClaim: "",
+        jwtSecret: "",
+        notFoundHandler,
+        projectDir: this.#projectRoot
+      });
+    }
+    if (this.#features.static) {
+      this.#staticHandler = new StaticHandler({
+        directory: [
+          this.#config?.config.build.publish ?? this.#projectRoot,
+          ...this.#staticHandlerAdditionalDirectories
+        ]
+      });
+    }
+    return {
+      serverAddress
+    };
   }
   async stop() {
-    await this.#runtime?.stop();
+    await Promise.allSettled(this.#cleanupJobs.map((task) => task()));
   }
 };
 export {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@netlify/dev",
-  "version": "3.0.0",
+  "version": "4.0.1",
   "description": "Emulation of the Netlify environment for local development",
   "type": "module",
   "engines": {
-    "node": "^18.14.0 || >=20"
+    "node": ">=20.6.1"
   },
   "main": "./dist/main.cjs",
   "module": "./dist/main.js",
@@ -46,19 +46,21 @@
   },
   "author": "Netlify Inc.",
   "devDependencies": {
-    "@netlify/api": "^14.0.2",
-    "@netlify/types": "2.0.0",
+    "@netlify/api": "^14.0.3",
+    "@netlify/types": "2.0.1",
     "tsup": "^8.0.0",
     "vitest": "^3.0.0"
   },
   "dependencies": {
-    "@netlify/blobs": "9.1.3",
-    "@netlify/config": "^23.0.7",
-    "@netlify/dev-utils": "3.0.0",
-    "@netlify/functions": "4.0.0",
-    "@netlify/headers": "1.0.0",
-    "@netlify/redirects": "2.0.0",
-    "@netlify/runtime": "3.0.0",
-    "@netlify/static": "2.0.0"
+    "@netlify/blobs": "9.1.4",
+    "@netlify/config": "^23.0.8",
+    "@netlify/dev-utils": "3.1.0",
+    "@netlify/edge-functions": "2.13.1",
+    "@netlify/functions": "4.1.0",
+    "@netlify/headers": "2.0.0",
+    "@netlify/redirects": "3.0.0",
+    "@netlify/runtime": "4.0.0",
+    "@netlify/static": "3.0.0",
+    "ulid": "^3.0.0"
   }
 }