chore: after rebase fixes

Author: Varixo

packages/qwik/src/core/bench/bench-results.json

@@ -72,7 +72,7 @@
     "dom-table-10": 0,
     "dom-table-1k": 0,
     "serialize-state-1k": 96844,
-    "ssr-table-10": 2449,
-    "ssr-table-1k": 177675
+    "ssr-table-10": 2175,
+    "ssr-table-1k": 177401
   }
 }

packages/qwik/src/core/preloader/bundle-graph.ts

@@ -1,5 +1,5 @@
 import { createMacroTask } from '../shared/platform/next-tick';
-import { config, isJSRegex, isRunningOnBrowser, yieldInterval } from './constants';
+import { config, isJSRegex, isBrowser, yieldInterval } from './constants';
 import { adjustProbabilities, bundles, shouldResetFactor, nextTriggerMacroTask } from './queue';
 import type { BundleGraph, BundleImport, ImportProbability } from './types';
 import { BundleImportState_None, BundleImportState_Alias } from './types';
@@ -77,7 +77,7 @@ export const loadBundleGraph = (
       config.$maxIdlePreloads$ = opts['P'] as number;
     }
   }
-  if (!isRunningOnBrowser || basePath == null) {
+  if (!isBrowser || basePath == null) {
     return;
   }
   base = basePath;

packages/qwik/src/core/preloader/constants.ts

@@ -1,11 +1,13 @@
-import { isBrowser } from '@qwik.dev/core/build';
+import { isServer } from '@qwik.dev/core/build';
 import { qTest } from '../shared/utils/qdev';
 import { isServerPlatform } from '../shared/platform/platform';
 
-export const isRunningOnBrowser = qTest ? !isServerPlatform() : isBrowser;
+const hasDocument = typeof document !== 'undefined';
+
+export const isBrowser = (qTest ? !isServerPlatform() : !isServer) && hasDocument;
 
 // Browser-specific setup
-export const doc = isRunningOnBrowser ? document : undefined!;
+export const doc = isBrowser ? document : undefined!;
 
 export const config = {
   $DEBUG$: false,
@@ -14,7 +16,7 @@ export const config = {
 
 // Determine which rel attribute to use based on browser support
 export const rel =
-  isRunningOnBrowser && doc.createElement('link').relList?.supports?.('modulepreload')
+  isBrowser && doc.createElement('link').relList?.supports?.('modulepreload')
     ? 'modulePreload'
     : 'preload';
 

packages/qwik/src/core/preloader/preloader.unit.ts

@@ -33,7 +33,7 @@ test('preloader script', async () => {
   const compressed = compress(Buffer.from(code), { mode: 1, quality: 11 });
   expect({ brotli: compressed.length, minified: code.length }).toMatchInlineSnapshot(`
     {
-      "brotli": 1354,
+      "brotli": 1360,
       "minified": 2923,
     }
   `);

packages/qwik/src/core/preloader/queue.ts

@@ -1,5 +1,5 @@
 import { base, getBundle } from './bundle-graph';
-import { config, doc, isRunningOnBrowser, rel, yieldInterval } from './constants';
+import { config, doc, isBrowser, rel, yieldInterval } from './constants';
 import type { BundleImport, BundleImports, ImportProbability } from './types';
 import {
   BundleImportState_Loaded,
@@ -180,13 +180,13 @@ function processPendingAdjustments() {
 
   isAdjustmentScheduled = false;
   isProcessingAdjustments = true;
-  const deadline = isRunningOnBrowser ? performance.now() + yieldInterval : 0;
+  const deadline = isBrowser ? performance.now() + yieldInterval : 0;
   let processed = false;
 
   while (adjustmentStack.length) {
     processed = true;
     const checkDeadline = processAdjustmentFrame();
-    if (isRunningOnBrowser && checkDeadline && performance.now() >= deadline) {
+    if (isBrowser && checkDeadline && performance.now() >= deadline) {
       if (!isAdjustmentScheduled) {
         isAdjustmentScheduled = true;
         nextAdjustmentMacroTask();
@@ -197,7 +197,7 @@ function processPendingAdjustments() {
 
   isProcessingAdjustments = false;
 
-  if (processed && isRunningOnBrowser) {
+  if (processed && isBrowser) {
     nextTriggerMacroTask();
   }
 }
@@ -248,7 +248,7 @@ export const adjustProbabilities = (
   seen?: Set<BundleImport>
 ) => {
   enqueueAdjustment(bundle, newInverseProbability, seen);
-  if (isRunningOnBrowser) {
+  if (isBrowser) {
     nextAdjustmentMacroTask();
   } else {
     processPendingAdjustments();
@@ -276,14 +276,14 @@ export const preload = (item: string | string[], probability?: number) => {
   } else {
     handleBundle(item, inverseProbability);
   }
-  if (isRunningOnBrowser) {
+  if (isBrowser) {
     nextAdjustmentMacroTask();
   } else {
     processPendingAdjustments();
   }
 };
 
-if (isRunningOnBrowser) {
+if (isBrowser) {
   // Get early hints from qwikloader
   document.addEventListener('qsymbol', (ev) => {
     const { symbol, href } = (ev as QwikSymbolEvent).detail;

packages/qwik/src/core/use/use-locale.ts

@@ -1,7 +1,6 @@
 import { tryGetInvokeContext } from './use-core';
 import { getAsyncLocalStorage } from '../shared/platform/async-local-storage';
 import { isServer } from '@qwik.dev/core/build';
-import { getAsyncLocalStorage } from '../shared/platform/async-local-storage';
 import type { AsyncLocalStorage } from 'node:async_hooks';
 
 let _locale: string | undefined = undefined;

packages/qwik/src/server/preload-impl.ts

@@ -1,5 +1,4 @@
 import { getPlatform } from '@qwik.dev/core';
-import { isDev } from '@qwik.dev/core/build';
 import { initPreloader, qTest } from './qwik-copy';
 import type { QRLInternal, SSRContainer } from './qwik-types';
 import type { PreloaderOptions, RenderOptions, RenderToStreamOptions } from './types';
@@ -44,7 +43,7 @@ export const preloaderPre = (
     bundleGraphPath = (import.meta.env?.BASE_URL || '/') + bundleGraphPath;
   }
   if (
-    !(isDev && !import.meta.env.TEST) &&
+    !(import.meta.env?.DEV && !qTest) &&
     preloaderBundle &&
     bundleGraphPath &&
     options !== false
@@ -194,7 +193,7 @@ export const includePreloader = (
 };
 
 export const preloaderPost = (ssrContainer: SSRContainer, opts: RenderOptions, nonce?: string) => {
-  if (isDev && !import.meta.env.TEST) {
+  if (import.meta.env?.DEV && !qTest) {
     return;
   }
   if (opts.preloader !== false) {

packages/qwik/src/server/preload-impl.unit.ts

@@ -35,13 +35,18 @@ const createContainer = () => {
 
 describe('preloader', () => {
   afterEach(() => {
+    vi.doUnmock('./qwik-copy');
     vi.unstubAllEnvs();
     vi.resetModules();
   });
 
   it('does not emit preloader assets or scripts in dev mode', async () => {
     vi.stubEnv('DEV', true);
-    vi.stubEnv('TEST', '');
+    vi.doMock('./qwik-copy', () => ({
+      initPreloader: vi.fn(),
+      qTest: false,
+    }));
+    vi.resetModules();
 
     const { container, elements, getScriptContent } = createContainer();
     const { preloaderPost, preloaderPre } = await import('./preload-impl');