Merge branch 'main' into fix-3483

Author: ottenhoff

deno.lock

@@ -14,9 +14,9 @@ To get started with daisyUI, make sure you have Tailwind CSS enabled in your
 Fresh project, then install daisyUI and update your configuration.
 
 1. Run `deno i -D npm:daisyui@latest` to install daisyUI
-2. Add daisyUI configuration in `./static/styles.css`:
+2. Add daisyUI configuration in `./assets/styles.css`:
 
-   ```diff static/styles.css
+   ```diff assets/styles.css
      @import "tailwindcss";
    + @plugin "daisyui";
    ```

docs/latest/examples/daisyui.md

@@ -83,7 +83,7 @@ export class Context<State> {
   data: unknown = undefined;
   /** Error value if an error was caught (Default: null) */
   error: unknown | null = null;
-  readonly info: Deno.ServeHandlerInfo | Deno.ServeHandlerInfo;
+  readonly info: Deno.ServeHandlerInfo;
   /**
    * Whether the current Request is a partial request.
    *

packages/fresh/src/context.ts

@@ -2,9 +2,8 @@ import type { AnyComponent } from "preact";
 import type { MaybeLazy, Route, RouteConfig } from "./types.ts";
 import type { HandlerByMethod, RouteHandler } from "./handlers.ts";
 import type { Middleware } from "./middlewares/mod.ts";
-import type { AsyncAnyComponent } from "./render.ts";
+import type { AsyncAnyComponent, PageProps } from "./render.ts";
 import { type HandlerFn, isHandlerByMethod } from "./handlers.ts";
-import type { PageProps } from "./render.ts";
 import {
   type Command,
   CommandType,

packages/fresh/src/fs_routes.ts

@@ -1,12 +1,12 @@
 import {
+  HOLE,
   INFINITY_NEG,
   INFINITY_POS,
   NAN,
   NULL,
   UNDEFINED,
   ZERO_NEG,
 } from "./constants.ts";
-import { HOLE } from "./constants.ts";
 
 export type Stringifiers = Record<
   string,

packages/fresh/src/jsonify/stringify.ts

@@ -42,7 +42,7 @@ export interface RouteResult<T> {
 
 export interface Router<T> {
   add(
-    method: Method | "OPTIONS" | "ALL",
+    method: Method | "ALL",
     pathname: string,
     handlers: T[],
   ): void;

packages/fresh/src/router.ts

@@ -11,4 +11,5 @@ export default defineConfig({
     }),
     tailwind(),
   ],
+  future: "warn",
 });

packages/plugin-vite/demo/vite.config.ts

@@ -23,9 +23,9 @@
   "imports": {
     "@babel/core": "npm:@babel/core@^7.28.0",
     "@babel/preset-react": "npm:@babel/preset-react@^7.27.1",
-    "@deno/loader": "jsr:@deno/loader@^0.3.2",
+    "@deno/loader": "jsr:@deno/loader@^0.3.10",
     "@marvinh-test/import-json": "jsr:@marvinh-test/import-json@^0.0.1",
-    "@mjackson/node-fetch-server": "npm:@mjackson/node-fetch-server@^0.7.0",
+    "@remix-run/node-fetch-server": "npm:@remix-run/node-fetch-server@^0.12.0",
     "@prefresh/vite": "npm:@prefresh/vite@^2.4.8",
     "@radix-ui/themes": "npm:@radix-ui/themes@^3.2.1",
     "@tailwindcss/vite": "npm:@tailwindcss/vite@^4.1.12",

packages/plugin-vite/deno.json

@@ -256,6 +256,6 @@ async function loadEnvFile(envPath: string) {
   try {
     await stdLoadEnv({ envPath, export: true });
   } catch {
-    // Ignoe
+    // Ignore
   }
 }

packages/plugin-vite/src/mod.ts

@@ -15,7 +15,7 @@ export function clientEntryPlugin(options: ResolvedFreshViteConfig): Plugin {
       isDev = env.command === "serve";
     },
     applyToEnvironment(env) {
-      return env.name === "client";
+      return env.config.consumer === "client";
     },
     configResolved(config) {
       clientEntry = pathWithRoot(options.clientEntry, config.root);