Merge remote-tracking branch 'upstream/main' into update-all-deps-minor

Author: sreeisalso

.vscode/launch.json

@@ -40,6 +40,18 @@
       "program": "${workspaceFolder}/packages/docs/node_modules/vite/bin/vite.js",
       "args": ["build", "-c", "adapters/cloudflare-pages/vite.config.mts"]
     },
+    {
+      "type": "node",
+      "name": "preloader-test build.client",
+      "request": "launch",
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": [
+        "run",
+        "build.client"
+      ],
+      "skipFiles": ["<node_internals>/**"],
+      "cwd": "${workspaceFolder}/starters/apps/preloader-test"
+    },
     {
       "type": "node",
       "name": "e2e.test",

package.json

@@ -132,7 +132,7 @@
     "cross-spawn": "7.0.6",
     "csstype": "3.1.3",
     "dotenv": "16.5.0",
-    "esbuild": "0.20.2",
+    "esbuild": "0.25.4",
     "eslint": "9.25.1",
     "eslint-plugin-no-only-tests": "3.3.0",
     "eslint-plugin-qwik": "workspace:^",

packages/docs/src/components/sidebar/sidebar.tsx

@@ -1,24 +1,11 @@
-import {
-  component$,
-  sync$,
-  useComputed$,
-  useContext,
-  useOnDocument,
-  useStyles$,
-} from '@builder.io/qwik';
-import { server$, useContent, useLocation, type ContentMenu } from '@builder.io/qwik-city';
+import { component$, sync$, useContext, useOnDocument, useStyles$ } from '@builder.io/qwik';
+import { type ContentMenu, useContent, useLocation, routeLoader$ } from '@builder.io/qwik-city';
 import { GlobalStore } from '../../context';
 import { CloseIcon } from '../svgs/close-icon';
 import styles from './sidebar.css?inline';
 
-let markdownItems: MarkdownItems | undefined;
-let markdownItemsPromise: Promise<MarkdownItems> | undefined;
-export const getMarkdownItems = server$(() => {
-  if (markdownItems) {
-    return markdownItems;
-  }
-
-  markdownItemsPromise ||= Promise.all(
+export const useMarkdownItems = routeLoader$(async () => {
+  const rawData = await Promise.all(
     Object.entries(import.meta.glob<{ frontmatter?: MDX }>('../../routes/**/*.{md,mdx}')).map(
       async ([k, v]) => {
         return [
@@ -33,22 +20,20 @@ export const getMarkdownItems = server$(() => {
         ] as const;
       }
     )
-  ).then((rawData) => {
-    markdownItems = {};
-    rawData.map(([k, v]) => {
-      if (v.frontmatter?.updated_at) {
-        markdownItems![k] = {
-          title: v.frontmatter.title,
-          contributors: v.frontmatter.contributors,
-          created_at: v.frontmatter.created_at,
-          updated_at: v.frontmatter.updated_at,
-        };
-      }
-    });
-
-    return markdownItems;
+  );
+  const markdownItems: MarkdownItems = {};
+  rawData.map(([k, v]) => {
+    if (v.frontmatter?.updated_at) {
+      markdownItems[k] = {
+        title: v.frontmatter.title,
+        contributors: v.frontmatter.contributors,
+        created_at: v.frontmatter.created_at,
+        updated_at: v.frontmatter.updated_at,
+      };
+    }
   });
-  return markdownItemsPromise;
+
+  return markdownItems;
 });
 
 type MarkdownItems = Record<string, MDX>;
@@ -79,7 +64,7 @@ export const SideBar = component$((props: { allOpen?: boolean }) => {
   const globalStore = useContext(GlobalStore);
   const { menu } = useContent();
   const { url } = useLocation();
-  const markdownItems = useComputed$(() => getMarkdownItems());
+  const markdownItems = useMarkdownItems();
   const allOpen = url.pathname.startsWith('/qwikcity/') || props.allOpen;
 
   useOnDocument(
@@ -93,7 +78,7 @@ export const SideBar = component$((props: { allOpen?: boolean }) => {
           el.scrollTop = savedScroll;
           el.style.visibility = 'visible';
         }
-      } catch {
+      } catch (err) {
         //
       }
     })
@@ -118,7 +103,7 @@ export const SideBar = component$((props: { allOpen?: boolean }) => {
             try {
               const scrollTop = document.getElementById('qwik-sidebar')!.scrollTop;
               sessionStorage.setItem('qwik-sidebar', String(scrollTop));
-            } catch {
+            } catch (err) {
               //
             }
           })}

packages/docs/src/routes/community/layout.tsx

@@ -6,6 +6,8 @@ import { OnThisPage } from '../../components/on-this-page/on-this-page';
 import { ContentNav } from '../../components/content-nav/content-nav';
 import styles from '../docs/docs.css?inline';
 
+export { useMarkdownItems } from '../../components/sidebar/sidebar';
+
 export default component$(() => {
   useStyles$(styles);
 

packages/docs/src/routes/docs/layout.tsx

@@ -9,6 +9,8 @@ import { createBreadcrumbs, SideBar } from '../../components/sidebar/sidebar';
 import { GlobalStore } from '../../context';
 import styles from './docs.css?inline';
 
+export { useMarkdownItems } from '../../components/sidebar/sidebar';
+
 export default component$(() => {
   useStyles$(styles);
   const loc = useLocation();

packages/qwik-city/src/buildtime/vite/get-route-imports.ts

@@ -26,9 +26,12 @@ export function getRouteImports(routes: BuildRoute[], manifest: QwikManifest) {
   for (const bundleName of Object.keys(manifest.bundles)) {
     const bundle = manifest.bundles[bundleName];
     if (bundle.origins?.some((s) => s.endsWith(QWIK_CITY_PLAN_ID))) {
-      // Don't consider the city plan for preloading
-      // we keep imports because something might be bundled with it
-      result[bundleName] = { imports: bundle.imports, dynamicImports: [] };
+      result[bundleName] = {
+        ...bundle,
+        dynamicImports: bundle.dynamicImports?.filter((d) =>
+          manifest.bundles[d].origins?.some((s) => s.endsWith('menu.md'))
+        ),
+      };
       break;
     }
   }

packages/qwik-city/src/buildtime/vite/get-route-imports.unit.ts

@@ -64,8 +64,12 @@ describe('modifyBundleGraph', () => {
           ],
         },
         "q-city-plan.js": {
-          "dynamicImports": [],
-          "imports": undefined,
+          "dynamicImports": undefined,
+          "origins": [
+            "@qwik-city-plan",
+          ],
+          "size": 0,
+          "total": 0,
         },
       }
     `);