Merge pull request #7826 from JerryWu1234/buildv2async

feat: enhance locale handling with AsyncLocalStorage support for server-side requests

Author: wmertens

.changeset/gentle-laws-see.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/router': minor
+---
+
+FEAT: if a server$ function throws an error that is not a `ServerError`, it will now log the error on the server

.changeset/pretty-parents-draw.md

@@ -0,0 +1,6 @@
+---
+'@qwik.dev/router': patch
+'@qwik.dev/core': patch
+---
+
+FEAT: withLocale() uses AsyncLocalStorage for server-side requests when available. This allows async operations to retain the correct locale context.

packages/docs/src/repl/bundler/rollup-plugins.ts

@@ -63,6 +63,10 @@ export const replResolver = (
       if (id.startsWith('/qwik/')) {
         return id;
       }
+      // Replace node: with modules that throw on import
+      if (id.startsWith('node:')) {
+        return id;
+      }
       const match = id.match(/(@builder\.io\/qwik|@qwik\.dev\/core)(.*)/);
       if (match) {
         const pkgName = match[2];
@@ -114,6 +118,9 @@ export const replResolver = (
       if (input && typeof input.code === 'string') {
         return input.code;
       }
+      if (id.startsWith('node:')) {
+        return `throw new Error('Module "${id}" is not available in the REPL environment.');`;
+      }
       if (id.startsWith('/qwik/')) {
         const path = id.slice('/qwik'.length);
         if (path === '/build') {

packages/docs/src/repl/ui/repl-output-update.ts

@@ -31,7 +31,7 @@ export const updateReplOutput = async (store: ReplStore, result: ReplResult) =>
   deepUpdate(store.clientBundles, result.clientBundles);
   deepUpdate(store.ssrModules, result.ssrModules);
 
-  if (result.diagnostics.length === 0) {
+  if (!result.diagnostics.some((d) => d.category === 'error' || d.category === 'sourceError')) {
     if (result.html && store.html !== result.html) {
       store.html = result.html;
       store.events = result.events;

packages/qwik-router/global.d.ts

@@ -1,12 +1,14 @@
 /* eslint-disable no-var */
 // Globals used by qwik-router, for internal use only
 
+declare module '*?compiled-string' {
+  const str: string;
+  export default str;
+}
+
 type RequestEventInternal =
   import('./middleware/request-handler/request-event').RequestEventInternal;
-type AsyncStore = import('node:async_hooks').AsyncLocalStorage<RequestEventInternal>;
 type SerializationStrategy = import('@qwik.dev/core/internal').SerializationStrategy;
-
-declare var qcAsyncRequestStore: AsyncStore | undefined;
 declare var _qwikActionsMap: Map<string, ActionInternal> | undefined;
 
 type ExperimentalFeatures = import('@qwik.dev/core/optimizer').ExperimentalFeatures;

packages/qwik-router/package.json

@@ -199,7 +199,7 @@
     "directory": "packages/qwik-router"
   },
   "scripts": {
-    "build": "cd src/runtime && vite build --mode lib"
+    "build": "vite build"
   },
   "sideEffects": false,
   "type": "module",

packages/qwik-router/src/buildtime/vite/plugin.ts

@@ -1,4 +1,4 @@
-import swRegister from '@qwik-router-sw-register-build';
+import swRegister from '../runtime-generation/sw-register-build?compiled-string';
 import type { QwikVitePlugin } from '@qwik.dev/core/optimizer';
 import fs from 'node:fs';
 import { basename, extname, join, resolve } from 'node:path';

packages/qwik-router/src/middleware/request-handler/async-request-store.ts

@@ -1,4 +1,4 @@
-export { requestHandler } from './request-handler';
+export { requestHandler, _asyncRequestStore } from './request-handler';
 
 export { getErrorHtml } from './error-handler';
 export { getNotFound } from './not-found-paths';

packages/qwik-router/src/middleware/request-handler/index.ts

@@ -5,6 +5,7 @@
 ```ts
 
 import type { Action } from '@qwik.dev/router';
+import type { AsyncLocalStorage } from 'node:async_hooks';
 import type { EnvGetter as EnvGetter_2 } from '@qwik.dev/router/middleware/request-handler';
 import type { FailReturn } from '@qwik.dev/router';
 import type { Loader as Loader_2 } from '@qwik.dev/router';
@@ -24,6 +25,11 @@ import type { ValueOrPromise } from '@qwik.dev/core';
 export class AbortMessage {
 }
 
+// Warning: (ae-forgotten-export) The symbol "RequestEventInternal" needs to be exported by the entry point index.d.ts
+//
+// @internal (undocumented)
+export let _asyncRequestStore: AsyncLocalStorage<RequestEventInternal> | undefined;
+
 // Warning: (ae-forgotten-export) The symbol "CacheControlOptions" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
@@ -240,8 +246,6 @@ export interface ServerRequestEvent<T = unknown> {
 // @public (undocumented)
 export type ServerRequestMode = 'dev' | 'static' | 'server';
 
-// Warning: (ae-forgotten-export) The symbol "RequestEventInternal" needs to be exported by the entry point index.d.ts
-//
 // @public (undocumented)
 export type ServerResponseHandler<T = any> = (status: number, headers: Headers, cookies: Cookie, resolve: (response: T) => void, requestEv: RequestEventInternal) => WritableStream<Uint8Array>;