🔀 Merge pull request #264 from siguici/main

CLI Improvement — Overhaul Project Scaffolding, Upgrade Dependencies & Integrate Panam for Consistent CI/CD

Author: siguici

.github/workflows/ci.yml

@@ -30,6 +30,9 @@ jobs:
         with:
           version: 9
 
+      - name: 📦️ Install Panam
+        run: pnpm i -g panam-cli
+
       - name: ✅ Install dependencies, check code & run E2E tests
         run: make test
 

.github/workflows/cli.yml

@@ -26,6 +26,9 @@ jobs:
       - name: 🔥 Remove lockfile
         run: rm pnpm-lock.yaml
 
+      - name: 📦️ Install Panam
+        run: npm i -g panam-cli
+
       - name: Setup Test Environment
         uses: siguici/setup-js@v1
         with:

.github/workflows/continuous-releases.yml

@@ -14,6 +14,9 @@ jobs:
         with:
           version: 9
 
+      - name: 📦️ Install Panam
+        run: pnpm i -g panam-cli
+
       - uses: actions/setup-node@v4
         with:
           node-version: 20

.github/workflows/release.yml

@@ -25,6 +25,9 @@ jobs:
         with:
           version: 9
 
+      - name: 📦️ Install Panam
+        run: pnpm i -g panam-cli
+
       # Use the Makefile's install target
       - name: Install Dependencies
         run: make install
@@ -36,4 +39,4 @@ jobs:
           publish: make release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

apps/deno-demo/package.json

@@ -16,11 +16,11 @@
     "@builder.io/qwik": "^1.14.1",
     "@deno/astro-adapter": "^0.3.1",
     "@qwikdev/astro": "workspace:*",
-    "@types/react": "^18.3.18",
-    "@types/react-dom": "^18.3.5",
-    "astro": "^5.8.0",
+    "@types/react": "^18.3.23",
+    "@types/react-dom": "^18.3.7",
+    "astro": "^5.9.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "typescript": "^5.7.2"
+    "typescript": "^5.8.3"
   }
 }

apps/node-demo/package.json

@@ -16,8 +16,8 @@
     "@astrojs/react": "4.3.0",
     "@builder.io/qwik": "^1.14.1",
     "@qwikdev/astro": "workspace:*",
-    "@types/react": "^18.3.18",
-    "@types/react-dom": "^18.3.5",
+    "@types/react": "^18.3.23",
+    "@types/react-dom": "^18.3.7",
     "astro": "5.8.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"

apps/website/package.json

@@ -20,14 +20,14 @@
   "dependencies": {
     "@astrojs/check": "^0.9.4",
     "@builder.io/qwik": "^1.14.1",
-    "@fontsource-variable/unbounded": "^5.1.1",
-    "@iconify-json/lucide": "^1.2.23",
+    "@fontsource-variable/unbounded": "^5.2.6",
+    "@iconify-json/lucide": "^1.2.47",
     "@qwikdev/astro": "workspace:*",
-    "astro": "^5.8.0",
-    "astro-icon": "^1.1.4",
+    "astro": "^5.9.2",
+    "astro-icon": "^1.1.5",
     "sharp": "^0.33.5"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.7.0"
+    "@biomejs/biome": "^1.9.4"
   }
 }

libs/create-qwikdev-astro/README.md

@@ -1,11 +1,31 @@
-# Create @qwikdev/astro 🎉
+# Create [@qwikdev/astro](https://github.com/QwikDev/astro) 🦾
 
 ## **The Ultimate Starter for QwikDev/Astro Projects**
 
 Seamlessly scaffold content-driven web projects with the power of [QwikDev/Astro](https://github.com/QwikDev/astro).
 Whether you're building blazing-fast blogs, portfolios, or scalable applications,
 this CLI has you covered.
 
+## Quickstart 🎉
+
+### Have an existing project?
+
+If you already have an existing Astro project and want to add the integration,
+you can do so with the following command:
+
+  ```bash
+  npm create @qwikdev/astro@latest --add
+  ```
+
+### Create a new project
+
+To create a brand new project,
+you can use the following command:
+
+  ```bash
+  npm create @qwikdev/astro@latest
+  ```
+
 ---
 
 ## 🚀 **Installation & Usage**
@@ -62,7 +82,7 @@ Run the following command using your preferred package manager:
   | `--copy` / `--no-copy`       | `-c` / `--no-c` | Copy files without overwriting.                |
   | `--biome` / `--no-biome`     |                 | Use Biome instead of ESLint/Prettier.          |
   | `--install` / `--no-install` | `-i` / `--no-i` | Automatically install dependencies.            |
-  | `--git` / `--no-git`         |                 | Initialize a Git repository.                   |
+  | `--git` / `--no-git`         |                 | Use Git to save changes.                       |
   | `--ci` / `--no-ci`           |                 | Add CI workflow.                               |
   | `--yes`                      | `-y`            | Accept all default configurations.             |
   | `--no`                       | `-n`            | Decline all default configurations.            |

libs/create-qwikdev-astro/package.json

@@ -9,7 +9,8 @@
     "build": "tsup-node --env.NODE_ENV production",
     "prod": "pnpm check && pnpm build",
     "start": "tsup-node --env.NODE_ENV development --watch",
-    "test": "node --loader tsm --enable-source-maps bin/test.ts"
+    "test": "pnm tsx bin/test.ts",
+    "tsx": "tsx"
   },
   "contributors": [
     {
@@ -67,12 +68,6 @@
       "require": "./dist/core.cjs",
       "default": "./dist/core.js"
     },
-    "./process": {
-      "types": "./dist/process.d.ts",
-      "import": "./dist/process.js",
-      "require": "./dist/process.cjs",
-      "default": "./dist/process.js"
-    },
     "./tester": {
       "types": "./dist/tester.d.ts",
       "import": "./dist/tester.js",
@@ -87,10 +82,7 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "dist",
-    "stubs"
-  ],
+  "files": ["dist", "stubs"],
   "bin": "./dist/cli.js",
   "keywords": [
     "astro-integration",
@@ -116,26 +108,27 @@
   },
   "bugs": "https://github.com/@QwikDev/astro/issues",
   "dependencies": {
-    "@clack/prompts": "^0.8.2",
+    "@clack/prompts": "^0.11.0",
     "cross-spawn": "^7.0.6",
-    "fs-extra": "^11.2.0",
+    "fs-extra": "^11.3.0",
     "kleur": "^4.1.5",
+    "panam": "^0.3.0",
+    "tsx": "^4.20.1",
     "which": "^5.0.0",
     "which-pm-runs": "^1.1.0",
-    "yargs": "^17.7.2"
+    "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@japa/assert": "^3.0.0",
-    "@japa/runner": "^3.1.4",
+    "@japa/assert": "^4.0.1",
+    "@japa/runner": "^4.2.0",
     "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.10.2",
+    "@types/node": "^24.0.0",
     "@types/which": "^3.0.4",
     "@types/which-pm-runs": "^1.0.2",
     "@types/yargs": "^17.0.33",
-    "tslib": "^2.8.1",
-    "tsm": "^2.3.0",
-    "tsup": "^8.3.5",
-    "typescript": "^5.7.2"
+    "rimraf": "^6.0.1",
+    "tsup": "^8.5.0",
+    "typescript": "^5.8.3"
   }
 }