Merge pull request #20 from siguici/main

✨ Fix #13: Add include and exclude options to filter entrypoints.
QwikDev · Nov 14, 2023 · e09b18c · e09b18c
2 parents a48fb94 + d6258d3
commit e09b18c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/apps/astro-demo/astro.config.mjs b/apps/astro-demo/astro.config.mjs
@@ -8,5 +8,10 @@ export default defineConfig({
   adapter: node({
     mode: "standalone",
   }),
-  integrations: [qwik()],
+  integrations: [qwik({
+    exclude: [
+      "**/react/*",
+      "**/react-*",
+    ]
+  })],
 });
diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts
@@ -1,4 +1,4 @@
-import { build } from "vite";
+import { build, createFilter, type FilterPattern } from "vite";
 import { join, relative } from "node:path";
 import { createInterface } from "node:readline";
 import { qwikVite } from "@builder.io/qwik/optimizer";
@@ -8,7 +8,10 @@ import { getQwikLoaderScript } from "@builder.io/qwik/server";
 
 import type { AstroConfig, AstroIntegration } from "astro";
 
-export default function createIntegration(): AstroIntegration {
+export type Options = Partial<{ include: FilterPattern, exclude: FilterPattern }>;
+
+export default function createIntegration(options: Options = {}): AstroIntegration {
+  let filter = createFilter(options.include, options.exclude);
   let distDir: string = "";
   let entryDir: string = "";
   let astroConfig: AstroConfig | null = null;
@@ -32,7 +35,7 @@ export default function createIntegration(): AstroIntegration {
           astroConfig.root.pathname,
           astroConfig.srcDir.pathname
         );
-        entrypoints = getQwikEntrypoints(entryDir);
+        entrypoints = getQwikEntrypoints(entryDir, filter);
         if ((await entrypoints).length !== 0) {
           addRenderer({
             name: "@qwikdev/astro",
@@ -138,11 +141,16 @@ async function crawlDirectory(dir: string): Promise<string[]> {
  * We need to find the Qwik entrypoints so that the client build will run successfully.
  *
  */
-async function getQwikEntrypoints(dir: string): Promise<string[]> {
+async function getQwikEntrypoints(dir: string, filter: (id: unknown) => boolean ): Promise<string[]> {
   const files = await crawlDirectory(dir);
   const qwikFiles = [];
 
   for (const file of files) {
+    // Skip files not matching patterns
+    if (! filter(file)) {
+      continue;
+    }
+
     const fileStream = createReadStream(file);
 
     // holds readline interface