fix

Author: marvinhagemeister

deno.json

@@ -46,7 +46,6 @@
   "imports": {
     "@deno/doc": "jsr:@deno/doc@^0.172.0",
     "@deno/esbuild-plugin": "jsr:@deno/esbuild-plugin@^1.1.1",
-    "@deno/loader": "jsr:@deno/loader@^0.2.1",
     "@std/cli": "jsr:@std/cli@^1.0.19",
     "@std/collections": "jsr:@std/collections@^1.0.11",
     "@std/http": "jsr:@std/http@^1.0.15",

deno.lock

@@ -17,6 +17,12 @@ function testTransformer(files: Record<string, string>, root = "/") {
       const buf = new TextEncoder().encode(content);
       return Promise.resolve(buf);
     },
+    readTextFile: (file) => {
+      if (file instanceof URL) throw new Error("Not supported");
+      // deno-lint-ignore no-explicit-any
+      const content = (files as any)[file];
+      return Promise.resolve(content);
+    },
   };
   return new FileTransformer(mockFs, root);
 }

src/dev/file_transformer_test.ts

@@ -5,7 +5,6 @@ import * as path from "@std/path";
 import { pathToPattern } from "../router.ts";
 import { CommandType } from "../commands.ts";
 import { sortRoutePaths } from "../fs_routes.ts";
-import { RequestedModuleType, ResolutionMode, Workspace } from "@deno/loader";
 import type { RouteConfig } from "../types.ts";
 
 const GROUP_REG = /[/\\\\]\((_[^/\\\\]+)\)[/\\\\]/;
@@ -17,12 +16,6 @@ export async function crawlRouteDir<State>(
   onIslandSpecifier: (spec: string) => void,
   files: FsRouteFileNoMod<State>[],
 ) {
-  const workspace = await new Workspace({
-    noTranspile: true,
-    preserveJsx: true,
-  });
-  const loader = await workspace.createLoader({ entrypoints: [] });
-
   await walkDir(
     fs,
     routeDir,
@@ -82,23 +75,15 @@ export async function crawlRouteDir<State>(
 
         routePattern = pathToPattern(id.slice(1));
 
-        const resolved = loader.resolve(
-          entry.path,
-          undefined,
-          ResolutionMode.Import,
-        );
-        const loaded = await loader.load(resolved, RequestedModuleType.Text);
-        if (loaded.kind !== "external") {
-          const text = new TextDecoder().decode(loaded.code);
-          lazy = !text.includes("routeOverride");
+        const code = await fs.readTextFile(entry.path);
+        lazy = !code.includes("routeOverride");
 
-          // TODO: We could do an AST parse here to detect the
-          // kind of handler that's used to get a more accurate
-          // list of methods this route supports.
-          overrideConfig = {
-            methods: "ALL",
-          };
-        }
+        // TODO: We could do an AST parse here to detect the
+        // kind of handler that's used to get a more accurate
+        // list of methods this route supports.
+        overrideConfig = {
+          methods: "ALL",
+        };
       }
 
       files.push({

src/dev/fs_crawl.ts

@@ -9,6 +9,7 @@ export interface FsAdapter {
   isDirectory(path: string | URL): Promise<boolean>;
   mkdirp(dir: string): Promise<void>;
   readFile(path: string | URL): Promise<Uint8Array>;
+  readTextFile(path: string | URL): Promise<string>;
 }
 
 export const fsAdapter: FsAdapter = {
@@ -33,4 +34,5 @@ export const fsAdapter: FsAdapter = {
     }
   },
   readFile: Deno.readFile,
+  readTextFile: Deno.readTextFile,
 };

src/fs.ts

@@ -1480,7 +1480,7 @@ Deno.test("fsRoutes - warn on _middleware with object handler", async () => {
 
   expect(warnSpy.fake).toHaveBeenCalledTimes(1);
   expect(warnSpy.fake).toHaveBeenLastCalledWith(
-    "🍋 %c[WARNING] Unsupported route config: Middleware does not support object handlers with GET, POST, etc.",
+    "🍋 %c[WARNING] Unsupported route config: Middleware does not support object handlers with GET, POST, etc. in routes/_middleware.ts",
     expect.any(String),
   );
 });

src/fs_routes_test.tsx

@@ -121,6 +121,10 @@ export function createFakeFs(files: Record<string, unknown>): FsAdapter {
     async mkdirp(_dir: string) {
     },
     readFile: Deno.readFile,
+    // deno-lint-ignore require-await
+    async readTextFile(path) {
+      return String(files[String(path)]);
+    },
   };
 }