Merge remote-tracking branch 'origin/main' into upcoming

Author: wmertens

.changeset/spicy-seas-check.md

@@ -0,0 +1,14 @@
+---
+'@builder.io/qwik-city': patch
+---
+
+fix: SPA routing is broken unless origin matches value in in vite.config #8093
+
+If the SSG origin was set to `localhost:3000` and a user visited from `127.0.0.1:3000`, SPA routing would be broken.
+
+Internally, useNavigate's context provider `goto` checks the new destination with the last route location. If the
+origin is different, it just does a normal browser navigation. This makes sense; links to other origins cannot use
+SPA routing. However, the initial route it compares was using an origin that came from the server environment.
+
+Now, the first navigation will set that initial route to the browser's actual href, eliminating the erroneous
+origin mismatch for SPA navigations.

.changeset/tiny-tires-wait.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik-city': patch
+---
+
+FIX: `this` in various Qwik-City handlers is now `RequestEvent` again.

.github/workflows/ci.yml

@@ -684,8 +684,8 @@ jobs:
           #   browser: firefox
           - host: macos-latest
             browser: webkit
-          # - host: windows-latest
-          #   browser: chromium
+          - host: windows-latest
+            browser: chromium
 
     runs-on: ${{ matrix.settings.host }}
 
@@ -834,7 +834,8 @@ jobs:
       always() && 
       github.repository == 'QwikDev/qwik' && (
         github.ref == 'refs/heads/upcoming' ||
-        needs.test-unit.result == 'success'
+        needs.test-unit.result == 'success' || 
+        needs.test-unit.result == 'skipped'
       )
 
     steps:

e2e/adapters-e2e/playwright.config.ts

@@ -20,7 +20,7 @@ export default defineConfig({
   },
 
   // Increase global timeout for service worker tests
-  timeout: 30000,
+  timeout: process.env.CI ? 120000 : 30000,
 
   projects: [
     {
@@ -44,5 +44,6 @@ export default defineConfig({
     port: 3000,
     stdout: 'pipe',
     reuseExistingServer: !process.env.CI,
+    timeout: process.env.CI ? 120000 : 30000,
   },
 });

e2e/qwik-cli-e2e/utils/index.ts

@@ -205,4 +205,4 @@ export function log(text: string) {
   console.log(yellow('E2E: ' + text));
 }
 
-export const DEFAULT_TIMEOUT = 30000;
+export const DEFAULT_TIMEOUT = process.env.CI ? 120000 : 30000;

e2e/qwik-react-e2e/playwright.config.ts

@@ -20,7 +20,7 @@ export default defineConfig({
   },
 
   // Increase global timeout for service worker tests
-  timeout: 30000,
+  timeout: process.env.CI ? 120000 : 30000,
 
   projects: [
     {
@@ -44,5 +44,6 @@ export default defineConfig({
     port: 3000,
     stdout: 'pipe',
     reuseExistingServer: !process.env.CI,
+    timeout: process.env.CI ? 120000 : 30000,
   },
 });

eslint.config.js

@@ -30,22 +30,26 @@ const ignores = [
   'packages/docs/src/routes/examples/apps',
   'packages/docs/src/routes/playground/app',
   'packages/docs/src/routes/tutorial',
+  'packages/qwik/src/optimizer/core/src/fixtures',
+  'packages/qwik/bindings',
   'packages/qwik-labs/lib',
   'packages/qwik-labs/lib-types',
   'packages/qwik-labs/vite',
   'packages/insights/drizzle.config.ts',
   'packages/insights/panda.config.ts',
+  'packages/qwik/src/napi',
   'starters/apps/base',
   'starters/apps/library',
   'starters/templates',
   '**/vite.config.ts',
   // packages with eslint.config.mjs
   'packages/qwik-labs',
   'packages/insights',
-  'starters',
   // eslint.config.*
   '**/eslint.config.mjs',
   '**/eslint.config.js',
+  '.changeset',
+  'packages/docs/public/builder',
 ];
 
 export default tseslint.config(

packages/docs/src/repl/ui/repl-commands.tsx

@@ -1,11 +1,7 @@
 import { createPlaygroundShareUrl } from './repl-share-url';
 import type { ReplAppInput } from '../types';
 
-export const ReplCommands = ({
-  input,
-  enableCopyToPlayground,
-  enableDownload,
-}: ReplCommandProps) => {
+export const ReplCommands = ({ input, enableCopyToPlayground }: ReplCommandProps) => {
   return (
     <div class="repl-commands">
       {enableCopyToPlayground ? (

packages/qwik-city/src/middleware/request-handler/request-event.ts

@@ -77,7 +77,10 @@ export function createRequestEvent(
 
     while (routeModuleIndex < requestHandlers.length) {
       const moduleRequestHandler = requestHandlers[routeModuleIndex];
-      const result = moduleRequestHandler(requestEv);
+      const asyncStore = globalThis.qcAsyncRequestStore;
+      const result = asyncStore?.run
+        ? asyncStore.run(requestEv, moduleRequestHandler, requestEv)
+        : moduleRequestHandler(requestEv);
       if (isPromise(result)) {
         await result;
       }

packages/qwik-city/src/runtime/src/contexts.ts

@@ -7,7 +7,6 @@ import type {
   RouteLocation,
   RouteNavigate,
   RoutePreventNavigate,
-  RouteStateInternal,
 } from './types';
 
 export const RouteStateContext = /*#__PURE__*/ createContextId<Record<string, any>>('qc-s');
@@ -24,8 +23,5 @@ export const RouteNavigateContext = /*#__PURE__*/ createContextId<RouteNavigate>
 
 export const RouteActionContext = /*#__PURE__*/ createContextId<RouteAction>('qc-a');
 
-export const RouteInternalContext =
-  /*#__PURE__*/ createContextId<Signal<RouteStateInternal>>('qc-ir');
-
 export const RoutePreventNavigateContext =
   /*#__PURE__*/ createContextId<RoutePreventNavigate>('qc-p');