Merge pull request #38 from iivvaannxx/fix-rollup-paths

Fixes #26 - Rollup not resolving path aliases on build.
QwikDev · Nov 29, 2023 · d9880b0 · d9880b0
2 parents e408fe4 + 3435e81
commit d9880b0
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 13 deletions.
diff --git a/apps/astro-demo/src/components/counter.tsx b/apps/astro-demo/src/components/counter.tsx
@@ -1,13 +1,15 @@
-import { Slot, component$, useSignal } from "@builder.io/qwik";
+import { component$, useSignal } from "@builder.io/qwik";
 
 export const Counter = component$<{ initial: number }>((props) => {
-  const counter = useSignal(0);
+
+  const counter = useSignal(props.initial);
 
   return (
-    <button onClick$={() => counter.value++}>
-      <Slot />
-      <Slot name="test" />
-      {counter.value}
-    </button>
+
+    <>
+      <button onClick$={() => counter.value++}>
+        {counter.value}
+      </button>
+    </>
   );
 });
diff --git a/apps/astro-demo/src/pages/index.astro b/apps/astro-demo/src/pages/index.astro
@@ -1,6 +1,5 @@
 ---
-import { Counter } from "../components/counter";
-import { ReactCounter } from "../components/react-counter";
+import { Counter } from "@components/counter";
 ---
 
 <html lang="en">
@@ -13,10 +12,8 @@ import { ReactCounter } from "../components/react-counter";
 	</head>
 	<body>
 		<h1>Astro.js - Qwik</h1>
-		<Counter initial={9}>
+		<Counter initial={5}>
 			Some text!
-			<p>test</p>
-			<div slot="test">test</div>
 		</Counter>
 	</body>
 </html>
diff --git a/apps/astro-demo/tsconfig.json b/apps/astro-demo/tsconfig.json
@@ -1,6 +1,13 @@
 {
   "extends": "astro/tsconfigs/strict",
   "compilerOptions": {
+
+    "baseUrl": ".",
+    "paths": {
+
+      "@components/*": ["./src/components/*"],
+    },
+
     "jsx": "react-jsx",
     "jsxImportSource": "@builder.io/qwik"
   }

diff --git a/libs/qwikdev-astro/package.json b/libs/qwikdev-astro/package.json
@@ -50,7 +50,8 @@
   },
   "bugs": "https://github.com/thejackshelton/@qwikdev/astro/issues",
   "dependencies": {
-    "fs-extra": "^11.1.1"
+    "fs-extra": "^11.1.1",
+    "vite-tsconfig-paths": "^4.2.1"
   },
   "devDependencies": {
     "@builder.io/qwik": "^1.2.19",

diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts
@@ -1,5 +1,6 @@
 import type { AstroConfig, AstroIntegration } from "astro";
 import ts from "typescript";
+import tsconfigPaths from 'vite-tsconfig-paths'
 
 import { build, createFilter, type FilterPattern } from "vite";
 import { qwikVite } from "@builder.io/qwik/optimizer";
@@ -93,6 +94,7 @@ export default function createIntegration(
                     input: "@qwikdev/astro/server",
                   },
                 }),
+                tsconfigPaths()
               ],
             },
           });

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