fix conflict

Author: wuls

.changeset/changelog-github-custom.cjs

@@ -351,12 +351,9 @@ var changelogFunctions = {
                 .concat(links.pull || links.commit, ')');
             }
             emojiFirstline = firstLine
-              .replace('FEAT:', '✨ ')
-              .replace('feat:', '✨ ')
-              .replace('fix:', '🐞🩹')
-              .replace('FIX:', '🐞🩹')
-              .replace('DOCS:', '📃')
-              .replace('docs:', '📃');
+              .replace(/feat:/i, '✨ ')
+              .replace(/fix:/i, '🐞🩹')
+              .replace(/docs:/i, '📃');
             return [
               2 /*return*/,
               '\n\n- '

.changeset/changelog-github-custom.ts

@@ -116,12 +116,9 @@ const changelogFunctions: ChangelogFunctions = {
     }
 
     const emojiFirstline = firstLine
-      .replace('FEAT:', '✨ ')
-      .replace('feat:', '✨ ')
-      .replace('fix:', '🐞🩹')
-      .replace('FIX:', '🐞🩹')
-      .replace('DOCS:', '📃')
-      .replace('docs:', '📃');
+      .replace(/feat:/i, '✨ ')
+      .replace(/fix:/i, '🐞🩹')
+      .replace(/docs:/i, '📃');
 
     return `\n\n- ${emojiFirstline} ${suffix}\n${futureLines.map((l) => `  ${l}`).join('\n')}`;
   },

.changeset/eleven-rabbits-cross.md

@@ -0,0 +1,36 @@
+---
+'@builder.io/qwik': minor
+---
+
+Async functions in `useComputed` are deprecated.
+
+**Why?**
+
+- Qwik can't track used signals after the first await, which leads to subtle bugs.
+- When calculating the first time, it will see it's a promise and it will restart the render function.
+- Both `useTask` and `useResource` are available, without these problems.
+
+In v2, async functions won't work.
+
+Again, to get the same functionality use `useTask` or `useResource` instead, or this function:
+
+```tsx
+export const useAsyncComputed$ = (qrlFn: QRL<() => Promise<any>>) => {
+  const sig = useSignal();
+  useTask(({ track }) => {
+    const result = track(qrlFn);
+    if (result && 'then' in result) {
+      result.then(
+        (val) => (sig.value = val),
+        (err) => {
+          console.error('async computed function threw!', err);
+          throw error;
+        }
+      );
+    } else {
+      sig.value = result;
+    }
+  });
+  return sig;
+};
+```

.changeset/funny-wasps-do.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik': patch
+---
+
+FIX: QRL segment filenames are no longer lowercased. This was giving trouble with parent lookups in dev mode and there was no good reason for it.

.changeset/gentle-adults-compare.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik': patch
+---
+
+FIX: the type for `<textarea>` now accepts text children, as per spec.

.changeset/lazy-worms-attack.md

@@ -2,4 +2,4 @@
 '@builder.io/qwik-city': patch
 ---
 
-MDX content no longer ignores Layout components. See [the MDX docs](https://mdxjs.com/docs/using-mdx/#layout) for more information.
+FIX: MDX content no longer ignores Layout components. See [the MDX docs](https://mdxjs.com/docs/using-mdx/#layout) for more information.

.changeset/lemon-gorillas-whisper.md

@@ -0,0 +1,5 @@
+---
+'@builder.io/qwik-city': patch
+---
+
+FIX: SSG errors now show the path that failed

.changeset/many-turtles-cough.md

@@ -2,4 +2,4 @@
 '@builder.io/qwik-city': patch
 ---
 
-Fix action redirect regression where searchParams were appended
+FIX: Fixed action redirect regression where searchParams were appended

.changeset/ninety-planets-search.md

@@ -3,4 +3,4 @@
 '@builder.io/qwik': patch
 ---
 
-FIX: `vite` is now a peer dependency of `qwik` and `qwik-city`, so that there can be no duplicate imports. This should not have consequences, since all apps also directly depend on `vite`.
+FIX: `vite` is now a peer dependency of `qwik`, `qwik-city`, `qwik-react` and `qwik-labs`, so that there can be no duplicate imports. This should not have consequences, since all apps also directly depend on `vite`.

.changeset/real-garlics-argue.md

@@ -2,4 +2,4 @@
 '@builder.io/qwik-city': patch
 ---
 
-Fixed MDX layout default export being ignored by transformer.
+FIX: Fixed MDX layout default export being ignored by transformer.