Merge remote-tracking branch 'origin/main' into v2-merge-main

Author: wmertens

.changeset/neat-maps-tickle.md

@@ -16,6 +16,8 @@
 
 ## 2.0.0-alpha.0
 
+## 1.12.1
+
 ## 1.12.0
 
 ## 1.11.0

packages/create-qwik/CHANGELOG.md

@@ -44,8 +44,8 @@
     "qwik-image": "0.0.16",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "rehype-pretty-code": "0.11.0",
-    "shiki": "0.14.7",
+    "rehype-pretty-code": "0.14.0",
+    "shiki": "1.29.1",
     "snarkdown": "2.0.0",
     "tailwindcss": "3.4.6",
     "terser": "5.37.0",

packages/docs/package.json

@@ -206,6 +206,10 @@ h6 a:hover .icon {
   font-weight: bold;
 }
 
+[data-highlighted-chars] {
+  background: #ac7ef4;
+}
+
 .docs article pre {
   padding: 18px 15px;
   overflow: auto;

packages/docs/src/routes/docs/docs.css

@@ -16,6 +16,8 @@
 
 ## 2.0.0-alpha.0
 
+## 1.12.1
+
 ## 1.12.0
 
 ## 1.11.0

packages/eslint-plugin-qwik/CHANGELOG.md

@@ -29,6 +29,31 @@
 
 ## 1.11.0
 
+## 1.12.1
+
+### Patch Changes
+
+- 🐞🩹 MDX content now accepts a prop of type `components` that lets you use your own custom components (by [@double-thinker](https://github.com/double-thinker) in [#7277](https://github.com/QwikDev/qwik/pull/7277))
+
+  To add custom components to your MDX content, you can now do this:
+
+  ```tsx
+  // routes/example/index.tsx
+  import Content from './markdown.mdx';
+  import MyComponent from '../../components/my-component/my-component';
+  import { component$ } from '@builder.io/qwik';
+
+  export default component$(() => <Content components={{ MyComponent }} />);
+  ```
+
+  You can also use props in JS expressions. See https://mdxjs.com/docs/using-mdx/#props
+
+- 🐞🩹 mdx not rendering (by [@shairez](https://github.com/shairez) in [#7168](https://github.com/QwikDev/qwik/pull/7168))
+
+- 📃 added a "Qwik for Mobile" guide to build iOS and Android Qwik apps (by [@srapport](https://github.com/srapport) in [#7205](https://github.com/QwikDev/qwik/pull/7205))
+
+- 🐞🩹 some qrls weren't fetched correctly on page load (by [@shairez](https://github.com/shairez) in [#7286](https://github.com/QwikDev/qwik/pull/7286))
+
 ## 1.12.0
 
 ### Patch Changes

packages/qwik-router/CHANGELOG.md

@@ -236,6 +236,26 @@
 
   That way you can run `qwik add --projectDir=packages/my-package` and it will add the feature to the specified project/package (sub) folder, instead of the root folder.
 
+## 1.12.1
+
+### Patch Changes
+
+- 📃 update turso integration keywords, add contributor (by [@A2-NieR](https://github.com/A2-NieR) in [#7215](https://github.com/QwikDev/qwik/pull/7215))
+
+- ✨ tailwindcss v4 integration (by [@sreeisalso](https://github.com/sreeisalso) in [#7274](https://github.com/QwikDev/qwik/pull/7274))
+
+- 🐞🩹 remove usage of `computedStyleMap` (by [@Varixo](https://github.com/Varixo) in [#7252](https://github.com/QwikDev/qwik/pull/7252))
+
+- 📃 remove shop (by [@gioboa](https://github.com/gioboa) in [#7221](https://github.com/QwikDev/qwik/pull/7221))
+
+- 🐞🩹 error in the middleware occurs 404 (by [@JerryWu1234](https://github.com/JerryWu1234) in [#6951](https://github.com/QwikDev/qwik/pull/6951))
+
+- 🐞🩹 changed turso createClient import to work with file urls, updated docs note with info & link to the corresponding section in the turso docs (by [@A2-NieR](https://github.com/A2-NieR) in [#7211](https://github.com/QwikDev/qwik/pull/7211))
+
+- 📃 add Qwik blog + articles (by [@gioboa](https://github.com/gioboa) in [#7214](https://github.com/QwikDev/qwik/pull/7214))
+
+- 🐞🩹 input's value is string when passing number (by [@JerryWu1234](https://github.com/JerryWu1234) in [#7249](https://github.com/QwikDev/qwik/pull/7249))
+
 ## 1.12.0
 
 ### Minor Changes

packages/qwik/CHANGELOG.md

@@ -916,8 +916,32 @@ export const manifest = ${JSON.stringify(manifest)};\n`;
   // order by discovery time, so that related segments are more likely to group together
   function manualChunks(id: string, { getModuleInfo }: Rollup.ManualChunkMeta) {
     const module = getModuleInfo(id)!;
-    const segment = module.meta.segment as SegmentAnalysis | undefined;
-    return segment?.entry;
+    const segment = module.meta.segment;
+
+    // We need to specifically return segment.entry for qwik-insights
+    if (segment) {
+      return segment.entry;
+    }
+
+    if (id.includes('node_modules')) {
+      return null;
+    }
+
+    // Patch to prevent over-prefetching, we must clearly separate .tsx/.jsx chunks so that rollup doesn't mix random imports into non-entry files such as hooks.
+    // Maybe a better solution would be to mark those files as entires earlier in the chain so that we can remove this check and the one above altogether.
+    // We check .(tsx|jsx) after node_modules in case some node_modules end with .jsx or .tsx.
+    if (/\.(tsx|jsx)$/.test(id)) {
+      const optimizer = getOptimizer();
+      const path = optimizer.sys.path;
+      const relativePath = path.relative(optimizer.sys.cwd(), id);
+      const sanitizedPath = relativePath
+        .replace(/^(\.\.\/)+/, '')
+        .replace(/^\/+/, '')
+        .replace(/\//g, '-');
+      return sanitizedPath; // We return sanitizedPath for qwikVite plugin with debug:true
+    }
+
+    return null;
   }
 
   return {