From e3c81fe1e11c78e1ec5b32c3e6e9e90c532f3876 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 3 May 2025 00:30:28 -0500 Subject: [PATCH 1/7] update deps --- apps/demo/package.json | 2 +- libs/qwikdev-astro/package.json | 6 +- package.json | 2 +- pnpm-lock.yaml | 519 ++++++++++++++++++++++++++------ 4 files changed, 435 insertions(+), 94 deletions(-) diff --git a/apps/demo/package.json b/apps/demo/package.json index 3fabe9bc..a83eadc5 100644 --- a/apps/demo/package.json +++ b/apps/demo/package.json @@ -14,6 +14,6 @@ "dependencies": { "@builder.io/qwik": "^1.12.0", "@qwikdev/astro": "workspace:*", - "astro": "5.1.1" + "astro": "5.7.10" } } diff --git a/libs/qwikdev-astro/package.json b/libs/qwikdev-astro/package.json index f1517df8..11e20bfb 100644 --- a/libs/qwikdev-astro/package.json +++ b/libs/qwikdev-astro/package.json @@ -61,13 +61,13 @@ }, "bugs": "https://github.com/thejackshelton/@qwikdev/astro/issues", "dependencies": { - "@inox-tools/inline-mod": "^2.0.2", + "@inox-tools/inline-mod": "^2.0.3", "astro-integration-kit": "^0.18.0" }, "devDependencies": { "@builder.io/qwik": "^1.12.0", - "astro": "^5.1.1", - "vite": "^5.4.11" + "astro": "^5.7.10", + "vite": "^6.3.4" }, "peerDependencies": { "@builder.io/qwik": ">=1.9.0" diff --git a/package.json b/package.json index 94a0a72b..a9c6c8cb 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@playwright/test": "^1.49.1", "@qwikdev/create-astro": "workspace:*", "@types/node": "^22.10.2", - "astro": "5.0.3", + "astro": "5.7.10", "lefthook": "^1.10.1", "pkg-pr-new": "^0.0.35", "@qwikdev/astro": "0.7.11" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6cbcc359..cec92086 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: version: 1.9.4 '@builder.io/qwik': specifier: ^1.12.0 - version: 1.12.1(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + version: 1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) '@changesets/cli': specifier: ^2.27.11 version: 2.28.1 @@ -25,7 +25,7 @@ importers: version: 1.51.1 '@qwikdev/astro': specifier: 0.7.11 - version: 0.7.11(@builder.io/qwik@1.12.1(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)))(astro@5.0.3(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0))(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + version: 0.7.11(@builder.io/qwik@1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)))(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0))(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) '@qwikdev/create-astro': specifier: workspace:* version: link:libs/create-qwikdev-astro @@ -33,8 +33,8 @@ importers: specifier: ^22.10.2 version: 22.13.13 astro: - specifier: 5.0.3 - version: 5.0.3(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + specifier: 5.7.10 + version: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) lefthook: specifier: ^1.10.1 version: 1.11.5 @@ -46,13 +46,13 @@ importers: dependencies: '@builder.io/qwik': specifier: ^1.12.0 - version: 1.12.1(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + version: 1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) '@qwikdev/astro': specifier: workspace:* version: link:../../libs/qwikdev-astro astro: - specifier: 5.1.1 - version: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + specifier: 5.7.10 + version: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) apps/deno-demo: dependencies: @@ -100,7 +100,7 @@ importers: version: 4.1.2(@types/node@22.13.13)(@types/react-dom@18.3.5(@types/react@18.3.20))(@types/react@18.3.20)(jiti@2.4.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(yaml@2.7.0) '@builder.io/qwik': specifier: ^1.12.0 - version: 1.12.1(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + version: 1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) '@qwikdev/astro': specifier: workspace:* version: link:../../libs/qwikdev-astro @@ -127,7 +127,7 @@ importers: version: 0.9.4(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.8.2) '@builder.io/qwik': specifier: ^1.12 - version: 1.12.1(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + version: 1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) '@fontsource-variable/unbounded': specifier: ^5.1.1 version: 5.2.5 @@ -215,21 +215,21 @@ importers: libs/qwikdev-astro: dependencies: '@inox-tools/inline-mod': - specifier: ^2.0.2 - version: 2.0.3(vite@5.4.15(@types/node@22.13.13)) + specifier: ^2.0.3 + version: 2.0.3(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) astro-integration-kit: specifier: ^0.18.0 - version: 0.18.0(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)) + version: 0.18.0(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)) devDependencies: '@builder.io/qwik': specifier: ^1.12.0 - version: 1.12.1(vite@5.4.15(@types/node@22.13.13)) + version: 1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) astro: - specifier: ^5.1.1 - version: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + specifier: ^5.7.10 + version: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) vite: - specifier: ^5.4.11 - version: 5.4.15(@types/node@22.13.13) + specifier: ^6.3.4 + version: 6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) libs/qwikdev-astro/tests/fixtures/minimal: dependencies: @@ -290,6 +290,9 @@ packages: '@astrojs/internal-helpers@0.4.2': resolution: {integrity: sha512-EdDWkC3JJVcpGpqJAU/5hSk2LKXyG3mNGkzGoAuyK+xoPHbaVdSuIWoN1QTnmK3N/gGfaaAfM8gO2KDCAW7S3w==} + '@astrojs/internal-helpers@0.6.1': + resolution: {integrity: sha512-l5Pqf6uZu31aG+3Lv8nl/3s4DbUzdlxTWDof4pEpto6GUJNhhCbelVi9dEyurOVyqaelwmS9oSyOWOENSfgo9A==} + '@astrojs/language-server@2.15.4': resolution: {integrity: sha512-JivzASqTPR2bao9BWsSc/woPHH7OGSGc9aMxXL4U6egVTqBycB3ZHdBJPuOCVtcGLrzdWTosAqVPz1BVoxE0+A==} hasBin: true @@ -305,15 +308,15 @@ packages: '@astrojs/markdown-remark@5.3.0': resolution: {integrity: sha512-r0Ikqr0e6ozPb5bvhup1qdWnSPUvQu6tub4ZLYaKyG50BXZ0ej6FhGz3GpChKpH7kglRFPObJd/bDyf2VM9pkg==} - '@astrojs/markdown-remark@6.0.0': - resolution: {integrity: sha512-Tabo7xM44Pz2Yf9qpdaCCgxRmtaypi2YCinqTUNefDrWUa+OyKW62OuNeCaGwNh/ys+QAd9FUWN5/3HgPWjP4Q==} - '@astrojs/markdown-remark@6.0.0-beta.3': resolution: {integrity: sha512-M6wGxQH9rRwsmcJ+IVfYJ8moYmPVXE2u2pcPJx+VbOEMgJ7gmnJ1eso40KP0JOvq8nGPlcfeyqba45WrYxhKlA==} '@astrojs/markdown-remark@6.0.1': resolution: {integrity: sha512-CTSYijj25NfxgZi15TU3CwPwgyD1/7yA3FcdcNmB9p94nydupiUbrIiq3IqeTp2m5kCVzxbPZeC7fTwEOaNyGw==} + '@astrojs/markdown-remark@6.3.1': + resolution: {integrity: sha512-c5F5gGrkczUaTVgmMW9g1YMJGzOtRvjjhw6IfGuxarM6ct09MpwysP10US729dy07gg8y+ofVifezvP3BNsWZg==} + '@astrojs/node@9.0.0': resolution: {integrity: sha512-3h/5kFZvpuo+chYAjj75YhtRUxfquxEJrpZRRC7TdiMGp2WhLp2us4VXm2mjezJp/zHKotW2L3qgp0P2ujQ0xw==} peerDependencies: @@ -348,6 +351,10 @@ packages: resolution: {integrity: sha512-8KCnaFAVsm/0KdXzWN0Afz50Ijyr1uHT31bE5AgCF5CLMh0dUpEOvHgZ++zLLq+VFj+5e4o0L6TLXMeAVHECBg==} engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0} + '@astrojs/telemetry@3.2.1': + resolution: {integrity: sha512-SSVM820Jqc6wjsn7qYfV9qfeQvePtVc1nSofhyap7l0/iakUKywj3hfy3UJAOV4sGV4Q/u450RD4AaCaFvNPlg==} + engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0} + '@astrojs/yaml2ts@0.2.2': resolution: {integrity: sha512-GOfvSr5Nqy2z5XiwqTouBBpy5FyI6DEe+/g/Mk5am9SjILN1S5fOEvYK0GuWHg98yS/dobP4m8qyqw/URW35fQ==} @@ -494,6 +501,9 @@ packages: peerDependencies: vite: ^5 + '@capsizecss/unpack@2.4.0': + resolution: {integrity: sha512-GrSU71meACqcmIUxPYOJvGKF0yryjN/L1aCuE9DViCTJI7bfkjgYDPD1zbNDcINJwSSP6UaBZY9GAbYDO7re0Q==} + '@changesets/apply-release-plan@7.0.10': resolution: {integrity: sha512-wNyeIJ3yDsVspYvHnEz1xQDq18D9ifed3lI+wxRQRK4pArUcuHgCTrHv0QRnnwjhVCQACxZ+CBih3wgOct6UXw==} @@ -1429,27 +1439,48 @@ packages: '@shikijs/core@1.29.2': resolution: {integrity: sha512-vju0lY9r27jJfOY4Z7+Rt/nIOjzJpZ3y+nYpqtUZInVoXQ/TJZcfGnNOGnKjFdVZb8qexiCuSlZRKcGfhhTTZQ==} + '@shikijs/core@3.3.0': + resolution: {integrity: sha512-CovkFL2WVaHk6PCrwv6ctlmD4SS1qtIfN8yEyDXDYWh4ONvomdM9MaFw20qHuqJOcb8/xrkqoWQRJ//X10phOQ==} + '@shikijs/engine-javascript@1.29.2': resolution: {integrity: sha512-iNEZv4IrLYPv64Q6k7EPpOCE/nuvGiKl7zxdq0WFuRPF5PAE9PRo2JGq/d8crLusM59BRemJ4eOqrFrC4wiQ+A==} + '@shikijs/engine-javascript@3.3.0': + resolution: {integrity: sha512-XlhnFGv0glq7pfsoN0KyBCz9FJU678LZdQ2LqlIdAj6JKsg5xpYKay3DkazXWExp3DTJJK9rMOuGzU2911pg7Q==} + '@shikijs/engine-oniguruma@1.29.2': resolution: {integrity: sha512-7iiOx3SG8+g1MnlzZVDYiaeHe7Ez2Kf2HrJzdmGwkRisT7r4rak0e655AcM/tF9JG/kg5fMNYlLLKglbN7gBqA==} + '@shikijs/engine-oniguruma@3.3.0': + resolution: {integrity: sha512-l0vIw+GxeNU7uGnsu6B+Crpeqf+WTQ2Va71cHb5ZYWEVEPdfYwY5kXwYqRJwHrxz9WH+pjSpXQz+TJgAsrkA5A==} + '@shikijs/langs@1.29.2': resolution: {integrity: sha512-FIBA7N3LZ+223U7cJDUYd5shmciFQlYkFXlkKVaHsCPgfVLiO+e12FmQE6Tf9vuyEsFe3dIl8qGWKXgEHL9wmQ==} + '@shikijs/langs@3.3.0': + resolution: {integrity: sha512-zt6Kf/7XpBQKSI9eqku+arLkAcDQ3NHJO6zFjiChI8w0Oz6Jjjay7pToottjQGjSDCFk++R85643WbyINcuL+g==} + '@shikijs/themes@1.29.2': resolution: {integrity: sha512-i9TNZlsq4uoyqSbluIcZkmPL9Bfi3djVxRnofUHwvx/h6SRW3cwgBC5SML7vsDcWyukY0eCzVN980rqP6qNl9g==} + '@shikijs/themes@3.3.0': + resolution: {integrity: sha512-tXeCvLXBnqq34B0YZUEaAD1lD4lmN6TOHAhnHacj4Owh7Ptb/rf5XCDeROZt2rEOk5yuka3OOW2zLqClV7/SOg==} + '@shikijs/types@1.29.2': resolution: {integrity: sha512-VJjK0eIijTZf0QSTODEXCqinjBn0joAHQ+aPSBzrv4O2d/QSbsMw+ZeSRx03kV34Hy7NzUvV/7NqfYGRLrASmw==} + '@shikijs/types@3.3.0': + resolution: {integrity: sha512-KPCGnHG6k06QG/2pnYGbFtFvpVJmC3uIpXrAiPrawETifujPBv0Se2oUxm5qYgjCvGJS9InKvjytOdN+bGuX+Q==} + '@shikijs/vscode-textmate@10.0.2': resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} '@sinclair/typebox@0.27.8': resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} + '@swc/helpers@0.5.17': + resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==} + '@trysound/sax@0.2.0': resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==} engines: {node: '>=10.13.0'} @@ -1696,13 +1727,13 @@ packages: engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} hasBin: true - astro@5.0.3: - resolution: {integrity: sha512-qpeN+POmmfAQu/XDXaI2CxkUgQFwH9uMUVaA1reV9rybzIbOVYc3E3BU5SkiP/W4BMUFPdJtyw6+/n/0AUv6rw==} + astro@5.1.1: + resolution: {integrity: sha512-prpWC2PRs4P3FKQg6gZaU+VNMqbZi5pDvORGB2nrjfRjkrvF6/l4BqhvkJ6YQ0Ohm5rIMVz8ljgaRI77mLHbwg==} engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} hasBin: true - astro@5.1.1: - resolution: {integrity: sha512-prpWC2PRs4P3FKQg6gZaU+VNMqbZi5pDvORGB2nrjfRjkrvF6/l4BqhvkJ6YQ0Ohm5rIMVz8ljgaRI77mLHbwg==} + astro@5.7.10: + resolution: {integrity: sha512-9TQcFZqP2w6//JXXUHfw8/5PX7KUx9EkG5O3m+hISuyeUztvjY1q5+p7+C5HiXyg24Zs3KkpieoL5BGRXGCAGA==} engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} hasBin: true @@ -1736,6 +1767,9 @@ packages: base-64@1.0.0: resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==} + base64-js@1.5.1: + resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} + before-after-hook@2.2.3: resolution: {integrity: sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==} @@ -1743,6 +1777,9 @@ packages: resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==} engines: {node: '>=4'} + blob-to-buffer@1.2.9: + resolution: {integrity: sha512-BF033y5fN6OCofD3vgHmNtwZWRcq9NLyyxyILx9hfMy1sXYy4ojFl765hJ2lP0YaN2fuxPaLO2Vzzoxy0FLFFA==} + boolbase@1.0.0: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} @@ -1757,6 +1794,9 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} + brotli@1.3.3: + resolution: {integrity: sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==} + browserslist@4.24.4: resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -1965,6 +2005,13 @@ packages: resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==} engines: {node: '>= 0.6'} + cookie@1.0.2: + resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} + engines: {node: '>=18'} + + cross-fetch@3.2.0: + resolution: {integrity: sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==} + cross-spawn@7.0.6: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} @@ -1986,6 +2033,10 @@ packages: resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==} engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} + css-tree@3.1.0: + resolution: {integrity: sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==} + engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} + css-what@6.1.0: resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==} engines: {node: '>= 6'} @@ -2097,6 +2148,9 @@ packages: devlop@1.1.0: resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==} + dfa@1.2.0: + resolution: {integrity: sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==} + diff-sequences@25.2.6: resolution: {integrity: sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==} engines: {node: '>= 8.3'} @@ -2428,6 +2482,14 @@ packages: picomatch: optional: true + fdir@6.4.4: + resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==} + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + fill-range@7.1.1: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} @@ -2468,6 +2530,9 @@ packages: debug: optional: true + fontkit@2.0.4: + resolution: {integrity: sha512-syetQadaUEDNdxdugga9CpEYVaQIxOwk7GlwZWWZ19//qW4zE5bknOKeMBDYAASwnpaSHKJITRLMF9m1fp3s6g==} + for-each@0.3.5: resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==} engines: {node: '>= 0.4'} @@ -3148,6 +3213,9 @@ packages: mdn-data@2.0.30: resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==} + mdn-data@2.12.2: + resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==} + memory-cache@0.2.0: resolution: {integrity: sha512-OcjA+jzjOYzKmKS6IQVALHLVz+rNTMPoJvCztFaZxwG14wtAW7VRZjwTQu06vKCYOxh4jVnik7ya0SXTB0W+xA==} @@ -3323,6 +3391,15 @@ packages: node-fetch-native@1.6.6: resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==} + node-fetch@2.7.0: + resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} + engines: {node: 4.x || >=6.0.0} + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + node-mock-http@1.0.0: resolution: {integrity: sha512-0uGYQ1WQL1M5kKvGRXWQ3uZCHtLTO8hln3oBjIusM75WoesZ909uQJs/Hb946i2SS+Gsrhkaa6iAO17jRIv6DQ==} @@ -3355,6 +3432,9 @@ packages: ofetch@1.4.1: resolution: {integrity: sha512-QZj2DfGplQAr2oj9KzceK9Hwz6Whxazmn85yYeVuS3u9XTMOGMRx0kO95MQ+vLsj/S/NwBDMMLU5hpxvI6Tklw==} + ohash@2.0.11: + resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==} + on-finished@2.4.1: resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} engines: {node: '>= 0.8'} @@ -3366,9 +3446,15 @@ packages: resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==} engines: {node: '>=18'} + oniguruma-parser@0.12.1: + resolution: {integrity: sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w==} + oniguruma-to-es@2.3.0: resolution: {integrity: sha512-bwALDxriqfKGfUufKGGepCzu9x7nJQuoRoAFp4AnwehhC2crqrDIAP/uN2qdlsAvSMpeRC3+Yzhqc7hLmle5+g==} + oniguruma-to-es@4.3.3: + resolution: {integrity: sha512-rPiZhzC3wXwE59YQMRDodUwwT9FZ9nNBwQQfsd1wfdtlKEyCdRV0avrTcSZ5xlIvGRVPd/cx6ZN45ECmS39xvg==} + openapi-schema-validator@3.0.3: resolution: {integrity: sha512-KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA==} @@ -3435,6 +3521,12 @@ packages: package-manager-detector@0.2.11: resolution: {integrity: sha512-BEnLolu+yuz22S56CU1SUKq3XC3PkwD5wv4ikR4MfGvnRVcmzXR9DwSlW2fEamyTPyXHomBJRzgapeuBvRNzJQ==} + package-manager-detector@1.2.0: + resolution: {integrity: sha512-PutJepsOtsqVfUsxCzgTTpyXmiAgvKptIgY4th5eq5UXXFhj5PxfQ9hnGkypMeovpAvVshFRItoFHYO18TCOqA==} + + pako@0.2.9: + resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==} + parse-latin@7.0.0: resolution: {integrity: sha512-mhHgobPPua5kZ98EF4HWiH167JWBfl4pvAIXXdbaVohtK7a6YBOy56kvhCqduqyo/f3yrHFWmqmiMg/BkBkYYQ==} @@ -3684,12 +3776,18 @@ packages: regex-recursion@5.1.1: resolution: {integrity: sha512-ae7SBCbzVNrIjgSbh7wMznPcQel1DNlDtzensnFxpiNpXt1U2ju/bHugH422r+4LAVS1FpW1YCwilmnNsjum9w==} + regex-recursion@6.0.2: + resolution: {integrity: sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==} + regex-utilities@2.3.0: resolution: {integrity: sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==} regex@5.1.1: resolution: {integrity: sha512-dN5I359AVGPnwzJm2jN1k0W9LPZ+ePvoOeVMMfqIMFz53sSwXkxaJoxr50ptnsC771lK95BnTrVSZxq0b9yCGw==} + regex@6.0.1: + resolution: {integrity: sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==} + regexp.prototype.flags@1.5.4: resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==} engines: {node: '>= 0.4'} @@ -3744,6 +3842,9 @@ packages: resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==} engines: {node: '>=18'} + restructure@3.0.2: + resolution: {integrity: sha512-gSfoiOEA0VPE6Tukkrr7I0RBdE0s7H1eFCDBk05l1KIQT1UIKNc5JZy6jdyW6eYH3aR3g5b3PuL77rq0hvwtAw==} + retext-latin@4.0.0: resolution: {integrity: sha512-hv9woG7Fy0M9IlRQloq/N6atV82NxLGveq+3H2WOi79dtIYWN8OaxogDm77f8YnVXJL2VD3bbqowu5E3EMhBYA==} @@ -3850,6 +3951,9 @@ packages: shiki@1.29.2: resolution: {integrity: sha512-njXuliz/cP+67jU2hukkxCNuH1yUi4QfdZZY+sMr5PPrIyXSu5iTb/qYC4BiWWB0vZ+7TbdvYUCeL23zpwCfbg==} + shiki@3.3.0: + resolution: {integrity: sha512-j0Z1tG5vlOFGW8JVj0Cpuatzvshes7VJy5ncDmmMaYcmnGW0Js1N81TOW98ivTFNZfKRn9uwEg/aIm638o368g==} + side-channel-list@1.0.0: resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==} engines: {node: '>= 0.4'} @@ -3892,6 +3996,10 @@ packages: resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==} engines: {node: '>=18'} + smol-toml@1.3.4: + resolution: {integrity: sha512-UOPtVuYkzYGee0Bd2Szz8d2G3RfMfJ2t3qVdZUAozZyAk+a0Sxa+QKix0YCwjL/A1RR0ar44nCxaoN9FxdJGwA==} + engines: {node: '>= 18'} + source-map-js@1.2.1: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} @@ -4022,6 +4130,9 @@ packages: resolution: {integrity: sha512-75voc/9G4rDIJleOo4jPvN4/YC4GRZrY8yy1uU4lwrB3XEQbWve8zXoO5No4eFrGcTAMYyoY67p8jRQdtA1HbA==} engines: {node: '>=12'} + tiny-inflate@1.0.3: + resolution: {integrity: sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==} + tiny-invariant@1.3.3: resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==} @@ -4032,6 +4143,10 @@ packages: resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} engines: {node: '>=12.0.0'} + tinyglobby@0.2.13: + resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==} + engines: {node: '>=12.0.0'} + tmp@0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} @@ -4044,6 +4159,9 @@ packages: resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} engines: {node: '>=0.6'} + tr46@0.0.3: + resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} + tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} @@ -4150,6 +4268,9 @@ packages: ultrahtml@1.5.3: resolution: {integrity: sha512-GykOvZwgDWZlTQMtp5jrD4BVL+gNn2NVlVafjcFUJ7taY20tqYdwdoWBFy6GBJsNTZe1GkGPkSl5knQAjtgceg==} + ultrahtml@1.6.0: + resolution: {integrity: sha512-R9fBn90VTJrqqLDwyMph+HGne8eqY1iPfYhPzZrvKpIfwkWZbcYlfpsb8B9dTvBfpy1/hqAD7Wi8EKfP9e8zdw==} + unbox-primitive@1.1.0: resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==} engines: {node: '>= 0.4'} @@ -4164,9 +4285,18 @@ packages: resolution: {integrity: sha512-uROZWze0R0itiAKVPsYhFov9LxrPMHLMEQFszeI2gCN6bnIIZ8twzBCJcN2LJrBBLfrP0t1FW0g+JmKVl8Vk1g==} engines: {node: '>=18.17'} + unicode-properties@1.4.1: + resolution: {integrity: sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==} + + unicode-trie@2.0.0: + resolution: {integrity: sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==} + unified@11.0.5: resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==} + unifont@0.4.1: + resolution: {integrity: sha512-zKSY9qO8svWYns+FGKjyVdLvpGPwqmsCjeJLN1xndMiqxHWBAhoWDMYMG960MxeV48clBmG+fDP59dHY1VoZvg==} + unist-util-find-after@5.0.0: resolution: {integrity: sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==} @@ -4297,22 +4427,27 @@ packages: vfile@6.0.3: resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==} - vite@5.4.15: - resolution: {integrity: sha512-6ANcZRivqL/4WtwPGTKNaosuNJr5tWiftOC7liM7G9+rMb8+oeJeyzymDu4rTN93seySBmbjSfsS3Vzr19KNtA==} - engines: {node: ^18.0.0 || >=20.0.0} + vite@6.2.3: + resolution: {integrity: sha512-IzwM54g4y9JA/xAeBPNaDXiBF8Jsgl3VBQ2YQ/wOY6fyW3xMdSoltIV3Bo59DErdqdE6RxUfv8W69DvUorE4Eg==} + engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 + '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 + jiti: '>=1.21.0' less: '*' lightningcss: ^1.21.0 sass: '*' sass-embedded: '*' stylus: '*' sugarss: '*' - terser: ^5.4.0 + terser: ^5.16.0 + tsx: ^4.8.1 + yaml: ^2.4.2 peerDependenciesMeta: '@types/node': optional: true + jiti: + optional: true less: optional: true lightningcss: @@ -4327,9 +4462,13 @@ packages: optional: true terser: optional: true + tsx: + optional: true + yaml: + optional: true - vite@6.2.3: - resolution: {integrity: sha512-IzwM54g4y9JA/xAeBPNaDXiBF8Jsgl3VBQ2YQ/wOY6fyW3xMdSoltIV3Bo59DErdqdE6RxUfv8W69DvUorE4Eg==} + vite@6.3.4: + resolution: {integrity: sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: @@ -4488,6 +4627,9 @@ packages: web-namespaces@2.0.1: resolution: {integrity: sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==} + webidl-conversions@3.0.1: + resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} + webidl-conversions@4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} @@ -4499,6 +4641,9 @@ packages: resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==} engines: {node: '>=18'} + whatwg-url@5.0.0: + resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} + whatwg-url@7.1.0: resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} @@ -4603,6 +4748,10 @@ packages: resolution: {integrity: sha512-VfmLIh/ZSZOJnVRQZc/dvpPP90lWL4G0bmxQMP0+U/2vKBA8GSpcBuWv17y7F+CZItRuO97HN1wdbb4p10uhOg==} engines: {node: '>=18.19'} + yocto-spinner@0.2.2: + resolution: {integrity: sha512-21rPcM3e4vCpOXThiFRByX8amU5By1R0wNS8Oex+DP3YgC8xdU0vEJ/K8cbPLiIJVosSSysgcFof6s6MSD5/Vw==} + engines: {node: '>=18.19'} + yoctocolors@2.1.1: resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==} engines: {node: '>=18'} @@ -4699,6 +4848,8 @@ snapshots: '@astrojs/internal-helpers@0.4.2': {} + '@astrojs/internal-helpers@0.6.1': {} + '@astrojs/language-server@2.15.4(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.8.2)': dependencies: '@astrojs/compiler': 2.11.0 @@ -4748,9 +4899,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@astrojs/markdown-remark@6.0.0': + '@astrojs/markdown-remark@6.0.0-beta.3': dependencies: - '@astrojs/prism': 3.2.0 + '@astrojs/prism': 3.2.0-beta.0 github-slugger: 2.0.0 hast-util-from-html: 2.0.3 hast-util-to-text: 4.0.2 @@ -4772,9 +4923,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@astrojs/markdown-remark@6.0.0-beta.3': + '@astrojs/markdown-remark@6.0.1': dependencies: - '@astrojs/prism': 3.2.0-beta.0 + '@astrojs/prism': 3.2.0 github-slugger: 2.0.0 hast-util-from-html: 2.0.3 hast-util-to-text: 4.0.2 @@ -4796,8 +4947,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@astrojs/markdown-remark@6.0.1': + '@astrojs/markdown-remark@6.3.1': dependencies: + '@astrojs/internal-helpers': 0.6.1 '@astrojs/prism': 3.2.0 github-slugger: 2.0.0 hast-util-from-html: 2.0.3 @@ -4811,7 +4963,8 @@ snapshots: remark-parse: 11.0.0 remark-rehype: 11.1.1 remark-smartypants: 3.0.2 - shiki: 1.29.2 + shiki: 3.3.0 + smol-toml: 1.3.4 unified: 11.0.5 unist-util-remove-position: 5.0.0 unist-util-visit: 5.0.0 @@ -4887,6 +5040,18 @@ snapshots: transitivePeerDependencies: - supports-color + '@astrojs/telemetry@3.2.1': + dependencies: + ci-info: 4.2.0 + debug: 4.4.0 + dlv: 1.1.3 + dset: 3.1.4 + is-docker: 3.0.0 + is-wsl: 3.1.0 + which-pm-runs: 1.1.0 + transitivePeerDependencies: + - supports-color + '@astrojs/yaml2ts@0.2.2': dependencies: yaml: 2.7.0 @@ -5040,15 +5205,23 @@ snapshots: '@biomejs/cli-win32-x64@1.9.4': optional: true - '@builder.io/qwik@1.12.1(vite@5.4.15(@types/node@22.13.13))': + '@builder.io/qwik@1.12.1(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': dependencies: csstype: 3.1.3 - vite: 5.4.15(@types/node@22.13.13) + vite: 6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) - '@builder.io/qwik@1.12.1(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': + '@builder.io/qwik@1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': dependencies: csstype: 3.1.3 - vite: 6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) + vite: 6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) + + '@capsizecss/unpack@2.4.0': + dependencies: + blob-to-buffer: 1.2.9 + cross-fetch: 3.2.0 + fontkit: 2.0.4 + transitivePeerDependencies: + - encoding '@changesets/apply-release-plan@7.0.10': dependencies: @@ -5571,7 +5744,7 @@ snapshots: '@astrojs/internal-helpers': 0.4.2 '@astrojs/markdown-remark': 5.3.0 '@inox-tools/utils': 0.3.1 - astro: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + astro: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) debug: 4.4.0 fast-glob: 3.3.3 shiki: 1.29.2 @@ -5595,6 +5768,7 @@ snapshots: - '@vercel/kv' - aws4fetch - db0 + - encoding - idb-keyval - ioredis - jiti @@ -5612,23 +5786,13 @@ snapshots: - uploadthing - yaml - '@inox-tools/inline-mod@2.0.3(vite@5.4.15(@types/node@22.13.13))': - dependencies: - '@inox-tools/utils': 0.3.1 - debug: 4.4.0 - typescript: 5.8.2 - optionalDependencies: - vite: 5.4.15(@types/node@22.13.13) - transitivePeerDependencies: - - supports-color - - '@inox-tools/inline-mod@2.0.3(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': + '@inox-tools/inline-mod@2.0.3(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': dependencies: '@inox-tools/utils': 0.3.1 debug: 4.4.0 typescript: 5.8.2 optionalDependencies: - vite: 6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) + vite: 6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) transitivePeerDependencies: - supports-color @@ -5852,11 +6016,11 @@ snapshots: '@poppinss/macroable@1.0.4': {} - '@qwikdev/astro@0.7.11(@builder.io/qwik@1.12.1(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)))(astro@5.0.3(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0))(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': + '@qwikdev/astro@0.7.11(@builder.io/qwik@1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)))(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0))(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': dependencies: - '@builder.io/qwik': 1.12.1(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) - '@inox-tools/inline-mod': 2.0.3(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) - astro-integration-kit: 0.18.0(astro@5.0.3(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)) + '@builder.io/qwik': 1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + '@inox-tools/inline-mod': 2.0.3(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + astro-integration-kit: 0.18.0(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)) transitivePeerDependencies: - astro - supports-color @@ -5939,34 +6103,69 @@ snapshots: '@types/hast': 3.0.4 hast-util-to-html: 9.0.5 + '@shikijs/core@3.3.0': + dependencies: + '@shikijs/types': 3.3.0 + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + hast-util-to-html: 9.0.5 + '@shikijs/engine-javascript@1.29.2': dependencies: '@shikijs/types': 1.29.2 '@shikijs/vscode-textmate': 10.0.2 oniguruma-to-es: 2.3.0 + '@shikijs/engine-javascript@3.3.0': + dependencies: + '@shikijs/types': 3.3.0 + '@shikijs/vscode-textmate': 10.0.2 + oniguruma-to-es: 4.3.3 + '@shikijs/engine-oniguruma@1.29.2': dependencies: '@shikijs/types': 1.29.2 '@shikijs/vscode-textmate': 10.0.2 + '@shikijs/engine-oniguruma@3.3.0': + dependencies: + '@shikijs/types': 3.3.0 + '@shikijs/vscode-textmate': 10.0.2 + '@shikijs/langs@1.29.2': dependencies: '@shikijs/types': 1.29.2 + '@shikijs/langs@3.3.0': + dependencies: + '@shikijs/types': 3.3.0 + '@shikijs/themes@1.29.2': dependencies: '@shikijs/types': 1.29.2 + '@shikijs/themes@3.3.0': + dependencies: + '@shikijs/types': 3.3.0 + '@shikijs/types@1.29.2': dependencies: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 + '@shikijs/types@3.3.0': + dependencies: + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + '@shikijs/vscode-textmate@10.0.2': {} '@sinclair/typebox@0.27.8': {} + '@swc/helpers@0.5.17': + dependencies: + tslib: 2.8.1 + '@trysound/sax@0.2.0': {} '@types/babel__core@7.20.5': @@ -6266,15 +6465,9 @@ snapshots: - debug - supports-color - astro-integration-kit@0.18.0(astro@5.0.3(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)): + astro-integration-kit@0.18.0(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)): dependencies: - astro: 5.0.3(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) - pathe: 1.1.2 - recast: 0.23.11 - - astro-integration-kit@0.18.0(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)): - dependencies: - astro: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + astro: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) pathe: 1.1.2 recast: 0.23.11 @@ -6329,8 +6522,8 @@ snapshots: ultrahtml: 1.5.3 unist-util-visit: 5.0.0 vfile: 6.0.3 - vite: 6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) - vitefu: 1.0.6(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + vite: 6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) + vitefu: 1.0.6(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) which-pm: 3.0.1 xxhash-wasm: 1.1.0 yargs-parser: 21.1.1 @@ -6356,11 +6549,11 @@ snapshots: - typescript - yaml - astro@5.0.3(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0): + astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0): dependencies: '@astrojs/compiler': 2.11.0 '@astrojs/internal-helpers': 0.4.2 - '@astrojs/markdown-remark': 6.0.0 + '@astrojs/markdown-remark': 6.0.1 '@astrojs/telemetry': 3.2.0 '@oslojs/encoding': 1.1.0 '@rollup/pluginutils': 5.1.4(rollup@4.37.0) @@ -6406,6 +6599,7 @@ snapshots: tsconfck: 3.1.5(typescript@5.8.2) ultrahtml: 1.5.3 unist-util-visit: 5.0.0 + unstorage: 1.15.0 vfile: 6.0.3 vite: 6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) vitefu: 1.0.6(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) @@ -6419,7 +6613,24 @@ snapshots: optionalDependencies: sharp: 0.33.5 transitivePeerDependencies: + - '@azure/app-configuration' + - '@azure/cosmos' + - '@azure/data-tables' + - '@azure/identity' + - '@azure/keyvault-secrets' + - '@azure/storage-blob' + - '@capacitor/preferences' + - '@deno/kv' + - '@netlify/blobs' + - '@planetscale/database' - '@types/node' + - '@upstash/redis' + - '@vercel/blob' + - '@vercel/kv' + - aws4fetch + - db0 + - idb-keyval + - ioredis - jiti - less - lightningcss @@ -6432,17 +6643,18 @@ snapshots: - terser - tsx - typescript + - uploadthing - yaml - astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0): + astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0): dependencies: '@astrojs/compiler': 2.11.0 - '@astrojs/internal-helpers': 0.4.2 - '@astrojs/markdown-remark': 6.0.1 - '@astrojs/telemetry': 3.2.0 + '@astrojs/internal-helpers': 0.6.1 + '@astrojs/markdown-remark': 6.3.1 + '@astrojs/telemetry': 3.2.1 + '@capsizecss/unpack': 2.4.0 '@oslojs/encoding': 1.1.0 '@rollup/pluginutils': 5.1.4(rollup@4.37.0) - '@types/cookie': 0.6.0 acorn: 8.14.1 aria-query: 5.3.2 axobject-query: 4.1.0 @@ -6450,7 +6662,7 @@ snapshots: ci-info: 4.2.0 clsx: 2.1.1 common-ancestor-path: 1.0.1 - cookie: 0.7.2 + cookie: 1.0.2 cssesc: 3.0.0 debug: 4.4.0 deterministic-object-hash: 2.0.2 @@ -6459,9 +6671,8 @@ snapshots: dlv: 1.1.3 dset: 3.1.4 es-module-lexer: 1.6.0 - esbuild: 0.21.5 + esbuild: 0.25.1 estree-walker: 3.0.3 - fast-glob: 3.3.3 flattie: 1.1.1 github-slugger: 2.0.0 html-escaper: 3.0.3 @@ -6470,28 +6681,29 @@ snapshots: kleur: 4.1.5 magic-string: 0.30.17 magicast: 0.3.5 - micromatch: 4.0.8 mrmime: 2.0.1 neotraverse: 0.6.18 p-limit: 6.2.0 p-queue: 8.1.0 - preferred-pm: 4.1.1 + package-manager-detector: 1.2.0 + picomatch: 4.0.2 prompts: 2.4.2 rehype: 13.0.2 semver: 7.7.1 - shiki: 1.29.2 + shiki: 3.3.0 tinyexec: 0.3.2 + tinyglobby: 0.2.13 tsconfck: 3.1.5(typescript@5.8.2) - ultrahtml: 1.5.3 + ultrahtml: 1.6.0 + unifont: 0.4.1 unist-util-visit: 5.0.0 unstorage: 1.15.0 vfile: 6.0.3 - vite: 6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) - vitefu: 1.0.6(vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) - which-pm: 3.0.1 + vite: 6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) + vitefu: 1.0.6(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) xxhash-wasm: 1.1.0 yargs-parser: 21.1.1 - yocto-spinner: 0.1.2 + yocto-spinner: 0.2.2 zod: 3.24.2 zod-to-json-schema: 3.24.5(zod@3.24.2) zod-to-ts: 1.2.0(typescript@5.8.2)(zod@3.24.2) @@ -6514,6 +6726,7 @@ snapshots: - '@vercel/kv' - aws4fetch - db0 + - encoding - idb-keyval - ioredis - jiti @@ -6559,12 +6772,16 @@ snapshots: base-64@1.0.0: {} + base64-js@1.5.1: {} + before-after-hook@2.2.3: {} better-path-resolve@1.0.0: dependencies: is-windows: 1.0.2 + blob-to-buffer@1.2.9: {} + boolbase@1.0.0: {} boxen@8.0.1: @@ -6586,6 +6803,10 @@ snapshots: dependencies: fill-range: 7.1.1 + brotli@1.3.3: + dependencies: + base64-js: 1.5.1 + browserslist@4.24.4: dependencies: caniuse-lite: 1.0.30001707 @@ -6781,6 +7002,14 @@ snapshots: cookie@0.7.2: {} + cookie@1.0.2: {} + + cross-fetch@3.2.0: + dependencies: + node-fetch: 2.7.0 + transitivePeerDependencies: + - encoding + cross-spawn@7.0.6: dependencies: path-key: 3.1.1 @@ -6811,6 +7040,11 @@ snapshots: mdn-data: 2.0.30 source-map-js: 1.2.1 + css-tree@3.1.0: + dependencies: + mdn-data: 2.12.2 + source-map-js: 1.2.1 + css-what@6.1.0: {} cssesc@3.0.0: {} @@ -6901,6 +7135,8 @@ snapshots: dependencies: dequal: 2.0.3 + dfa@1.2.0: {} + diff-sequences@25.2.6: {} diff-sequences@29.6.3: {} @@ -7288,6 +7524,10 @@ snapshots: optionalDependencies: picomatch: 4.0.2 + fdir@6.4.4(picomatch@4.0.2): + optionalDependencies: + picomatch: 4.0.2 + fill-range@7.1.1: dependencies: to-regex-range: 5.0.1 @@ -7320,6 +7560,18 @@ snapshots: follow-redirects@1.15.9: {} + fontkit@2.0.4: + dependencies: + '@swc/helpers': 0.5.17 + brotli: 1.3.3 + clone: 2.1.2 + dfa: 1.2.0 + fast-deep-equal: 3.1.3 + restructure: 3.0.2 + tiny-inflate: 1.0.3 + unicode-properties: 1.4.1 + unicode-trie: 2.0.0 + for-each@0.3.5: dependencies: is-callable: 1.2.7 @@ -8127,6 +8379,8 @@ snapshots: mdn-data@2.0.30: {} + mdn-data@2.12.2: {} + memory-cache@0.2.0: {} merge2@1.4.1: {} @@ -8389,6 +8643,10 @@ snapshots: node-fetch-native@1.6.6: {} + node-fetch@2.7.0: + dependencies: + whatwg-url: 5.0.0 + node-mock-http@1.0.0: {} node-releases@2.0.19: {} @@ -8420,6 +8678,8 @@ snapshots: node-fetch-native: 1.6.6 ufo: 1.5.4 + ohash@2.0.11: {} + on-finished@2.4.1: dependencies: ee-first: 1.1.1 @@ -8432,12 +8692,20 @@ snapshots: dependencies: mimic-function: 5.0.1 + oniguruma-parser@0.12.1: {} + oniguruma-to-es@2.3.0: dependencies: emoji-regex-xs: 1.0.0 regex: 5.1.1 regex-recursion: 5.1.1 + oniguruma-to-es@4.3.3: + dependencies: + oniguruma-parser: 0.12.1 + regex: 6.0.1 + regex-recursion: 6.0.2 + openapi-schema-validator@3.0.3: dependencies: ajv: 6.12.6 @@ -8500,6 +8768,10 @@ snapshots: dependencies: quansync: 0.2.10 + package-manager-detector@1.2.0: {} + + pako@0.2.9: {} + parse-latin@7.0.0: dependencies: '@types/nlcst': 2.0.3 @@ -8743,12 +9015,20 @@ snapshots: regex: 5.1.1 regex-utilities: 2.3.0 + regex-recursion@6.0.2: + dependencies: + regex-utilities: 2.3.0 + regex-utilities@2.3.0: {} regex@5.1.1: dependencies: regex-utilities: 2.3.0 + regex@6.0.1: + dependencies: + regex-utilities: 2.3.0 + regexp.prototype.flags@1.5.4: dependencies: call-bind: 1.0.8 @@ -8839,6 +9119,8 @@ snapshots: onetime: 7.0.0 signal-exit: 4.1.0 + restructure@3.0.2: {} + retext-latin@4.0.0: dependencies: '@types/nlcst': 2.0.3 @@ -9029,6 +9311,17 @@ snapshots: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 + shiki@3.3.0: + dependencies: + '@shikijs/core': 3.3.0 + '@shikijs/engine-javascript': 3.3.0 + '@shikijs/engine-oniguruma': 3.3.0 + '@shikijs/langs': 3.3.0 + '@shikijs/themes': 3.3.0 + '@shikijs/types': 3.3.0 + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + side-channel-list@1.0.0: dependencies: es-errors: 1.3.0 @@ -9079,6 +9372,8 @@ snapshots: ansi-styles: 6.2.1 is-fullwidth-code-point: 5.0.0 + smol-toml@1.3.4: {} + source-map-js@1.2.1: {} source-map@0.6.1: {} @@ -9229,6 +9524,8 @@ snapshots: dependencies: convert-hrtime: 5.0.0 + tiny-inflate@1.0.3: {} + tiny-invariant@1.3.3: {} tinyexec@0.3.2: {} @@ -9238,6 +9535,11 @@ snapshots: fdir: 6.4.3(picomatch@4.0.2) picomatch: 4.0.2 + tinyglobby@0.2.13: + dependencies: + fdir: 6.4.4(picomatch@4.0.2) + picomatch: 4.0.2 + tmp@0.0.33: dependencies: os-tmpdir: 1.0.2 @@ -9248,6 +9550,8 @@ snapshots: toidentifier@1.0.1: {} + tr46@0.0.3: {} + tr46@1.0.1: dependencies: punycode: 2.3.1 @@ -9365,6 +9669,8 @@ snapshots: ultrahtml@1.5.3: {} + ultrahtml@1.6.0: {} + unbox-primitive@1.1.0: dependencies: call-bound: 1.0.4 @@ -9378,6 +9684,16 @@ snapshots: undici@6.21.2: {} + unicode-properties@1.4.1: + dependencies: + base64-js: 1.5.1 + unicode-trie: 2.0.0 + + unicode-trie@2.0.0: + dependencies: + pako: 0.2.9 + tiny-inflate: 1.0.3 + unified@11.0.5: dependencies: '@types/unist': 3.0.3 @@ -9388,6 +9704,11 @@ snapshots: trough: 2.2.0 vfile: 6.0.3 + unifont@0.4.1: + dependencies: + css-tree: 3.1.0 + ohash: 2.0.11 + unist-util-find-after@5.0.0: dependencies: '@types/unist': 3.0.3 @@ -9480,20 +9801,25 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.2 - vite@5.4.15(@types/node@22.13.13): + vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0): dependencies: - esbuild: 0.21.5 + esbuild: 0.25.1 postcss: 8.5.3 rollup: 4.37.0 optionalDependencies: '@types/node': 22.13.13 fsevents: 2.3.3 + jiti: 2.4.2 + yaml: 2.7.0 - vite@6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0): + vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0): dependencies: esbuild: 0.25.1 + fdir: 6.4.4(picomatch@4.0.2) + picomatch: 4.0.2 postcss: 8.5.3 rollup: 4.37.0 + tinyglobby: 0.2.13 optionalDependencies: '@types/node': 22.13.13 fsevents: 2.3.3 @@ -9504,6 +9830,10 @@ snapshots: optionalDependencies: vite: 6.2.3(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) + vitefu@1.0.6(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)): + optionalDependencies: + vite: 6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) + volar-service-css@0.0.62(@volar/language-service@2.4.12): dependencies: vscode-css-languageservice: 6.3.3 @@ -9620,6 +9950,8 @@ snapshots: web-namespaces@2.0.1: {} + webidl-conversions@3.0.1: {} + webidl-conversions@4.0.2: {} whatwg-encoding@3.1.1: @@ -9628,6 +9960,11 @@ snapshots: whatwg-mimetype@4.0.0: {} + whatwg-url@5.0.0: + dependencies: + tr46: 0.0.3 + webidl-conversions: 3.0.1 + whatwg-url@7.1.0: dependencies: lodash.sortby: 4.7.0 @@ -9765,6 +10102,10 @@ snapshots: dependencies: yoctocolors: 2.1.1 + yocto-spinner@0.2.2: + dependencies: + yoctocolors: 2.1.1 + yoctocolors@2.1.1: {} youch-terminal@2.2.3: From ba7f2e965aaca48e46b5f03c9721cfe36c81371d Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 3 May 2025 01:25:55 -0500 Subject: [PATCH 2/7] no globalThis --- apps/demo/package.json | 2 +- libs/qwikdev-astro/package.json | 9 +- libs/qwikdev-astro/server.ts | 11 +- libs/qwikdev-astro/src/index.ts | 6 +- pnpm-lock.yaml | 273 ++++++++++++++++++++++++++++---- 5 files changed, 247 insertions(+), 54 deletions(-) diff --git a/apps/demo/package.json b/apps/demo/package.json index a83eadc5..160e80bf 100644 --- a/apps/demo/package.json +++ b/apps/demo/package.json @@ -12,7 +12,7 @@ "astro": "astro" }, "dependencies": { - "@builder.io/qwik": "^1.12.0", + "@builder.io/qwik": "https://pkg.pr.new/@builder.io/qwik@465483f", "@qwikdev/astro": "workspace:*", "astro": "5.7.10" } diff --git a/libs/qwikdev-astro/package.json b/libs/qwikdev-astro/package.json index 11e20bfb..0aedf6aa 100644 --- a/libs/qwikdev-astro/package.json +++ b/libs/qwikdev-astro/package.json @@ -40,12 +40,7 @@ "./utils": "./src/utils.ts", "./q-astro-manifest.json": "./q-astro-manifest.json" }, - "files": [ - "src", - "src/index.ts", - "server.ts", - "env.d.ts" - ], + "files": ["src", "src/index.ts", "server.ts", "env.d.ts"], "keywords": [ "astro-integration", "astro-component", @@ -65,7 +60,7 @@ "astro-integration-kit": "^0.18.0" }, "devDependencies": { - "@builder.io/qwik": "^1.12.0", + "@builder.io/qwik": "https://pkg.pr.new/@builder.io/qwik@465483f", "astro": "^5.7.10", "vite": "^6.3.4" }, diff --git a/libs/qwikdev-astro/server.ts b/libs/qwikdev-astro/server.ts index f89931de..518a3c41 100644 --- a/libs/qwikdev-astro/server.ts +++ b/libs/qwikdev-astro/server.ts @@ -79,14 +79,9 @@ export async function renderToStaticMarkup( ...(isDev && { "q-astro-marker": "" }) }, containerTagName: "div", - ...(isDev - ? { - manifest: {} as QwikManifest, - symbolMapper: globalThis.symbolMapperFn - } - : { - manifest: globalThis.qManifest - }), + ...(isDev && { + symbolMapper: globalThis.symbolMapperFn + }), serverData: props, qwikPrefetchServiceWorker: { include: false diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts index 00f0ab8d..6ae6e538 100644 --- a/libs/qwikdev-astro/src/index.ts +++ b/libs/qwikdev-astro/src/index.ts @@ -243,8 +243,6 @@ export default defineIntegration({ input: [...qwikEntrypoints, resolver("./root.tsx")], outDir: finalDir, manifestOutput: (manifest) => { - globalThis.qManifest = manifest; - if (astroConfig?.adapter) { const serverChunksDir = join(serverDir, "chunks"); if (!fs.existsSync(serverChunksDir)) { @@ -262,8 +260,8 @@ export default defineIntegration({ // Replace the manifest handling in the bundled code const manifestJson = JSON.stringify(manifest); const newContent = content.replace( - "globalThis.qManifest", - `globalThis.qManifest || ${manifestJson}` + "serverData: props,", + `serverData: props, manifest: ${manifestJson},` ); fs.writeFileSync(serverPath, newContent); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cec92086..31e691ff 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,13 +19,13 @@ importers: version: 2.28.1 '@inox-tools/astro-tests': specifier: ^0.2.1 - version: 0.2.2(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + version: 0.2.2(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) '@playwright/test': specifier: ^1.49.1 version: 1.51.1 '@qwikdev/astro': specifier: 0.7.11 - version: 0.7.11(@builder.io/qwik@1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)))(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0))(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + version: 0.7.11(@builder.io/qwik@1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)))(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0))(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) '@qwikdev/create-astro': specifier: workspace:* version: link:libs/create-qwikdev-astro @@ -34,7 +34,7 @@ importers: version: 22.13.13 astro: specifier: 5.7.10 - version: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + version: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) lefthook: specifier: ^1.10.1 version: 1.11.5 @@ -45,14 +45,14 @@ importers: apps/demo: dependencies: '@builder.io/qwik': - specifier: ^1.12.0 - version: 1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + specifier: https://pkg.pr.new/@builder.io/qwik@465483f + version: https://pkg.pr.new/@builder.io/qwik@465483f(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) '@qwikdev/astro': specifier: workspace:* version: link:../../libs/qwikdev-astro astro: specifier: 5.7.10 - version: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + version: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) apps/deno-demo: dependencies: @@ -61,7 +61,7 @@ importers: version: 0.9.4(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.8.2) '@astrojs/deno': specifier: ^5.0.1 - version: 5.0.1(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)) + version: 5.0.1(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0)) '@astrojs/react': specifier: ^4.1.2 version: 4.1.2(@types/node@22.13.13)(@types/react-dom@18.3.5(@types/react@18.3.20))(@types/react@18.3.20)(jiti@2.4.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(yaml@2.7.0) @@ -79,7 +79,7 @@ importers: version: 18.3.5(@types/react@18.3.20) astro: specifier: ^5.1.1 - version: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + version: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) react: specifier: ^18.3.1 version: 18.3.1 @@ -94,7 +94,7 @@ importers: dependencies: '@astrojs/node': specifier: 9.0.0 - version: 9.0.0(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)) + version: 9.0.0(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0)) '@astrojs/react': specifier: 4.1.2 version: 4.1.2(@types/node@22.13.13)(@types/react-dom@18.3.5(@types/react@18.3.20))(@types/react@18.3.20)(jiti@2.4.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(yaml@2.7.0) @@ -112,7 +112,7 @@ importers: version: 18.3.5(@types/react@18.3.20) astro: specifier: 5.1.1 - version: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + version: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) react: specifier: ^18.3.1 version: 18.3.1 @@ -139,7 +139,7 @@ importers: version: link:../../libs/qwikdev-astro astro: specifier: ^5.1 - version: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + version: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) astro-icon: specifier: ^1.1.4 version: 1.1.5 @@ -219,14 +219,14 @@ importers: version: 2.0.3(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) astro-integration-kit: specifier: ^0.18.0 - version: 0.18.0(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)) + version: 0.18.0(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0)) devDependencies: '@builder.io/qwik': - specifier: ^1.12.0 - version: 1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) + specifier: https://pkg.pr.new/@builder.io/qwik@465483f + version: https://pkg.pr.new/@builder.io/qwik@465483f(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) astro: specifier: ^5.7.10 - version: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + version: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) vite: specifier: ^6.3.4 version: 6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) @@ -238,7 +238,7 @@ importers: version: link:../../.. astro: specifier: 5.0.0-beta.12 - version: 5.0.0-beta.12(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + version: 5.0.0-beta.12(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) packages: @@ -501,6 +501,14 @@ packages: peerDependencies: vite: ^5 + '@builder.io/qwik@https://pkg.pr.new/@builder.io/qwik@465483f': + resolution: {tarball: https://pkg.pr.new/@builder.io/qwik@465483f} + version: 1.14.0 + engines: {node: '>=16.8.0 <18.0.0 || >=18.11'} + hasBin: true + peerDependencies: + vite: ^5 + '@capsizecss/unpack@2.4.0': resolution: {integrity: sha512-GrSU71meACqcmIUxPYOJvGKF0yryjN/L1aCuE9DViCTJI7bfkjgYDPD1zbNDcINJwSSP6UaBZY9GAbYDO7re0Q==} @@ -1341,101 +1349,201 @@ packages: cpu: [arm] os: [android] + '@rollup/rollup-android-arm-eabi@4.40.1': + resolution: {integrity: sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==} + cpu: [arm] + os: [android] + '@rollup/rollup-android-arm64@4.37.0': resolution: {integrity: sha512-6U3SlVyMxezt8Y+/iEBcbp945uZjJwjZimu76xoG7tO1av9VO691z8PkhzQ85ith2I8R2RddEPeSfcbyPfD4hA==} cpu: [arm64] os: [android] + '@rollup/rollup-android-arm64@4.40.1': + resolution: {integrity: sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==} + cpu: [arm64] + os: [android] + '@rollup/rollup-darwin-arm64@4.37.0': resolution: {integrity: sha512-+iTQ5YHuGmPt10NTzEyMPbayiNTcOZDWsbxZYR1ZnmLnZxG17ivrPSWFO9j6GalY0+gV3Jtwrrs12DBscxnlYA==} cpu: [arm64] os: [darwin] + '@rollup/rollup-darwin-arm64@4.40.1': + resolution: {integrity: sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA==} + cpu: [arm64] + os: [darwin] + '@rollup/rollup-darwin-x64@4.37.0': resolution: {integrity: sha512-m8W2UbxLDcmRKVjgl5J/k4B8d7qX2EcJve3Sut7YGrQoPtCIQGPH5AMzuFvYRWZi0FVS0zEY4c8uttPfX6bwYQ==} cpu: [x64] os: [darwin] + '@rollup/rollup-darwin-x64@4.40.1': + resolution: {integrity: sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==} + cpu: [x64] + os: [darwin] + '@rollup/rollup-freebsd-arm64@4.37.0': resolution: {integrity: sha512-FOMXGmH15OmtQWEt174v9P1JqqhlgYge/bUjIbiVD1nI1NeJ30HYT9SJlZMqdo1uQFyt9cz748F1BHghWaDnVA==} cpu: [arm64] os: [freebsd] + '@rollup/rollup-freebsd-arm64@4.40.1': + resolution: {integrity: sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==} + cpu: [arm64] + os: [freebsd] + '@rollup/rollup-freebsd-x64@4.37.0': resolution: {integrity: sha512-SZMxNttjPKvV14Hjck5t70xS3l63sbVwl98g3FlVVx2YIDmfUIy29jQrsw06ewEYQ8lQSuY9mpAPlmgRD2iSsA==} cpu: [x64] os: [freebsd] + '@rollup/rollup-freebsd-x64@4.40.1': + resolution: {integrity: sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==} + cpu: [x64] + os: [freebsd] + '@rollup/rollup-linux-arm-gnueabihf@4.37.0': resolution: {integrity: sha512-hhAALKJPidCwZcj+g+iN+38SIOkhK2a9bqtJR+EtyxrKKSt1ynCBeqrQy31z0oWU6thRZzdx53hVgEbRkuI19w==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-gnueabihf@4.40.1': + resolution: {integrity: sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.37.0': resolution: {integrity: sha512-jUb/kmn/Gd8epbHKEqkRAxq5c2EwRt0DqhSGWjPFxLeFvldFdHQs/n8lQ9x85oAeVb6bHcS8irhTJX2FCOd8Ag==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.40.1': + resolution: {integrity: sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.37.0': resolution: {integrity: sha512-oNrJxcQT9IcbcmKlkF+Yz2tmOxZgG9D9GRq+1OE6XCQwCVwxixYAa38Z8qqPzQvzt1FCfmrHX03E0pWoXm1DqA==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.40.1': + resolution: {integrity: sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-arm64-musl@4.37.0': resolution: {integrity: sha512-pfxLBMls+28Ey2enpX3JvjEjaJMBX5XlPCZNGxj4kdJyHduPBXtxYeb8alo0a7bqOoWZW2uKynhHxF/MWoHaGQ==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-musl@4.40.1': + resolution: {integrity: sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-loongarch64-gnu@4.37.0': resolution: {integrity: sha512-yCE0NnutTC/7IGUq/PUHmoeZbIwq3KRh02e9SfFh7Vmc1Z7atuJRYWhRME5fKgT8aS20mwi1RyChA23qSyRGpA==} cpu: [loong64] os: [linux] + '@rollup/rollup-linux-loongarch64-gnu@4.40.1': + resolution: {integrity: sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==} + cpu: [loong64] + os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.37.0': resolution: {integrity: sha512-NxcICptHk06E2Lh3a4Pu+2PEdZ6ahNHuK7o6Np9zcWkrBMuv21j10SQDJW3C9Yf/A/P7cutWoC/DptNLVsZ0VQ==} cpu: [ppc64] os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.40.1': + resolution: {integrity: sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==} + cpu: [ppc64] + os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.37.0': resolution: {integrity: sha512-PpWwHMPCVpFZLTfLq7EWJWvrmEuLdGn1GMYcm5MV7PaRgwCEYJAwiN94uBuZev0/J/hFIIJCsYw4nLmXA9J7Pw==} cpu: [riscv64] os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.40.1': + resolution: {integrity: sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==} + cpu: [riscv64] + os: [linux] + '@rollup/rollup-linux-riscv64-musl@4.37.0': resolution: {integrity: sha512-DTNwl6a3CfhGTAOYZ4KtYbdS8b+275LSLqJVJIrPa5/JuIufWWZ/QFvkxp52gpmguN95eujrM68ZG+zVxa8zHA==} cpu: [riscv64] os: [linux] + '@rollup/rollup-linux-riscv64-musl@4.40.1': + resolution: {integrity: sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==} + cpu: [riscv64] + os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.37.0': resolution: {integrity: sha512-hZDDU5fgWvDdHFuExN1gBOhCuzo/8TMpidfOR+1cPZJflcEzXdCy1LjnklQdW8/Et9sryOPJAKAQRw8Jq7Tg+A==} cpu: [s390x] os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.40.1': + resolution: {integrity: sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==} + cpu: [s390x] + os: [linux] + '@rollup/rollup-linux-x64-gnu@4.37.0': resolution: {integrity: sha512-pKivGpgJM5g8dwj0ywBwe/HeVAUSuVVJhUTa/URXjxvoyTT/AxsLTAbkHkDHG7qQxLoW2s3apEIl26uUe08LVQ==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-gnu@4.40.1': + resolution: {integrity: sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ==} + cpu: [x64] + os: [linux] + '@rollup/rollup-linux-x64-musl@4.37.0': resolution: {integrity: sha512-E2lPrLKE8sQbY/2bEkVTGDEk4/49UYRVWgj90MY8yPjpnGBQ+Xi1Qnr7b7UIWw1NOggdFQFOLZ8+5CzCiz143w==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-musl@4.40.1': + resolution: {integrity: sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==} + cpu: [x64] + os: [linux] + '@rollup/rollup-win32-arm64-msvc@4.37.0': resolution: {integrity: sha512-Jm7biMazjNzTU4PrQtr7VS8ibeys9Pn29/1bm4ph7CP2kf21950LgN+BaE2mJ1QujnvOc6p54eWWiVvn05SOBg==} cpu: [arm64] os: [win32] + '@rollup/rollup-win32-arm64-msvc@4.40.1': + resolution: {integrity: sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==} + cpu: [arm64] + os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.37.0': resolution: {integrity: sha512-e3/1SFm1OjefWICB2Ucstg2dxYDkDTZGDYgwufcbsxTHyqQps1UQf33dFEChBNmeSsTOyrjw2JJq0zbG5GF6RA==} cpu: [ia32] os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.40.1': + resolution: {integrity: sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==} + cpu: [ia32] + os: [win32] + '@rollup/rollup-win32-x64-msvc@4.37.0': resolution: {integrity: sha512-LWbXUBwn/bcLx2sSsqy7pK5o+Nr+VCoRoAohfJ5C/aBio9nfJmGQqHAhU6pwxV/RmyTk5AqdySma7uwWGlmeuA==} cpu: [x64] os: [win32] + '@rollup/rollup-win32-x64-msvc@4.40.1': + resolution: {integrity: sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==} + cpu: [x64] + os: [win32] + '@shikijs/core@1.29.2': resolution: {integrity: sha512-vju0lY9r27jJfOY4Z7+Rt/nIOjzJpZ3y+nYpqtUZInVoXQ/TJZcfGnNOGnKjFdVZb8qexiCuSlZRKcGfhhTTZQ==} @@ -3870,6 +3978,11 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + rollup@4.40.1: + resolution: {integrity: sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -4839,9 +4952,9 @@ snapshots: '@astrojs/compiler@2.11.0': {} - '@astrojs/deno@5.0.1(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0))': + '@astrojs/deno@5.0.1(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0))': dependencies: - astro: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + astro: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) esbuild: 0.19.12 '@astrojs/internal-helpers@0.4.1': {} @@ -4973,9 +5086,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@astrojs/node@9.0.0(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0))': + '@astrojs/node@9.0.0(astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0))': dependencies: - astro: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + astro: 5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) send: 1.1.0 server-destroy: 1.0.1 transitivePeerDependencies: @@ -5215,6 +5328,12 @@ snapshots: csstype: 3.1.3 vite: 6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) + '@builder.io/qwik@https://pkg.pr.new/@builder.io/qwik@465483f(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': + dependencies: + csstype: 3.1.3 + rollup: 4.40.1 + vite: 6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0) + '@capsizecss/unpack@2.4.0': dependencies: blob-to-buffer: 1.2.9 @@ -5739,12 +5858,12 @@ snapshots: '@img/sharp-win32-x64@0.33.5': optional: true - '@inox-tools/astro-tests@0.2.2(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)': + '@inox-tools/astro-tests@0.2.2(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0)': dependencies: '@astrojs/internal-helpers': 0.4.2 '@astrojs/markdown-remark': 5.3.0 '@inox-tools/utils': 0.3.1 - astro: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + astro: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) debug: 4.4.0 fast-glob: 3.3.3 shiki: 1.29.2 @@ -6016,84 +6135,144 @@ snapshots: '@poppinss/macroable@1.0.4': {} - '@qwikdev/astro@0.7.11(@builder.io/qwik@1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)))(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0))(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': + '@qwikdev/astro@0.7.11(@builder.io/qwik@1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)))(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0))(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0))': dependencies: '@builder.io/qwik': 1.12.1(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) '@inox-tools/inline-mod': 2.0.3(vite@6.3.4(@types/node@22.13.13)(jiti@2.4.2)(yaml@2.7.0)) - astro-integration-kit: 0.18.0(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)) + astro-integration-kit: 0.18.0(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0)) transitivePeerDependencies: - astro - supports-color - vite - '@rollup/pluginutils@5.1.4(rollup@4.37.0)': + '@rollup/pluginutils@5.1.4(rollup@4.40.1)': dependencies: '@types/estree': 1.0.7 estree-walker: 2.0.2 picomatch: 4.0.2 optionalDependencies: - rollup: 4.37.0 + rollup: 4.40.1 '@rollup/rollup-android-arm-eabi@4.37.0': optional: true + '@rollup/rollup-android-arm-eabi@4.40.1': + optional: true + '@rollup/rollup-android-arm64@4.37.0': optional: true + '@rollup/rollup-android-arm64@4.40.1': + optional: true + '@rollup/rollup-darwin-arm64@4.37.0': optional: true + '@rollup/rollup-darwin-arm64@4.40.1': + optional: true + '@rollup/rollup-darwin-x64@4.37.0': optional: true + '@rollup/rollup-darwin-x64@4.40.1': + optional: true + '@rollup/rollup-freebsd-arm64@4.37.0': optional: true + '@rollup/rollup-freebsd-arm64@4.40.1': + optional: true + '@rollup/rollup-freebsd-x64@4.37.0': optional: true + '@rollup/rollup-freebsd-x64@4.40.1': + optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.37.0': optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.40.1': + optional: true + '@rollup/rollup-linux-arm-musleabihf@4.37.0': optional: true + '@rollup/rollup-linux-arm-musleabihf@4.40.1': + optional: true + '@rollup/rollup-linux-arm64-gnu@4.37.0': optional: true + '@rollup/rollup-linux-arm64-gnu@4.40.1': + optional: true + '@rollup/rollup-linux-arm64-musl@4.37.0': optional: true + '@rollup/rollup-linux-arm64-musl@4.40.1': + optional: true + '@rollup/rollup-linux-loongarch64-gnu@4.37.0': optional: true + '@rollup/rollup-linux-loongarch64-gnu@4.40.1': + optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.37.0': optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.40.1': + optional: true + '@rollup/rollup-linux-riscv64-gnu@4.37.0': optional: true + '@rollup/rollup-linux-riscv64-gnu@4.40.1': + optional: true + '@rollup/rollup-linux-riscv64-musl@4.37.0': optional: true + '@rollup/rollup-linux-riscv64-musl@4.40.1': + optional: true + '@rollup/rollup-linux-s390x-gnu@4.37.0': optional: true + '@rollup/rollup-linux-s390x-gnu@4.40.1': + optional: true + '@rollup/rollup-linux-x64-gnu@4.37.0': optional: true + '@rollup/rollup-linux-x64-gnu@4.40.1': + optional: true + '@rollup/rollup-linux-x64-musl@4.37.0': optional: true + '@rollup/rollup-linux-x64-musl@4.40.1': + optional: true + '@rollup/rollup-win32-arm64-msvc@4.37.0': optional: true + '@rollup/rollup-win32-arm64-msvc@4.40.1': + optional: true + '@rollup/rollup-win32-ia32-msvc@4.37.0': optional: true + '@rollup/rollup-win32-ia32-msvc@4.40.1': + optional: true + '@rollup/rollup-win32-x64-msvc@4.37.0': optional: true + '@rollup/rollup-win32-x64-msvc@4.40.1': + optional: true + '@shikijs/core@1.29.2': dependencies: '@shikijs/engine-javascript': 1.29.2 @@ -6465,20 +6644,20 @@ snapshots: - debug - supports-color - astro-integration-kit@0.18.0(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0)): + astro-integration-kit@0.18.0(astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0)): dependencies: - astro: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0) + astro: 5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0) pathe: 1.1.2 recast: 0.23.11 - astro@5.0.0-beta.12(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0): + astro@5.0.0-beta.12(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0): dependencies: '@astrojs/compiler': 2.11.0 '@astrojs/internal-helpers': 0.4.1 '@astrojs/markdown-remark': 6.0.0-beta.3 '@astrojs/telemetry': 3.2.0-beta.0 '@oslojs/encoding': 1.1.0 - '@rollup/pluginutils': 5.1.4(rollup@4.37.0) + '@rollup/pluginutils': 5.1.4(rollup@4.40.1) '@types/cookie': 0.6.0 acorn: 8.14.1 aria-query: 5.3.2 @@ -6549,14 +6728,14 @@ snapshots: - typescript - yaml - astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0): + astro@5.1.1(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0): dependencies: '@astrojs/compiler': 2.11.0 '@astrojs/internal-helpers': 0.4.2 '@astrojs/markdown-remark': 6.0.1 '@astrojs/telemetry': 3.2.0 '@oslojs/encoding': 1.1.0 - '@rollup/pluginutils': 5.1.4(rollup@4.37.0) + '@rollup/pluginutils': 5.1.4(rollup@4.40.1) '@types/cookie': 0.6.0 acorn: 8.14.1 aria-query: 5.3.2 @@ -6646,7 +6825,7 @@ snapshots: - uploadthing - yaml - astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.37.0)(typescript@5.8.2)(yaml@2.7.0): + astro@5.7.10(@types/node@22.13.13)(jiti@2.4.2)(rollup@4.40.1)(typescript@5.8.2)(yaml@2.7.0): dependencies: '@astrojs/compiler': 2.11.0 '@astrojs/internal-helpers': 0.6.1 @@ -6654,7 +6833,7 @@ snapshots: '@astrojs/telemetry': 3.2.1 '@capsizecss/unpack': 2.4.0 '@oslojs/encoding': 1.1.0 - '@rollup/pluginutils': 5.1.4(rollup@4.37.0) + '@rollup/pluginutils': 5.1.4(rollup@4.40.1) acorn: 8.14.1 aria-query: 5.3.2 axobject-query: 4.1.0 @@ -9176,6 +9355,32 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.37.0 fsevents: 2.3.3 + rollup@4.40.1: + dependencies: + '@types/estree': 1.0.7 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.40.1 + '@rollup/rollup-android-arm64': 4.40.1 + '@rollup/rollup-darwin-arm64': 4.40.1 + '@rollup/rollup-darwin-x64': 4.40.1 + '@rollup/rollup-freebsd-arm64': 4.40.1 + '@rollup/rollup-freebsd-x64': 4.40.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.40.1 + '@rollup/rollup-linux-arm-musleabihf': 4.40.1 + '@rollup/rollup-linux-arm64-gnu': 4.40.1 + '@rollup/rollup-linux-arm64-musl': 4.40.1 + '@rollup/rollup-linux-loongarch64-gnu': 4.40.1 + '@rollup/rollup-linux-powerpc64le-gnu': 4.40.1 + '@rollup/rollup-linux-riscv64-gnu': 4.40.1 + '@rollup/rollup-linux-riscv64-musl': 4.40.1 + '@rollup/rollup-linux-s390x-gnu': 4.40.1 + '@rollup/rollup-linux-x64-gnu': 4.40.1 + '@rollup/rollup-linux-x64-musl': 4.40.1 + '@rollup/rollup-win32-arm64-msvc': 4.40.1 + '@rollup/rollup-win32-ia32-msvc': 4.40.1 + '@rollup/rollup-win32-x64-msvc': 4.40.1 + fsevents: 2.3.3 + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 From 5906ebb99db2d9fdb3908a860d824bf4b20ac853 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 3 May 2025 01:41:00 -0500 Subject: [PATCH 3/7] remove preloader logic and simplify qwik loader --- libs/qwikdev-astro/server.ts | 50 +++++++++--------------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/libs/qwikdev-astro/server.ts b/libs/qwikdev-astro/server.ts index 518a3c41..463ae48f 100644 --- a/libs/qwikdev-astro/server.ts +++ b/libs/qwikdev-astro/server.ts @@ -1,15 +1,10 @@ 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 RenderToStreamOptions, - getQwikLoaderScript, - renderToStream -} from "@builder.io/qwik/server"; +import { type RenderToStreamOptions, renderToStream } from "@builder.io/qwik/server"; import type { SSRResult } from "astro"; -const isQwikLoaderAddedMap = new WeakMap(); -const modulePreloadScript = `window.addEventListener("load",()=>{(async()=>{window.requestIdleCallback||(window.requestIdleCallback=(e,t)=>{const n=t||{},o=1,i=n.timeout||o,a=performance.now();return setTimeout(()=>{e({get didTimeout(){return!n.timeout&&performance.now()-a-o>i},timeRemaining:()=>Math.max(0,o+(performance.now()-a))})},o)});const e=async()=>{const e=new Set,t=document.querySelectorAll('script[q\\\\:type="prefetch-bundles"]');t.forEach(t=>{if(!t.textContent)return;const n=t.textContent,o=n.match(/\\["prefetch","[/]build[/]","(.*?)"\\]/);o&&o[1]&&o[1].split('","').forEach(t=>{t.startsWith("q-")&&e.add(t)})}),document.querySelectorAll('script[type="qwik/json"]').forEach(t=>{if(!t.textContent)return;const n=t.textContent.match(/q-[A-Za-z0-9_-]+\\.js/g);n&&n.forEach(t=>e.add(t))}),e.forEach(e=>{const t=document.createElement("link");t.rel="modulepreload",t.href="/build/"+e,t.fetchPriority="low",document.head.appendChild(t)})};await requestIdleCallback(await e)})()});`; +const containerMap = new WeakMap(); type RendererContext = { result: SSRResult; @@ -73,14 +68,19 @@ export async function renderToStaticMarkup( let html = ""; + // https://qwik.dev/docs/advanced/qwikloader/#qwikloader + const isInitialContainer = !containerMap.has(this.result); + const renderToStreamOpts: RenderToStreamOptions = { containerAttributes: { style: "display: contents", ...(isDev && { "q-astro-marker": "" }) }, + qwikLoader: isInitialContainer ? { include: "always" } : { include: "never" }, containerTagName: "div", ...(isDev && { - symbolMapper: globalThis.symbolMapperFn + symbolMapper: globalThis.symbolMapperFn, + manifest: {} as QwikManifest }), serverData: props, qwikPrefetchServiceWorker: { @@ -104,32 +104,6 @@ export async function renderToStaticMarkup( }; } - // https://qwik.dev/docs/advanced/qwikloader/#qwikloader - const isQwikLoaderNeeded = !isQwikLoaderAddedMap.has(this.result); - const qwikLoader = - isQwikLoaderNeeded && - jsx("script", { - "qwik-loader": "", - dangerouslySetInnerHTML: getQwikLoaderScript() - }); - - const modulePreload = - isQwikLoaderNeeded && - jsx("script", { - "qwik-astro-preloader": "", - dangerouslySetInnerHTML: modulePreloadScript - }); - - /** - * service worker script is only added to the page once, and in prod. - * https://github.com/QwikDev/qwik/pull/5618 - */ - const qwikScripts = jsx("span", { - "q:slot": "qwik-scripts", - "qwik-scripts": "", - children: [qwikLoader, modulePreload] - }); - const slots: { [key: string]: unknown } = {}; let defaultSlot: JSXNode<"span"> | undefined = undefined; @@ -156,11 +130,11 @@ export async function renderToStaticMarkup( const slotValues = Object.values(slots); const qwikComponentJSX = jsx(component, { ...props, - children: [qwikScripts, defaultSlot, ...slotValues] + children: [defaultSlot, ...slotValues] }); - if (isQwikLoaderNeeded) { - isQwikLoaderAddedMap.set(this.result, true); + if (isInitialContainer) { + containerMap.set(this.result, true); renderToStreamOpts.containerAttributes!["q-astro-marker"] = "first"; } @@ -183,7 +157,7 @@ export async function renderToStaticMarkup( isClientRouter && htmlWithRerun + ` - ${isQwikLoaderNeeded ? `` : ""} + ${isInitialContainer ? `` : ""} `; return { From e26472350c611f8db7a335842c881d82039c0076 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 3 May 2025 02:42:47 -0500 Subject: [PATCH 4/7] test no adapter check --- libs/qwikdev-astro/src/index.ts | 41 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts index 6ae6e538..1ccd210b 100644 --- a/libs/qwikdev-astro/src/index.ts +++ b/libs/qwikdev-astro/src/index.ts @@ -188,6 +188,7 @@ export default defineIntegration({ srcDir, ssr: { input: resolver("../server.ts") + // manifestInput: "qwik replace me!" as unknown as QwikManifest }, client: { input: resolver("./root.tsx"), @@ -243,29 +244,27 @@ export default defineIntegration({ input: [...qwikEntrypoints, resolver("./root.tsx")], outDir: finalDir, manifestOutput: (manifest) => { - if (astroConfig?.adapter) { - const serverChunksDir = join(serverDir, "chunks"); - if (!fs.existsSync(serverChunksDir)) { - fs.mkdirSync(serverChunksDir, { recursive: true }); - } - const files = fs.readdirSync(serverChunksDir); - const serverFile = files.find( - (f) => f.startsWith("server_") && f.endsWith(".mjs") + const serverChunksDir = join(serverDir, "chunks"); + if (!fs.existsSync(serverChunksDir)) { + fs.mkdirSync(serverChunksDir, { recursive: true }); + } + const files = fs.readdirSync(serverChunksDir); + const serverFile = files.find( + (f) => f.startsWith("server_") && f.endsWith(".mjs") + ); + + if (serverFile) { + const serverPath = join(serverChunksDir, serverFile); + const content = fs.readFileSync(serverPath, "utf-8"); + + // Replace the manifest handling in the bundled code + const manifestJson = JSON.stringify(manifest); + const newContent = content.replace( + "serverData: props,", + `serverData: props, manifest: ${manifestJson},` ); - if (serverFile) { - const serverPath = join(serverChunksDir, serverFile); - const content = fs.readFileSync(serverPath, "utf-8"); - - // Replace the manifest handling in the bundled code - const manifestJson = JSON.stringify(manifest); - const newContent = content.replace( - "serverData: props,", - `serverData: props, manifest: ${manifestJson},` - ); - - fs.writeFileSync(serverPath, newContent); - } + fs.writeFileSync(serverPath, newContent); } } }, From 2b9f56eb2ca01cd728b76b2252d2c85a9c5b4126 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 3 May 2025 10:01:05 -0500 Subject: [PATCH 5/7] inject for ssg files --- libs/qwikdev-astro/src/index.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts index 1ccd210b..c7170fc7 100644 --- a/libs/qwikdev-astro/src/index.ts +++ b/libs/qwikdev-astro/src/index.ts @@ -244,11 +244,15 @@ export default defineIntegration({ input: [...qwikEntrypoints, resolver("./root.tsx")], outDir: finalDir, manifestOutput: (manifest) => { - const serverChunksDir = join(serverDir, "chunks"); + const serverChunksDir = astroConfig?.adapter + ? join(serverDir, "chunks") + : join(finalDir, "chunks"); + if (!fs.existsSync(serverChunksDir)) { fs.mkdirSync(serverChunksDir, { recursive: true }); } const files = fs.readdirSync(serverChunksDir); + console.log("files", files); const serverFile = files.find( (f) => f.startsWith("server_") && f.endsWith(".mjs") ); From a65f108e94f7508c101a3a61725bcfa9f4bd7987 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 3 May 2025 10:12:10 -0500 Subject: [PATCH 6/7] loop over for Astro actions --- libs/qwikdev-astro/src/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts index c7170fc7..daa71cd8 100644 --- a/libs/qwikdev-astro/src/index.ts +++ b/libs/qwikdev-astro/src/index.ts @@ -252,12 +252,12 @@ export default defineIntegration({ fs.mkdirSync(serverChunksDir, { recursive: true }); } const files = fs.readdirSync(serverChunksDir); - console.log("files", files); - const serverFile = files.find( + + const serverFiles = files.filter( (f) => f.startsWith("server_") && f.endsWith(".mjs") ); - if (serverFile) { + for (const serverFile of serverFiles) { const serverPath = join(serverChunksDir, serverFile); const content = fs.readFileSync(serverPath, "utf-8"); From 882c7cce9454659005360173b6b08e9cbbd2da56 Mon Sep 17 00:00:00 2001 From: thejackshelton Date: Sat, 3 May 2025 10:12:46 -0500 Subject: [PATCH 7/7] add comment for actions --- libs/qwikdev-astro/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/qwikdev-astro/src/index.ts b/libs/qwikdev-astro/src/index.ts index daa71cd8..36e9fec6 100644 --- a/libs/qwikdev-astro/src/index.ts +++ b/libs/qwikdev-astro/src/index.ts @@ -253,6 +253,7 @@ export default defineIntegration({ } const files = fs.readdirSync(serverChunksDir); + // Astro actions can add more server files const serverFiles = files.filter( (f) => f.startsWith("server_") && f.endsWith(".mjs") );