diff --git a/apps/node-demo/package.json b/apps/node-demo/package.json index 653cf277..62e52e84 100644 --- a/apps/node-demo/package.json +++ b/apps/node-demo/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^8.2.3", "@astrojs/react": "^3.0.10", - "@builder.io/qwik": "^1.5.1", + "@builder.io/qwik": "https://pkg.pr.new/@builder.io/qwik@5382c66", "@qwikdev/astro": "workspace:*", "@types/react": "^18.2.64", "@types/react-dom": "^18.2.21", diff --git a/libs/qwikdev-astro/package.json b/libs/qwikdev-astro/package.json index 2173d0d0..3a25bd0f 100644 --- a/libs/qwikdev-astro/package.json +++ b/libs/qwikdev-astro/package.json @@ -49,7 +49,7 @@ "vite-tsconfig-paths": "^4.2.1" }, "devDependencies": { - "@builder.io/qwik": "1.5.6", + "@builder.io/qwik": "https://pkg.pr.new/@builder.io/qwik@5382c66", "@types/fs-extra": "^11.0.4", "@types/node": "^20.10.0", "astro": "^4.5", @@ -57,7 +57,7 @@ "vite": "^5.2.6" }, "peerDependencies": { - "@builder.io/qwik": "1.5.6", + "@builder.io/qwik": "https://pkg.pr.new/@builder.io/qwik@5382c66", "typescript": "^5.4.2" } } diff --git a/libs/qwikdev-astro/server.ts b/libs/qwikdev-astro/server.ts index 56328e87..79209c21 100644 --- a/libs/qwikdev-astro/server.ts +++ b/libs/qwikdev-astro/server.ts @@ -6,7 +6,8 @@ import { PrefetchServiceWorker, jsx } from "@builder.io/qwik"; -import type { QwikManifest, SymbolMapperFn } from "@builder.io/qwik/optimizer"; +import type { QwikManifest } from "@builder.io/qwik/optimizer"; +import { symbolMapper } from '@builder.io/qwik/optimizer'; import { isDev } from "@builder.io/qwik/build"; import { getQwikLoaderScript, renderToString } from "@builder.io/qwik/server"; @@ -94,22 +95,6 @@ export async function renderToStaticMarkup( children: [qwikScripts, ...(defaultSlot ? [defaultSlot] : []), ...slotValues] }); - /** - For a given symbol (QRL such as `onKeydown$`) the server needs to know which bundle the symbol is in. - - Normally this is provided by Qwik's `q-manifest` . But `q-manifest` only exists after a full client build. - - This would be a problem in dev mode. So in dev mode the symbol is mapped to the expected URL using the symbolMapper function above. For Vite the given path is fixed for a given symbol. - */ - const symbolMapper: SymbolMapperFn = (symbolName: string) => { - /* don't want to add a file path for sync$ */ - if (symbolName === "") { - return; - } - - return [symbolName, `/${process.env.SRC_DIR}/${symbolName.toLocaleLowerCase()}.js`]; - }; - if (shouldAddQwikLoader) { qwikLoaderAdded.set(this.result, true); } @@ -124,7 +109,7 @@ export async function renderToStaticMarkup( containerTagName: "div", containerAttributes: { style: "display: contents" }, manifest: isDev ? ({} as QwikManifest) : manifest, - ...(manifest ? undefined : { symbolMapper }), + ...(manifest ? undefined : symbolMapper), qwikLoader: { include: "never" } }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ce211884..b5e2b404 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,8 +72,8 @@ importers: specifier: ^3.0.10 version: 3.3.0(@types/react-dom@18.2.25)(@types/react@18.2.79)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(vite@5.2.10(@types/node@20.12.7)) '@builder.io/qwik': - specifier: ^1.5.1 - version: 1.5.2(@types/node@20.12.7)(undici@6.13.0) + specifier: https://pkg.pr.new/@builder.io/qwik@5382c66 + version: https://pkg.pr.new/@builder.io/qwik@5382c66(@types/node@20.12.7)(undici@6.13.0) '@qwikdev/astro': specifier: workspace:* version: link:../../libs/qwikdev-astro @@ -158,8 +158,8 @@ importers: version: 4.3.2(typescript@5.4.5)(vite@5.2.10(@types/node@20.12.7)) devDependencies: '@builder.io/qwik': - specifier: 1.5.6 - version: 1.5.6(@types/node@20.12.7)(undici@6.13.0) + specifier: https://pkg.pr.new/@builder.io/qwik@5382c66 + version: https://pkg.pr.new/@builder.io/qwik@5382c66(@types/node@20.12.7)(undici@6.13.0) '@types/fs-extra': specifier: ^11.0.4 version: 11.0.4 @@ -433,8 +433,9 @@ packages: peerDependencies: undici: '*' - '@builder.io/qwik@1.5.6': - resolution: {integrity: sha512-dBdKrDpJ2qru2pLx/v/E6Jgq6AOMd3SgfpeSl5lStI5xQu/PLacPlkTsUVCy/Wr8XIfTqY/LHTbIywnw4O3Fhw==} + '@builder.io/qwik@https://pkg.pr.new/@builder.io/qwik@5382c66': + resolution: {tarball: https://pkg.pr.new/@builder.io/qwik@5382c66} + version: 1.6.0-dev20240704222606 engines: {node: '>=16.8.0 <18.0.0 || >=18.11'} hasBin: true peerDependencies: @@ -4169,7 +4170,7 @@ snapshots: - sugarss - terser - '@builder.io/qwik@1.5.6(@types/node@20.12.7)(undici@6.13.0)': + '@builder.io/qwik@https://pkg.pr.new/@builder.io/qwik@5382c66(@types/node@20.12.7)(undici@6.13.0)': dependencies: csstype: 3.1.3 undici: 6.13.0