Merge branch 'main' into feature/add_ip_restriction_middleware

Octo8080X · web-flow · commit ef5ff800d0b0 · 2025-12-23T23:45:28.000+09:00
diff --git a/deno.lock b/deno.lock
diff --git a/packages/fresh/src/context.ts b/packages/fresh/src/context.ts
@@ -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.
    *
diff --git a/packages/fresh/src/fs_routes.ts b/packages/fresh/src/fs_routes.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,
diff --git a/packages/fresh/src/jsonify/stringify.ts b/packages/fresh/src/jsonify/stringify.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,
diff --git a/packages/fresh/src/router.ts b/packages/fresh/src/router.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;
diff --git a/packages/plugin-vite/demo/vite.config.ts b/packages/plugin-vite/demo/vite.config.ts
@@ -11,4 +11,5 @@ export default defineConfig({
     }),
     tailwind(),
   ],
+  future: "warn",
 });
diff --git a/packages/plugin-vite/deno.json b/packages/plugin-vite/deno.json
@@ -25,7 +25,7 @@
     "@babel/preset-react": "npm:@babel/preset-react@^7.27.1",
     "@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",
diff --git a/packages/plugin-vite/src/mod.ts b/packages/plugin-vite/src/mod.ts
@@ -256,6 +256,6 @@ async function loadEnvFile(envPath: string) {
   try {
     await stdLoadEnv({ envPath, export: true });
   } catch {
-    // Ignoe
+    // Ignore
   }
 }
diff --git a/packages/plugin-vite/src/plugins/client_entry.ts b/packages/plugin-vite/src/plugins/client_entry.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);
diff --git a/packages/plugin-vite/src/plugins/client_snapshot.ts b/packages/plugin-vite/src/plugins/client_snapshot.ts
@@ -17,7 +17,7 @@ export function clientSnapshot(options: ResolvedFreshViteConfig): Plugin[] {
       name: "fresh:client-snapshot",
       sharedDuringBuild: true,
       applyToEnvironment(env) {
-        return env.name === "client";
+        return env.config.consumer === "client";
       },
 
       async config(cfg, env) {
diff --git a/packages/plugin-vite/src/plugins/deno.ts b/packages/plugin-vite/src/plugins/deno.ts
@@ -64,7 +64,9 @@ export function deno(): Plugin {
           external: true,
         };
       }
-      const loader = options?.ssr ? ssrLoader : browserLoader;
+      const loader = this.environment.config.consumer === "server"
+        ? ssrLoader
+        : browserLoader;
 
       const original = id;
 
@@ -154,8 +156,10 @@ export function deno(): Plugin {
         // ignore
       }
     },
-    async load(id, options) {
-      const loader = options?.ssr ? ssrLoader : browserLoader;
+    async load(id) {
+      const loader = this.environment.config.consumer === "server"
+        ? ssrLoader
+        : browserLoader;
 
       if (isDenoSpecifier(id)) {
         const { type, specifier } = parseDenoSpecifier(id);
@@ -168,7 +172,7 @@ export function deno(): Plugin {
         const code = new TextDecoder().decode(result.code);
 
         const maybeJsx = babelTransform({
-          ssr: !!options?.ssr,
+          ssr: this.environment.config.consumer === "server",
           media: result.mediaType,
           code,
           id: specifier,
@@ -212,7 +216,7 @@ export function deno(): Plugin {
       const code = new TextDecoder().decode(result.code);
 
       const maybeJsx = babelTransform({
-        ssr: !!options?.ssr,
+        ssr: this.environment.config.consumer === "server",
         media: result.mediaType,
         id,
         code,
@@ -230,10 +234,10 @@ export function deno(): Plugin {
       filter: {
         id: JSX_REG,
       },
-      async handler(_, id, options) {
+      async handler(_, id) {
         // This transform is a hack to be able to re-use Deno's precompile
         // jsx transform.
-        if (!options?.ssr) {
+        if (this.environment.name === "client") {
           return;
         }
 
diff --git a/packages/plugin-vite/src/plugins/dev_server.ts b/packages/plugin-vite/src/plugins/dev_server.ts
@@ -1,7 +1,7 @@
 import type { DevEnvironment, Plugin } from "vite";
 import * as path from "@std/path";
 import { ASSET_CACHE_BUST_KEY } from "fresh/internal";
-import { createRequest, sendResponse } from "@mjackson/node-fetch-server";
+import { createRequest, sendResponse } from "@remix-run/node-fetch-server";
 import { hashCode } from "../shared.ts";
 
 export function devServer(): Plugin[] {
@@ -118,7 +118,7 @@ export function devServer(): Plugin[] {
     {
       name: "fresh:server_hmr",
       applyToEnvironment(env) {
-        return env.name === "ssr";
+        return env.config.consumer === "server";
       },
       hotUpdate(options) {
         const clientMod = options.server.environments.client.moduleGraph
diff --git a/packages/plugin-vite/src/plugins/patches.ts b/packages/plugin-vite/src/plugins/patches.ts
@@ -26,9 +26,9 @@ export function patches(): Plugin {
       filter: {
         id: JS_REG,
       },
-      handler(code, id, options) {
+      handler(code, id) {
         const presets = [];
-        if (!options?.ssr && JSX_REG.test(id)) {
+        if (this.environment.config.consumer === "client" && JSX_REG.test(id)) {
           presets.push([babelReact, {
             runtime: "automatic",
             importSource: "preact",
@@ -40,7 +40,7 @@ export function patches(): Plugin {
         const env = isDev ? "development" : "production";
 
         const plugins: babel.PluginItem[] = [
-          codeEvalPlugin(options?.ssr ? "ssr" : "client", env),
+          codeEvalPlugin(this.environment.config.consumer, env),
           cjsPlugin,
           removePolyfills,
           jsxComments,
diff --git a/packages/plugin-vite/src/plugins/patches/code_eval.ts b/packages/plugin-vite/src/plugins/patches/code_eval.ts
@@ -3,7 +3,7 @@ import type { PluginObj, PluginPass, types } from "@babel/core";
 const APPLY_PG_QUIRKS = "applyPgQuirks";
 
 export function codeEvalPlugin(
-  env: "ssr" | "client",
+  env: "server" | "client",
   mode: string,
 ) {
   return (
@@ -41,7 +41,7 @@ export function codeEvalPlugin(
 
 function evaluateExpr(
   t: typeof types,
-  env: "client" | "ssr",
+  env: "server" | "client",
   mode: string,
   node: types.Node,
   state: PluginPass,
@@ -76,9 +76,9 @@ function evaluateExpr(
       node.right.value === "undefined"
     ) {
       if (node.operator === "==" || node.operator === "===") {
-        return env !== "ssr";
+        return env !== "server";
       } else if (node.operator === "!=" || node.operator === "!==") {
-        return env === "ssr";
+        return env === "server";
       }
     } else if (
       // Workaround for npm:pg
@@ -125,7 +125,7 @@ function evaluateExpr(
       if (result !== null) return result;
     } else if (
       // Check: process.foo === "bar"
-      env === "ssr" && t.isMemberExpression(node.left) &&
+      env === "server" && t.isMemberExpression(node.left) &&
       t.isIdentifier(node.left.object) && node.left.object.name === "process" &&
       t.isIdentifier(node.left.property) &&
       !PROCESS_PROPERTIES.has(node.left.property.name)
diff --git a/packages/plugin-vite/src/plugins/patches/code_eval_test.ts b/packages/plugin-vite/src/plugins/patches/code_eval_test.ts
@@ -6,7 +6,7 @@ function runTest(
   options: {
     input: string;
     expected: string;
-    env: "client" | "ssr";
+    env: "client" | "server";
     mode: "development" | "production";
   },
 ) {
@@ -45,7 +45,7 @@ Deno.test("code eval - resolve runtime conditional detection", () => {
   });
 
   runTest({
-    env: "ssr",
+    env: "server",
     mode: "development",
     input: `if (typeof process === 'undefined') {
       module.exports = require('./browser.js');
@@ -56,7 +56,7 @@ Deno.test("code eval - resolve runtime conditional detection", () => {
   });
 
   runTest({
-    env: "ssr",
+    env: "server",
     mode: "development",
     input: `if (typeof process !== 'undefined') {
 	module.exports = require('./node.js');
@@ -93,7 +93,7 @@ Deno.test("code eval - resolve process.env.NODE_ENV", () => {
 
 Deno.test("code eval - npm:debug", () => {
   runTest({
-    env: "ssr",
+    env: "server",
     mode: "development",
     input:
       `if (typeof process === 'undefined' || process.type === 'renderer' || process.browser === true || process.__nwjs) {
@@ -107,7 +107,7 @@ Deno.test("code eval - npm:debug", () => {
 
 Deno.test("code eval - npm:pg", () => {
   runTest({
-    env: "ssr",
+    env: "server",
     mode: "development",
     input: `if (typeof process.env.NODE_PG_FORCE_NATIVE !== "undefined") {
 	module.exports = require('./native.js');
@@ -120,7 +120,7 @@ Deno.test("code eval - npm:pg", () => {
 
 Deno.test("code eval - npm:pg #2", () => {
   runTest({
-    env: "ssr",
+    env: "server",
     mode: "development",
     input:
       `const useLegacyCrypto = parseInt(process.versions && process.versions.node && process.versions.node.split('.')[0]) < 15
diff --git a/packages/plugin-vite/src/plugins/server_entry.ts b/packages/plugin-vite/src/plugins/server_entry.ts
diff --git a/packages/plugin-vite/src/plugins/server_snapshot.ts b/packages/plugin-vite/src/plugins/server_snapshot.ts
diff --git a/packages/plugin-vite/src/plugins/verify_imports.ts b/packages/plugin-vite/src/plugins/verify_imports.ts

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ export class Context<State> {`
`83`	`83`	`data: unknown = undefined;`
`84`	`84`	`/** Error value if an error was caught (Default: null) */`
`85`	`85`	`error: unknown \| null = null;`
`86`		`- readonly info: Deno.ServeHandlerInfo \| Deno.ServeHandlerInfo;`
	`86`	`+ readonly info: Deno.ServeHandlerInfo;`
`87`	`87`	`/**`
`88`	`88`	`* Whether the current Request is a partial request.`
`89`	`89`	`*`
Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,6 @@ async function loadEnvFile(envPath: string) {`
`256`	`256`	`try {`
`257`	`257`	`await stdLoadEnv({ envPath, export: true });`
`258`	`258`	`} catch {`
`259`		`- // Ignoe`
	`259`	`+ // Ignore`
`260`	`260`	`}`
`261`	`261`	`}`