From 1fcd4240eb0b8927e217408cdb99ae8ebd3e0925 Mon Sep 17 00:00:00 2001 From: jack shelton Date: Tue, 24 Dec 2024 23:34:43 -0600 Subject: [PATCH 1/2] upgrade cli deps --- .../stubs/templates/deno-biome/package.json | 6 +- .../stubs/templates/deno/package.json | 6 +- .../stubs/templates/node-biome/package.json | 6 +- .../stubs/templates/node/package.json | 6 +- .../stubs/templates/none-biome/package.json | 6 +- .../stubs/templates/none/package.json | 6 +- libs/qwikdev-astro/package.json | 9 +-- pnpm-lock.yaml | 56 ++++++++++++++++--- 8 files changed, 68 insertions(+), 33 deletions(-) diff --git a/libs/create-qwikdev-astro/stubs/templates/deno-biome/package.json b/libs/create-qwikdev-astro/stubs/templates/deno-biome/package.json index 76714104..da7ccce8 100644 --- a/libs/create-qwikdev-astro/stubs/templates/deno-biome/package.json +++ b/libs/create-qwikdev-astro/stubs/templates/deno-biome/package.json @@ -22,9 +22,9 @@ "dependencies": { "@astrojs/check": "^0.9.4", "@astrojs/deno": "^5.0.1", - "@builder.io/qwik": "^1.11", - "@qwikdev/astro": "https://pkg.pr.new/QwikDev/astro/@qwikdev/astro@6d96827", - "astro": "5.0.2", + "@builder.io/qwik": "^1.12", + "@qwikdev/astro": "^0.7", + "astro": "^5.1", "typescript": "^5.4.3" }, "devDependencies": { diff --git a/libs/create-qwikdev-astro/stubs/templates/deno/package.json b/libs/create-qwikdev-astro/stubs/templates/deno/package.json index 4f307bb6..b12804ad 100644 --- a/libs/create-qwikdev-astro/stubs/templates/deno/package.json +++ b/libs/create-qwikdev-astro/stubs/templates/deno/package.json @@ -23,9 +23,9 @@ "dependencies": { "@astrojs/check": "^0.9.4", "@astrojs/deno": "^5.0.1", - "@builder.io/qwik": "^1.11", - "@qwikdev/astro": "https://pkg.pr.new/QwikDev/astro/@qwikdev/astro@6d96827", - "astro": "5.0.2" + "@builder.io/qwik": "^1.12", + "@qwikdev/astro": "^0.7", + "astro": "^5.1" }, "devDependencies": { "@types/eslint": "^8.56.10", diff --git a/libs/create-qwikdev-astro/stubs/templates/node-biome/package.json b/libs/create-qwikdev-astro/stubs/templates/node-biome/package.json index afae5cd2..19129c27 100644 --- a/libs/create-qwikdev-astro/stubs/templates/node-biome/package.json +++ b/libs/create-qwikdev-astro/stubs/templates/node-biome/package.json @@ -21,9 +21,9 @@ "dependencies": { "@astrojs/check": "^0.9.4", "@astrojs/node": "^9.0.0", - "@builder.io/qwik": "^1.11", - "@qwikdev/astro": "https://pkg.pr.new/QwikDev/astro/@qwikdev/astro@6d96827", - "astro": "5.0.2" + "@builder.io/qwik": "^1.12", + "@qwikdev/astro": "^0.7", + "astro": "^5.1" }, "devDependencies": { "@biomejs/biome": "^1.7.0" diff --git a/libs/create-qwikdev-astro/stubs/templates/node/package.json b/libs/create-qwikdev-astro/stubs/templates/node/package.json index e9780762..736146db 100644 --- a/libs/create-qwikdev-astro/stubs/templates/node/package.json +++ b/libs/create-qwikdev-astro/stubs/templates/node/package.json @@ -22,9 +22,9 @@ "dependencies": { "@astrojs/check": "^0.9.4", "@astrojs/node": "^9.0.0", - "@builder.io/qwik": "^1.11", - "@qwikdev/astro": "https://pkg.pr.new/QwikDev/astro/@qwikdev/astro@6d96827", - "astro": "5.0.2" + "@builder.io/qwik": "^1.12", + "@qwikdev/astro": "^0.7", + "astro": "^5.1" }, "devDependencies": { "@types/eslint": "^8.56.10", diff --git a/libs/create-qwikdev-astro/stubs/templates/none-biome/package.json b/libs/create-qwikdev-astro/stubs/templates/none-biome/package.json index 4a50f077..b0d0d17b 100644 --- a/libs/create-qwikdev-astro/stubs/templates/none-biome/package.json +++ b/libs/create-qwikdev-astro/stubs/templates/none-biome/package.json @@ -19,9 +19,9 @@ }, "dependencies": { "@astrojs/check": "^0.9.4", - "@builder.io/qwik": "^1.11", - "@qwikdev/astro": "https://pkg.pr.new/QwikDev/astro/@qwikdev/astro@6d96827", - "astro": "5.0.2" + "@builder.io/qwik": "^1.12", + "@qwikdev/astro": "^0.7", + "astro": "^5.1" }, "devDependencies": { "@biomejs/biome": "^1.7.0" diff --git a/libs/create-qwikdev-astro/stubs/templates/none/package.json b/libs/create-qwikdev-astro/stubs/templates/none/package.json index 92ffce2c..0f68cb7b 100644 --- a/libs/create-qwikdev-astro/stubs/templates/none/package.json +++ b/libs/create-qwikdev-astro/stubs/templates/none/package.json @@ -20,9 +20,9 @@ }, "dependencies": { "@astrojs/check": "^0.9.4", - "@builder.io/qwik": "^1.11", - "@qwikdev/astro": "https://pkg.pr.new/QwikDev/astro/@qwikdev/astro@6d96827", - "astro": "5.0.2" + "@builder.io/qwik": "^1.12", + "@qwikdev/astro": "^0.7", + "astro": "^5.1" }, "devDependencies": { "@types/eslint": "^8.56.10", diff --git a/libs/qwikdev-astro/package.json b/libs/qwikdev-astro/package.json index 933fc93c..f0f6a7c3 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 @@ }, "devDependencies": { "@builder.io/qwik": "^1.12.0", - "astro": "5.1.1", + "astro": "^5.1", "vite": "^5.4.11" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5a66be19..94a736d3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,7 +55,7 @@ importers: dependencies: '@astrojs/check': specifier: ^0.9.4 - version: 0.9.4(prettier@3.4.2)(typescript@5.7.2) + version: 0.9.4(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.7.2) '@astrojs/deno': specifier: ^5.0.1 version: 5.0.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)) @@ -121,7 +121,7 @@ importers: dependencies: '@astrojs/check': specifier: ^0.5.10 - version: 0.5.10(prettier@3.4.2)(typescript@5.7.2) + version: 0.5.10(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.7.2) '@astrojs/starlight': specifier: ^0.21.5 version: 0.21.5(astro@4.16.18(@types/node@22.10.2)(rollup@4.29.1)(typescript@5.7.2)) @@ -209,7 +209,7 @@ importers: specifier: ^1.12.0 version: 1.12.0(vite@5.4.11(@types/node@22.10.2)) astro: - specifier: 5.1.1 + 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) vite: specifier: ^5.4.11 @@ -257,6 +257,9 @@ packages: peerDependencies: typescript: ^5.0.0 + '@astrojs/compiler@1.8.2': + resolution: {integrity: sha512-o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw==} + '@astrojs/compiler@2.10.3': resolution: {integrity: sha512-bL/O7YBxsFt55YHU021oL+xz+B/9HvGNId3F9xURN16aeqDK9juHGktdkCSXz+U4nqFACq6ZFvWomOzhV+zfPw==} @@ -4057,6 +4060,10 @@ packages: resolution: {integrity: sha512-gYBeFTZLu055D8Vv3cSPox/0iTPtkzxpLroSYYA7WXgRi31WCJ51Uyl8ZiPeUUjyvs2MBzK+S8v9JVUgHU/Sqw==} engines: {node: '>=18.12'} + prettier-plugin-astro@0.13.0: + resolution: {integrity: sha512-5HrJNnPmZqTUNoA97zn4gNQv9BgVhv+et03314WpQ9H9N8m2L9OSV798olwmG2YLXPl1iSstlJCR1zB3x5xG4g==} + engines: {node: ^14.15.0 || >=16.0.0} + prettier@2.8.7: resolution: {integrity: sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==} engines: {node: '>=10.13.0'} @@ -4311,6 +4318,9 @@ packages: run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} + s.color@0.0.15: + resolution: {integrity: sha512-AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==} + safe-array-concat@1.1.3: resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==} engines: {node: '>=0.4'} @@ -4325,6 +4335,9 @@ packages: safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} + sass-formatter@0.7.9: + resolution: {integrity: sha512-CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw==} + sax@1.4.1: resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==} @@ -4560,6 +4573,9 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true + suf-log@2.5.3: + resolution: {integrity: sha512-KvC8OPjzdNOe+xQ4XWJV2whQA0aM1kGVczMQ8+dStAO6KfEB140JEVQ9dE76ONZ0/Ylf67ni4tILPJB41U0eow==} + supports-color@10.0.0: resolution: {integrity: sha512-HRVVSbCCMbj7/kdWF9Q+bbckjBHLtHMEoJWlkmYzzdwhYMkjkOwubLM6t7NbWKjgKamGDrWL1++KrjUO1t9oAQ==} engines: {node: '>=18'} @@ -5304,9 +5320,9 @@ snapshots: openapi-types: 12.1.3 z-schema: 5.0.5 - '@astrojs/check@0.5.10(prettier@3.4.2)(typescript@5.7.2)': + '@astrojs/check@0.5.10(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.7.2)': dependencies: - '@astrojs/language-server': 2.15.4(prettier@3.4.2)(typescript@5.7.2) + '@astrojs/language-server': 2.15.4(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.7.2) chokidar: 3.6.0 fast-glob: 3.3.2 kleur: 4.1.5 @@ -5316,9 +5332,9 @@ snapshots: - prettier - prettier-plugin-astro - '@astrojs/check@0.9.4(prettier@3.4.2)(typescript@5.7.2)': + '@astrojs/check@0.9.4(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.7.2)': dependencies: - '@astrojs/language-server': 2.15.4(prettier@3.4.2)(typescript@5.7.2) + '@astrojs/language-server': 2.15.4(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.7.2) chokidar: 4.0.3 kleur: 4.1.5 typescript: 5.7.2 @@ -5327,6 +5343,9 @@ snapshots: - prettier - prettier-plugin-astro + '@astrojs/compiler@1.8.2': + optional: true + '@astrojs/compiler@2.10.3': {} '@astrojs/deno@5.0.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))': @@ -5338,7 +5357,7 @@ snapshots: '@astrojs/internal-helpers@0.4.2': {} - '@astrojs/language-server@2.15.4(prettier@3.4.2)(typescript@5.7.2)': + '@astrojs/language-server@2.15.4(prettier-plugin-astro@0.13.0)(prettier@3.4.2)(typescript@5.7.2)': dependencies: '@astrojs/compiler': 2.10.3 '@astrojs/yaml2ts': 0.2.2 @@ -5360,6 +5379,7 @@ snapshots: vscode-uri: 3.0.8 optionalDependencies: prettier: 3.4.2 + prettier-plugin-astro: 0.13.0 transitivePeerDependencies: - typescript @@ -10024,6 +10044,13 @@ snapshots: find-yarn-workspace-root2: 1.2.16 which-pm: 3.0.0 + prettier-plugin-astro@0.13.0: + dependencies: + '@astrojs/compiler': 1.8.2 + prettier: 3.4.2 + sass-formatter: 0.7.9 + optional: true + prettier@2.8.7: optional: true @@ -10402,6 +10429,9 @@ snapshots: dependencies: queue-microtask: 1.2.3 + s.color@0.0.15: + optional: true + safe-array-concat@1.1.3: dependencies: call-bind: 1.0.8 @@ -10420,6 +10450,11 @@ snapshots: safer-buffer@2.1.2: {} + sass-formatter@0.7.9: + dependencies: + suf-log: 2.5.3 + optional: true + sax@1.4.1: {} scheduler@0.23.2: @@ -10726,6 +10761,11 @@ snapshots: pirates: 4.0.6 ts-interface-checker: 0.1.13 + suf-log@2.5.3: + dependencies: + s.color: 0.0.15 + optional: true + supports-color@10.0.0: {} supports-color@7.2.0: From 5baee127838259671d072461fdcf85dccc0068d6 Mon Sep 17 00:00:00 2001 From: jack shelton Date: Tue, 24 Dec 2024 23:50:39 -0600 Subject: [PATCH 2/2] add changeset --- .changeset/tall-pumpkins-hide.md | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .changeset/tall-pumpkins-hide.md diff --git a/.changeset/tall-pumpkins-hide.md b/.changeset/tall-pumpkins-hide.md new file mode 100644 index 00000000..bb802cca --- /dev/null +++ b/.changeset/tall-pumpkins-hide.md @@ -0,0 +1,33 @@ +--- +"@qwikdev/create-astro": patch +"@qwikdev/astro": patch +--- + +## 🎄 Qwik Astro CLI Holiday Update! 🎅 + +This release introduces the ability to add Qwik to your existing Astro projects, with an improved CLI experience and better project integration. + +### ✨ Core Features +- ✨ New CLI command to add Qwik to existing Astro projects +- 🚸 Improved interactive experience with smart defaults +- 🎯 Simplified project setup with fewer required inputs +- 🔄 Smarter handling of existing project names +- ⚡️ Streamlined installation process + +### 🔧 Improvements +- 🎮 Enhanced interactive mode +- ✅ Better validation of user inputs +- 🔄 Smoother integration with existing projects +- 🛠️ Improved handling of CLI options +- 🚀 Faster project setup + +### 🐛 Bug Fixes +- 🪟 Fixed Windows compatibility issues +- 🔧 Improved package manager detection +- 🛠️ Better error handling and user feedback +- 🔄 Fixed conflicts between CLI options + +### 📦 Updates +- ⬆️ Updated dependencies +- 🔨 Improved build process +- 📦 Better package structure