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

Author: timreichen

deno.json

@@ -7,7 +7,7 @@
     "./www"
   ],
   "name": "@fresh/core",
-  "version": "2.0.0-alpha.27",
+  "version": "2.0.0-alpha.29",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

deno.lock

@@ -1,7 +1,6 @@
 # Examples for Fresh
 
-This is an package contains examples for using Fresh with
-[JSR](https://jsr.io/).
+This package contains examples for using Fresh with [JSR](https://jsr.io/).
 
 Learn more about the Fresh framework here:
 [https://fresh.deno.dev/](https://fresh.deno.dev/)

examples/README.md

@@ -1,6 +1,6 @@
 {
   "name": "@fresh/init",
-  "version": "2.0.0-alpha.27",
+  "version": "2.0.0-alpha.29",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

init/deno.json

@@ -2,10 +2,10 @@ import * as colors from "@std/fmt/colors";
 import * as path from "@std/path";
 
 // Keep these as is, as we replace these version in our release script
-const FRESH_VERSION = "2.0.0-alpha.27";
+const FRESH_VERSION = "2.0.0-alpha.29";
 const FRESH_TAILWIND_VERSION = "0.0.1-alpha.7";
-const PREACT_VERSION = "10.25.2";
-const PREACT_SIGNALS_VERSION = "1.3.1";
+const PREACT_VERSION = "10.25.4";
+const PREACT_SIGNALS_VERSION = "2.0.1";
 
 export const enum InitStep {
   ProjectName = "ProjectName",

init/src/init.ts

@@ -296,7 +296,10 @@ export async function fsRoutes<State>(
         isHandlerByMethod(handlers) &&
         !Object.keys(handlers).includes("GET");
       if (missingGetHandler) {
-        app.get(routePath, renderMiddleware(components, undefined));
+        const combined = middlewares.concat(
+          renderMiddleware(components, undefined),
+        );
+        app.get(routePath, ...combined);
       }
     }
 
@@ -397,37 +400,18 @@ export function sortRoutePaths(a: string, b: string) {
   let aIdx = 0;
   let bIdx = 0;
   for (; aIdx < aLen && bIdx < bLen; aIdx++, bIdx++) {
-    let charA = a.charAt(aIdx);
-    let charB = b.charAt(bIdx);
+    const charA = a.charAt(aIdx);
+    const charB = b.charAt(bIdx);
 
     // When comparing a grouped route with a non-grouped one, we
     // need to skip over the group name to effectively compare the
     // actual route.
     if (charA === "(" && charB !== "(") {
-      aIdx++;
-
-      while (aIdx < aLen) {
-        charA = a.charAt(aIdx);
-        if (charA === ")") {
-          aIdx += 2;
-          charA = a.charAt(aIdx);
-          break;
-        }
-
-        aIdx++;
-      }
+      if (charB == "[") return -1;
+      return 1;
     } else if (charB === "(" && charA !== "(") {
-      bIdx++;
-      while (bIdx < bLen) {
-        charB = b.charAt(bIdx);
-        if (charB === ")") {
-          bIdx += 2;
-          charB = b.charAt(bIdx);
-          break;
-        }
-
-        bIdx++;
-      }
+      if (charA == "[") return 1;
+      return -1;
     }
 
     if (charA === "/" || charB === "/") {

src/plugins/fs_routes/mod.ts

@@ -1164,6 +1164,54 @@ Deno.test("fsRoutes - sortRoutePaths", () => {
   expect(routes).toEqual(sorted);
 });
 
+Deno.test("fsRoutes - sortRoutePaths with groups", () => {
+  let routes = [
+    "/(authed)/_middleware.ts",
+    "/(authed)/index.ts",
+    "/about.tsx",
+  ];
+  routes.sort(sortRoutePaths);
+  let sorted = [
+    "/about.tsx",
+    "/(authed)/_middleware.ts",
+    "/(authed)/index.ts",
+  ];
+  expect(routes).toEqual(sorted);
+
+  routes = [
+    "/_app",
+    "/(authed)/_middleware",
+    "/(authed)/_layout",
+    "/_error",
+    "/(authed)/index",
+    "/login",
+    "/auth/login",
+    "/auth/logout",
+    "/(authed)/(account)/account",
+    "/(authed)/api/slug",
+    "/hooks/github",
+    "/(authed)/[org]/_middleware",
+    "/(authed)/[org]/index",
+  ];
+  routes.sort(sortRoutePaths);
+  sorted = [
+    "/_app",
+    "/_error",
+    "/login",
+    "/auth/login",
+    "/auth/logout",
+    "/hooks/github",
+    "/(authed)/_middleware",
+    "/(authed)/_layout",
+    "/(authed)/index",
+    "/(authed)/api/slug",
+    "/(authed)/(account)/account",
+    "/(authed)/[org]/_middleware",
+    "/(authed)/[org]/index",
+  ];
+  expect(routes).toEqual(sorted);
+});
+
 Deno.test("fsRoutes - registers default GET route for component without GET handler", async () => {
   const server = await createServer<{ value: boolean }>({
     "routes/noGetHandler.tsx": {
@@ -1193,6 +1241,47 @@ Deno.test("fsRoutes - registers default GET route for component without GET hand
   );
 });
 
+Deno.test("fsRoutes - default GET route works with nested middleware", async () => {
+  const server = await createServer<{ text: string }>({
+    "routes/_middleware.ts": {
+      handler: (ctx) => {
+        ctx.state.text = "A";
+        return ctx.next();
+      },
+    },
+    "routes/foo/_middleware.ts": {
+      handler: (ctx) => {
+        ctx.state.text += "B";
+        return ctx.next();
+      },
+    },
+    "routes/foo/noGetHandler.tsx": {
+      default: (ctx) => {
+        return <h1>{ctx.state.text}</h1>;
+      },
+      handlers: {
+        POST: () => new Response("POST"),
+      },
+    },
+  });
+
+  const postRes = await server.post("/foo/noGetHandler");
+  expect(postRes.status).toEqual(200);
+  expect(postRes.headers.get("Content-Type")).toEqual(
+    "text/plain;charset=UTF-8",
+  );
+  expect(await postRes.text()).toEqual("POST");
+
+  const getRes = await server.get("/foo/noGetHandler");
+  expect(getRes.status).toEqual(200);
+  expect(getRes.headers.get("Content-Type")).toEqual(
+    "text/html; charset=utf-8",
+  );
+  expect(await getRes.text()).toContain(
+    "<h1>AB</h1>",
+  );
+});
+
 Deno.test("fsRoutes - default GET route doesn't override existing handler", async () => {
   const server = await createServer<{ value: boolean }>({
     "routes/withGetHandler.tsx": {

src/plugins/fs_routes/mod_test.tsx

@@ -1,6 +1,6 @@
 {
   "name": "@fresh/update",
-  "version": "2.0.0-alpha.27",
+  "version": "2.0.0-alpha.29",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

update/deno.json

@@ -4,9 +4,9 @@ import * as tsmorph from "ts-morph";
 
 export const SyntaxKind = tsmorph.ts.SyntaxKind;
 
-export const FRESH_VERSION = "2.0.0-alpha.27";
-export const PREACT_VERSION = "10.25.2";
-export const PREACT_SIGNALS_VERSION = "1.3.1";
+export const FRESH_VERSION = "2.0.0-alpha.29";
+export const PREACT_VERSION = "10.25.4";
+export const PREACT_SIGNALS_VERSION = "2.0.1";
 
 export interface DenoJson {
   name?: string;

update/src/update.ts

@@ -12,7 +12,7 @@ export function SidebarCategory(props: {
     <li class="my-2 block">
       <a
         href={href}
-        class="text-gray-900 hover:text-gray-600 aria-[current]:text-green-700 aria-[current]:hover:underline font-bold"
+        class="text-foreground-secondary hover:text-gray-600 aria-[current]:text-fresh-green aria-[current]:hover:underline font-bold"
       >
         {title}
       </a>
@@ -36,7 +36,7 @@ export function SidebarEntry(props: {
     <li class="py-[1px]">
       <a
         href={href}
-        class="aria-[current]:text-green-700 aria-[current]:border-green-600 aria-[current]:bg-green-50 border-l-4 border-transparent px-4 py-0.5 transition-colors hover:text-green-500 font-normal block"
+        class="aria-[current]:text-fresh-green aria-[current]:border-green-600 aria-[current]:bg-fresh-green/5 border-l-4 border-transparent px-4 py-0.5 transition-colors hover:text-fresh-green/80 font-normal block"
       >
         {title}
       </a>