♻️ CLI rewrite

.gitignore

@@ -3,7 +3,10 @@ node_modules/
 .history
 **/.vite-inspect
 **/dist
+**/labs/*
 /test-results/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+/tests/unit/report/
+/tests/unit/coverage/

Makefile

@@ -26,6 +26,7 @@ fix: install
 
 build: fix
 	pnpm build
+	pnpm build.create-qwikdev-astro
 
 pr-release: test
 	pnpx pkg-pr-new publish ./libs/* --template ./libs/create-qwikdev-astro/stubs/templates/default/*

apps/demo/package.json

@@ -12,7 +12,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@builder.io/qwik": "^1.11",
+    "@builder.io/qwik": "^1.12.0",
     "@qwikdev/astro": "workspace:*",
     "astro": "5.0.2"
   }

apps/deno-demo/package.json

@@ -13,14 +13,14 @@
   "dependencies": {
     "@astrojs/check": "^0.9.4",
     "@astrojs/deno": "^5.0.1",
-    "@astrojs/react": "^4.0.0",
-    "@builder.io/qwik": "^1.11",
+    "@astrojs/react": "^4.1.2",
+    "@builder.io/qwik": "^1.12.0",
     "@qwikdev/astro": "workspace:*",
-    "@types/react": "^18.2.64",
-    "@types/react-dom": "^18.2.21",
-    "astro": "^5.0.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "typescript": "^5.4.3"
+    "@types/react": "^18.3.18",
+    "@types/react-dom": "^18.3.5",
+    "astro": "^5.1.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "typescript": "^5.7.2"
   }
 }

apps/node-demo/package.json

@@ -14,12 +14,12 @@
   "dependencies": {
     "@astrojs/node": "9.0.0",
     "@astrojs/react": "4.0.0",
-    "@builder.io/qwik": "^1.11",
+    "@builder.io/qwik": "^1.12.0",
     "@qwikdev/astro": "workspace:*",
-    "@types/react": "^18.2.64",
-    "@types/react-dom": "^18.2.21",
+    "@types/react": "^18.3.18",
+    "@types/react-dom": "^18.3.5",
     "astro": "5.0.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   }
 }

apps/website/package.json

@@ -11,11 +11,11 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/starlight": "^0.21.2",
-    "@qwikdev/astro": "workspace:*",
-    "astro": "^4.3.5",
-    "sharp": "^0.32.5",
     "@astrojs/check": "^0.5.10",
-    "typescript": "^5.4.3"
+    "@astrojs/starlight": "^0.21.5",
+    "@qwikdev/astro": "workspace:*",
+    "astro": "^4.16.18",
+    "sharp": "^0.32.6",
+    "typescript": "^5.7.2"
   }
 }

biome.json

@@ -22,7 +22,7 @@
       "quoteProperties": "preserve",
       "quoteStyle": "double",
       "semicolons": "always",
-      "trailingComma": "none"
+      "trailingCommas": "none"
     }
   },
 

libs/create-qwikdev-astro/README.md

@@ -34,19 +34,19 @@
 
   **Types of arguments:**
 
-  | Name    | Type             | Default value    | Description                       |
-  | :-------| :----------------| :----------------| :---------------------------------|
-  | project | String           | ./qwik-astro-app | Directory of the project.         |
-  | adapter | "deno" or "node" | node             | Server adapter.                   |
+  | Name        | Type                       | Default value | Description                       |
+  | :-----------| :--------------------------| :-------------| :---------------------------------|
+  | destination | String                     | .             | Directory of the project.         |
+  | adapter     | "deno" or "node" or "none" | none          | Server adapter.                   |
 
   **Types of options:**
 
   | Name                                   | Description                              |
   | :--------------------------------------| :----------------------------------------|
   | `--help` (`-h`)                            | Display available flags.                 |
-  | `--it`                                   | Execute actions interactively.           |
   | `--dry-run`                              | Walk through steps without executing.    |
   | `--force` / `--no-force` (`-f` / `--no-f`)     | Overwrite target directory if it exists. |
+  | `--add` / `--no-add` (`-a` / `--no-a`) | Add QwikDev/astro to existing project.   |
   | `--install` / `--no-install` (`-i` / `--no-i`) | Install dependencies.                    |
   | `--biome` / `--no-biome`                   | Prefer Biome to ESLint/Prettier.         |
   | `--git` / `--no-git`                       | Initialize Git repository.               |
@@ -67,43 +67,47 @@
   - Specify the command line arguments to use:
 
     ```typescript
-    import { runCreate } from '@qwikdev/create-astro';
+    import { run } from '@qwikdev/create-astro';
 
-    runCreate("./qwik-astro-app", "node", "--it");
+    run(["./qwik-astro-app", "node"]);
     ```
 
-  - Pass the arguments to create a new project:
-
-    ```typescript
-    import { createProject } from '@qwikdev/create-astro';
-
-    const config = {
-      project: "./qwik-astro-app",
-      starter: "node",
-      it: false,
-    };
-
-    createProject(config);
-    ```
-
-  **Project configuration type:**
+  **Definition type:**
 
   ```typescript
-  export type ProjectConfig = {
-    project: string;
-    adapter?: "deno" | "node";
+  export type Definition = {
+    destination: string;
+    adapter?: "deno" | "node" | "none";
     force?: boolean;
+    add?: boolean;
     install?: boolean;
     biome?: boolean;
     git?: boolean;
     ci?: boolean;
-    yes: boolean;
-    no: boolean;
-    it: boolean;
-    dryRun: boolean;
+    yes?: boolean;
+    no?: boolean;
+    dryRun?: boolean;
   };
   ```
 
+**Default definition:**
+
+```typescript
+export const defaultDefinition = {
+  destination: ".",
+  adapter: "none",
+  force: undefined,
+  add: undefined,
+  install: undefined,
+  biome: undefined,
+  git: undefined,
+  ci: undefined,
+  yes: undefined,
+  no: undefined,
+  dryRun: undefined
+} as const;
+```
+
 ## 🌍 Community
 
 - Follow us on [@QwikDev](https://twitter.com/QwikDev)

libs/create-qwikdev-astro/bin/test.ts

@@ -0,0 +1,23 @@
+import { assert } from "@japa/assert";
+import { configure, processCLIArgs, run } from "@japa/runner";
+import { TestContext } from "@japa/runner/core";
+import { PathTester } from "@qwikdev/create-astro/tester";
+
+declare module "@japa/runner/core" {
+  interface TestContext {
+    path(path: string): PathTester;
+  }
+}
+
+TestContext.macro("path", function (path: string) {
+  return new PathTester(path);
+});
+
+processCLIArgs(process.argv.splice(2));
+
+configure({
+  files: ["tests/**/*.spec.ts"],
+  plugins: [assert()]
+});
+
+run();

libs/create-qwikdev-astro/package.json

@@ -7,7 +7,8 @@
   "scripts": {
     "check": "tsc --noEmit",
     "build": "pnpm check && tsup-node --env.NODE_ENV production",
-    "start": "tsup-node --env.NODE_ENV development --watch"
+    "start": "tsup-node --env.NODE_ENV development --watch",
+    "test": "NODE_ENV=test node --loader tsm --enable-source-maps bin/test.ts"
   },
   "contributors": [
     {
@@ -41,12 +42,48 @@
       "require": "./dist/index.cjs",
       "default": "./dist/index.js"
     },
+    "./app": {
+      "types": "./dist/app.d.ts",
+      "import": "./dist/app.js",
+      "require": "./dist/app.cjs",
+      "default": "./dist/app.js"
+    },
     "./cli": {
       "types": "./dist/cli.d.ts",
       "import": "./dist/cli.js",
       "require": "./dist/cli.cjs",
       "default": "./dist/cli.js"
     },
+    "./console": {
+      "types": "./dist/console.d.ts",
+      "import": "./dist/console.js",
+      "require": "./dist/console.cjs",
+      "default": "./dist/console.js"
+    },
+    "./core": {
+      "types": "./dist/core.d.ts",
+      "import": "./dist/core.js",
+      "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",
+      "require": "./dist/tester.cjs",
+      "default": "./dist/tester.js"
+    },
+    "./utils": {
+      "types": "./dist/utils.d.ts",
+      "import": "./dist/utils.js",
+      "require": "./dist/utils.cjs",
+      "default": "./dist/utils.js"
+    },
     "./package.json": "./package.json"
   },
   "files": ["dist", "stubs"],
@@ -75,15 +112,26 @@
   },
   "bugs": "https://github.com/@QwikDev/astro/issues",
   "dependencies": {
-    "@clack/prompts": "^0.7.0",
+    "@clack/prompts": "^0.8.2",
+    "cross-spawn": "^7.0.6",
+    "fs-extra": "^11.2.0",
     "kleur": "^4.1.5",
+    "which": "^5.0.0",
     "which-pm-runs": "^1.1.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
+    "@japa/assert": "^3.0.0",
+    "@japa/runner": "^3.1.4",
+    "@types/cross-spawn": "^6.0.6",
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^22.10.2",
+    "@types/which": "^3.0.4",
     "@types/which-pm-runs": "^1.0.2",
-    "@types/yargs": "^17.0.32",
-    "tsup": "^8.2.4",
-    "typescript": "^5.4.5"
+    "@types/yargs": "^17.0.33",
+    "tslib": "^2.8.1",
+    "tsm": "^2.3.0",
+    "tsup": "^8.3.5",
+    "typescript": "^5.7.2"
   }
 }