@netlify/functions-dev 1.1.11 → 1.2.0

package/dist/main.d.ts

@@ -1,11 +1,11 @@
-import { DevEventHandler, Geolocation } from '@netlify/dev-utils';
+import { Reactive, DevEventHandler, FileWatcher, Geolocation } from '@netlify/dev-utils';
 import { Manifest } from '@netlify/zip-it-and-ship-it';
 import { EnvironmentContext } from '@netlify/blobs';
 
 interface FunctionRegistryOptions {
     blobsContext?: EnvironmentContext;
     destPath: string;
-    config: any;
+    config: Reactive<any>;
     debug?: boolean;
     eventHandler?: DevEventHandler;
     frameworksAPIFunctionsPath?: string;
@@ -17,7 +17,7 @@ interface FunctionRegistryOptions {
         syncFunctions?: number;
         backgroundFunctions?: number;
     };
-    watch?: boolean;
+    fileWatcher?: FileWatcher;
 }
 
 interface FunctionMatch {

package/dist/main.js

@@ -6,7 +6,6 @@ import { stat } from "fs/promises";
 import { createRequire as createRequire2 } from "module";
 import { basename as basename2, extname as extname2, isAbsolute, join, resolve } from "path";
 import { env } from "process";
-import { watchDebounced } from "@netlify/dev-utils";
 import { SYNCHRONOUS_FUNCTION_TIMEOUT, BACKGROUND_FUNCTION_TIMEOUT } from "@netlify/functions";
 import { listFunctions } from "@netlify/zip-it-and-ship-it";
 import extractZip from "extract-zip";
@@ -657,8 +656,8 @@ var FunctionsRegistry = class {
    */
   functions = /* @__PURE__ */ new Map();
   /**
-   * File watchers for function files. Maps function names to objects built
-   * by the `watchDebounced` utility.
+   * File watchers for function files. Maps function names to subscription
+   * handles from the shared `FileWatcher`.
    */
   functionWatchers = /* @__PURE__ */ new Map();
   /**
@@ -678,7 +677,7 @@ var FunctionsRegistry = class {
   projectRoot;
   timeouts;
   settings;
-  watch;
+  fileWatcher;
   constructor({
     blobsContext,
     config,
@@ -691,7 +690,7 @@ var FunctionsRegistry = class {
     projectRoot,
     settings,
     timeouts,
-    watch
+    fileWatcher
   }) {
     this.blobsContext = blobsContext;
     this.config = config;
@@ -702,7 +701,8 @@ var FunctionsRegistry = class {
     });
     this.internalFunctionsPath = internalFunctionsPath;
     this.projectRoot = projectRoot;
-    const siteTimeout = config?.siteInfo?.functions_timeout ?? config?.siteInfo?.functions_config?.timeout;
+    const configValue = config.get();
+    const siteTimeout = configValue?.siteInfo?.functions_timeout ?? configValue?.siteInfo?.functions_config?.timeout;
     this.timeouts = {
       syncFunctions: timeouts?.syncFunctions ?? siteTimeout ?? SYNCHRONOUS_FUNCTION_TIMEOUT,
       // NOTE: This isn't documented, but the generically named "functions timeout" config fields only
@@ -710,7 +710,7 @@ var FunctionsRegistry = class {
       backgroundFunctions: timeouts?.backgroundFunctions ?? BACKGROUND_FUNCTION_TIMEOUT
     };
     this.settings = settings;
-    this.watch = watch === true;
+    this.fileWatcher = fileWatcher;
     this.buildCache = {};
     this.directoryWatchers = /* @__PURE__ */ new Map();
     this.manifest = manifest;
@@ -753,27 +753,29 @@ var FunctionsRegistry = class {
     if (!srcFilesDiff) {
       return;
     }
-    if (!this.watch) {
+    if (!this.fileWatcher) {
       return;
     }
-    const watcher = this.functionWatchers.get(func.name);
-    if (watcher) {
+    const handle = this.functionWatchers.get(func.name);
+    if (handle) {
       srcFilesDiff.deleted.forEach((path2) => {
-        watcher.unwatch(path2);
+        handle.unwatch(path2);
       });
       srcFilesDiff.added.forEach((path2) => {
-        watcher.add(path2);
+        handle.add(path2);
       });
       return;
     }
     if (srcFilesDiff.added.size !== 0) {
       const filesToWatch = [...srcFilesDiff.added, ...includedFiles];
-      const newWatcher = await watchDebounced(filesToWatch, {
+      const newHandle = this.fileWatcher.subscribe({
+        paths: filesToWatch,
+        decache: true,
         onChange: () => {
           this.buildFunctionAndWatchFiles(func, false);
         }
       });
-      this.functionWatchers.set(func.name, newWatcher);
+      this.functionWatchers.set(func.name, newHandle);
     }
   }
   set eventHandler(handler) {
@@ -849,7 +851,7 @@ var FunctionsRegistry = class {
       } catch {
         func.mainFile = join(unzippedDirectory, basename2(manifestEntry.mainFile));
       }
-    } else if (this.watch) {
+    } else if (this.fileWatcher) {
       this.buildFunctionAndWatchFiles(func, !isReload);
     }
     this.functions.set(name, func);
@@ -876,7 +878,7 @@ var FunctionsRegistry = class {
         buildRustSource: env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE === "true"
       },
       configFileDirectories: [this.internalFunctionsPath].filter(Boolean),
-      config: this.config.functions,
+      config: this.config.get().functions,
       parseISC: true
     });
     const ignoredFunctions = new Set(
@@ -913,7 +915,7 @@ var FunctionsRegistry = class {
         }
         const func = new NetlifyFunction({
           blobsContext: this.blobsContext,
-          config: this.config,
+          config: this.config.get(),
           directory,
           displayName,
           excludedRoutes,
@@ -938,7 +940,7 @@ var FunctionsRegistry = class {
       }
       this.handleEvent({ function: func, name: "FunctionRemovedEvent" });
     });
-    if (this.watch) {
+    if (this.fileWatcher) {
       await Promise.all(directories.map((path2) => this.setupDirectoryWatcher(path2)));
     }
   }
@@ -951,7 +953,8 @@ var FunctionsRegistry = class {
     if (this.directoryWatchers.has(directory)) {
       return;
     }
-    const watcher = await watchDebounced(directory, {
+    const handle = this.fileWatcher.subscribe({
+      paths: directory,
       depth: 1,
       onAdd: () => {
         this.scan([directory]);
@@ -960,7 +963,7 @@ var FunctionsRegistry = class {
         this.scan([directory]);
       }
     });
-    this.directoryWatchers.set(directory, watcher);
+    this.directoryWatchers.set(directory, handle);
   }
   /**
    * Removes a function from the registry and closes its file watchers.
@@ -968,9 +971,9 @@ var FunctionsRegistry = class {
   async unregisterFunction(func) {
     const { name } = func;
     this.functions.delete(name);
-    const watcher = this.functionWatchers.get(name);
-    if (watcher) {
-      await watcher.close();
+    const handle = this.functionWatchers.get(name);
+    if (handle) {
+      handle.unsubscribe();
     }
     this.functionWatchers.delete(name);
   }

package/package.json

@@ -11,7 +11,7 @@
       }
     }
   },
-  "version": "1.1.11",
+  "version": "1.2.0",
   "description": "Local dev emulation of Netlify Functions",
   "files": [
     "dist/**/*.js",
@@ -42,10 +42,10 @@
   },
   "author": "Netlify Inc.",
   "dependencies": {
-    "@netlify/blobs": "10.7.0",
-    "@netlify/dev-utils": "4.3.3",
+    "@netlify/blobs": "10.7.1",
+    "@netlify/dev-utils": "4.4.0",
     "@netlify/functions": "5.1.2",
-    "@netlify/zip-it-and-ship-it": "^14.3.1",
+    "@netlify/zip-it-and-ship-it": "^14.3.2",
     "cron-parser": "^4.9.0",
     "decache": "^4.6.2",
     "extract-zip": "^2.0.1",