Merge branch 'main' into rename-FreshContext-req-to-request

Author: timreichen

deno.lock

@@ -330,7 +330,7 @@ export class App<State> {
       if (cmd.type !== CommandType.App && cmd.type !== CommandType.NotFound) {
         const clone = {
           ...cmd,
-          pattern: mergePath(path, cmd.pattern),
+          pattern: mergePath(path, cmd.pattern, true),
           includeLastSegment: cmd.pattern === "/" || cmd.includeLastSegment,
         };
         this.#commands.push(clone);

packages/fresh/src/app.ts

@@ -273,6 +273,7 @@ function applyCommandsInner<State>(
           const routePath = mergePath(
             basePath,
             config?.routeOverride ?? pattern,
+            false,
           );
 
           let def: Route<State>;
@@ -304,6 +305,7 @@ function applyCommandsInner<State>(
           const routePath = toRoutePath(mergePath(
             basePath,
             route.config?.routeOverride ?? pattern,
+            false,
           ));
 
           if (typeof route.handler === "function") {
@@ -333,7 +335,7 @@ function applyCommandsInner<State>(
 
         result.push(...fns);
 
-        const resPath = toRoutePath(mergePath(basePath, pattern));
+        const resPath = toRoutePath(mergePath(basePath, pattern, false));
         if (method === "ALL") {
           router.add("GET", resPath, result);
           router.add("DELETE", resPath, result);

packages/fresh/src/commands.ts

@@ -389,6 +389,42 @@ Deno.test({
   sanitizeResources: false,
 });
 
+Deno.test({
+  name: "Builder - dev server supports basePath",
+  fn: async () => {
+    const root = path.join(import.meta.dirname!, "..", "..");
+    await using _tmp = await withTmpDir({ dir: root, prefix: "tmp_builder_" });
+    const tmp = _tmp.dir;
+
+    const app = new App({ basePath: "/foo/bar" })
+      .get("/", () => new Response("ok"))
+      .get("/asdf", () => new Response("ok"));
+
+    const builder = new Builder({
+      root: tmp,
+      outDir: path.join(tmp, "dist"),
+    });
+
+    const controller = new AbortController();
+    let address;
+    await builder.listen(() => Promise.resolve<App<unknown>>(app), {
+      signal: controller.signal,
+      onListen(addr) {
+        address = `http://localhost:${addr.port}`;
+      },
+    });
+
+    const res = await fetch(`${address}/foo/bar/asdf`);
+
+    const text = await res.text();
+    expect(text).toEqual("ok");
+
+    controller.abort();
+  },
+  sanitizeOps: false,
+  sanitizeResources: false,
+});
+
 Deno.test({
   name: "Builder - serves static files in subdir",
   fn: async () => {

packages/fresh/src/dev/builder_test.ts

@@ -284,11 +284,15 @@ export function patternToSegments(
   return out;
 }
 
-export function mergePath(basePath: string, path: string): string {
+export function mergePath(
+  basePath: string,
+  path: string,
+  isMounting: boolean,
+): string {
   if (basePath.endsWith("*")) basePath = basePath.slice(0, -1);
   if (basePath === "/") basePath = "";
 
-  if (path === "*") path = "";
+  if (path === "*") path = isMounting ? "" : "/*";
   else if (path === "/*") path = "/*";
 
   const s = (basePath !== "" && path === "/") ? "" : path;

packages/fresh/src/router.ts

@@ -155,12 +155,22 @@ Deno.test("patternToSegments", () => {
 });
 
 Deno.test("mergePath", () => {
-  expect(mergePath("", "/foo")).toEqual("/foo");
-  expect(mergePath("/", "/foo")).toEqual("/foo");
-  expect(mergePath("/foo/bar", "/")).toEqual("/foo/bar");
-  expect(mergePath("/foo/bar", "/baz")).toEqual("/foo/bar/baz");
-  expect(mergePath("*", "/baz")).toEqual("/baz");
-  expect(mergePath("/*", "/baz")).toEqual("/baz");
-  expect(mergePath("/foo", "*")).toEqual("/foo");
-  expect(mergePath("/foo", "/*")).toEqual("/foo/*");
+  expect(mergePath("", "/foo", false)).toEqual("/foo");
+  expect(mergePath("/", "/foo", false)).toEqual("/foo");
+  expect(mergePath("/foo/bar", "/", false)).toEqual("/foo/bar");
+  expect(mergePath("/foo/bar", "/baz", false)).toEqual("/foo/bar/baz");
+  expect(mergePath("*", "/baz", false)).toEqual("/baz");
+  expect(mergePath("/*", "/baz", false)).toEqual("/baz");
+  expect(mergePath("/foo", "*", false)).toEqual("/foo/*");
+  expect(mergePath("/foo", "/*", false)).toEqual("/foo/*");
+
+  // mounting
+  expect(mergePath("", "/foo", true)).toEqual("/foo");
+  expect(mergePath("/", "/foo", true)).toEqual("/foo");
+  expect(mergePath("/foo/bar", "/", true)).toEqual("/foo/bar");
+  expect(mergePath("/foo/bar", "/baz", true)).toEqual("/foo/bar/baz");
+  expect(mergePath("*", "/baz", true)).toEqual("/baz");
+  expect(mergePath("/*", "/baz", true)).toEqual("/baz");
+  expect(mergePath("/foo", "*", true)).toEqual("/foo");
+  expect(mergePath("/foo", "/*", true)).toEqual("/foo/*");
 });

packages/fresh/src/router_test.ts

@@ -0,0 +1 @@
+exports.value = "ok";

packages/plugin-vite/demo/fixtures/commonjs_mod.cjs

@@ -0,0 +1,5 @@
+import { value } from "../../fixtures/commonjs_mod.cjs";
+
+export default function Page() {
+  return <h1>{value}</h1>;
+}

packages/plugin-vite/demo/routes/tests/commonjs.tsx

@@ -1,10 +1,13 @@
 {
   "name": "@fresh/plugin-vite",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"
   },
+  "publish": {
+    "include": ["./src", "README.md"]
+  },
   "compilerOptions": {
     "jsx": "precompile",
     "jsxImportSource": "preact"
@@ -16,8 +19,10 @@
     "demo:start": "cd demo && deno serve -A _fresh/server/server-entry.mjs"
   },
   "imports": {
+    "@babel/core": "npm:@babel/core@^7.28.0",
     "@deno/loader": "jsr:@deno/loader@^0.3.2",
     "@prefresh/vite": "npm:@prefresh/vite@^2.4.8",
+    "@types/babel__core": "npm:@types/babel__core@^7.20.5",
     "@types/node": "npm:@types/node@^24.1.0",
     "preact": "npm:preact@^10.26.9",
     "vite": "npm:vite@^7.0.6",

packages/plugin-vite/deno.json

@@ -12,6 +12,7 @@ import { devServer } from "./plugins/dev_server.ts";
 import { buildIdPlugin } from "./plugins/build_id.ts";
 import { clientSnapshot } from "./plugins/client_snapshot.ts";
 import { serverSnapshot } from "./plugins/server_snapshot.ts";
+import { patches } from "./plugins/patches.ts";
 
 export function fresh(config?: FreshViteConfig): Plugin[] {
   const fConfig: ResolvedFreshViteConfig = {
@@ -37,7 +38,6 @@ export function fresh(config?: FreshViteConfig): Plugin[] {
               "react-dom": "preact/compat",
               react: "preact/compat",
             },
-            noExternal: true,
           },
           optimizeDeps: {
             include: [
@@ -108,6 +108,7 @@ export function fresh(config?: FreshViteConfig): Plugin[] {
         fConfig.routeDir = pathWithRoot(fConfig.routeDir, config.root);
       },
     },
+    patches(),
     serverEntryPlugin(fConfig),
     ...serverSnapshot(fConfig),
     clientEntryPlugin(),