Skip to content

Commit 724a0d1

Browse files
feat: dev mode working
1 parent 08402f1 commit 724a0d1

File tree

7 files changed

+514
-132
lines changed

7 files changed

+514
-132
lines changed

apps/demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"astro": "astro"
1313
},
1414
"dependencies": {
15-
"@builder.io/qwik": "^1.14.1",
15+
"@qwik.dev/core": "2.0.0-beta.7",
1616
"@qwikdev/astro": "workspace:*",
17-
"astro": "5.8.0"
17+
"astro": "5.13.3"
1818
}
1919
}

apps/demo/src/components/qwik/counter.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Slot, component$, useSignal } from "@builder.io/qwik";
2-
import { type RenderOptions } from "@builder.io/qwik/server";
1+
import { Slot, component$, useSignal } from "@qwik.dev/core";
2+
import { type RenderOptions } from "@qwik.dev/core/server";
33

44
export const Counter = component$<{ initial: number; renderOpts?: RenderOptions }>((props) => {
55
const counter = useSignal(props.initial);

apps/demo/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
},
88

99
"jsx": "react-jsx",
10-
"jsxImportSource": "@builder.io/qwik"
10+
"jsxImportSource": "@qwik.dev/core"
1111
}
1212
}

libs/qwikdev-astro/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262
"bugs": "https://github.com/thejackshelton/@qwikdev/astro/issues",
6363
"dependencies": {
6464
"@inox-tools/aik-mod": "^0.11.0",
65-
"astro-integration-kit": "^0.18.0"
65+
"astro-integration-kit": "^0.19.0"
6666
},
6767
"devDependencies": {
68-
"@builder.io/qwik": "^1.14.1",
69-
"astro": "^5.9.2",
68+
"@qwik.dev/core": "2.0.0-beta.7",
69+
"astro": "^5.13.3",
7070
"vite": "^6.3.5"
7171
},
7272
"peerDependencies": {
73-
"@builder.io/qwik": ">=1.14.1"
73+
"@qwik.dev/core": ">=2.0.0-beta.7"
7474
}
7575
}

libs/qwikdev-astro/server.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { type JSXNode, jsx } from "@builder.io/qwik";
2-
import { isDev } from "@builder.io/qwik/build";
3-
import type { QwikManifest } from "@builder.io/qwik/optimizer";
4-
import { type RenderToStreamOptions, renderToStream } from "@builder.io/qwik/server";
1+
import { type JSXNode, type JSXOutput, jsx } from "@qwik.dev/core";
2+
import { isDev } from "@qwik.dev/core/build";
3+
import type { QwikManifest } from "@qwik.dev/core/optimizer";
4+
import { type RenderToStreamOptions, renderToStream } from "@qwik.dev/core/server";
55
import type { SSRResult } from "astro";
66
import { renderOpts as globalRenderOpts } from "virtual:qwikdev-astro";
77

@@ -81,16 +81,9 @@ export async function renderToStaticMarkup(
8181
},
8282
qwikLoader: isInitialContainer ? { include: "always" } : { include: "never" },
8383
containerTagName: "div",
84-
...(isDev && {
85-
symbolMapper: globalThis.symbolMapperFn,
86-
manifest: {} as QwikManifest
87-
}),
8884
serverData: props,
89-
qwikPrefetchServiceWorker: {
90-
include: false
91-
},
9285
stream: {
93-
write: (chunk) => {
86+
write: (chunk: string) => {
9487
html += chunk;
9588
}
9689
},
@@ -134,7 +127,7 @@ export async function renderToStaticMarkup(
134127
const qwikComponentJSX = jsx(component, {
135128
...props,
136129
children: [defaultSlot, ...slotValues]
137-
});
130+
}) as JSXOutput;
138131

139132
if (isInitialContainer) {
140133
containerMap.set(this.result, true);

libs/qwikdev-astro/src/index.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import fs from "node:fs";
22
import { join } from "node:path";
3-
import { qwikVite, symbolMapper } from "@builder.io/qwik/optimizer";
3+
import { qwikVite } from "@qwik.dev/core/optimizer";
44
import type {
55
QwikManifest,
66
QwikVitePluginOptions,
77
SymbolMapperFn
8-
} from "@builder.io/qwik/optimizer";
9-
import type { RenderOptions } from "@builder.io/qwik/server";
8+
} from "@qwik.dev/core/optimizer";
9+
import type { RenderOptions } from "@qwik.dev/core/server";
1010
import type { AstroConfig, AstroIntegration } from "astro";
1111
import { createResolver, defineIntegration, watchDirectory, withPlugins } from "astro-integration-kit";
1212
import { z } from "astro/zod";
@@ -157,9 +157,9 @@ export default defineIntegration({
157157
const astroQwikPlugin: PluginOption = {
158158
name: "astro-qwik-parser",
159159
enforce: "pre",
160-
configResolved() {
161-
globalThis.symbolMapperFn = symbolMapper;
162-
},
160+
// configResolved() {
161+
// globalThis.symbolMapperFn = symbolMapper;
162+
// },
163163
buildEnd() {
164164
resolveEntrypoints();
165165
},
@@ -253,7 +253,7 @@ export default defineIntegration({
253253
},
254254

255255
"astro:build:setup": async ({ vite }) => {
256-
astroVite = vite as InlineConfig;
256+
astroVite = vite;
257257
},
258258

259259
"astro:build:ssr": async () => {
@@ -342,7 +342,7 @@ export default defineIntegration({
342342
outDir: finalDir,
343343
emptyOutDir: false
344344
}
345-
} as InlineConfig);
345+
});
346346
}
347347
};
348348

0 commit comments

Comments
 (0)