@netlify/dev 5.0.5 → 5.1.0

package/dist/main.cjs

@@ -47,6 +47,7 @@ var import_functions_dev = require("@netlify/functions-dev");
 var import_headers = require("@netlify/headers");
 var import_images = require("@netlify/images");
 var import_redirects = require("@netlify/redirects");
+var import_server_dev = require("@netlify/server-dev");
 var import_static = require("@netlify/static");
 var import_database_dev = require("@netlify/database-dev");
 var import_database_dev2 = require("@netlify/database-dev");
@@ -341,6 +342,7 @@ var NetlifyDev = class {
   #logger;
   #projectRoot;
   #redirectsHandler;
+  #serverHandler;
   #serverAddress;
   #siteID;
   #staticHandler;
@@ -367,6 +369,7 @@ var NetlifyDev = class {
       headers: options.headers?.enabled !== false,
       images: options.images?.enabled !== false,
       redirects: options.redirects?.enabled !== false,
+      server: options.server?.enabled === true,
       static: options.staticFiles?.enabled !== false
     };
     this.#functionsServePath = import_node_path2.default.join(projectRoot, ".netlify", "functions-serve");
@@ -400,17 +403,17 @@ var NetlifyDev = class {
    * @returns
    */
   async handleInEphemeralDirectory(readRequest, getWriteRequest, destPath, options = {}) {
-    const serverAddress = this.getServerAddress(options.serverAddress);
+    const getServerAddress = () => this.getServerAddress(options.serverAddress);
     const edgeFunctionMatch = await this.#edgeFunctionsHandler?.match(readRequest);
     if (edgeFunctionMatch) {
       return {
-        response: await edgeFunctionMatch.handle(getWriteRequest(), serverAddress),
+        response: await edgeFunctionMatch.handle(getWriteRequest(), getServerAddress()),
         type: "edge-function"
       };
     }
     const imageMatch = this.#imageHandler?.match(readRequest);
     if (imageMatch) {
-      const response = await imageMatch.handle(serverAddress);
+      const response = await imageMatch.handle(getServerAddress());
       return { response, type: "image" };
     }
     const functionMatch = await this.#functionsHandler?.match(readRequest, destPath);
@@ -425,12 +428,22 @@ var NetlifyDev = class {
       }
       return { response: await functionMatch.handle(getWriteRequest()), type: "function" };
     }
+    const serverMatch = await this.#serverHandler?.match(readRequest);
+    if (serverMatch) {
+      const staticMatch2 = await this.#staticHandler?.match(readRequest);
+      if (staticMatch2) {
+        const response = await staticMatch2.handle();
+        await this.#headersHandler?.apply(readRequest, response, options.headersCollector);
+        return { response, type: "static" };
+      }
+      return { response: await serverMatch.handle(getWriteRequest()), type: "server" };
+    }
     const redirectMatch = await this.#redirectsHandler?.match(readRequest);
     if (redirectMatch) {
       const redirectRequest = new Request(redirectMatch.target);
       const imageMatch2 = this.#imageHandler?.match(redirectRequest);
       if (imageMatch2) {
-        const response2 = await imageMatch2.handle(serverAddress);
+        const response2 = await imageMatch2.handle(getServerAddress());
         return { response: response2, type: "image" };
       }
       const functionMatch2 = await this.#functionsHandler?.match(redirectRequest, destPath);
@@ -700,6 +713,23 @@ var NetlifyDev = class {
         userFunctionsPath: userFunctionsPathExists ? userFunctionsPath : void 0
       });
     }
+    if (this.#features.server) {
+      geolocation ??= await (0, import_dev_utils.getGeoLocation)({
+        enabled: this.#features.geolocation,
+        cache: this.#geolocationConfig?.cache ?? true,
+        state
+      });
+      const serverHandler = new import_server_dev.ServerHandler({
+        accountID: config?.siteInfo?.account_id,
+        fileWatcher,
+        geolocation,
+        logger: this.#logger,
+        projectRoot: this.#projectRoot,
+        siteID
+      });
+      this.#serverHandler = serverHandler;
+      this.#cleanupJobs.push(() => serverHandler.stop());
+    }
     if (this.#features.headers) {
       this.#headersHandler = new import_headers.HeadersHandler({
         configPath: this.#config?.configPath,
@@ -740,6 +770,12 @@ var NetlifyDev = class {
       serverAddress
     };
   }
+  async handleUpgrade(request, socket, head) {
+    if (!this.#serverHandler) {
+      return false;
+    }
+    return await this.#serverHandler.handleUpgrade(request, socket, head);
+  }
   get db() {
     return this.#db;
   }

package/dist/main.d.cts

@@ -1,4 +1,6 @@
+import { Buffer } from 'node:buffer';
 import { IncomingMessage } from 'node:http';
+import { Duplex } from 'node:stream';
 import { Logger } from '@netlify/dev-utils';
 import { HeadersCollector } from '@netlify/headers';
 import { NetlifyDB } from '@netlify/database-dev';
@@ -45,6 +47,12 @@ interface Features {
     functions?: {
         enabled?: boolean;
     };
+    /**
+     * [Experimental] Configuration options for Netlify Server.
+     */
+    server?: {
+        enabled?: boolean;
+    };
     /**
      * Configuration options for geolocation data used by Functions and Edge Functions.
      *
@@ -139,7 +147,7 @@ interface HandleOptions {
      */
     serverAddress?: string;
 }
-type ResponseType = 'edge-function' | 'function' | 'image' | 'redirect' | 'static';
+type ResponseType = 'edge-function' | 'function' | 'image' | 'redirect' | 'server' | 'static';
 declare class NetlifyDev {
     #private;
     constructor(options: NetlifyDevOptions);
@@ -186,6 +194,7 @@ declare class NetlifyDev {
     start(): Promise<{
         serverAddress: string | undefined;
     }>;
+    handleUpgrade(request: IncomingMessage, socket: Duplex, head: Buffer): Promise<boolean>;
     get db(): NetlifyDB | undefined;
     stop(): Promise<void>;
     getEnabledFeatures(): string[];

package/dist/main.d.ts

@@ -1,4 +1,6 @@
+import { Buffer } from 'node:buffer';
 import { IncomingMessage } from 'node:http';
+import { Duplex } from 'node:stream';
 import { Logger } from '@netlify/dev-utils';
 import { HeadersCollector } from '@netlify/headers';
 import { NetlifyDB } from '@netlify/database-dev';
@@ -45,6 +47,12 @@ interface Features {
     functions?: {
         enabled?: boolean;
     };
+    /**
+     * [Experimental] Configuration options for Netlify Server.
+     */
+    server?: {
+        enabled?: boolean;
+    };
     /**
      * Configuration options for geolocation data used by Functions and Edge Functions.
      *
@@ -139,7 +147,7 @@ interface HandleOptions {
      */
     serverAddress?: string;
 }
-type ResponseType = 'edge-function' | 'function' | 'image' | 'redirect' | 'static';
+type ResponseType = 'edge-function' | 'function' | 'image' | 'redirect' | 'server' | 'static';
 declare class NetlifyDev {
     #private;
     constructor(options: NetlifyDevOptions);
@@ -186,6 +194,7 @@ declare class NetlifyDev {
     start(): Promise<{
         serverAddress: string | undefined;
     }>;
+    handleUpgrade(request: IncomingMessage, socket: Duplex, head: Buffer): Promise<boolean>;
     get db(): NetlifyDB | undefined;
     stop(): Promise<void>;
     getEnabledFeatures(): string[];

package/dist/main.js

@@ -18,6 +18,7 @@ import { FunctionsHandler } from "@netlify/functions-dev";
 import { HeadersHandler } from "@netlify/headers";
 import { ImageHandler } from "@netlify/images";
 import { RedirectsHandler } from "@netlify/redirects";
+import { ServerHandler } from "@netlify/server-dev";
 import { StaticHandler } from "@netlify/static";
 import { NetlifyDB } from "@netlify/database-dev";
 import { applyMigrations, initializeTrackingTable, resetDatabase } from "@netlify/database-dev";
@@ -312,6 +313,7 @@ var NetlifyDev = class {
   #logger;
   #projectRoot;
   #redirectsHandler;
+  #serverHandler;
   #serverAddress;
   #siteID;
   #staticHandler;
@@ -338,6 +340,7 @@ var NetlifyDev = class {
       headers: options.headers?.enabled !== false,
       images: options.images?.enabled !== false,
       redirects: options.redirects?.enabled !== false,
+      server: options.server?.enabled === true,
       static: options.staticFiles?.enabled !== false
     };
     this.#functionsServePath = path2.join(projectRoot, ".netlify", "functions-serve");
@@ -371,17 +374,17 @@ var NetlifyDev = class {
    * @returns
    */
   async handleInEphemeralDirectory(readRequest, getWriteRequest, destPath, options = {}) {
-    const serverAddress = this.getServerAddress(options.serverAddress);
+    const getServerAddress = () => this.getServerAddress(options.serverAddress);
     const edgeFunctionMatch = await this.#edgeFunctionsHandler?.match(readRequest);
     if (edgeFunctionMatch) {
       return {
-        response: await edgeFunctionMatch.handle(getWriteRequest(), serverAddress),
+        response: await edgeFunctionMatch.handle(getWriteRequest(), getServerAddress()),
         type: "edge-function"
       };
     }
     const imageMatch = this.#imageHandler?.match(readRequest);
     if (imageMatch) {
-      const response = await imageMatch.handle(serverAddress);
+      const response = await imageMatch.handle(getServerAddress());
       return { response, type: "image" };
     }
     const functionMatch = await this.#functionsHandler?.match(readRequest, destPath);
@@ -396,12 +399,22 @@ var NetlifyDev = class {
       }
       return { response: await functionMatch.handle(getWriteRequest()), type: "function" };
     }
+    const serverMatch = await this.#serverHandler?.match(readRequest);
+    if (serverMatch) {
+      const staticMatch2 = await this.#staticHandler?.match(readRequest);
+      if (staticMatch2) {
+        const response = await staticMatch2.handle();
+        await this.#headersHandler?.apply(readRequest, response, options.headersCollector);
+        return { response, type: "static" };
+      }
+      return { response: await serverMatch.handle(getWriteRequest()), type: "server" };
+    }
     const redirectMatch = await this.#redirectsHandler?.match(readRequest);
     if (redirectMatch) {
       const redirectRequest = new Request(redirectMatch.target);
       const imageMatch2 = this.#imageHandler?.match(redirectRequest);
       if (imageMatch2) {
-        const response2 = await imageMatch2.handle(serverAddress);
+        const response2 = await imageMatch2.handle(getServerAddress());
         return { response: response2, type: "image" };
       }
       const functionMatch2 = await this.#functionsHandler?.match(redirectRequest, destPath);
@@ -671,6 +684,23 @@ var NetlifyDev = class {
         userFunctionsPath: userFunctionsPathExists ? userFunctionsPath : void 0
       });
     }
+    if (this.#features.server) {
+      geolocation ??= await getGeoLocation({
+        enabled: this.#features.geolocation,
+        cache: this.#geolocationConfig?.cache ?? true,
+        state
+      });
+      const serverHandler = new ServerHandler({
+        accountID: config?.siteInfo?.account_id,
+        fileWatcher,
+        geolocation,
+        logger: this.#logger,
+        projectRoot: this.#projectRoot,
+        siteID
+      });
+      this.#serverHandler = serverHandler;
+      this.#cleanupJobs.push(() => serverHandler.stop());
+    }
     if (this.#features.headers) {
       this.#headersHandler = new HeadersHandler({
         configPath: this.#config?.configPath,
@@ -711,6 +741,12 @@ var NetlifyDev = class {
       serverAddress
     };
   }
+  async handleUpgrade(request, socket, head) {
+    if (!this.#serverHandler) {
+      return false;
+    }
+    return await this.#serverHandler.handleUpgrade(request, socket, head);
+  }
   get db() {
     return this.#db;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/dev",
-  "version": "5.0.5",
+  "version": "5.1.0",
   "description": "Emulation of the Netlify environment for local development",
   "type": "module",
   "engines": {
@@ -68,6 +68,7 @@
     "@netlify/images": "2.0.1",
     "@netlify/redirects": "4.0.2",
     "@netlify/runtime": "5.0.3",
+    "@netlify/server-dev": "0.1.1",
     "@netlify/static": "4.0.0",
     "ulid": "^3.0.0"
   }