chore: fixes after merges

Author: wmertens

.github/ISSUE_TEMPLATE/bug.yaml

@@ -53,7 +53,7 @@ body:
     id: system-info
     attributes:
       label: System Info
-      description: Output of `npx envinfo --system --npmPackages '{vite,typescript,@builder.io/*}' --binaries --browsers`
+      description: Output of `npx envinfo --system --npmPackages '{vite,typescript,@builder.io/*,@qwik.dev/*}' --binaries --browsers`
       render: shell
       placeholder: System, Binaries, Browsers
     validations:

packages/docs/public/docs/qwikcity/README.md

@@ -475,13 +475,16 @@ export function generateManifestFromBundles(
       .map((m) => path.relative(opts.rootDir, m));
     if (modulePaths.length > 0) {
       bundle.origins = modulePaths;
+      // keep these if statements separate so that weird bundling still works
       if (modulePaths.some((m) => /[/\\](core|qwik)[/\\]dist[/\\]preloader\.[cm]js$/.test(m))) {
         manifest.preloader = bundleFileName;
-      } else if (
+      }
+      if (
         modulePaths.some((m) => /[/\\](core|qwik)[/\\]dist[/\\]core(.min|.prod)?\.[cm]js$/.test(m))
       ) {
         manifest.core = bundleFileName;
-      } else if (modulePaths.some((m) => /[/\\](core|qwik)[/\\]handlers\.[cm]js$/.test(m))) {
+      }
+      if (modulePaths.some((m) => /[/\\](core|qwik)[/\\]handlers\.[cm]js$/.test(m))) {
         qwikHandlersName = bundleFileName;
       }
     }
@@ -527,7 +530,7 @@ export function generateManifestFromBundles(
       manifest.mapping[symbol] = qwikHandlersName;
     }
   } else {
-    console.error('Qwik bundle not found, is Qwik actually used in this project?');
+    console.error('Qwik core bundle not found, is Qwik actually used in this project?');
   }
 
   for (const bundle of Object.values(manifest.bundles)) {

packages/docs/src/routes/api/qwik-city-middleware-request-handler/api.json

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

packages/docs/src/routes/docs/(qwikcity)/error-handling/index.mdx renamed to packages/docs/src/routes/docs/(qwikrouter)/error-handling/index.mdx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

packages/docs/src/routes/docs/(qwikcity)/guides/capacitor/index.mdx renamed to packages/docs/src/routes/docs/(qwikrouter)/guides/capacitor/index.mdx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

packages/docs/src/routes/docs/(qwikcity)/guides/rewrites/index.mdx renamed to packages/docs/src/routes/docs/(qwikrouter)/guides/rewrites/index.mdx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

packages/docs/src/routes/docs/menu.md

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

packages/qwik-router/src/buildtime/vite/qwik-city.buildtime.api.md

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

packages/qwik/src/optimizer/src/manifest.ts

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter1.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter10.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter100.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter11.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter12.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter13.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter14.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter15.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter16.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter17.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter18.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter19.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter2.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter20.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter21.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter22.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter23.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter24.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter25.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter26.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter27.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter28.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter29.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter3.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter30.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter31.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter32.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter33.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter34.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter35.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter36.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter37.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter38.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter39.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter4.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter40.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter41.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter42.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter43.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter44.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);

starters/apps/preloader-test/src/components/generated/counter45.tsx

@@ -1,4 +1,4 @@
-import { component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@qwik.dev/core";
 
 export default component$(() => {
   const count = useSignal(0);