@netlify/dev 4.2.1 → 4.3.0

package/dist/main.cjs

@@ -319,7 +319,7 @@ var NetlifyDev = class {
   #logger;
   #projectRoot;
   #redirectsHandler;
-  #server;
+  #serverAddress;
   #siteID;
   #staticHandler;
   #staticHandlerAdditionalDirectories;
@@ -344,10 +344,19 @@ var NetlifyDev = class {
     };
     this.#functionsServePath = import_node_path2.default.join(projectRoot, ".netlify", "functions-serve");
     this.#logger = options.logger ?? globalThis.console;
-    this.#server = options.serverAddress;
+    this.#serverAddress = options.serverAddress;
     this.#projectRoot = projectRoot;
     this.#staticHandlerAdditionalDirectories = options.staticFiles?.directories ?? [];
   }
+  getServerAddress(requestServerAddress) {
+    if (requestServerAddress) {
+      return requestServerAddress;
+    }
+    if (typeof this.#serverAddress === "string") {
+      return this.#serverAddress;
+    }
+    throw new Error("Server address is not defined");
+  }
   /**
    * Runs a request through the Netlify request chain and returns a `Response`
    * if there's a match. We must not disturb the incoming request unless we
@@ -362,16 +371,17 @@ var NetlifyDev = class {
    * @returns
    */
   async handleInEphemeralDirectory(readRequest, getWriteRequest, destPath, options = {}) {
+    const serverAddress = this.getServerAddress(options.serverAddress);
     const edgeFunctionMatch = await this.#edgeFunctionsHandler?.match(readRequest);
     if (edgeFunctionMatch) {
       return {
-        response: await edgeFunctionMatch.handle(getWriteRequest()),
+        response: await edgeFunctionMatch.handle(getWriteRequest(), serverAddress),
         type: "edge-function"
       };
     }
     const imageMatch = this.#imageHandler?.match(readRequest);
     if (imageMatch) {
-      const response = await imageMatch.handle();
+      const response = await imageMatch.handle(serverAddress);
       return { response, type: "image" };
     }
     const functionMatch = await this.#functionsHandler?.match(readRequest, destPath);
@@ -391,7 +401,7 @@ var NetlifyDev = class {
       const redirectRequest = new Request(redirectMatch.target);
       const imageMatch2 = this.#imageHandler?.match(redirectRequest);
       if (imageMatch2) {
-        const response2 = await imageMatch2.handle();
+        const response2 = await imageMatch2.handle(serverAddress);
         return { response: response2, type: "image" };
       }
       const functionMatch2 = await this.#functionsHandler?.match(redirectRequest, destPath);
@@ -511,15 +521,16 @@ var NetlifyDev = class {
     });
     this.#cleanupJobs.push(() => runtime.stop());
     let serverAddress;
-    if (typeof this.#server === "string") {
-      serverAddress = this.#server;
-    } else if (this.#features.edgeFunctions || this.#features.images) {
+    if (typeof this.#serverAddress === "string") {
+      serverAddress = this.#serverAddress;
+    } else if (this.#serverAddress !== null && (this.#features.edgeFunctions || this.#features.images)) {
       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();
+      this.#serverAddress = serverAddress;
     }
     let envVariables = {};
     if (this.#features.environmentVariables) {
@@ -531,7 +542,7 @@ var NetlifyDev = class {
         siteID
       });
     }
-    if (this.#features.edgeFunctions && serverAddress !== void 0) {
+    if (this.#features.edgeFunctions) {
       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 {
@@ -547,7 +558,6 @@ var NetlifyDev = class {
         env,
         geolocation: import_dev_utils.mockLocation,
         logger: this.#logger,
-        originServerAddress: serverAddress,
         siteID,
         siteName: config?.siteInfo.name
       });
@@ -596,8 +606,7 @@ var NetlifyDev = class {
     if (this.#features.images) {
       this.#imageHandler = new import_images.ImageHandler({
         imagesConfig: this.#config?.config.images,
-        logger: this.#logger,
-        originServerAddress: serverAddress
+        logger: this.#logger
       });
     }
     return {

package/dist/main.d.cts

@@ -59,11 +59,6 @@ interface Features {
     redirects?: {
         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.
      */
@@ -81,6 +76,11 @@ interface NetlifyDevOptions extends Features {
     apiToken?: string;
     logger?: Logger;
     projectRoot?: string;
+    /**
+     * If your local development setup has its own HTTP server (e.g. Vite), set
+     * its address here.
+     */
+    serverAddress?: string | null;
 }
 interface HandleOptions {
     /**
@@ -90,11 +90,18 @@ interface HandleOptions {
      * {@link} https://docs.netlify.com/routing/headers/
      */
     headersCollector?: HeadersCollector;
+    /**
+     * If your local development setup has its own HTTP server (e.g. Vite), you
+     * can supply its address here. It will override any value defined in the
+     * top-level `serverAddress` setting.
+     */
+    serverAddress?: string;
 }
 type ResponseType = 'edge-function' | 'function' | 'image' | 'redirect' | 'static';
 declare class NetlifyDev {
     #private;
     constructor(options: NetlifyDevOptions);
+    private getServerAddress;
     /**
      * Runs a request through the Netlify request chain and returns a `Response`
      * if there's a match. We must not disturb the incoming request unless we

package/dist/main.d.ts

@@ -59,11 +59,6 @@ interface Features {
     redirects?: {
         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.
      */
@@ -81,6 +76,11 @@ interface NetlifyDevOptions extends Features {
     apiToken?: string;
     logger?: Logger;
     projectRoot?: string;
+    /**
+     * If your local development setup has its own HTTP server (e.g. Vite), set
+     * its address here.
+     */
+    serverAddress?: string | null;
 }
 interface HandleOptions {
     /**
@@ -90,11 +90,18 @@ interface HandleOptions {
      * {@link} https://docs.netlify.com/routing/headers/
      */
     headersCollector?: HeadersCollector;
+    /**
+     * If your local development setup has its own HTTP server (e.g. Vite), you
+     * can supply its address here. It will override any value defined in the
+     * top-level `serverAddress` setting.
+     */
+    serverAddress?: string;
 }
 type ResponseType = 'edge-function' | 'function' | 'image' | 'redirect' | 'static';
 declare class NetlifyDev {
     #private;
     constructor(options: NetlifyDevOptions);
+    private getServerAddress;
     /**
      * Runs a request through the Netlify request chain and returns a `Response`
      * if there's a match. We must not disturb the incoming request unless we

package/dist/main.js

@@ -285,7 +285,7 @@ var NetlifyDev = class {
   #logger;
   #projectRoot;
   #redirectsHandler;
-  #server;
+  #serverAddress;
   #siteID;
   #staticHandler;
   #staticHandlerAdditionalDirectories;
@@ -310,10 +310,19 @@ var NetlifyDev = class {
     };
     this.#functionsServePath = path2.join(projectRoot, ".netlify", "functions-serve");
     this.#logger = options.logger ?? globalThis.console;
-    this.#server = options.serverAddress;
+    this.#serverAddress = options.serverAddress;
     this.#projectRoot = projectRoot;
     this.#staticHandlerAdditionalDirectories = options.staticFiles?.directories ?? [];
   }
+  getServerAddress(requestServerAddress) {
+    if (requestServerAddress) {
+      return requestServerAddress;
+    }
+    if (typeof this.#serverAddress === "string") {
+      return this.#serverAddress;
+    }
+    throw new Error("Server address is not defined");
+  }
   /**
    * Runs a request through the Netlify request chain and returns a `Response`
    * if there's a match. We must not disturb the incoming request unless we
@@ -328,16 +337,17 @@ var NetlifyDev = class {
    * @returns
    */
   async handleInEphemeralDirectory(readRequest, getWriteRequest, destPath, options = {}) {
+    const serverAddress = this.getServerAddress(options.serverAddress);
     const edgeFunctionMatch = await this.#edgeFunctionsHandler?.match(readRequest);
     if (edgeFunctionMatch) {
       return {
-        response: await edgeFunctionMatch.handle(getWriteRequest()),
+        response: await edgeFunctionMatch.handle(getWriteRequest(), serverAddress),
         type: "edge-function"
       };
     }
     const imageMatch = this.#imageHandler?.match(readRequest);
     if (imageMatch) {
-      const response = await imageMatch.handle();
+      const response = await imageMatch.handle(serverAddress);
       return { response, type: "image" };
     }
     const functionMatch = await this.#functionsHandler?.match(readRequest, destPath);
@@ -357,7 +367,7 @@ var NetlifyDev = class {
       const redirectRequest = new Request(redirectMatch.target);
       const imageMatch2 = this.#imageHandler?.match(redirectRequest);
       if (imageMatch2) {
-        const response2 = await imageMatch2.handle();
+        const response2 = await imageMatch2.handle(serverAddress);
         return { response: response2, type: "image" };
       }
       const functionMatch2 = await this.#functionsHandler?.match(redirectRequest, destPath);
@@ -477,15 +487,16 @@ var NetlifyDev = class {
     });
     this.#cleanupJobs.push(() => runtime.stop());
     let serverAddress;
-    if (typeof this.#server === "string") {
-      serverAddress = this.#server;
-    } else if (this.#features.edgeFunctions || this.#features.images) {
+    if (typeof this.#serverAddress === "string") {
+      serverAddress = this.#serverAddress;
+    } else if (this.#serverAddress !== null && (this.#features.edgeFunctions || this.#features.images)) {
       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();
+      this.#serverAddress = serverAddress;
     }
     let envVariables = {};
     if (this.#features.environmentVariables) {
@@ -497,7 +508,7 @@ var NetlifyDev = class {
         siteID
       });
     }
-    if (this.#features.edgeFunctions && serverAddress !== void 0) {
+    if (this.#features.edgeFunctions) {
       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 {
@@ -513,7 +524,6 @@ var NetlifyDev = class {
         env,
         geolocation: mockLocation,
         logger: this.#logger,
-        originServerAddress: serverAddress,
         siteID,
         siteName: config?.siteInfo.name
       });
@@ -562,8 +572,7 @@ var NetlifyDev = class {
     if (this.#features.images) {
       this.#imageHandler = new ImageHandler({
         imagesConfig: this.#config?.config.images,
-        logger: this.#logger,
-        originServerAddress: serverAddress
+        logger: this.#logger
       });
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/dev",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "description": "Emulation of the Netlify environment for local development",
   "type": "module",
   "engines": {
@@ -52,15 +52,15 @@
     "vitest": "^3.0.0"
   },
   "dependencies": {
-    "@netlify/blobs": "9.1.6",
+    "@netlify/blobs": "10.0.0",
     "@netlify/config": "^23.0.10",
     "@netlify/dev-utils": "3.2.0",
-    "@netlify/edge-functions": "2.14.5",
-    "@netlify/functions": "4.1.4",
+    "@netlify/edge-functions": "2.15.0",
+    "@netlify/functions": "4.1.5",
     "@netlify/headers": "2.0.2",
-    "@netlify/images": "1.0.0",
+    "@netlify/images": "1.1.0",
     "@netlify/redirects": "3.0.2",
-    "@netlify/runtime": "4.0.3",
+    "@netlify/runtime": "4.0.4",
     "@netlify/static": "3.0.2",
     "ulid": "^3.0.0"
   }