@reckona/mreact-router 0.0.154 → 0.0.156

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reckona/mreact-router",
-  "version": "0.0.154",
+  "version": "0.0.156",
   "description": "File-system app router, SSR, actions, and deployment adapters for mreact.",
   "keywords": [
     "jsx",
@@ -105,20 +105,20 @@
   },
   "dependencies": {
     "typescript": "^6.0.3",
-    "@reckona/mreact": "0.0.154",
-    "@reckona/mreact-compat": "0.0.154",
-    "@reckona/mreact-compiler": "0.0.154",
-    "@reckona/mreact-devtools": "0.0.154",
-    "@reckona/mreact-query": "0.0.154",
-    "@reckona/mreact-reactive-core": "0.0.154",
-    "@reckona/mreact-reactive-dom": "0.0.154",
-    "@reckona/mreact-shared": "0.0.154",
-    "@reckona/mreact-server": "0.0.154"
+    "@reckona/mreact-compat": "0.0.156",
+    "@reckona/mreact-compiler": "0.0.156",
+    "@reckona/mreact-devtools": "0.0.156",
+    "@reckona/mreact-reactive-core": "0.0.156",
+    "@reckona/mreact-query": "0.0.156",
+    "@reckona/mreact": "0.0.156",
+    "@reckona/mreact-reactive-dom": "0.0.156",
+    "@reckona/mreact-server": "0.0.156",
+    "@reckona/mreact-shared": "0.0.156"
   },
   "peerDependencies": {
     "vite": ">=8 <9"
   },
   "optionalDependencies": {
-    "@reckona/mreact-router-native": "0.0.154"
+    "@reckona/mreact-router-native": "0.0.156"
   }
 }

package/src/adapters/cloudflare.ts

@@ -5,9 +5,11 @@ import {
   __MREACT_QUERY_STATE_SCRIPT_ID,
   createQueryClient,
   dehydrate,
+  installQueryAsyncStorage,
   isQueryClientScopeUnavailableError,
   runWithQueryClient,
   type DehydratedQueryClient,
+  type QueryAsyncStorage,
   type QueryClient,
 } from "@reckona/mreact-query";
 import type {
@@ -489,18 +491,92 @@ function injectCloudflareQueryStateScript(html: string, state: DehydratedQueryCl
     : `${html}${script}`;
 }
 
-function runWithCloudflareQueryClient<T>(queryClient: QueryClient, fn: () => T): T {
+async function runWithCloudflareQueryClient<T>(
+  queryClient: QueryClient,
+  fn: () => T,
+): Promise<Awaited<T>> {
   try {
-    return runWithQueryClient(queryClient, fn);
+    return await runWithQueryClient(queryClient, fn);
   } catch (error) {
     if (isQueryClientScopeUnavailableError(error)) {
-      return fn();
+      installQueryAsyncStorage(cloudflareQueryClientStorage);
+      return await runWithSerializedCloudflareQueryClient(queryClient, fn);
     }
 
     throw error;
   }
 }
 
+const cloudflareQueryClientStorage = createCloudflareQueryClientStorage();
+let cloudflareQueryClientFallbackQueue: Promise<void> = Promise.resolve();
+
+async function runWithSerializedCloudflareQueryClient<T>(
+  queryClient: QueryClient,
+  fn: () => T,
+): Promise<Awaited<T>> {
+  const previous = cloudflareQueryClientFallbackQueue;
+  let releaseCurrent!: () => void;
+  const current = new Promise<void>((resolve) => {
+    releaseCurrent = resolve;
+  });
+  cloudflareQueryClientFallbackQueue = previous.then(() => current, () => current);
+
+  await previous;
+
+  try {
+    return await runWithQueryClient(queryClient, fn);
+  } finally {
+    releaseCurrent();
+  }
+}
+
+function createCloudflareQueryClientStorage(): QueryAsyncStorage<QueryClient> {
+  const stores: QueryClient[] = [];
+
+  return {
+    getStore() {
+      return stores.at(-1);
+    },
+    run<TResult>(store: QueryClient, callback: () => TResult): TResult {
+      stores.push(store);
+      let popSynchronously = true;
+
+      try {
+        const result = callback();
+
+        if (isPromiseLike(result)) {
+          popSynchronously = false;
+          return Promise.resolve(result).finally(() => {
+            removeCloudflareQueryClientStore(stores, store);
+          }) as TResult;
+        }
+
+        return result;
+      } finally {
+        if (popSynchronously) {
+          removeCloudflareQueryClientStore(stores, store);
+        }
+      }
+    },
+  };
+}
+
+function removeCloudflareQueryClientStore(stores: QueryClient[], store: QueryClient): void {
+  const index = stores.lastIndexOf(store);
+
+  if (index >= 0) {
+    stores.splice(index, 1);
+  }
+}
+
+function isPromiseLike(value: unknown): value is PromiseLike<unknown> {
+  return (
+    (typeof value === "object" || typeof value === "function") &&
+    value !== null &&
+    typeof (value as { then?: unknown }).then === "function"
+  );
+}
+
 async function dispatchCloudflareServerRoute<Env>(
   module: CloudflareServerRouteModule<Env>,
   request: Request,

package/src/module-runner.ts

@@ -342,6 +342,28 @@ export function resolveCompatVendorEntryFiles(resolveDir?: string): Map<string,
   return files;
 }
 
+const compatVendorPlaceholderImportPattern =
+  /(["'])mreact-compat-vendor:([\w-]+)\1/gu;
+
+export function rewriteCompatVendorPlaceholderImportsForRunner(
+  code: string,
+  resolveDir?: string,
+): string {
+  if (!code.includes(COMPAT_VENDOR_PLACEHOLDER_PREFIX)) {
+    return code;
+  }
+  const entryFiles = resolveCompatVendorEntryFiles(resolveDir);
+
+  return code.replace(
+    compatVendorPlaceholderImportPattern,
+    (source, quote: string, entry: string) => {
+      const file = entryFiles.get(entry);
+
+      return file === undefined ? source : `${quote}${pathToFileURL(file).href}${quote}`;
+    },
+  );
+}
+
 // Marks every compat-family import as external with a deterministic
 // placeholder specifier; writeServerModuleArtifactFiles later rewrites the
 // placeholders to relative paths into the emitted shared vendor chunks.

package/src/render.ts

@@ -64,6 +64,7 @@ import {
   importAppRouterFileModule,
   importAppRouterSourceModule,
   fileImportMetaUrlPlugin,
+  rewriteCompatVendorPlaceholderImportsForRunner,
 } from "./module-runner.js";
 import { bytesResponse, htmlResponse } from "./http.js";
 import { isNotFoundError, isRedirectError, rewriteLocation } from "./navigation.js";
@@ -2952,7 +2953,8 @@ async function loadServerModule(
       serverModuleCacheVersion,
     });
   }
-  const moduleCode = prebuiltCode ?? code;
+  const moduleCode =
+    prebuiltCode === undefined ? code : rewriteCompatVendorPlaceholderImportsForRunner(prebuiltCode);
   const cacheKey =
     serverModuleCacheVersion === undefined
       ? undefined
@@ -3604,7 +3606,8 @@ async function loadServerStreamModule(
       serverModuleCacheVersion,
     });
   }
-  const moduleCode = prebuiltCode ?? code;
+  const moduleCode =
+    prebuiltCode === undefined ? code : rewriteCompatVendorPlaceholderImportsForRunner(prebuiltCode);
   const cacheKey =
     serverModuleCacheVersion === undefined
       ? undefined