support libs

QwikDev · Nov 30, 2024 · cbc9aaf · cbc9aaf
1 parent c370247
commit cbc9aaf
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/apps/demo/package.json b/apps/demo/package.json
@@ -14,6 +14,7 @@
   "dependencies": {
     "@builder.io/qwik": "^1.10",
     "@qwikdev/astro": "workspace:*",
-    "astro": "^4.16.14"
+    "astro": "^4.16.14",
+    "demo-lib": "workspace:*"
   }
 }
diff --git a/apps/demo/src/pages/index.astro b/apps/demo/src/pages/index.astro
@@ -1,6 +1,6 @@
 ---
-import { ViewTransitions } from "astro:transitions";
-import { Counter } from "@components/qwik/counter";
+import { Counter } from "demo-lib";
+import { Counter as NativeCounter } from "@components/qwik/counter";
 ---
 
 <html lang="en">
@@ -10,11 +10,11 @@ import { Counter } from "@components/qwik/counter";
 		<meta name="viewport" content="width=device-width" />
 		<meta name="generator" content={Astro.generator} />
 		<title>Astro</title>
-		<ViewTransitions />
 	</head>
 	<body>
-		<div style={{ height: '1000px' }}>
-			<Counter initial={5}>Yo</Counter>
+		<div style={{ height: "1000px" }}>
+			<Counter />
+			<NativeCounter initial={2} />
 		</div>
 	</body>
-</html>
+</html>
diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts
@@ -22,6 +22,7 @@ const FilterPatternSchema = z.union([
 ]);
 
 const qwikEntrypoints = new Set<string>();
+const potentialEntrypoints = new Set<string>();
 let resolveEntrypoints: () => void;
 const entrypointsReady = new Promise<void>((resolve) => {
   resolveEntrypoints = resolve;
@@ -131,12 +132,28 @@ export default defineIntegration({
               throw new Error(`Could not resolve ${id} from ${importer}`);
             }
 
-            console.log("RESOLVED ID:", resolved.id);
-
-            // Only add non-astro files to entrypoints
-            if (resolved.id.includes(".tsx")) {
+            // qwik libraries
+            if (resolved.id.includes(".qwik.")) {
               qwikEntrypoints.add(resolved.id);
             }
+
+            if (/\.(tsx|jsx|ts|js)$/.test(resolved.id)) {
+              potentialEntrypoints.add(resolved.id);
+            }
+
+            return null;
+          },
+          async transform(code, id) {
+            if (!potentialEntrypoints.has(id)) {
+              return null;
+            }
+
+            const qwikPackages = ['@builder.io/qwik', "@builder.io/qwik-react", "qwik.dev/core", "@qwik.dev/react"]
+
+            if (qwikPackages.some(pkg => code.includes(pkg))) {
+              qwikEntrypoints.add(id);
+            }
+
             return null;
           }
         };

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml