From 3a41159b6eea3f7fcaac63a186883465503b9e46 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 8 Mar 2025 17:59:06 -0600 Subject: [PATCH 1/7] initial v2 --- apps/demo/package.json | 4 +++- apps/demo/src/components/qwik/counter.tsx | 2 +- apps/demo/tsconfig.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/demo/package.json b/apps/demo/package.json index 3fabe9bc..7fdbc4c9 100644 --- a/apps/demo/package.json +++ b/apps/demo/package.json @@ -12,8 +12,10 @@ "astro": "astro" }, "dependencies": { - "@builder.io/qwik": "^1.12.0", "@qwikdev/astro": "workspace:*", "astro": "5.1.1" + }, + "devDependencies": { + "@qwik.dev/core": "2.0.0-alpha.8" } } diff --git a/apps/demo/src/components/qwik/counter.tsx b/apps/demo/src/components/qwik/counter.tsx index 90597e25..9623d59e 100644 --- a/apps/demo/src/components/qwik/counter.tsx +++ b/apps/demo/src/components/qwik/counter.tsx @@ -1,4 +1,4 @@ -import { Slot, component$, useSignal } from "@builder.io/qwik"; +import { Slot, component$, useSignal } from "@qwik.dev/core"; export const Counter = component$<{ initial: number }>((props) => { const counter = useSignal(props.initial); diff --git a/apps/demo/tsconfig.json b/apps/demo/tsconfig.json index 1881c255..86ca76d4 100644 --- a/apps/demo/tsconfig.json +++ b/apps/demo/tsconfig.json @@ -7,6 +7,6 @@ }, "jsx": "react-jsx", - "jsxImportSource": "@builder.io/qwik" + "jsxImportSource": "@qwik.dev/core" } } From e728897854106bd2a337e4f51be1ac711a2143e2 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 8 Mar 2025 17:59:14 -0600 Subject: [PATCH 2/7] v2 --- libs/qwikdev-astro/package.json | 7 ++-- libs/qwikdev-astro/server.ts | 12 +++--- libs/qwikdev-astro/src/index.ts | 9 +++-- pnpm-lock.yaml | 71 ++++++++++++++++++++++++++++----- 4 files changed, 75 insertions(+), 24 deletions(-) diff --git a/libs/qwikdev-astro/package.json b/libs/qwikdev-astro/package.json index 1cbba89d..8af9bf2b 100644 --- a/libs/qwikdev-astro/package.json +++ b/libs/qwikdev-astro/package.json @@ -60,11 +60,12 @@ "astro-integration-kit": "^0.18.0" }, "devDependencies": { - "@builder.io/qwik": "^1.12.0", + "@qwik.dev/core": "2.0.0-alpha.8", "astro": "^5.1.1", - "vite": "^5.4.11" + "vite": "^5.4.11", + "ts-morph": "latest" }, "peerDependencies": { - "@builder.io/qwik": ">=1.9.0" + "@qwik.dev/core": ">=2.0.0-alpha.8" } } diff --git a/libs/qwikdev-astro/server.ts b/libs/qwikdev-astro/server.ts index a32af9ac..623e2a01 100644 --- a/libs/qwikdev-astro/server.ts +++ b/libs/qwikdev-astro/server.ts @@ -1,11 +1,11 @@ -import { type JSXNode, jsx } from "@builder.io/qwik"; -import { isDev } from "@builder.io/qwik/build"; -import type { QwikManifest } from "@builder.io/qwik/optimizer"; +import { type JSXNode, type JSXOutput, jsx } from "@qwik.dev/core"; +import { isDev } from "@qwik.dev/core/build"; +import type { QwikManifest } from "@qwik.dev/core/optimizer"; import { type RenderToStreamOptions, getQwikLoaderScript, renderToStream -} from "@builder.io/qwik/server"; +} from "@qwik.dev/core/server"; import type { SSRResult } from "astro"; const isQwikLoaderAddedMap = new WeakMap(); @@ -103,7 +103,7 @@ export async function renderToStaticMarkup( include: false }, stream: { - write: (chunk) => { + write: (chunk: string) => { html += chunk; } } @@ -180,7 +180,7 @@ export async function renderToStaticMarkup( renderToStreamOpts.containerAttributes!["q-astro-marker"] = "first"; } - await renderToStream(qwikComponentJSX, renderToStreamOpts); + await renderToStream(qwikComponentJSX as JSXOutput, renderToStreamOpts); // we only want to add the preloader script if the container is the last one if (isDev && devUrls.size > 0) { diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts index 41b2f725..d3d76398 100644 --- a/libs/qwikdev-astro/src/index.ts +++ b/libs/qwikdev-astro/src/index.ts @@ -1,11 +1,11 @@ import fs from "node:fs"; import { join } from "node:path"; -import { qwikVite, symbolMapper } from "@builder.io/qwik/optimizer"; import type { QwikManifest, QwikVitePluginOptions, SymbolMapperFn } from "@builder.io/qwik/optimizer"; +import { qwikVite, symbolMapper } from "@qwik.dev/core/optimizer"; import type { AstroConfig, AstroIntegration } from "astro"; import { createResolver, defineIntegration, watchDirectory } from "astro-integration-kit"; import { z } from "astro/zod"; @@ -134,9 +134,10 @@ export default defineIntegration({ resolveEntrypoints(); }, async resolveId(id, importer) { - const isFromAstro = importer?.endsWith('.astro') || importer?.endsWith('.mdx'); - const isFromTrackedFile = potentialEntries.has(importer ?? ''); - + const isFromAstro = + importer?.endsWith(".astro") || importer?.endsWith(".mdx"); + const isFromTrackedFile = potentialEntries.has(importer ?? ""); + if (!isFromAstro && !isFromTrackedFile) { return null; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d633efa..6ec4be9f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,15 +41,16 @@ importers: apps/demo: dependencies: - '@builder.io/qwik': - specifier: ^1.12.0 - version: 1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) '@qwikdev/astro': specifier: workspace:* version: link:../../libs/qwikdev-astro astro: specifier: 5.1.1 version: 5.1.1(@types/node@22.10.2)(jiti@2.4.2)(rollup@4.29.1)(typescript@5.7.2)(yaml@2.6.1) + devDependencies: + '@qwik.dev/core': + specifier: 2.0.0-alpha.8 + version: 2.0.0-alpha.8(prettier@3.4.2)(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) apps/deno-demo: dependencies: @@ -218,12 +219,15 @@ importers: specifier: ^0.18.0 version: 0.18.0(astro@5.1.1(@types/node@22.10.2)(jiti@2.4.2)(rollup@4.29.1)(typescript@5.7.2)(yaml@2.6.1)) devDependencies: - '@builder.io/qwik': - specifier: ^1.12.0 - version: 1.12.0(vite@5.4.11(@types/node@22.10.2)) + '@qwik.dev/core': + specifier: 2.0.0-alpha.8 + version: 2.0.0-alpha.8(prettier@3.4.2)(vite@5.4.11(@types/node@22.10.2)) astro: specifier: ^5.1.1 version: 5.1.1(@types/node@22.10.2)(jiti@2.4.2)(rollup@4.29.1)(typescript@5.7.2)(yaml@2.6.1) + ts-morph: + specifier: latest + version: 25.0.1 vite: specifier: ^5.4.11 version: 5.4.11(@types/node@22.10.2) @@ -1309,6 +1313,20 @@ packages: resolution: {integrity: sha512-ct43jurbe7lsUX5eIrj4ijO3j/6zIPp7CDnFWXDs7UPAbw1Pu1iH3oAmFdP4jcskKJBURH5M9oTtyeiUXyHX8Q==} engines: {node: '>=18.16.0'} + '@qwik.dev/core@2.0.0-alpha.8': + resolution: {integrity: sha512-zT8dNIUohH3VbDLVXA7ASWHrEpWWiyv5qmzxsZsFxMcNzzHUflKpQa3p0udNTuxq6/xVhN/5KvfMQWE1I7FZJA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + hasBin: true + peerDependencies: + prettier: '*' + vite: ^5 + vitest: ^2 + peerDependenciesMeta: + prettier: + optional: true + vitest: + optional: true + '@qwikdev/astro@0.7.7': resolution: {integrity: sha512-8pICYm4Aoy5aB9ZFojnLzjhDpwW/n4NBXGtYsnn+5tAwaR9x1KfRJicvT+nvN01maAmIBfN+qYd7EyHspSDn3A==} peerDependencies: @@ -1440,6 +1458,9 @@ packages: resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==} engines: {node: '>=10.13.0'} + '@ts-morph/common@0.26.1': + resolution: {integrity: sha512-Sn28TGl/4cFpcM+jwsH1wLncYq3FtN/BIpem+HOygfBWPT5pAeS5dB4VFVzV8FbnOKHpDLZmvAl4AjPEev5idA==} + '@types/babel__core@7.20.5': resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==} @@ -1885,6 +1906,9 @@ packages: resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} + code-block-writer@13.0.3: + resolution: {integrity: sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==} + color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} @@ -4030,6 +4054,9 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + ts-morph@25.0.1: + resolution: {integrity: sha512-QJEiTdnz1YjrB3JFhd626gX4rKHDLSjSVMvGGG4v7ONc3RBwa0Eei98G9AT9uNFDMtV54JyuXsFeC+OH0n6bXQ==} + tsconfck@3.1.4: resolution: {integrity: sha512-kdqWFGVJqe+KGYvlSO9NIaWn9jT1Ny4oKVzAJsKii5eoE9snzTJzL4+MMVOMn+fikWGFmKEylcXL710V/kIPJQ==} engines: {node: ^18 || >=20} @@ -5009,11 +5036,6 @@ snapshots: '@biomejs/cli-win32-x64@1.9.4': optional: true - '@builder.io/qwik@1.12.0(vite@5.4.11(@types/node@22.10.2))': - dependencies: - csstype: 3.1.3 - vite: 5.4.11(@types/node@22.10.2) - '@builder.io/qwik@1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1))': dependencies: csstype: 3.1.3 @@ -5803,6 +5825,20 @@ snapshots: '@poppinss/macroable@1.0.4': {} + '@qwik.dev/core@2.0.0-alpha.8(prettier@3.4.2)(vite@5.4.11(@types/node@22.10.2))': + dependencies: + csstype: 3.1.3 + vite: 5.4.11(@types/node@22.10.2) + optionalDependencies: + prettier: 3.4.2 + + '@qwik.dev/core@2.0.0-alpha.8(prettier@3.4.2)(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1))': + dependencies: + csstype: 3.1.3 + vite: 6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1) + optionalDependencies: + prettier: 3.4.2 + '@qwikdev/astro@0.7.7(@builder.io/qwik@1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)))(astro@5.1.1(@types/node@22.10.2)(jiti@2.4.2)(rollup@4.29.1)(typescript@5.7.2)(yaml@2.6.1))(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1))': dependencies: '@builder.io/qwik': 1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) @@ -5909,6 +5945,12 @@ snapshots: '@trysound/sax@0.2.0': {} + '@ts-morph/common@0.26.1': + dependencies: + fast-glob: 3.3.2 + minimatch: 9.0.5 + path-browserify: 1.0.1 + '@types/babel__core@7.20.5': dependencies: '@babel/parser': 7.26.3 @@ -6673,6 +6715,8 @@ snapshots: clsx@2.1.1: {} + code-block-writer@13.0.3: {} + color-convert@2.0.1: dependencies: color-name: 1.1.4 @@ -9170,6 +9214,11 @@ snapshots: ts-interface-checker@0.1.13: {} + ts-morph@25.0.1: + dependencies: + '@ts-morph/common': 0.26.1 + code-block-writer: 13.0.3 + tsconfck@3.1.4(typescript@5.7.2): optionalDependencies: typescript: 5.7.2 From c0ca6cc824b3e17ac366cd75758c404a6f6345f6 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 8 Mar 2025 18:03:37 -0600 Subject: [PATCH 3/7] deno and node to v2 --- apps/deno-demo/deno.lock | 74 +++++++++++++++++++ apps/deno-demo/package.json | 4 +- .../deno-demo/src/components/qwik/counter.tsx | 2 +- apps/deno-demo/src/components/qwik/say-hi.tsx | 2 +- apps/deno-demo/src/components/qwik/test.tsx | 2 +- apps/deno-demo/tsconfig.json | 2 +- apps/node-demo/package.json | 4 +- .../node-demo/src/components/qwik/counter.tsx | 2 +- apps/node-demo/src/components/qwik/say-hi.tsx | 2 +- apps/node-demo/src/components/qwik/test.tsx | 2 +- apps/node-demo/tsconfig.json | 2 +- libs/qwikdev-astro/src/root.tsx | 2 +- .../minimal/src/components/counter.tsx | 2 +- pnpm-lock.yaml | 14 ++-- 14 files changed, 98 insertions(+), 18 deletions(-) create mode 100644 apps/deno-demo/deno.lock diff --git a/apps/deno-demo/deno.lock b/apps/deno-demo/deno.lock new file mode 100644 index 00000000..2670ecd7 --- /dev/null +++ b/apps/deno-demo/deno.lock @@ -0,0 +1,74 @@ +{ + "version": "4", + "remote": { + "https://deno.land/std@0.177.0/_util/asserts.ts": "178dfc49a464aee693a7e285567b3d0b555dc805ff490505a8aae34f9cfb1462", + "https://deno.land/std@0.177.0/_util/os.ts": "d932f56d41e4f6a6093d56044e29ce637f8dcc43c5a90af43504a889cf1775e3", + "https://deno.land/std@0.177.0/async/abortable.ts": "73acfb3ed7261ce0d930dbe89e43db8d34e017b063cf0eaa7d215477bf53442e", + "https://deno.land/std@0.177.0/async/deadline.ts": "c5facb0b404eede83e38bd2717ea8ab34faa2ffb20ef87fd261fcba32ba307aa", + "https://deno.land/std@0.177.0/async/debounce.ts": "adab11d04ca38d699444ac8a9d9856b4155e8dda2afd07ce78276c01ea5a4332", + "https://deno.land/std@0.177.0/async/deferred.ts": "42790112f36a75a57db4a96d33974a936deb7b04d25c6084a9fa8a49f135def8", + "https://deno.land/std@0.177.0/async/delay.ts": "73aa04cec034c84fc748c7be49bb15cac3dd43a57174bfdb7a4aec22c248f0dd", + "https://deno.land/std@0.177.0/async/mod.ts": "f04344fa21738e5ad6bea37a6bfffd57c617c2d372bb9f9dcfd118a1b622e576", + "https://deno.land/std@0.177.0/async/mux_async_iterator.ts": "70c7f2ee4e9466161350473ad61cac0b9f115cff4c552eaa7ef9d50c4cbb4cc9", + "https://deno.land/std@0.177.0/async/pool.ts": "fd082bd4aaf26445909889435a5c74334c017847842ec035739b4ae637ae8260", + "https://deno.land/std@0.177.0/async/retry.ts": "5efa3ba450ac0c07a40a82e2df296287b5013755d232049efd7ea2244f15b20f", + "https://deno.land/std@0.177.0/async/tee.ts": "47e42d35f622650b02234d43803d0383a89eb4387e1b83b5a40106d18ae36757", + "https://deno.land/std@0.177.0/collections/_utils.ts": "5114abc026ddef71207a79609b984614e66a63a4bda17d819d56b0e72c51527e", + "https://deno.land/std@0.177.0/collections/deep_merge.ts": "5a8ed29030f4471a5272785c57c3455fa79697b9a8f306013a8feae12bafc99a", + "https://deno.land/std@0.177.0/crypto/_fnv/fnv32.ts": "e4649dfdefc5c987ed53c3c25db62db771a06d9d1b9c36d2b5cf0853b8e82153", + "https://deno.land/std@0.177.0/crypto/_fnv/fnv64.ts": "bfa0e4702061fdb490a14e6bf5f9168a22fb022b307c5723499469bfefca555e", + "https://deno.land/std@0.177.0/crypto/_fnv/index.ts": "169c213eb75de2d6738c1ed66a8e5782bd222b70b187cc4e7fb7b73edfcf0927", + "https://deno.land/std@0.177.0/crypto/_fnv/util.ts": "accba12bfd80a352e32a872f87df2a195e75561f1b1304a4cb4f5a4648d288f9", + "https://deno.land/std@0.177.0/crypto/_util.ts": "0522d1466e3c92df84cea94da85dbb7bd93e629dacb2aa5b39cab432ab7cb3d6", + "https://deno.land/std@0.177.0/crypto/_wasm/lib/deno_std_wasm_crypto.generated.mjs": "5dedb7f9aa05f0e18ed017691c58df5f4686e4cbbd70368c6f896e5cca03f2b4", + "https://deno.land/std@0.177.0/crypto/_wasm/mod.ts": "e2df88236fc061eac7a89e8cb0b97843f5280b08b2a990e473b7397a3e566003", + "https://deno.land/std@0.177.0/crypto/crypto.ts": "d5ce53784ab7b1348095389426a7ea98536223fb143812ecb50724a0aa1ec657", + "https://deno.land/std@0.177.0/crypto/keystack.ts": "877ab0f19eb7d37ad6495190d3c3e39f58e9c52e0b6a966f82fd6df67ca55f90", + "https://deno.land/std@0.177.0/crypto/mod.ts": "885738e710868202d7328305b0c0c134e36a2d9c98ceab9513ea2442863c00eb", + "https://deno.land/std@0.177.0/crypto/timing_safe_equal.ts": "8d69ab611c67fe51b6127d97fcfb4d8e7d0e1b6b4f3e0cc4ab86744c3691f965", + "https://deno.land/std@0.177.0/crypto/to_hash_string.ts": "fe4e95239d7afb617f469bc2f76ff20f888ddb8d1385e0d92276f6e4d5a809d1", + "https://deno.land/std@0.177.0/encoding/base64.ts": "7de04c2f8aeeb41453b09b186480be90f2ff357613b988e99fabb91d2eeceba1", + "https://deno.land/std@0.177.0/encoding/base64url.ts": "3f1178f6446834457b16bfde8b559c1cd3481727fe384d3385e4a9995dc2d851", + "https://deno.land/std@0.177.0/encoding/hex.ts": "50f8c95b52eae24395d3dfcb5ec1ced37c5fe7610ef6fffdcc8b0fdc38e3b32f", + "https://deno.land/std@0.177.0/flags/mod.ts": "d1cdefa18472ef69858a17df5cf7c98445ed27ac10e1460183081303b0ebc270", + "https://deno.land/std@0.177.0/fmt/colors.ts": "938c5d44d889fb82eff6c358bea8baa7e85950a16c9f6dae3ec3a7a729164471", + "https://deno.land/std@0.177.0/http/file_server.ts": "86d624c0c908a4a377090668ee872cf5c064245da71b3e8f8f7df888cac869d5", + "https://deno.land/std@0.177.0/http/http_status.ts": "8a7bcfe3ac025199ad804075385e57f63d055b2aed539d943ccc277616d6f932", + "https://deno.land/std@0.177.0/http/server.ts": "cbb17b594651215ba95c01a395700684e569c165a567e4e04bba327f41197433", + "https://deno.land/std@0.177.0/http/util.ts": "36c0b60c031f9e2ba024353ed11693f76c714551f9e766b36cdaacda54f25a21", + "https://deno.land/std@0.177.0/media_types/_db.ts": "7606d83e31f23ce1a7968cbaee852810c2cf477903a095696cdc62eaab7ce570", + "https://deno.land/std@0.177.0/media_types/_util.ts": "916efbd30b6148a716f110e67a4db29d6949bf4048997b754415dd7e42c52378", + "https://deno.land/std@0.177.0/media_types/content_type.ts": "c682589a0aeb016bfed355cc1ed6fbb3ead2ea48fc0000ac5de6a5730613ad1c", + "https://deno.land/std@0.177.0/media_types/format_media_type.ts": "1e35e16562e5c417401ffc388a9f8f421f97f0ee06259cbe990c51bae4e6c7a8", + "https://deno.land/std@0.177.0/media_types/get_charset.ts": "8be15a1fd31a545736b91ace56d0e4c66ea0d7b3fdc5c90760e8202e7b4b1fad", + "https://deno.land/std@0.177.0/media_types/parse_media_type.ts": "bed260d868ea271445ae41d748e7afed9b5a7f407d2777ead08cecf73e9278de", + "https://deno.land/std@0.177.0/media_types/type_by_extension.ts": "6076a7fc63181d70f92ec582fdea2c927eb2cfc7f9c9bee9d6add2aca86f2355", + "https://deno.land/std@0.177.0/media_types/vendor/mime-db.v1.52.0.ts": "6925bbcae81ca37241e3f55908d0505724358cda3384eaea707773b2c7e99586", + "https://deno.land/std@0.177.0/path/_constants.ts": "e49961f6f4f48039c0dfed3c3f93e963ca3d92791c9d478ac5b43183413136e0", + "https://deno.land/std@0.177.0/path/_interface.ts": "6471159dfbbc357e03882c2266d21ef9afdb1e4aa771b0545e90db58a0ba314b", + "https://deno.land/std@0.177.0/path/_util.ts": "d7abb1e0dea065f427b89156e28cdeb32b045870acdf865833ba808a73b576d0", + "https://deno.land/std@0.177.0/path/common.ts": "ee7505ab01fd22de3963b64e46cff31f40de34f9f8de1fff6a1bd2fe79380000", + "https://deno.land/std@0.177.0/path/glob.ts": "d479e0a695621c94d3fd7fe7abd4f9499caf32a8de13f25073451c6ef420a4e1", + "https://deno.land/std@0.177.0/path/mod.ts": "4b83694ac500d7d31b0cdafc927080a53dc0c3027eb2895790fb155082b0d232", + "https://deno.land/std@0.177.0/path/posix.ts": "8b7c67ac338714b30c816079303d0285dd24af6b284f7ad63da5b27372a2c94d", + "https://deno.land/std@0.177.0/path/separator.ts": "0fb679739d0d1d7bf45b68dacfb4ec7563597a902edbaf3c59b50d5bcadd93b1", + "https://deno.land/std@0.177.0/path/win32.ts": "d186344e5583bcbf8b18af416d13d82b35a317116e6460a5a3953508c3de5bba", + "https://deno.land/std@0.177.0/version.ts": "259c8866ec257c3511b437baa95205a86761abaef852a9b2199072accb2ef046" + }, + "workspace": { + "packageJson": { + "dependencies": [ + "npm:@astrojs/check@~0.9.4", + "npm:@astrojs/deno@^5.0.1", + "npm:@astrojs/react@^4.1.2", + "npm:@qwik.dev/core@2.0.0-alpha.8", + "npm:@types/react-dom@^18.3.5", + "npm:@types/react@^18.3.18", + "npm:astro@^5.1.1", + "npm:react-dom@^18.3.1", + "npm:react@^18.3.1", + "npm:typescript@^5.7.2" + ] + } + } +} diff --git a/apps/deno-demo/package.json b/apps/deno-demo/package.json index bfa821a6..5424ec4d 100644 --- a/apps/deno-demo/package.json +++ b/apps/deno-demo/package.json @@ -14,7 +14,6 @@ "@astrojs/check": "^0.9.4", "@astrojs/deno": "^5.0.1", "@astrojs/react": "^4.1.2", - "@builder.io/qwik": "^1.12.0", "@qwikdev/astro": "workspace:*", "@types/react": "^18.3.18", "@types/react-dom": "^18.3.5", @@ -22,5 +21,8 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "typescript": "^5.7.2" + }, + "devDependencies": { + "@qwik.dev/core": "2.0.0-alpha.8" } } diff --git a/apps/deno-demo/src/components/qwik/counter.tsx b/apps/deno-demo/src/components/qwik/counter.tsx index 49b16ead..82bf397b 100644 --- a/apps/deno-demo/src/components/qwik/counter.tsx +++ b/apps/deno-demo/src/components/qwik/counter.tsx @@ -1,4 +1,4 @@ -import { Slot, component$, useSignal } from "@builder.io/qwik"; +import { Slot, component$, useSignal } from "@qwik.dev/core"; export const Counter = component$<{ initial: number }>((props) => { const counter = useSignal(props.initial); diff --git a/apps/deno-demo/src/components/qwik/say-hi.tsx b/apps/deno-demo/src/components/qwik/say-hi.tsx index 9a77fbd2..8d75ca3f 100644 --- a/apps/deno-demo/src/components/qwik/say-hi.tsx +++ b/apps/deno-demo/src/components/qwik/say-hi.tsx @@ -1,4 +1,4 @@ -import { Slot, component$, sync$ } from "@builder.io/qwik"; +import { Slot, component$, sync$ } from "@qwik.dev/core"; export const SayHi = component$(() => { return ( diff --git a/apps/deno-demo/src/components/qwik/test.tsx b/apps/deno-demo/src/components/qwik/test.tsx index 73ee55a6..c6aa7638 100644 --- a/apps/deno-demo/src/components/qwik/test.tsx +++ b/apps/deno-demo/src/components/qwik/test.tsx @@ -1,4 +1,4 @@ -import { component$ } from "@builder.io/qwik"; +import { component$ } from "@qwik.dev/core"; export const Test = component$(() => { return
test
; diff --git a/apps/deno-demo/tsconfig.json b/apps/deno-demo/tsconfig.json index 1881c255..86ca76d4 100644 --- a/apps/deno-demo/tsconfig.json +++ b/apps/deno-demo/tsconfig.json @@ -7,6 +7,6 @@ }, "jsx": "react-jsx", - "jsxImportSource": "@builder.io/qwik" + "jsxImportSource": "@qwik.dev/core" } } diff --git a/apps/node-demo/package.json b/apps/node-demo/package.json index 1cefda3f..76229d3c 100644 --- a/apps/node-demo/package.json +++ b/apps/node-demo/package.json @@ -14,12 +14,14 @@ "dependencies": { "@astrojs/node": "9.0.0", "@astrojs/react": "4.1.2", - "@builder.io/qwik": "^1.12.0", "@qwikdev/astro": "workspace:*", "@types/react": "^18.3.18", "@types/react-dom": "^18.3.5", "astro": "5.1.1", "react": "^18.3.1", "react-dom": "^18.3.1" + }, + "devDependencies": { + "@qwik.dev/core": "2.0.0-alpha.8" } } diff --git a/apps/node-demo/src/components/qwik/counter.tsx b/apps/node-demo/src/components/qwik/counter.tsx index 49b16ead..82bf397b 100644 --- a/apps/node-demo/src/components/qwik/counter.tsx +++ b/apps/node-demo/src/components/qwik/counter.tsx @@ -1,4 +1,4 @@ -import { Slot, component$, useSignal } from "@builder.io/qwik"; +import { Slot, component$, useSignal } from "@qwik.dev/core"; export const Counter = component$<{ initial: number }>((props) => { const counter = useSignal(props.initial); diff --git a/apps/node-demo/src/components/qwik/say-hi.tsx b/apps/node-demo/src/components/qwik/say-hi.tsx index 9a77fbd2..8d75ca3f 100644 --- a/apps/node-demo/src/components/qwik/say-hi.tsx +++ b/apps/node-demo/src/components/qwik/say-hi.tsx @@ -1,4 +1,4 @@ -import { Slot, component$, sync$ } from "@builder.io/qwik"; +import { Slot, component$, sync$ } from "@qwik.dev/core"; export const SayHi = component$(() => { return ( diff --git a/apps/node-demo/src/components/qwik/test.tsx b/apps/node-demo/src/components/qwik/test.tsx index 73ee55a6..c6aa7638 100644 --- a/apps/node-demo/src/components/qwik/test.tsx +++ b/apps/node-demo/src/components/qwik/test.tsx @@ -1,4 +1,4 @@ -import { component$ } from "@builder.io/qwik"; +import { component$ } from "@qwik.dev/core"; export const Test = component$(() => { return
test
; diff --git a/apps/node-demo/tsconfig.json b/apps/node-demo/tsconfig.json index 1881c255..86ca76d4 100644 --- a/apps/node-demo/tsconfig.json +++ b/apps/node-demo/tsconfig.json @@ -7,6 +7,6 @@ }, "jsx": "react-jsx", - "jsxImportSource": "@builder.io/qwik" + "jsxImportSource": "@qwik.dev/core" } } diff --git a/libs/qwikdev-astro/src/root.tsx b/libs/qwikdev-astro/src/root.tsx index 9eb11611..cfbea2ee 100644 --- a/libs/qwikdev-astro/src/root.tsx +++ b/libs/qwikdev-astro/src/root.tsx @@ -1,4 +1,4 @@ -import { Slot, component$ } from "@builder.io/qwik"; +import { Slot, component$ } from "@qwik.dev/core"; export default component$(() => { return ( diff --git a/libs/qwikdev-astro/tests/fixtures/minimal/src/components/counter.tsx b/libs/qwikdev-astro/tests/fixtures/minimal/src/components/counter.tsx index 7bb988f8..b7e3acdd 100644 --- a/libs/qwikdev-astro/tests/fixtures/minimal/src/components/counter.tsx +++ b/libs/qwikdev-astro/tests/fixtures/minimal/src/components/counter.tsx @@ -1,4 +1,4 @@ -import { component$, useSignal } from "@builder.io/qwik"; +import { component$, useSignal } from "@qwik.dev/core"; export const Counter = component$(() => { const count = useSignal(0); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6ec4be9f..a5422b04 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,9 +63,6 @@ importers: '@astrojs/react': specifier: ^4.1.2 version: 4.1.2(@types/node@22.10.2)(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(jiti@2.4.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(yaml@2.6.1) - '@builder.io/qwik': - specifier: ^1.12.0 - version: 1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) '@qwikdev/astro': specifier: workspace:* version: link:../../libs/qwikdev-astro @@ -87,6 +84,10 @@ importers: typescript: specifier: ^5.7.2 version: 5.7.2 + devDependencies: + '@qwik.dev/core': + specifier: 2.0.0-alpha.8 + version: 2.0.0-alpha.8(prettier@3.4.2)(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) apps/node-demo: dependencies: @@ -96,9 +97,6 @@ importers: '@astrojs/react': specifier: 4.1.2 version: 4.1.2(@types/node@22.10.2)(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(jiti@2.4.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(yaml@2.6.1) - '@builder.io/qwik': - specifier: ^1.12.0 - version: 1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) '@qwikdev/astro': specifier: workspace:* version: link:../../libs/qwikdev-astro @@ -117,6 +115,10 @@ importers: react-dom: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) + devDependencies: + '@qwik.dev/core': + specifier: 2.0.0-alpha.8 + version: 2.0.0-alpha.8(prettier@3.4.2)(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) apps/website: dependencies: From fb52bf7c064c8d3ef478ffbeb20b295318cda433 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 8 Mar 2025 18:26:32 -0600 Subject: [PATCH 4/7] migrate to v2 --- apps/website/package.json | 4 ++-- apps/website/src/components/home/background/background.tsx | 2 +- apps/website/src/components/home/bar-chart/bar-chart.tsx | 2 +- apps/website/src/components/home/cli-copy/cli-copy.tsx | 2 +- .../components/home/js-chunk-animator/js-chunk-animator.tsx | 2 +- apps/website/src/components/home/js-chunk/js-chunk.tsx | 2 +- apps/website/src/components/home/logo-hover/logo-hover.tsx | 2 +- apps/website/src/components/home/spotlight/spotlight.tsx | 2 +- apps/website/src/components/home/squiggle/squiggle.tsx | 2 +- apps/website/src/icons/astro.tsx | 2 +- apps/website/src/icons/qwik.tsx | 2 +- apps/website/tsconfig.json | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/website/package.json b/apps/website/package.json index 6fe1573e..94512083 100644 --- a/apps/website/package.json +++ b/apps/website/package.json @@ -19,7 +19,6 @@ }, "dependencies": { "@astrojs/check": "^0.9.4", - "@builder.io/qwik": "^1.12", "@fontsource-variable/unbounded": "^5.1.1", "@iconify-json/lucide": "^1.2.23", "@qwikdev/astro": "^0.7", @@ -28,6 +27,7 @@ "sharp": "^0.33.5" }, "devDependencies": { - "@biomejs/biome": "^1.7.0" + "@biomejs/biome": "^1.7.0", + "@qwik.dev/core": "2.0.0-alpha.8" } } diff --git a/apps/website/src/components/home/background/background.tsx b/apps/website/src/components/home/background/background.tsx index fc8cd551..bdecdcdb 100644 --- a/apps/website/src/components/home/background/background.tsx +++ b/apps/website/src/components/home/background/background.tsx @@ -1,4 +1,4 @@ -import { component$, useStylesScoped$ } from "@builder.io/qwik"; +import { component$, useStylesScoped$ } from "@qwik.dev/core"; import styles from "./background.css?inline"; export const Background = component$(() => { diff --git a/apps/website/src/components/home/bar-chart/bar-chart.tsx b/apps/website/src/components/home/bar-chart/bar-chart.tsx index 8ecc2c9d..2a5a5426 100644 --- a/apps/website/src/components/home/bar-chart/bar-chart.tsx +++ b/apps/website/src/components/home/bar-chart/bar-chart.tsx @@ -1,4 +1,4 @@ -import { component$, useStylesScoped$ } from "@builder.io/qwik"; +import { component$, useStylesScoped$ } from "@qwik.dev/core"; import styles from "./bar-chart.css?inline"; interface BarChartProps { diff --git a/apps/website/src/components/home/cli-copy/cli-copy.tsx b/apps/website/src/components/home/cli-copy/cli-copy.tsx index cc3bcf5e..4e5061c8 100644 --- a/apps/website/src/components/home/cli-copy/cli-copy.tsx +++ b/apps/website/src/components/home/cli-copy/cli-copy.tsx @@ -5,7 +5,7 @@ import { useSignal, useStyles$, useTask$ -} from "@builder.io/qwik"; +} from "@qwik.dev/core"; import styles from "./cli-copy.css?inline"; export const CLICopy = component$((props: PropsOf<"button">) => { diff --git a/apps/website/src/components/home/js-chunk-animator/js-chunk-animator.tsx b/apps/website/src/components/home/js-chunk-animator/js-chunk-animator.tsx index 511975e2..03da876a 100644 --- a/apps/website/src/components/home/js-chunk-animator/js-chunk-animator.tsx +++ b/apps/website/src/components/home/js-chunk-animator/js-chunk-animator.tsx @@ -4,7 +4,7 @@ import { useOnDocument, useSignal, useStylesScoped$ -} from "@builder.io/qwik"; +} from "@qwik.dev/core"; import { JSChunk } from "../js-chunk/js-chunk"; export const JSChunkAnimator = component$(() => { diff --git a/apps/website/src/components/home/js-chunk/js-chunk.tsx b/apps/website/src/components/home/js-chunk/js-chunk.tsx index 4c8ad4aa..b28be07e 100644 --- a/apps/website/src/components/home/js-chunk/js-chunk.tsx +++ b/apps/website/src/components/home/js-chunk/js-chunk.tsx @@ -1,4 +1,4 @@ -import { component$, useStylesScoped$ } from "@builder.io/qwik"; +import { component$, useStylesScoped$ } from "@qwik.dev/core"; export const JSChunk = component$(() => { useStylesScoped$( diff --git a/apps/website/src/components/home/logo-hover/logo-hover.tsx b/apps/website/src/components/home/logo-hover/logo-hover.tsx index c6d718ad..052dee86 100644 --- a/apps/website/src/components/home/logo-hover/logo-hover.tsx +++ b/apps/website/src/components/home/logo-hover/logo-hover.tsx @@ -5,7 +5,7 @@ import { useSignal, useStyles$, useVisibleTask$ -} from "@builder.io/qwik"; +} from "@qwik.dev/core"; import { AstroIcon } from "@icons/astro"; import { QwikIcon } from "@icons/qwik"; import styles from "./logo-hover.css?inline"; diff --git a/apps/website/src/components/home/spotlight/spotlight.tsx b/apps/website/src/components/home/spotlight/spotlight.tsx index 3ba0cf2d..68a83178 100644 --- a/apps/website/src/components/home/spotlight/spotlight.tsx +++ b/apps/website/src/components/home/spotlight/spotlight.tsx @@ -1,4 +1,4 @@ -import { $, Slot, component$, useSignal, useStyles$ } from "@builder.io/qwik"; +import { $, Slot, component$, useSignal, useStyles$ } from "@qwik.dev/core"; import styles from "./spotlight.css?inline"; export const Spotlight = component$(() => { diff --git a/apps/website/src/components/home/squiggle/squiggle.tsx b/apps/website/src/components/home/squiggle/squiggle.tsx index 42ce96c8..70bf6136 100644 --- a/apps/website/src/components/home/squiggle/squiggle.tsx +++ b/apps/website/src/components/home/squiggle/squiggle.tsx @@ -1,4 +1,4 @@ -import { type PropsOf, component$, useStylesScoped$ } from "@builder.io/qwik"; +import { type PropsOf, component$, useStylesScoped$ } from "@qwik.dev/core"; import styles from "./squiggle.css?inline"; export const Squiggle = component$((props: PropsOf<"svg">) => { diff --git a/apps/website/src/icons/astro.tsx b/apps/website/src/icons/astro.tsx index 34e8d77c..b8e24e15 100644 --- a/apps/website/src/icons/astro.tsx +++ b/apps/website/src/icons/astro.tsx @@ -1,4 +1,4 @@ -import { type PropsOf, component$ } from "@builder.io/qwik"; +import { type PropsOf, component$ } from "@qwik.dev/core"; export const AstroIcon = component$((props: PropsOf<"svg">) => { return ( diff --git a/apps/website/src/icons/qwik.tsx b/apps/website/src/icons/qwik.tsx index 4cb5448b..27c6c658 100644 --- a/apps/website/src/icons/qwik.tsx +++ b/apps/website/src/icons/qwik.tsx @@ -1,4 +1,4 @@ -import { type PropsOf, component$ } from "@builder.io/qwik"; +import { type PropsOf, component$ } from "@qwik.dev/core"; export const QwikIcon = component$((props: PropsOf<"svg">) => { return ( diff --git a/apps/website/tsconfig.json b/apps/website/tsconfig.json index fcd2713e..43e74828 100644 --- a/apps/website/tsconfig.json +++ b/apps/website/tsconfig.json @@ -10,6 +10,6 @@ }, "jsx": "react-jsx", - "jsxImportSource": "@builder.io/qwik" + "jsxImportSource": "@qwik.dev/core" } } From bca846e94fa8c55e1fc4894a95c609414ba9f9d5 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 8 Mar 2025 18:26:50 -0600 Subject: [PATCH 5/7] pnpm --- pnpm-lock.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a5422b04..3378e2c6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,9 +125,6 @@ importers: '@astrojs/check': specifier: ^0.9.4 version: 0.9.4(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.7.2) - '@builder.io/qwik': - specifier: ^1.12 - version: 1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) '@fontsource-variable/unbounded': specifier: ^5.1.1 version: 5.1.2 @@ -150,6 +147,9 @@ importers: '@biomejs/biome': specifier: ^1.7.0 version: 1.9.4 + '@qwik.dev/core': + specifier: 2.0.0-alpha.8 + version: 2.0.0-alpha.8(prettier@3.4.2)(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) libs/create-qwikdev-astro: dependencies: From ad6453c05e1f18378c454567cf6c3719379e85af Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 8 Mar 2025 18:35:44 -0600 Subject: [PATCH 6/7] add back chunk animator --- apps/website/package.json | 2 +- pnpm-lock.yaml | 29 ++--------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/apps/website/package.json b/apps/website/package.json index 94512083..05f84b27 100644 --- a/apps/website/package.json +++ b/apps/website/package.json @@ -21,7 +21,7 @@ "@astrojs/check": "^0.9.4", "@fontsource-variable/unbounded": "^5.1.1", "@iconify-json/lucide": "^1.2.23", - "@qwikdev/astro": "^0.7", + "@qwikdev/astro": "workspace:*", "astro": "^5.1", "astro-icon": "^1.1.4", "sharp": "^0.33.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3378e2c6..6919e4b9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -132,8 +132,8 @@ importers: specifier: ^1.2.23 version: 1.2.23 '@qwikdev/astro': - specifier: ^0.7 - version: 0.7.7(@builder.io/qwik@1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)))(astro@5.1.1(@types/node@22.10.2)(jiti@2.4.2)(rollup@4.29.1)(typescript@5.7.2)(yaml@2.6.1))(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) + specifier: workspace:* + version: link:../../libs/qwikdev-astro astro: specifier: ^5.1 version: 5.1.1(@types/node@22.10.2)(jiti@2.4.2)(rollup@4.29.1)(typescript@5.7.2)(yaml@2.6.1) @@ -1329,11 +1329,6 @@ packages: vitest: optional: true - '@qwikdev/astro@0.7.7': - resolution: {integrity: sha512-8pICYm4Aoy5aB9ZFojnLzjhDpwW/n4NBXGtYsnn+5tAwaR9x1KfRJicvT+nvN01maAmIBfN+qYd7EyHspSDn3A==} - peerDependencies: - '@builder.io/qwik': '>=1.9.0' - '@rollup/pluginutils@5.1.4': resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==} engines: {node: '>=14.0.0'} @@ -5597,16 +5592,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@inox-tools/inline-mod@2.0.2(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1))': - dependencies: - '@inox-tools/utils': 0.3.0 - debug: 4.4.0 - typescript: 5.7.2 - optionalDependencies: - vite: 6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1) - transitivePeerDependencies: - - supports-color - '@inox-tools/utils@0.3.0': {} '@isaacs/cliui@8.0.2': @@ -5841,16 +5826,6 @@ snapshots: optionalDependencies: prettier: 3.4.2 - '@qwikdev/astro@0.7.7(@builder.io/qwik@1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)))(astro@5.1.1(@types/node@22.10.2)(jiti@2.4.2)(rollup@4.29.1)(typescript@5.7.2)(yaml@2.6.1))(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1))': - dependencies: - '@builder.io/qwik': 1.12.0(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) - '@inox-tools/inline-mod': 2.0.2(vite@6.0.6(@types/node@22.10.2)(jiti@2.4.2)(yaml@2.6.1)) - astro-integration-kit: 0.18.0(astro@5.1.1(@types/node@22.10.2)(jiti@2.4.2)(rollup@4.29.1)(typescript@5.7.2)(yaml@2.6.1)) - transitivePeerDependencies: - - astro - - supports-color - - vite - '@rollup/pluginutils@5.1.4(rollup@4.29.1)': dependencies: '@types/estree': 1.0.6 From 8131cf6bf14ed5a88d19c5ee7e36322df3a502f3 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Tue, 25 Mar 2025 00:22:15 -0500 Subject: [PATCH 7/7] remove dev preloading --- libs/qwikdev-astro/server.ts | 38 +----------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/libs/qwikdev-astro/server.ts b/libs/qwikdev-astro/server.ts index 623e2a01..5ae1bca8 100644 --- a/libs/qwikdev-astro/server.ts +++ b/libs/qwikdev-astro/server.ts @@ -83,17 +83,7 @@ export async function renderToStaticMarkup( ...(isDev ? { manifest: {} as QwikManifest, - symbolMapper: (symbolName, mapper, parent) => { - const requestUrl = new URL(this.result.request.url); - const origin = requestUrl.origin; - const devUrl = origin + parent + "_" + symbolName + ".js"; - devUrls.add(devUrl); - - // this determines if the container is the last one - renderToStreamOpts.containerAttributes!["q-astro-marker"] = "last"; - - return globalThis.symbolMapperFn(symbolName, mapper, parent); - } + symbolMapper: globalThis.symbolMapperFn } : { manifest: globalThis.qManifest @@ -182,32 +172,6 @@ export async function renderToStaticMarkup( await renderToStream(qwikComponentJSX as JSXOutput, renderToStreamOpts); - // we only want to add the preloader script if the container is the last one - if (isDev && devUrls.size > 0) { - const preloaderScript = ``; - - // if there is one container, add the preloader script to the first one - if (html.includes('q-astro-marker="first"')) { - html += preloaderScript; - } - - // if there is more than one container, add the preloader script to the last one - if (html.includes('q-astro-marker="last"')) { - html += preloaderScript; - } - } - const isClientRouter = Array.from(this.result._metadata.renderedScripts).some( (path) => path.includes("ClientRouter.astro") );