@react-router/cloudflare 0.0.0-experimental-8cee090e4 → 0.0.0-experimental-dd63c14ca

package/dist/index.d.mts

@@ -0,0 +1,53 @@
+import { SessionData, SessionIdStorageStrategy, SessionStorage, ServerBuild, UNSAFE_MiddlewareEnabled, RouterContextProvider, AppLoadContext } from 'react-router';
+import { CacheStorage } from '@cloudflare/workers-types';
+
+interface WorkersKVSessionStorageOptions {
+    /**
+     * The Cookie used to store the session id on the client, or options used
+     * to automatically create one.
+     */
+    cookie?: SessionIdStorageStrategy["cookie"];
+    /**
+     * The KVNamespace used to store the sessions.
+     */
+    kv: KVNamespace;
+}
+/**
+ * Creates a SessionStorage that stores session data in the Clouldflare KV Store.
+ *
+ * The advantage of using this instead of cookie session storage is that
+ * KV Store may contain much more data than cookies.
+ */
+declare function createWorkersKVSessionStorage<Data = SessionData, FlashData = Data>({ cookie, kv, }: WorkersKVSessionStorageOptions): SessionStorage<Data, FlashData>;
+
+type MaybePromise<T> = T | Promise<T>;
+/**
+ * A function that returns the value to use as `context` in route `loader` and
+ * `action` functions.
+ *
+ * You can think of this as an escape hatch that allows you to pass
+ * environment/platform-specific values through to your loader/action.
+ */
+type GetLoadContextFunction<Env = unknown, Params extends string = any, Data extends Record<string, unknown> = Record<string, unknown>> = (args: {
+    request: Request;
+    context: {
+        cloudflare: EventContext<Env, Params, Data> & {
+            cf: EventContext<Env, Params, Data>["request"]["cf"];
+            ctx: {
+                waitUntil: EventContext<Env, Params, Data>["waitUntil"];
+                passThroughOnException: EventContext<Env, Params, Data>["passThroughOnException"];
+            };
+            caches: CacheStorage;
+        };
+    };
+}) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<RouterContextProvider> : MaybePromise<AppLoadContext>;
+type RequestHandler<Env = any> = PagesFunction<Env>;
+interface createPagesFunctionHandlerParams<Env = any> {
+    build: ServerBuild | (() => ServerBuild | Promise<ServerBuild>);
+    getLoadContext?: GetLoadContextFunction<Env>;
+    mode?: string;
+}
+declare function createRequestHandler<Env = any>({ build, mode, getLoadContext, }: createPagesFunctionHandlerParams<Env>): RequestHandler<Env>;
+declare function createPagesFunctionHandler<Env = any>({ build, getLoadContext, mode, }: createPagesFunctionHandlerParams<Env>): (context: EventContext<Env, any, any>) => Promise<Response>;
+
+export { type GetLoadContextFunction, type RequestHandler, createPagesFunctionHandler, type createPagesFunctionHandlerParams, createRequestHandler, createWorkersKVSessionStorage };

package/dist/index.d.ts

@@ -1,18 +1,16 @@
+import { SessionData, SessionIdStorageStrategy, SessionStorage, ServerBuild, UNSAFE_MiddlewareEnabled, RouterContextProvider, AppLoadContext } from 'react-router';
+import { CacheStorage } from '@cloudflare/workers-types';
 
-import { RouterContextProvider, ServerBuild, SessionData, SessionIdStorageStrategy, SessionStorage } from "react-router";
-import { CacheStorage } from "@cloudflare/workers-types";
-
-//#region sessions/workersKVStorage.d.ts
 interface WorkersKVSessionStorageOptions {
-  /**
-   * The Cookie used to store the session id on the client, or options used
-   * to automatically create one.
-   */
-  cookie?: SessionIdStorageStrategy["cookie"];
-  /**
-   * The KVNamespace used to store the sessions.
-   */
-  kv: KVNamespace;
+    /**
+     * The Cookie used to store the session id on the client, or options used
+     * to automatically create one.
+     */
+    cookie?: SessionIdStorageStrategy["cookie"];
+    /**
+     * The KVNamespace used to store the sessions.
+     */
+    kv: KVNamespace;
 }
 /**
  * Creates a SessionStorage that stores session data in the Clouldflare KV Store.
@@ -20,12 +18,8 @@ interface WorkersKVSessionStorageOptions {
  * The advantage of using this instead of cookie session storage is that
  * KV Store may contain much more data than cookies.
  */
-declare function createWorkersKVSessionStorage<Data = SessionData, FlashData = Data>({
-  cookie,
-  kv
-}: WorkersKVSessionStorageOptions): SessionStorage<Data, FlashData>;
-//#endregion
-//#region worker.d.ts
+declare function createWorkersKVSessionStorage<Data = SessionData, FlashData = Data>({ cookie, kv, }: WorkersKVSessionStorageOptions): SessionStorage<Data, FlashData>;
+
 type MaybePromise<T> = T | Promise<T>;
 /**
  * A function that returns the value to use as `context` in route `loader` and
@@ -35,33 +29,25 @@ type MaybePromise<T> = T | Promise<T>;
  * environment/platform-specific values through to your loader/action.
  */
 type GetLoadContextFunction<Env = unknown, Params extends string = any, Data extends Record<string, unknown> = Record<string, unknown>> = (args: {
-  request: Request;
-  context: {
-    cloudflare: EventContext<Env, Params, Data> & {
-      cf: EventContext<Env, Params, Data>["request"]["cf"];
-      ctx: {
-        waitUntil: EventContext<Env, Params, Data>["waitUntil"];
-        passThroughOnException: EventContext<Env, Params, Data>["passThroughOnException"];
-      };
-      caches: CacheStorage;
+    request: Request;
+    context: {
+        cloudflare: EventContext<Env, Params, Data> & {
+            cf: EventContext<Env, Params, Data>["request"]["cf"];
+            ctx: {
+                waitUntil: EventContext<Env, Params, Data>["waitUntil"];
+                passThroughOnException: EventContext<Env, Params, Data>["passThroughOnException"];
+            };
+            caches: CacheStorage;
+        };
     };
-  };
-}) => MaybePromise<RouterContextProvider>;
+}) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<RouterContextProvider> : MaybePromise<AppLoadContext>;
 type RequestHandler<Env = any> = PagesFunction<Env>;
 interface createPagesFunctionHandlerParams<Env = any> {
-  build: ServerBuild | (() => ServerBuild | Promise<ServerBuild>);
-  getLoadContext: GetLoadContextFunction<Env>;
-  mode?: string;
+    build: ServerBuild | (() => ServerBuild | Promise<ServerBuild>);
+    getLoadContext?: GetLoadContextFunction<Env>;
+    mode?: string;
 }
-declare function createRequestHandler<Env = any>({
-  build,
-  mode,
-  getLoadContext
-}: createPagesFunctionHandlerParams<Env>): RequestHandler<Env>;
-declare function createPagesFunctionHandler<Env = any>({
-  build,
-  getLoadContext,
-  mode
-}: createPagesFunctionHandlerParams<Env>): (context: EventContext<Env, any, any>) => Promise<Response>;
-//#endregion
-export { type GetLoadContextFunction, type RequestHandler, createPagesFunctionHandler, type createPagesFunctionHandlerParams, createRequestHandler, createWorkersKVSessionStorage };
+declare function createRequestHandler<Env = any>({ build, mode, getLoadContext, }: createPagesFunctionHandlerParams<Env>): RequestHandler<Env>;
+declare function createPagesFunctionHandler<Env = any>({ build, getLoadContext, mode, }: createPagesFunctionHandlerParams<Env>): (context: EventContext<Env, any, any>) => Promise<Response>;
+
+export { type GetLoadContextFunction, type RequestHandler, createPagesFunctionHandler, type createPagesFunctionHandlerParams, createRequestHandler, createWorkersKVSessionStorage };

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/cloudflare v0.0.0-experimental-8cee090e4
+ * @react-router/cloudflare v0.0.0-experimental-dd63c14ca
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,86 +8,150 @@
  *
  * @license MIT
  */
-import { createRequestHandler as createRequestHandler$1, createSessionStorage } from "react-router";
-import "@cloudflare/workers-types";
-//#region sessions/workersKVStorage.ts
-/**
-* Creates a SessionStorage that stores session data in the Clouldflare KV Store.
-*
-* The advantage of using this instead of cookie session storage is that
-* KV Store may contain much more data than cookies.
-*/
-function createWorkersKVSessionStorage({ cookie, kv }) {
-	return createSessionStorage({
-		cookie,
-		async createData(data, expires) {
-			while (true) {
-				let id = [...crypto.getRandomValues(new Uint8Array(8))].map((x) => x.toString(16).padStart(2, "0")).join("");
-				if (await kv.get(id, "json")) continue;
-				await kv.put(id, JSON.stringify(data), { expiration: expires ? Math.round(expires.getTime() / 1e3) : void 0 });
-				return id;
-			}
-		},
-		async readData(id) {
-			let session = await kv.get(id);
-			if (!session) return null;
-			return JSON.parse(session);
-		},
-		async updateData(id, data, expires) {
-			await kv.put(id, JSON.stringify(data), { expiration: expires ? Math.round(expires.getTime() / 1e3) : void 0 });
-		},
-		async deleteData(id) {
-			await kv.delete(id);
-		}
-	});
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// index.ts
+var index_exports = {};
+__export(index_exports, {
+  createPagesFunctionHandler: () => createPagesFunctionHandler,
+  createRequestHandler: () => createRequestHandler,
+  createWorkersKVSessionStorage: () => createWorkersKVSessionStorage
+});
+module.exports = __toCommonJS(index_exports);
+
+// sessions/workersKVStorage.ts
+var import_react_router = require("react-router");
+function createWorkersKVSessionStorage({
+  cookie,
+  kv
+}) {
+  return (0, import_react_router.createSessionStorage)({
+    cookie,
+    async createData(data, expires) {
+      while (true) {
+        let randomBytes = crypto.getRandomValues(new Uint8Array(8));
+        let id = [...randomBytes].map((x) => x.toString(16).padStart(2, "0")).join("");
+        if (await kv.get(id, "json")) {
+          continue;
+        }
+        await kv.put(id, JSON.stringify(data), {
+          expiration: expires ? Math.round(expires.getTime() / 1e3) : void 0
+        });
+        return id;
+      }
+    },
+    async readData(id) {
+      let session = await kv.get(id);
+      if (!session) {
+        return null;
+      }
+      return JSON.parse(session);
+    },
+    async updateData(id, data, expires) {
+      await kv.put(id, JSON.stringify(data), {
+        expiration: expires ? Math.round(expires.getTime() / 1e3) : void 0
+      });
+    },
+    async deleteData(id) {
+      await kv.delete(id);
+    }
+  });
 }
-//#endregion
-//#region worker.ts
-function createRequestHandler({ build, mode, getLoadContext }) {
-	let handleRequest = createRequestHandler$1(build, mode);
-	return async (cloudflare) => {
-		let loadContext = await getLoadContext({
-			request: cloudflare.request,
-			context: { cloudflare: {
-				...cloudflare,
-				cf: cloudflare.request.cf,
-				ctx: {
-					waitUntil: cloudflare.waitUntil.bind(cloudflare),
-					passThroughOnException: cloudflare.passThroughOnException.bind(cloudflare)
-				},
-				caches
-			} }
-		});
-		return handleRequest(cloudflare.request, loadContext);
-	};
+
+// worker.ts
+var import_react_router2 = require("react-router");
+function createRequestHandler({
+  build,
+  mode,
+  getLoadContext = ({ context }) => ({
+    ...context,
+    cloudflare: {
+      ...context.cloudflare,
+      cf: context.cloudflare.request.cf
+    }
+  })
+}) {
+  let handleRequest = (0, import_react_router2.createRequestHandler)(build, mode);
+  return async (cloudflare) => {
+    let loadContext = await getLoadContext({
+      request: cloudflare.request,
+      context: {
+        cloudflare: {
+          ...cloudflare,
+          cf: cloudflare.request.cf,
+          ctx: {
+            waitUntil: cloudflare.waitUntil.bind(cloudflare),
+            passThroughOnException: cloudflare.passThroughOnException.bind(cloudflare)
+          },
+          caches
+        }
+      }
+    });
+    return handleRequest(cloudflare.request, loadContext);
+  };
 }
-function createPagesFunctionHandler({ build, getLoadContext, mode }) {
-	let handleRequest = createRequestHandler({
-		build,
-		getLoadContext,
-		mode
-	});
-	let handleFetch = async (context) => {
-		let response;
-		context.request.headers.delete("if-none-match");
-		try {
-			response = await context.env.ASSETS.fetch(context.request.url, context.request.clone());
-			response = response && response.status >= 200 && response.status < 400 ? new Response(response.body, response) : void 0;
-		} catch {}
-		if (!response) response = await handleRequest(context);
-		return response;
-	};
-	return async (context) => {
-		try {
-			return await handleFetch(context);
-		} catch (error) {
-			if (process.env.NODE_ENV === "development" && error instanceof Error) {
-				console.error(error);
-				return new Response(error.message || error.toString(), { status: 500 });
-			}
-			return new Response("Internal Error", { status: 500 });
-		}
-	};
+function createPagesFunctionHandler({
+  build,
+  getLoadContext,
+  mode
+}) {
+  let handleRequest = createRequestHandler({
+    build,
+    getLoadContext,
+    mode
+  });
+  let handleFetch = async (context) => {
+    let response;
+    context.request.headers.delete("if-none-match");
+    try {
+      response = await context.env.ASSETS.fetch(
+        context.request.url,
+        context.request.clone()
+      );
+      response = response && response.status >= 200 && response.status < 400 ? new Response(response.body, response) : void 0;
+    } catch {
+    }
+    if (!response) {
+      response = await handleRequest(context);
+    }
+    return response;
+  };
+  return async (context) => {
+    try {
+      return await handleFetch(context);
+    } catch (error) {
+      if (process.env.NODE_ENV === "development" && error instanceof Error) {
+        console.error(error);
+        return new Response(error.message || error.toString(), {
+          status: 500
+        });
+      }
+      return new Response("Internal Error", {
+        status: 500
+      });
+    }
+  };
 }
-//#endregion
-export { createPagesFunctionHandler, createRequestHandler, createWorkersKVSessionStorage };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createPagesFunctionHandler,
+  createRequestHandler,
+  createWorkersKVSessionStorage
+});

package/dist/index.mjs

@@ -0,0 +1,129 @@
+/**
+ * @react-router/cloudflare v0.0.0-experimental-dd63c14ca
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+// sessions/workersKVStorage.ts
+import { createSessionStorage } from "react-router";
+function createWorkersKVSessionStorage({
+  cookie,
+  kv
+}) {
+  return createSessionStorage({
+    cookie,
+    async createData(data, expires) {
+      while (true) {
+        let randomBytes = crypto.getRandomValues(new Uint8Array(8));
+        let id = [...randomBytes].map((x) => x.toString(16).padStart(2, "0")).join("");
+        if (await kv.get(id, "json")) {
+          continue;
+        }
+        await kv.put(id, JSON.stringify(data), {
+          expiration: expires ? Math.round(expires.getTime() / 1e3) : void 0
+        });
+        return id;
+      }
+    },
+    async readData(id) {
+      let session = await kv.get(id);
+      if (!session) {
+        return null;
+      }
+      return JSON.parse(session);
+    },
+    async updateData(id, data, expires) {
+      await kv.put(id, JSON.stringify(data), {
+        expiration: expires ? Math.round(expires.getTime() / 1e3) : void 0
+      });
+    },
+    async deleteData(id) {
+      await kv.delete(id);
+    }
+  });
+}
+
+// worker.ts
+import { createRequestHandler as createReactRouterRequestHandler } from "react-router";
+function createRequestHandler({
+  build,
+  mode,
+  getLoadContext = ({ context }) => ({
+    ...context,
+    cloudflare: {
+      ...context.cloudflare,
+      cf: context.cloudflare.request.cf
+    }
+  })
+}) {
+  let handleRequest = createReactRouterRequestHandler(build, mode);
+  return async (cloudflare) => {
+    let loadContext = await getLoadContext({
+      request: cloudflare.request,
+      context: {
+        cloudflare: {
+          ...cloudflare,
+          cf: cloudflare.request.cf,
+          ctx: {
+            waitUntil: cloudflare.waitUntil.bind(cloudflare),
+            passThroughOnException: cloudflare.passThroughOnException.bind(cloudflare)
+          },
+          caches
+        }
+      }
+    });
+    return handleRequest(cloudflare.request, loadContext);
+  };
+}
+function createPagesFunctionHandler({
+  build,
+  getLoadContext,
+  mode
+}) {
+  let handleRequest = createRequestHandler({
+    build,
+    getLoadContext,
+    mode
+  });
+  let handleFetch = async (context) => {
+    let response;
+    context.request.headers.delete("if-none-match");
+    try {
+      response = await context.env.ASSETS.fetch(
+        context.request.url,
+        context.request.clone()
+      );
+      response = response && response.status >= 200 && response.status < 400 ? new Response(response.body, response) : void 0;
+    } catch {
+    }
+    if (!response) {
+      response = await handleRequest(context);
+    }
+    return response;
+  };
+  return async (context) => {
+    try {
+      return await handleFetch(context);
+    } catch (error) {
+      if (process.env.NODE_ENV === "development" && error instanceof Error) {
+        console.error(error);
+        return new Response(error.message || error.toString(), {
+          status: 500
+        });
+      }
+      return new Response("Internal Error", {
+        status: 500
+      });
+    }
+  };
+}
+export {
+  createPagesFunctionHandler,
+  createRequestHandler,
+  createWorkersKVSessionStorage
+};

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@react-router/cloudflare",
-  "type": "module",
-  "version": "0.0.0-experimental-8cee090e4",
+  "version": "0.0.0-experimental-dd63c14ca",
   "description": "Cloudflare platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
@@ -16,14 +15,20 @@
   "typings": "dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "default": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     },
     "./package.json": "./package.json"
   },
   "wireit": {
     "build": {
-      "command": "tsdown",
+      "command": "tsup",
       "files": [
         "../../pnpm-workspace.yaml",
         "sessions/**",
@@ -37,16 +42,16 @@
     }
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20260527.1",
-    "tsdown": "^0.22.0",
-    "typescript": "^6.0.3",
-    "wireit": "0.14.12",
-    "react-router": "0.0.0-experimental-8cee090e4"
+    "@cloudflare/workers-types": "^4.20250803.0",
+    "tsup": "^8.3.0",
+    "typescript": "^5.4.5",
+    "wireit": "0.14.9",
+    "react-router": "0.0.0-experimental-dd63c14ca"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.0.0",
     "typescript": "^5.1.0 || ^6.0.0",
-    "react-router": "^0.0.0-experimental-8cee090e4"
+    "react-router": "^0.0.0-experimental-dd63c14ca"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -54,7 +59,7 @@
     }
   },
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "dist/",