netlify-cli 17.7.0 → 17.8.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "17.7.0",
+  "version": "17.8.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "17.7.0",
+      "version": "17.8.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.7.0",
+  "version": "17.8.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {

package/src/lib/edge-functions/registry.js

@@ -253,7 +253,9 @@ export class EdgeFunctionsRegistry {
      */
     processGraph(graph) {
         if (!graph) {
-            warn('Could not process edge functions dependency graph. Live reload will not be available.');
+            if (this.functions.length !== 0) {
+                warn('Could not process edge functions dependency graph. Live reload will not be available.');
+            }
             return;
         }
         // Creating a Map from `this.functions` that maps function paths to function

package/src/lib/functions/netlify-function.js

@@ -8,9 +8,7 @@ import { BACKGROUND } from '../../utils/functions/get-functions.js';
 const TYPESCRIPT_EXTENSIONS = new Set(['.cts', '.mts', '.ts']);
 const V2_MIN_NODE_VERSION = '18.14.0';
 // Returns a new set with all elements of `setA` that don't exist in `setB`.
-// @ts-expect-error TS(7006) FIXME: Parameter 'setA' implicitly has an 'any' type.
 const difference = (setA, setB) => new Set([...setA].filter((item) => !setB.has(item)));
-// @ts-expect-error TS(7006) FIXME: Parameter 'schedule' implicitly has an 'any' type.
 const getNextRun = function (schedule) {
     const cron = CronParser.parseExpression(schedule, {
         tz: 'Etc/UTC',
@@ -41,60 +39,40 @@ export default class NetlifyFunction {
     timeoutBackground, 
     // @ts-expect-error TS(7031) FIXME: Binding element 'timeoutSynchronous' implicitly ha... Remove this comment to see the full error message
     timeoutSynchronous, }) {
-        // @ts-expect-error TS(2339) FIXME: Property 'blobsContext' does not exist on type 'Ne... Remove this comment to see the full error message
-        this.blobsContext = blobsContext;
-        // @ts-expect-error TS(2339) FIXME: Property 'buildError' does not exist on type 'Netl... Remove this comment to see the full error message
         this.buildError = null;
+        // List of the function's source files. This starts out as an empty set
+        // and will get populated on every build.
+        this.srcFiles = new Set();
+        this.blobsContext = blobsContext;
         // @ts-expect-error TS(2339) FIXME: Property 'config' does not exist on type 'NetlifyF... Remove this comment to see the full error message
         this.config = config;
-        // @ts-expect-error TS(2339) FIXME: Property 'directory' does not exist on type 'Netli... Remove this comment to see the full error message
         this.directory = directory;
-        // @ts-expect-error TS(2339) FIXME: Property 'errorExit' does not exist on type 'Netli... Remove this comment to see the full error message
-        this.errorExit = errorExit;
-        // @ts-expect-error TS(2339) FIXME: Property 'mainFile' does not exist on type 'Netlif... Remove this comment to see the full error message
         this.mainFile = mainFile;
-        // @ts-expect-error TS(2339) FIXME: Property 'name' does not exist on type 'NetlifyFun... Remove this comment to see the full error message
         this.name = name;
-        // @ts-expect-error TS(2339) FIXME: Property 'displayName' does not exist on type 'Net... Remove this comment to see the full error message
         this.displayName = displayName ?? name;
-        // @ts-expect-error TS(2339) FIXME: Property 'projectRoot' does not exist on type 'Net... Remove this comment to see the full error message
         this.projectRoot = projectRoot;
         // @ts-expect-error TS(2339) FIXME: Property 'runtime' does not exist on type 'Netlify... Remove this comment to see the full error message
         this.runtime = runtime;
-        // @ts-expect-error TS(2339) FIXME: Property 'timeoutBackground' does not exist on typ... Remove this comment to see the full error message
         this.timeoutBackground = timeoutBackground;
-        // @ts-expect-error TS(2339) FIXME: Property 'timeoutSynchronous' does not exist on ty... Remove this comment to see the full error message
         this.timeoutSynchronous = timeoutSynchronous;
         // @ts-expect-error TS(2339) FIXME: Property 'settings' does not exist on type 'Netlif... Remove this comment to see the full error message
         this.settings = settings;
-        // Determines whether this is a background function based on the function
-        // name.
-        // @ts-expect-error TS(2339) FIXME: Property 'isBackground' does not exist on type 'Ne... Remove this comment to see the full error message
         this.isBackground = name.endsWith(BACKGROUND);
         const functionConfig = config.functions && config.functions[name];
-        // @ts-expect-error TS(2339) FIXME: Property 'schedule' does not exist on type 'Netlif... Remove this comment to see the full error message
         this.schedule = functionConfig && functionConfig.schedule;
-        // List of the function's source files. This starts out as an empty set
-        // and will get populated on every build.
-        // @ts-expect-error TS(2339) FIXME: Property 'srcFiles' does not exist on type 'Netlif... Remove this comment to see the full error message
         this.srcFiles = new Set();
     }
     get filename() {
-        // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
         if (!this.buildData?.mainFile) {
             return null;
         }
-        // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
         return basename(this.buildData.mainFile);
     }
     getRecommendedExtension() {
-        // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
         if (this.buildData?.runtimeAPIVersion !== 2) {
             return;
         }
-        // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
         const extension = this.buildData?.mainFile ? extname(this.buildData.mainFile) : undefined;
-        // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
         const moduleFormat = this.buildData?.outputModuleFormat;
         if (moduleFormat === 'esm') {
             return;
@@ -108,18 +86,14 @@ export default class NetlifyFunction {
     }
     hasValidName() {
         // same as https://github.com/netlify/bitballoon/blob/fbd7881e6c8e8c48e7a0145da4ee26090c794108/app/models/deploy.rb#L482
-        // @ts-expect-error TS(2339) FIXME: Property 'name' does not exist on type 'NetlifyFun... Remove this comment to see the full error message
         // eslint-disable-next-line unicorn/better-regex
         return /^[A-Za-z0-9_-]+$/.test(this.name);
     }
     async isScheduled() {
-        // @ts-expect-error TS(2339) FIXME: Property 'buildQueue' does not exist on type 'Netl... Remove this comment to see the full error message
         await this.buildQueue;
-        // @ts-expect-error TS(2339) FIXME: Property 'schedule' does not exist on type 'Netlif... Remove this comment to see the full error message
         return Boolean(this.schedule);
     }
     isSupported() {
-        // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
         return !(this.buildData?.runtimeAPIVersion === 2 && semver.lt(nodeVersion, V2_MIN_NODE_VERSION));
     }
     isTypeScript() {
@@ -132,7 +106,7 @@ export default class NetlifyFunction {
         if (!(await this.isScheduled())) {
             return null;
         }
-        // @ts-expect-error TS(2339) FIXME: Property 'schedule' does not exist on type 'Netlif... Remove this comment to see the full error message
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return getNextRun(this.schedule);
     }
     // The `build` method transforms source files into invocable functions. Its
@@ -146,24 +120,17 @@ export default class NetlifyFunction {
         const buildFunction = await this.runtime.getBuildFunction({
             // @ts-expect-error TS(2339) FIXME: Property 'config' does not exist on type 'NetlifyF... Remove this comment to see the full error message
             config: this.config,
-            // @ts-expect-error TS(2339) FIXME: Property 'directory' does not exist on type 'Netli... Remove this comment to see the full error message
             directory: this.directory,
-            // @ts-expect-error TS(2339) FIXME: Property 'errorExit' does not exist on type 'Netli... Remove this comment to see the full error message
-            errorExit: this.errorExit,
+            errorExit,
             func: this,
-            // @ts-expect-error TS(2339) FIXME: Property 'projectRoot' does not exist on type 'Net... Remove this comment to see the full error message
             projectRoot: this.projectRoot,
         });
-        // @ts-expect-error TS(2339) FIXME: Property 'buildQueue' does not exist on type 'Netl... Remove this comment to see the full error message
         this.buildQueue = buildFunction({ cache });
         try {
-            // @ts-expect-error TS(2339) FIXME: Property 'buildQueue' does not exist on type 'Netl... Remove this comment to see the full error message
             const { includedFiles = [], schedule, srcFiles, ...buildData } = await this.buildQueue;
             const srcFilesSet = new Set(srcFiles);
             const srcFilesDiff = this.getSrcFilesDiff(srcFilesSet);
-            // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
             this.buildData = buildData;
-            // @ts-expect-error TS(2339) FIXME: Property 'buildError' does not exist on type 'Netl... Remove this comment to see the full error message
             this.buildError = null;
             // @ts-expect-error TS(2339) FIXME: Property 'srcFiles' does not exist on type 'Netlif... Remove this comment to see the full error message
             this.srcFiles = srcFilesSet;
@@ -175,24 +142,18 @@ export default class NetlifyFunction {
             return { includedFiles, srcFilesDiff };
         }
         catch (error) {
-            // @ts-expect-error TS(2339) FIXME: Property 'buildError' does not exist on type 'Netl... Remove this comment to see the full error message
             this.buildError = error;
             return { error };
         }
     }
     async getBuildData() {
-        // @ts-expect-error TS(2339) FIXME: Property 'buildQueue' does not exist on type 'Netl... Remove this comment to see the full error message
         await this.buildQueue;
-        // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
         return this.buildData;
     }
     // Compares a new set of source files against a previous one, returning an
     // object with two Sets, one with added and the other with deleted files.
-    // @ts-expect-error TS(7006) FIXME: Parameter 'newSrcFiles' implicitly has an 'any' ty... Remove this comment to see the full error message
     getSrcFilesDiff(newSrcFiles) {
-        // @ts-expect-error TS(2339) FIXME: Property 'srcFiles' does not exist on type 'Netlif... Remove this comment to see the full error message
         const added = difference(newSrcFiles, this.srcFiles);
-        // @ts-expect-error TS(2339) FIXME: Property 'srcFiles' does not exist on type 'Netlif... Remove this comment to see the full error message
         const deleted = difference(this.srcFiles, newSrcFiles);
         return {
             added,
@@ -201,22 +162,16 @@ export default class NetlifyFunction {
     }
     // Invokes the function and returns its response object.
     async invoke(event = {}, context = {}) {
-        // @ts-expect-error TS(2339) FIXME: Property 'buildQueue' does not exist on type 'Netl... Remove this comment to see the full error message
         await this.buildQueue;
-        // @ts-expect-error TS(2339) FIXME: Property 'buildError' does not exist on type 'Netl... Remove this comment to see the full error message
         if (this.buildError) {
             // @ts-expect-error TS(2339) FIXME: Property 'buildError' does not exist on type 'Netl... Remove this comment to see the full error message
             return { result: null, error: { errorMessage: this.buildError.message } };
         }
-        // @ts-expect-error TS(2339) FIXME: Property 'isBackground' does not exist on type 'Ne... Remove this comment to see the full error message
         const timeout = this.isBackground ? this.timeoutBackground : this.timeoutSynchronous;
         const environment = {};
-        // @ts-expect-error TS(2339) FIXME: Property 'blobsContext' does not exist on type 'Ne... Remove this comment to see the full error message
         if (this.blobsContext) {
             const payload = JSON.stringify({
-                // @ts-expect-error TS(2339) FIXME: Property 'blobsContext' does not exist on type 'Ne... Remove this comment to see the full error message
                 url: this.blobsContext.edgeURL,
-                // @ts-expect-error TS(2339) FIXME: Property 'blobsContext' does not exist on type 'Ne... Remove this comment to see the full error message
                 token: this.blobsContext.token,
             });
             // @ts-expect-error TS(2339) FIXME: Property 'blobs' does not exist on type '{}'.
@@ -239,20 +194,15 @@ export default class NetlifyFunction {
     }
     /**
      * Matches all routes agains the incoming request. If a match is found, then the matched route is returned.
-     * @param {string} rawPath
-     * @param {string} method
      * @returns matched route
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'rawPath' implicitly has an 'any' type.
-    async matchURLPath(rawPath, method) {
-        // @ts-expect-error TS(2339) FIXME: Property 'buildQueue' does not exist on type 'Netl... Remove this comment to see the full error message
+    async matchURLPath(rawPath, method, hasStaticFile) {
         await this.buildQueue;
         let path = rawPath !== '/' && rawPath.endsWith('/') ? rawPath.slice(0, -1) : rawPath;
         path = path.toLowerCase();
-        // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
         const { routes = [] } = this.buildData;
         // @ts-expect-error TS(7031) FIXME: Binding element 'expression' implicitly has an 'an... Remove this comment to see the full error message
-        return routes.find(({ expression, literal, methods }) => {
+        const route = routes.find(({ expression, literal, methods }) => {
             if (methods.length !== 0 && !methods.includes(method)) {
                 return false;
             }
@@ -265,9 +215,15 @@ export default class NetlifyFunction {
             }
             return false;
         });
+        if (!route) {
+            return;
+        }
+        if (route.prefer_static && (await hasStaticFile())) {
+            return;
+        }
+        return route;
     }
     get runtimeAPIVersion() {
-        // @ts-expect-error TS(2339) FIXME: Property 'buildData' does not exist on type 'Netli... Remove this comment to see the full error message
         return this.buildData?.runtimeAPIVersion ?? 1;
     }
     get url() {
@@ -278,7 +234,6 @@ export default class NetlifyFunction {
         const port = this.settings.port || this.settings.functionsPort;
         // @ts-expect-error TS(2339) FIXME: Property 'settings' does not exist on type 'Netlif... Remove this comment to see the full error message
         const protocol = this.settings.https ? 'https' : 'http';
-        // @ts-expect-error TS(2339) FIXME: Property 'name' does not exist on type 'NetlifyFun... Remove this comment to see the full error message
         const url = new URL(`/.netlify/functions/${this.name}`, `${protocol}://localhost:${port}`);
         return url.href;
     }

package/src/lib/functions/registry.js

@@ -17,9 +17,7 @@ const ZIP_EXTENSION = '.zip';
  * @typedef {"buildError" | "extracted" | "loaded" | "missing-types-package" | "reloaded" | "reloading" | "removed"} FunctionEvent
  */
 export class FunctionsRegistry {
-    constructor({ 
-    // @ts-expect-error TS(7031) FIXME: Binding element 'blobsContext' implicitly has an '... Remove this comment to see the full error message
-    blobsContext, 
+    constructor({ blobsContext, 
     // @ts-expect-error TS(7031) FIXME: Binding element 'capabilities' implicitly has an '... Remove this comment to see the full error message
     capabilities, 
     // @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
@@ -27,33 +25,36 @@ export class FunctionsRegistry {
     // @ts-expect-error TS(7031) FIXME: Binding element 'logLambdaCompat' implicitly has a... Remove this comment to see the full error message
     logLambdaCompat, 
     // @ts-expect-error TS(7031) FIXME: Binding element 'manifest' implicitly has an 'any'... Remove this comment to see the full error message
-    manifest, 
-    // @ts-expect-error TS(7031) FIXME: Binding element 'projectRoot' implicitly has an 'a... Remove this comment to see the full error message
-    projectRoot, 
+    manifest, projectRoot, 
     // @ts-expect-error TS(7031) FIXME: Binding element 'settings' implicitly has an 'any'... Remove this comment to see the full error message
     settings, 
     // @ts-expect-error TS(7031) FIXME: Binding element 'timeouts' implicitly has an 'any'... Remove this comment to see the full error message
     timeouts, }) {
+        /**
+         * The functions held by the registry
+         */
+        this.functions = new Map();
+        /**
+         * File watchers for function files. Maps function names to objects built
+         * by the `watchDebounced` utility.
+         */
+        this.functionWatchers = new Map();
+        /**
+         * Keeps track of whether we've checked whether `TYPES_PACKAGE` is
+         * installed.
+         */
+        this.hasCheckedTypesPackage = false;
         // @ts-expect-error TS(2339) FIXME: Property 'capabilities' does not exist on type 'Fu... Remove this comment to see the full error message
         this.capabilities = capabilities;
         // @ts-expect-error TS(2339) FIXME: Property 'config' does not exist on type 'Function... Remove this comment to see the full error message
         this.config = config;
-        // @ts-expect-error TS(2339) FIXME: Property 'debug' does not exist on type 'Functions... Remove this comment to see the full error message
         this.debug = debug;
-        // @ts-expect-error TS(2339) FIXME: Property 'isConnected' does not exist on type 'Fun... Remove this comment to see the full error message
         this.isConnected = isConnected;
-        // @ts-expect-error TS(2339) FIXME: Property 'projectRoot' does not exist on type 'Fun... Remove this comment to see the full error message
         this.projectRoot = projectRoot;
         // @ts-expect-error TS(2339) FIXME: Property 'timeouts' does not exist on type 'Functi... Remove this comment to see the full error message
         this.timeouts = timeouts;
         // @ts-expect-error TS(2339) FIXME: Property 'settings' does not exist on type 'Functi... Remove this comment to see the full error message
         this.settings = settings;
-        /**
-         * Context object for Netlify Blobs
-         *
-         * @type {import("../blobs/blobs.js").BlobsContext}
-         */
-        // @ts-expect-error TS(2339) FIXME: Property 'blobsContext' does not exist on type 'Fu... Remove this comment to see the full error message
         this.blobsContext = blobsContext;
         /**
          * An object to be shared among all functions in the registry. It can be
@@ -73,27 +74,6 @@ export class FunctionsRegistry {
          */
         // @ts-expect-error TS(2339) FIXME: Property 'directoryWatchers' does not exist on typ... Remove this comment to see the full error message
         this.directoryWatchers = new Map();
-        /**
-         * The functions held by the registry
-         *
-         * @type {Map<string, NetlifyFunction>}
-         */
-        // @ts-expect-error TS(2339) FIXME: Property 'functions' does not exist on type 'Funct... Remove this comment to see the full error message
-        this.functions = new Map();
-        /**
-         * File watchers for function files. Maps function names to objects built
-         * by the `watchDebounced` utility.
-         *
-         * @type {Map<string, Awaited<ReturnType<watchDebounced>>>}
-         */
-        // @ts-expect-error TS(2339) FIXME: Property 'functionWatchers' does not exist on type... Remove this comment to see the full error message
-        this.functionWatchers = new Map();
-        /**
-         * Keeps track of whether we've checked whether `TYPES_PACKAGE` is
-         * installed.
-         */
-        // @ts-expect-error TS(2339) FIXME: Property 'hasCheckedTypesPackage' does not exist o... Remove this comment to see the full error message
-        this.hasCheckedTypesPackage = false;
         /**
          * Whether to log V1 functions as using the "Lambda compatibility mode"
          *
@@ -111,16 +91,12 @@ export class FunctionsRegistry {
         this.manifest = manifest;
     }
     checkTypesPackage() {
-        // @ts-expect-error TS(2339) FIXME: Property 'hasCheckedTypesPackage' does not exist o... Remove this comment to see the full error message
         if (this.hasCheckedTypesPackage) {
             return;
         }
-        // @ts-expect-error TS(2339) FIXME: Property 'hasCheckedTypesPackage' does not exist o... Remove this comment to see the full error message
         this.hasCheckedTypesPackage = true;
-        // @ts-expect-error TS(2339) FIXME: Property 'projectRoot' does not exist on type 'Fun... Remove this comment to see the full error message
         const require = createRequire(this.projectRoot);
         try {
-            // @ts-expect-error TS(2339) FIXME: Property 'projectRoot' does not exist on type 'Fun... Remove this comment to see the full error message
             require.resolve(TYPES_PACKAGE, { paths: [this.projectRoot] });
         }
         catch (error) {
@@ -135,10 +111,7 @@ export class FunctionsRegistry {
      * Runs before `scan` and calls any `onDirectoryScan` hooks defined by the
      * runtime before the directory is read. This gives runtime the opportunity
      * to run additional logic when a directory is scanned.
-     *
-     * @param {string} directory
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'directory' implicitly has an 'any' type... Remove this comment to see the full error message
     static async prepareDirectoryScan(directory) {
         await mkdir(directory, { recursive: true });
         // We give runtimes the opportunity to react to a directory scan and run
@@ -156,12 +129,7 @@ export class FunctionsRegistry {
     /**
      * Builds a function and sets up the appropriate file watchers so that any
      * changes will trigger another build.
-     *
-     * @param {NetlifyFunction} func
-     * @param {boolean} [firstLoad ]
-     * @returns
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'func' implicitly has an 'any' type.
     async buildFunctionAndWatchFiles(func, firstLoad = false) {
         if (!firstLoad) {
             FunctionsRegistry.logEvent('reloading', { func });
@@ -196,16 +164,13 @@ export class FunctionsRegistry {
         if (!srcFilesDiff) {
             return;
         }
-        // @ts-expect-error TS(2339) FIXME: Property 'functionWatchers' does not exist on type... Remove this comment to see the full error message
         const watcher = this.functionWatchers.get(func.name);
         // If there is already a watcher for this function, we need to unwatch any
         // files that have been removed and watch any files that have been added.
         if (watcher) {
-            // @ts-expect-error TS(7006) FIXME: Parameter 'path' implicitly has an 'any' type.
             srcFilesDiff.deleted.forEach((path) => {
                 watcher.unwatch(path);
             });
-            // @ts-expect-error TS(7006) FIXME: Parameter 'path' implicitly has an 'any' type.
             srcFilesDiff.added.forEach((path) => {
                 watcher.add(path);
             });
@@ -220,18 +185,13 @@ export class FunctionsRegistry {
                     this.buildFunctionAndWatchFiles(func, false);
                 },
             });
-            // @ts-expect-error TS(2339) FIXME: Property 'functionWatchers' does not exist on type... Remove this comment to see the full error message
             this.functionWatchers.set(func.name, newWatcher);
         }
     }
     /**
      * Returns a function by name.
-     *
-     * @param {string} name
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'name' implicitly has an 'any' type.
     get(name) {
-        // @ts-expect-error TS(2339) FIXME: Property 'functions' does not exist on type 'Funct... Remove this comment to see the full error message
         return this.functions.get(name);
     }
     /**
@@ -240,17 +200,13 @@ export class FunctionsRegistry {
      * matches the default functions URL (i.e. can only be for a function) but no
      * function with the given name exists, returns an object with the function
      * and the route set to `null`. Otherwise, `undefined` is returned,
-     *
-     * @param {string} url
-     * @param {string} method
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'url' implicitly has an 'any' type.
-    async getFunctionForURLPath(url, method) {
+    async getFunctionForURLPath(urlPath, method, hasStaticFile) {
         // We're constructing a URL object just so that we can extract the path from
         // the incoming URL. It doesn't really matter that we don't have the actual
         // local URL with the correct port.
-        const urlPath = new URL(url, 'http://localhost').pathname;
-        const defaultURLMatch = urlPath.match(DEFAULT_FUNCTION_URL_EXPRESSION);
+        const url = new URL(`http://localhost${urlPath}`);
+        const defaultURLMatch = url.pathname.match(DEFAULT_FUNCTION_URL_EXPRESSION);
         if (defaultURLMatch) {
             const func = this.get(defaultURLMatch[2]);
             if (!func) {
@@ -260,14 +216,13 @@ export class FunctionsRegistry {
             if (routes.length !== 0) {
                 // @ts-expect-error TS(7006) FIXME: Parameter 'route' implicitly has an 'any' type.
                 const paths = routes.map((route) => chalk.underline(route.pattern)).join(', ');
-                warn(`Function ${chalk.yellow(func.name)} cannot be invoked on ${chalk.underline(urlPath)}, because the function has the following URL paths defined: ${paths}`);
+                warn(`Function ${chalk.yellow(func.name)} cannot be invoked on ${chalk.underline(url.pathname)}, because the function has the following URL paths defined: ${paths}`);
                 return;
             }
             return { func, route: null };
         }
-        // @ts-expect-error TS(2339) FIXME: Property 'functions' does not exist on type 'Funct... Remove this comment to see the full error message
         for (const func of this.functions.values()) {
-            const route = await func.matchURLPath(urlPath, method);
+            const route = await func.matchURLPath(url.pathname, method, hasStaticFile);
             if (route) {
                 return { func, route };
             }
@@ -352,7 +307,6 @@ export class FunctionsRegistry {
         // the new location.
         if (extname(func.mainFile) === ZIP_EXTENSION) {
             const unzippedDirectory = await this.unzipFunction(func);
-            // @ts-expect-error TS(2339) FIXME: Property 'debug' does not exist on type 'Functions... Remove this comment to see the full error message
             if (this.debug) {
                 FunctionsRegistry.logEvent('extracted', { func });
             }
@@ -360,13 +314,16 @@ export class FunctionsRegistry {
             // the build data.
             // @ts-expect-error TS(2339) FIXME: Property 'manifest' does not exist on type 'Functi... Remove this comment to see the full error message
             const manifestEntry = (this.manifest?.functions || []).find((manifestFunc) => manifestFunc.name === func.name);
-            func.buildData = manifestEntry?.buildData || {};
+            func.buildData = {
+                ...manifestEntry?.buildData,
+                routes: manifestEntry.routes,
+            };
             // When we look at an unzipped function, we don't know whether it uses
-            // the legacy entry file format (i.e. `[function name].js`) or the new
-            // one (i.e. `___netlify-entry-point.js`). Let's look for the new one
+            // the legacy entry file format (i.e. `[function name].mjs`) or the new
+            // one (i.e. `___netlify-entry-point.mjs`). Let's look for the new one
             // and use it if it exists, otherwise use the old one.
             try {
-                const v2EntryPointPath = join(unzippedDirectory, '___netlify-entry-point.js');
+                const v2EntryPointPath = join(unzippedDirectory, '___netlify-entry-point.mjs');
                 await stat(v2EntryPointPath);
                 func.mainFile = v2EntryPointPath;
             }
@@ -377,7 +334,6 @@ export class FunctionsRegistry {
         else {
             this.buildFunctionAndWatchFiles(func, !isReload);
         }
-        // @ts-expect-error TS(2339) FIXME: Property 'functions' does not exist on type 'Funct... Remove this comment to see the full error message
         this.functions.set(name, func);
     }
     /**
@@ -419,7 +375,6 @@ export class FunctionsRegistry {
         });
         // Before registering any functions, we look for any functions that were on
         // the previous list but are missing from the new one. We unregister them.
-        // @ts-expect-error TS(2339) FIXME: Property 'functions' does not exist on type 'Funct... Remove this comment to see the full error message
         const deletedFunctions = [...this.functions.values()].filter((oldFunc) => {
             const isFound = functions.some((newFunc) => newFunc.name === oldFunc.name && newFunc.mainFile === oldFunc.mainFile);
             return !isFound;
@@ -438,12 +393,10 @@ export class FunctionsRegistry {
                 return;
             }
             // If this function has already been registered, we skip it.
-            // @ts-expect-error TS(2339) FIXME: Property 'functions' does not exist on type 'Funct... Remove this comment to see the full error message
             if (this.functions.has(name)) {
                 return;
             }
             const func = new NetlifyFunction({
-                // @ts-expect-error TS(2339) FIXME: Property 'blobsContext' does not exist on type 'Fu... Remove this comment to see the full error message
                 blobsContext: this.blobsContext,
                 // @ts-expect-error TS(2339) FIXME: Property 'config' does not exist on type 'Function... Remove this comment to see the full error message
                 config: this.config,
@@ -452,7 +405,6 @@ export class FunctionsRegistry {
                 mainFile,
                 name,
                 displayName,
-                // @ts-expect-error TS(2339) FIXME: Property 'projectRoot' does not exist on type 'Fun... Remove this comment to see the full error message
                 projectRoot: this.projectRoot,
                 runtime,
                 // @ts-expect-error TS(2339) FIXME: Property 'timeouts' does not exist on type 'Functi... Remove this comment to see the full error message
@@ -469,7 +421,6 @@ export class FunctionsRegistry {
             await this.registerFunction(name, func, isReload);
             return func;
         }));
-        // @ts-expect-error TS(2339) FIXME: Property 'name' does not exist on type 'NetlifyFun... Remove this comment to see the full error message
         const addedFunctionNames = new Set(addedFunctions.filter(Boolean).map((func) => func?.name));
         deletedFunctions.forEach((func) => {
             // If a function we've unregistered was also registered in this run, then
@@ -486,10 +437,7 @@ export class FunctionsRegistry {
      * Creates a watcher that looks at files being added or removed from a
      * functions directory. It doesn't care about files being changed, because
      * those will be handled by each functions' watcher.
-     *
-     * @param {string} directory
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'directory' implicitly has an 'any' type... Remove this comment to see the full error message
     async setupDirectoryWatcher(directory) {
         // @ts-expect-error TS(2339) FIXME: Property 'directoryWatchers' does not exist on typ... Remove this comment to see the full error message
         if (this.directoryWatchers.has(directory)) {
@@ -509,32 +457,21 @@ export class FunctionsRegistry {
     }
     /**
      * Removes a function from the registry and closes its file watchers.
-     *
-     * @param {NetlifyFunction} func
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'func' implicitly has an 'any' type.
     async unregisterFunction(func) {
         const { name } = func;
-        // @ts-expect-error TS(2339) FIXME: Property 'functions' does not exist on type 'Funct... Remove this comment to see the full error message
         this.functions.delete(name);
-        // @ts-expect-error TS(2339) FIXME: Property 'functionWatchers' does not exist on type... Remove this comment to see the full error message
         const watcher = this.functionWatchers.get(name);
         if (watcher) {
             await watcher.close();
         }
-        // @ts-expect-error TS(2339) FIXME: Property 'functionWatchers' does not exist on type... Remove this comment to see the full error message
         this.functionWatchers.delete(name);
     }
     /**
      * Takes a zipped function and extracts its contents to an internal directory.
-     *
-     * @param {NetlifyFunction} func
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'func' implicitly has an 'any' type.
     async unzipFunction(func) {
-        const targetDirectory = resolve(
-        // @ts-expect-error TS(2339) FIXME: Property 'projectRoot' does not exist on type 'Fun... Remove this comment to see the full error message
-        this.projectRoot, getPathInProject([SERVE_FUNCTIONS_FOLDER, '.unzipped', func.name]));
+        const targetDirectory = resolve(this.projectRoot, getPathInProject([SERVE_FUNCTIONS_FOLDER, '.unzipped', func.name]));
         await extractZip(func.mainFile, { dir: targetDirectory });
         return targetDirectory;
     }

package/src/lib/functions/server.js

@@ -259,6 +259,7 @@ export const startFunctionsServer = async (options) => {
     }
     const functionsRegistry = new FunctionsRegistry({
         blobsContext,
+        // @ts-expect-error TS(7031) FIXME
         capabilities,
         config,
         debug,

package/src/lib/images/proxy.js

@@ -94,7 +94,7 @@ export const initializeProxy = async function ({ config, settings, }) {
         if (!sourceImagePath.startsWith('http://') && !sourceImagePath.startsWith('https://')) {
             // Construct the full URL for relative paths to request from development server
             const sourceImagePathWithLeadingSlash = sourceImagePath.startsWith('/') ? sourceImagePath : `/${sourceImagePath}`;
-            const fullImageUrl = `${devServerUrl}/${encodeURIComponent(sourceImagePathWithLeadingSlash)}`;
+            const fullImageUrl = `${devServerUrl}${encodeURIComponent(sourceImagePathWithLeadingSlash)}`;
             console.log(`fullImageUrl: ${fullImageUrl}`);
             req.url = `/${modifiers}/${fullImageUrl}`;
         }

package/src/utils/proxy.js

@@ -312,8 +312,9 @@ siteInfo, }) {
             (ct.endsWith('/x-www-form-urlencoded') || ct === 'multipart/form-data')) {
             return proxy.web(req, res, { target: options.functionsServer });
         }
-        const matchingFunction = functionsRegistry && (await functionsRegistry.getFunctionForURLPath(destURL, req.method));
         const destStaticFile = await getStatic(dest.pathname, options.publicFolder);
+        const matchingFunction = functionsRegistry &&
+            (await functionsRegistry.getFunctionForURLPath(destURL, req.method, () => Boolean(destStaticFile)));
         let statusValue;
         if (match.force ||
             (!staticFile && ((!options.framework && destStaticFile) || isInternal(destURL) || matchingFunction))) {
@@ -573,11 +574,15 @@ res) => {
     req.originalBody = ['GET', 'OPTIONS', 'HEAD'].includes(req.method)
         ? null
         : await createStreamPromise(req, BYTES_LIMIT);
+    if (isImageRequest(req)) {
+        return imageProxy(req, res);
+    }
     const edgeFunctionsProxyURL = await edgeFunctionsProxy(req, res);
     if (edgeFunctionsProxyURL !== undefined) {
         return proxy.web(req, res, { target: edgeFunctionsProxyURL });
     }
-    const functionMatch = functionsRegistry && (await functionsRegistry.getFunctionForURLPath(req.url, req.method));
+    const functionMatch = functionsRegistry &&
+        (await functionsRegistry.getFunctionForURLPath(req.url, req.method, () => getStatic(decodeURIComponent(reqToURL(req, req.url).pathname), settings.dist)));
     if (functionMatch) {
         // Setting an internal header with the function name so that we don't
         // have to match the URL again in the functions server.
@@ -626,9 +631,6 @@ res) => {
         (ct.endsWith('/x-www-form-urlencoded') || ct === 'multipart/form-data')) {
         return proxy.web(req, res, { target: functionsServer });
     }
-    if (isImageRequest(req)) {
-        return imageProxy(req, res);
-    }
     proxy.web(req, res, options);
 };
 /**