what we have w/ symbol mapper

thejackshelton · thejackshelton · commit 448193b9a3aa · 2024-07-10T11:26:32.000-05:00
diff --git a/apps/node-demo/astro.config.mjs b/apps/node-demo/astro.config.mjs
@@ -1,7 +1,6 @@
 import { defineConfig } from "astro/config";
 
 import node from "@astrojs/node";
-import react from "@astrojs/react";
 import qwik from "@qwikdev/astro";
 
 // https://astro.build/config
@@ -11,5 +10,5 @@ export default defineConfig({
     mode: "standalone"
   }),
 
-  integrations: [qwik({ include: "**/qwik/*" }), react({ include: "**/react/*" })]
+  integrations: [qwik({ include: "**/qwik/*" })]
 });
diff --git a/apps/node-demo/src/pages/index.astro b/apps/node-demo/src/pages/index.astro
@@ -1,5 +1,4 @@
 ---
-import { ViewTransitions } from "astro:transitions";
 import { Counter } from "@components/qwik/counter";
 import { SayHi } from "@components/qwik/say-hi";
 ---
@@ -11,7 +10,6 @@ import { SayHi } from "@components/qwik/say-hi";
 		<meta name="viewport" content="width=device-width" />
 		<meta name="generator" content={Astro.generator} />
 		<title>Astro</title>
-		<ViewTransitions />
 	</head>
 	<body>
 		<div style={{ height: '1000px' }}>
diff --git a/libs/qwikdev-astro/package.json b/libs/qwikdev-astro/package.json
@@ -25,7 +25,8 @@
   "main": "./src/index.ts",
   "exports": {
     ".": "./src/index.ts",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./server": "./server.ts"
   },
   "files": ["src", "src/index.ts", "server.ts", "env.d.ts"],
   "keywords": [
diff --git a/libs/qwikdev-astro/server.ts b/libs/qwikdev-astro/server.ts
@@ -6,7 +6,6 @@ import {
   PrefetchServiceWorker,
   jsx
 } from "@builder.io/qwik";
-import { symbolMapper, type QwikManifest } from '@builder.io/qwik/optimizer';
 import { isDev } from "@builder.io/qwik/build";
 import { getQwikLoaderScript, renderToString } from "@builder.io/qwik/server";
 import { manifest } from "@qwik-client-manifest";
@@ -99,6 +98,7 @@ export async function renderToStaticMarkup(
 
     const base = (props["q:base"] || process.env.Q_BASE) as string;
 
+
     // TODO: `jsx` must correctly be imported.
     // Currently the vite loads `core.mjs` and `core.prod.mjs` at the same time and this causes issues.
     // WORKAROUND: ensure that `npm postinstall` is run to patch the `@builder.io/qwik/package.json` file.
@@ -107,7 +107,7 @@ export async function renderToStaticMarkup(
       containerTagName: "div",
       containerAttributes: { style: "display: contents" },
       ...(isDev
-        ? { manifest: {} as QwikManifest, symbolMapper }
+        ? { manifest: {} as QwikManifest, symbolMapper: globalThis._mymapper }
         : { manifest }),
       qwikLoader: { include: "never" }
     });
diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts
@@ -12,8 +12,9 @@ import { z } from "astro/zod";
 import ts from "typescript";
 
 import { qwikVite } from "@builder.io/qwik/optimizer";
-import { createResolver, defineIntegration } from "astro-integration-kit";
+import { defineIntegration } from "astro-integration-kit";
 import { watchIntegrationPlugin } from "astro-integration-kit/plugins";
+import { symbolMapper, type QwikManifest } from '@builder.io/qwik/optimizer';
 
 import { type InlineConfig, build, createFilter } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
@@ -47,7 +48,6 @@ export default defineIntegration({
 
     const tempDir = join(`tmp-${hash()}`);
     const filter = createFilter(options.include, options.exclude);
-    const { resolve } = createResolver(import.meta.url);
 
     return {
       "astro:config:setup": async ({
@@ -56,10 +56,9 @@ export default defineIntegration({
         config,
         command,
         injectScript,
-        watchIntegration
       }) => {
-        // Integration HMR
-        watchIntegration(resolve());
+        // // Integration HMR
+        // watchIntegration(resolve());
 
         // Because Astro uses the same port for both dev and preview, we need to unregister the SW in order to avoid a stale SW in dev mode.
         if (command === "dev") {
@@ -80,12 +79,14 @@ export default defineIntegration({
           astroConfig.srcDir.pathname
         );
 
+
+
         entrypoints = getQwikEntrypoints(srcDir, filter);
 
         if ((await entrypoints).length !== 0) {
           addRenderer({
             name: "@qwikdev/astro",
-            serverEntrypoint: resolve("../server.ts")
+            serverEntrypoint: "@qwikdev/astro/server"
           });
 
           // Update the global dist directory
@@ -107,8 +108,10 @@ export default defineIntegration({
               },
 
               plugins: [
+                {name:"grabSymbolMapper", configResolved() { globalThis._mymapper = symbolMapper }},
                 qwikVite({
                   /* user passed include & exclude config (to use multiple JSX frameworks) */
+                  debug: true,
                   fileFilter: (id: string, hook: string) => {
                     if (hook === "transform" && !filter(id)) {
                       return false;
@@ -127,7 +130,7 @@ export default defineIntegration({
                     input: await entrypoints
                   },
                   ssr: {
-                    input: resolve("../server.ts")
+                    input: "@qwikdev/astro/server"
                   }
                 }),
                 tsconfigPaths(),
