create-quadrokit 0.2.2 → 0.2.4

package/README.md

@@ -14,22 +14,29 @@ bun create-quadrokit/src/index.ts --template dashboard --dir /path/to/my-app
 | Flag | Description |
 |------|-------------|
 | `--template <name>` | `dashboard` \| `website` \| `ecommerce` \| `admin-shell` |
-| `--dir <path>` | Target directory (created; must be empty) |
+| `--dir <path>` | Target directory relative to cwd (created; must be empty if it already exists) |
+| `--name <name>` | Same as `--dir` (project folder name); ignored if `--dir` is set |
+| `-y` / `--yes` | Non-interactive: requires `--template`; uses `quadro-<template>` as the directory unless `--dir` / `--name` is set; runs git init and install without prompting (override with `--no-git` / `--no-install`) |
+| `-h` / `--help` | Print usage and exit |
 | `--keep-workspace` | Keep `workspace:*` in `package.json` (for development inside the QuadroKit monorepo only) |
 | `--git` / `--no-git` | Initialize a git repo after scaffolding (skip the prompt) |
 | `--install` / `--no-install` | Run `bun install` or `npm install` after scaffolding (skip the prompt) |
 
+The banner shows **create-quadrokit**’s package version (e.g. `v0.2.2`).
+
 On start, the CLI prints a short **prerequisites** check (Node.js, Bun, Git). Node 18+ is required; Bun is optional (falls back to npm for installs). Git is only needed if you choose to init a repository.
 
-Interactive mode: run without `--template` / `--dir` to be prompted for those; you are then asked about **git** and **install** unless overridden with the flags above.
+Interactive mode: run without `--template` / `--dir` / `--name` to be prompted. If the project directory already exists and is **not empty**, you are asked again for a different name. You are then asked about **git** and **install** unless `-y` or the explicit flags above apply.
 
 ## What it does
 
 1. Copies the chosen template from `create-quadrokit/templates/<name>` when installed from npm, or `packages/templates/<name>` when you run the CLI from the monorepo (skips `node_modules`, `dist`, `.quadrokit`, lockfiles).
-2. Rewrites `src/lib/quadro-client.ts` to import from `../../.quadrokit/generated/client.gen.js`.
-3. Removes `@quadrokit/sample-client` and rewrites `workspace:*` on `@quadrokit/*` deps to `^<version>` matching **create-quadrokit**’s own `package.json` `version` (run `bun run version:set` at repo root to bump public packages) unless `--keep-workspace`.
-4. Writes `QUADROKIT.md` with proxy and `quadrokit:generate` instructions. Does **not** copy `.quadrokit/generated` — run `bun run quadrokit:generate` after install.
-5. Optionally runs `git init` and installs dependencies (`bun` if available, otherwise `npm`).
+2. Overlays **`template-common/`** (shared across all templates): `.env.example`, `tsconfig*.json`, `postcss.config.js`, `biome.json`, `src/vite-env.d.ts`, `.cursor/rules/commitlint-conventional.mdc`, etc. In the monorepo, run `bun run sync:template-common` before template `build`/`typecheck` (also runs as part of root `bun run build`).
+3. Rewrites `src/lib/quadro-client.ts` to import from `../../.quadrokit/generated/client.gen.js`.
+4. Removes `@quadrokit/sample-client` and rewrites `workspace:*` on `@quadrokit/*` deps to `^<version>` matching **create-quadrokit**’s own `package.json` `version` (run `bun run version:set` at repo root to bump public packages) unless `--keep-workspace`.
+5. Writes `QUADROKIT.md` with proxy and `quadrokit:generate` instructions. Does **not** copy `.quadrokit/generated` — run `bun run quadrokit:generate` after install.
+6. Adds a root `.gitignore` (unless the template already shipped one).
+7. Optionally runs `git init` and installs dependencies (`bun` if available, otherwise `npm`).
 
 ## Published usage (future)
 

package/dist/copy-tree.mjs

@@ -0,0 +1,33 @@
+import { cp, mkdir, readdir } from 'node:fs/promises';
+import path from 'node:path';
+/** Names skipped when copying templates or template-common (lockfiles, build output). */
+export const TEMPLATE_COPY_SKIP = new Set([
+    'node_modules',
+    'dist',
+    '.turbo',
+    '.quadrokit',
+    'bun.lock',
+    'bun.lockb',
+    'package-lock.json',
+    'pnpm-lock.yaml',
+    'yarn.lock',
+]);
+export async function copyTree(src, dest, options = {}) {
+    const skip = options.skipNames ?? TEMPLATE_COPY_SKIP;
+    const { dereference = false } = options;
+    await mkdir(dest, { recursive: true });
+    const entries = await readdir(src, { withFileTypes: true });
+    for (const e of entries) {
+        if (skip.has(e.name)) {
+            continue;
+        }
+        const from = path.join(src, e.name);
+        const to = path.join(dest, e.name);
+        if (e.isDirectory()) {
+            await copyTree(from, to, options);
+        }
+        else {
+            await cp(from, to, { force: true, dereference });
+        }
+    }
+}

package/dist/index.mjs

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 import { spawnSync } from 'node:child_process';
 import { readFileSync } from 'node:fs';
-import { cp, mkdir, readdir, readFile, stat, writeFile } from 'node:fs/promises';
+import { readdir, readFile, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import prompts from 'prompts';
+import { copyTree, TEMPLATE_COPY_SKIP } from './copy-tree.mjs';
 const MIN_NODE_MAJOR = 18;
 function cmdVersion(cmd, args) {
     const r = spawnSync(cmd, args, { encoding: 'utf8', shell: false });
@@ -31,12 +32,49 @@ function checkPrereqs() {
         gitVersion,
     };
 }
-function printWelcome() {
+function readPackageVersion() {
+    try {
+        const raw = readFileSync(path.join(packageRoot(), 'package.json'), 'utf8');
+        const v = JSON.parse(raw).version;
+        return typeof v === 'string' ? v : '0.0.0';
+    }
+    catch {
+        return '0.0.0';
+    }
+}
+function printWelcome(version) {
     console.log(`
-  ${'✨'.repeat(2)}  ${'\u001b[1mcreate-quadrokit\u001b[0m'}  ${'✨'.repeat(2)}
+  ${'✨'.repeat(2)}  ${'\u001b[1mcreate-quadrokit\u001b[0m'} ${'\u001b[90m'}v${version}${'\u001b[0m'}  ${'✨'.repeat(2)}
   ${'🚀'.repeat(2)}  Scaffold a QuadroKit Vite + React app for 4D REST
 `);
 }
+function printHelp(version) {
+    const t = TEMPLATES.join(' | ');
+    console.log(`create-quadrokit v${version}
+
+Scaffold a QuadroKit Vite + React app for 4D REST.
+
+Usage:
+  create-quadrokit [options]
+  bunx create-quadrokit@latest [options]
+
+Options:
+  --template <name>     Template: ${t}
+  --dir <path>          Project directory (relative to cwd; must not exist or be empty)
+  --name <name>         Same as --dir when --dir is omitted
+  -y, --yes             Non-interactive: requires --template; uses quadro-<template> as directory
+                        unless --dir / --name; runs git init + install (override with --no-git / --no-install)
+  --git                 Initialize a git repository (skips prompt)
+  --no-git              Do not run git init
+  --install             Install dependencies after scaffold (skips prompt)
+  --no-install          Do not install dependencies
+  --keep-workspace      Keep workspace:* @quadrokit deps (monorepo development only)
+  -h, --help            Show this help
+
+If the chosen directory already exists and is not empty, you are prompted for a different name
+(unless --yes is set; then the CLI exits with an error).
+`);
+}
 function printPrereqReport(p) {
     console.log('  Prerequisites');
     const line = (ok, emoji, label, detail) => {
@@ -85,8 +123,11 @@ async function resolveBiomeJsonPath() {
 function parseArgs(argv) {
     let template;
     let dir;
+    let name;
     let keepWorkspace = false;
-    /** `undefined` = prompt later */
+    /** Non-interactive: default project dir, git init, and install (no prompts). */
+    let yes = false;
+    /** `undefined` = prompt later (unless yes) */
     let initGit;
     let installDeps;
     for (let i = 0; i < argv.length; i++) {
@@ -97,9 +138,15 @@ function parseArgs(argv) {
         else if (a === '--dir' && argv[i + 1]) {
             dir = argv[++i];
         }
+        else if (a === '--name' && argv[i + 1]) {
+            name = argv[++i];
+        }
         else if (a === '--keep-workspace') {
             keepWorkspace = true;
         }
+        else if (a === '-y' || a === '--yes') {
+            yes = true;
+        }
         else if (a === '--git') {
             initGit = true;
         }
@@ -113,7 +160,10 @@ function parseArgs(argv) {
             installDeps = false;
         }
     }
-    return { template, dir, keepWorkspace, initGit, installDeps };
+    if (!dir && name) {
+        dir = name;
+    }
+    return { template, dir, keepWorkspace, yes, initGit, installDeps };
 }
 async function pathExists(p) {
     try {
@@ -124,34 +174,80 @@ async function pathExists(p) {
         return false;
     }
 }
-const SKIP_TEMPLATE_NAMES = new Set([
-    'node_modules',
-    'dist',
-    '.turbo',
-    '.quadrokit',
-    'bun.lock',
-    'bun.lockb',
-    'package-lock.json',
-    'pnpm-lock.yaml',
-    'yarn.lock',
-]);
-async function copyTemplate(src, dest) {
-    await mkdir(dest, { recursive: true });
-    const entries = await readdir(src, { withFileTypes: true });
-    for (const e of entries) {
-        if (SKIP_TEMPLATE_NAMES.has(e.name)) {
+/**
+ * Resolves an absolute path for the project root. Re-prompts (interactive) when the path exists
+ * as a non-empty directory or is not a directory. With --yes, exits if the path is unusable.
+ */
+async function resolveProjectDest(dirArg, template, yesFlag) {
+    let dirInput = dirArg?.trim() || undefined;
+    let retryAfterConflict = false;
+    while (true) {
+        if (!dirInput) {
+            if (yesFlag && !retryAfterConflict) {
+                dirInput = `quadro-${template}`;
+            }
+            else if (yesFlag) {
+                console.error('  ❌  With --yes, pass --dir or --name pointing at a missing or empty directory.');
+                process.exit(1);
+            }
+            else {
+                const res = await prompts({
+                    type: 'text',
+                    name: 'dir',
+                    message: retryAfterConflict
+                        ? 'That path exists and is not empty — enter a different project directory'
+                        : 'Project directory',
+                    initial: retryAfterConflict ? `quadro-${template}-2` : `quadro-${template}`,
+                });
+                if (typeof res.dir !== 'string') {
+                    process.exit(1);
+                }
+                dirInput = res.dir.trim();
+                if (!dirInput) {
+                    process.exit(1);
+                }
+            }
+        }
+        const dest = path.resolve(process.cwd(), dirInput);
+        const st = await stat(dest).catch(() => null);
+        if (!st) {
+            return dest;
+        }
+        if (!st.isDirectory()) {
+            if (yesFlag) {
+                console.error(`  ❌  Not a directory: ${dest}`);
+                process.exit(1);
+            }
+            console.log(`  ⚠️  Not a directory: ${dest}`);
+            dirInput = undefined;
+            retryAfterConflict = true;
             continue;
         }
-        const from = path.join(src, e.name);
-        const to = path.join(dest, e.name);
-        if (e.isDirectory()) {
-            await copyTemplate(from, to);
+        const files = await readdir(dest);
+        if (files.length === 0) {
+            return dest;
         }
-        else {
-            await cp(from, to);
+        if (yesFlag) {
+            console.error(`  ❌  Directory not empty: ${dest}\n      Use --dir or --name with an empty path, or remove files from that folder.`);
+            process.exit(1);
         }
+        console.log(`  ⚠️  Directory not empty: ${dest}`);
+        dirInput = undefined;
+        retryAfterConflict = true;
     }
 }
+async function copyTemplate(src, dest) {
+    await copyTree(src, dest, { skipNames: TEMPLATE_COPY_SKIP });
+}
+/** Overlay shared files from template-common (same as monorepo packages/templates sync). */
+async function injectTemplateCommon(dest) {
+    const common = path.join(packageRoot(), 'template-common');
+    if (!(await pathExists(common))) {
+        console.warn('  ⚠️  template-common missing — skipping common file overlay.');
+        return;
+    }
+    await copyTree(common, dest, { skipNames: TEMPLATE_COPY_SKIP });
+}
 /** Caret range for published @quadrokit/* deps (matches create-quadrokit release line). */
 function quadrokitPublishedSemverRange() {
     try {
@@ -190,6 +286,10 @@ async function patchPackageJson(dest, projectName, keepWorkspace) {
     if (!keepWorkspace) {
         rewriteWorkspaceDeps(pkg);
     }
+    const scripts = pkg.scripts;
+    if (scripts) {
+        scripts['quadrokit:generate'] = 'quadrokit-client generate';
+    }
     await writeFile(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`, 'utf8');
 }
 /** Standalone Biome config for projects outside the monorepo (no `extends` to repo root). */
@@ -234,70 +334,89 @@ Created with **create-quadrokit** (template: \`${template}\`).
 ## Next steps
 
 1. \`cd ${path.basename(dest)}\` and install dependencies (\`bun install\` or \`npm install\`).
-2. Generate the typed REST client (required before \`dev\` / \`build\`):
+2. Copy \`.env.example\` to \`.env\` and set \`VITE_4D_ORIGIN\` to your 4D web server (used for the dev proxy and as the default catalog origin for generate).
+
+3. Generate the typed REST client (required before \`dev\` / \`build\`). The CLI is \`quadrokit-client\` from \`@quadrokit/client\` (reads \`.env\` in the project cwd for defaults):
 
    \`\`\`bash
    bun run quadrokit:generate
    \`\`\`
 
-   This uses \`assets/catalog.placeholder.json\` by default (demo catalog from QuadroKit). Point at your live 4D catalog:
+   Same as \`quadrokit-client generate\`. One-off (no local install): \`bunx -p @quadrokit/client quadrokit-client generate\` (or \`bunx quadrokit-client generate\`).
 
-   \`\`\`bash
-   QUADROKIT_CATALOG_URL='http://localhost:7080/rest/\\$catalog' QUADROKIT_CATALOG_TOKEN='…' bun run quadrokit:generate
-   \`\`\`
+   Default catalog URL: \`\${VITE_4D_ORIGIN}/rest/\\$catalog\`, or \`http://127.0.0.1:7080/rest/\\$catalog\` if unset. Generator-only \`.env\` keys (not used by the browser):
+
+   - \`QUADROKIT_ACCESS_KEY\` — multipart \`accessKey\` to \`/api/login\`; then \`4DAdminSID\` for the catalog request.
+   - \`QUADROKIT_LOGIN_URL\` — full login URL if not \`\${catalog origin}/api/login\`.
+
+   Flags: \`--url\`, \`--access-key\`, \`--login-url\`, \`--token\` / \`QUADROKIT_CATALOG_TOKEN\` (Bearer).
 
-3. Copy \`.env.example\` to \`.env\` and set \`VITE_4D_ORIGIN\` to your 4D web server.
 4. \`bun run dev\` — the dev server proxies \`/rest\` to \`VITE_4D_ORIGIN\` so **4DSID_** cookies stay same-origin.
 
 Production: serve the SPA and reverse-proxy \`/rest\` to 4D on the **same host** as the UI.
 `;
     await writeFile(path.join(dest, 'QUADROKIT.md'), text, 'utf8');
 }
+async function writeGitignore(dest) {
+    const p = path.join(dest, '.gitignore');
+    if (await pathExists(p)) {
+        return;
+    }
+    const body = `node_modules
+dist
+.DS_Store
+*.log
+*.local
+.env
+.env.*.local
+
+# Vite / tsc
+*.tsbuildinfo
+
+# Optional: do not commit generated REST client (see QUADROKIT.md)
+# .quadrokit/generated/
+`;
+    await writeFile(p, body, 'utf8');
+}
 async function main() {
     const argv = process.argv.slice(2);
-    const { template: tArg, dir: dirArg, keepWorkspace, initGit: gitFlag, installDeps: installFlag, } = parseArgs(argv);
-    printWelcome();
+    if (argv.includes('-h') || argv.includes('--help')) {
+        printHelp(readPackageVersion());
+        process.exit(0);
+    }
+    const { template: tArg, dir: dirArg, keepWorkspace, yes: yesFlag, initGit: gitFlag, installDeps: installFlag, } = parseArgs(argv);
+    printWelcome(readPackageVersion());
     const prereqs = checkPrereqs();
     printPrereqReport(prereqs);
     if (!prereqs.nodeOk) {
         console.error(`  ❌ Node.js ${MIN_NODE_MAJOR}+ is required.`);
         process.exit(1);
     }
-    const template = tArg && TEMPLATES.includes(tArg)
-        ? tArg
-        : (await prompts({
+    let template = tArg && TEMPLATES.includes(tArg) ? tArg : undefined;
+    if (!template) {
+        if (yesFlag) {
+            console.error('  ❌  --yes requires --template <name>');
+            process.exit(1);
+        }
+        const picked = await prompts({
             type: 'select',
             name: 'template',
             message: 'Template',
             choices: TEMPLATES.map((value) => ({ title: value, value })),
-        })).template;
-    if (!template) {
-        process.exit(1);
+        });
+        template = picked.template;
     }
-    const dirAns = dirArg ??
-        (await prompts({
-            type: 'text',
-            name: 'dir',
-            message: 'Project directory',
-            initial: `quadro-${template}`,
-        })).dir;
-    if (!dirAns || typeof dirAns !== 'string') {
+    if (!template) {
         process.exit(1);
     }
-    const dest = path.resolve(process.cwd(), dirAns);
-    if (await pathExists(dest)) {
-        const files = await readdir(dest);
-        if (files.length > 0) {
-            console.error(`Directory not empty: ${dest}`);
-            process.exit(1);
-        }
-    }
+    const dest = await resolveProjectDest(dirArg, template, yesFlag);
     const src = await resolveTemplateDir(template);
     if (!src) {
         console.error(`Template not found: ${template} (expected under create-quadrokit/templates or packages/templates)`);
         process.exit(1);
     }
     await copyTemplate(src, dest);
+    await injectTemplateCommon(dest);
     await writeStandaloneBiome(dest, keepWorkspace);
     await patchPackageJson(dest, path
         .basename(dest)
@@ -305,19 +424,25 @@ async function main() {
         .toLowerCase() || 'quadro-app', keepWorkspace);
     await writeQuadroClientImport(dest);
     await writeReadme(dest, template);
+    await writeGitignore(dest);
     console.log(`\n  🎉  Project files are ready at ${'\u001b[1m'}${dest}${'\u001b[0m'}\n`);
     let initGit = gitFlag;
     if (initGit === undefined) {
-        const g = await prompts({
-            type: 'confirm',
-            name: 'v',
-            message: 'Initialize a git repository here?',
-            initial: true,
-        });
-        if (typeof g.v !== 'boolean') {
-            process.exit(1);
+        if (yesFlag) {
+            initGit = true;
+        }
+        else {
+            const g = await prompts({
+                type: 'confirm',
+                name: 'v',
+                message: 'Initialize a git repository here?',
+                initial: true,
+            });
+            if (typeof g.v !== 'boolean') {
+                process.exit(1);
+            }
+            initGit = g.v;
         }
-        initGit = g.v;
     }
     if (initGit) {
         if (!prereqs.gitOk) {
@@ -335,16 +460,21 @@ async function main() {
     }
     let installDeps = installFlag;
     if (installDeps === undefined) {
-        const ins = await prompts({
-            type: 'confirm',
-            name: 'v',
-            message: 'Install dependencies now?',
-            initial: true,
-        });
-        if (typeof ins.v !== 'boolean') {
-            process.exit(1);
+        if (yesFlag) {
+            installDeps = true;
+        }
+        else {
+            const ins = await prompts({
+                type: 'confirm',
+                name: 'v',
+                message: 'Install dependencies now?',
+                initial: true,
+            });
+            if (typeof ins.v !== 'boolean') {
+                process.exit(1);
+            }
+            installDeps = ins.v;
         }
-        installDeps = ins.v;
     }
     if (installDeps) {
         const useBun = prereqs.bunOk;

package/dist/inject-quadrokit-generate.mjs

@@ -0,0 +1,10 @@
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+/** Copy the shared generate runner into the new project (TypeScript; run with `bun`). */
+export async function injectQuadrokitGenerateScript(dest, createPackageRoot) {
+    const srcPath = path.join(createPackageRoot, 'scaffold-scripts', 'quadrokit-generate.ts');
+    const body = await readFile(srcPath, 'utf8');
+    const outDir = path.join(dest, 'scripts');
+    await mkdir(outDir, { recursive: true });
+    await writeFile(path.join(outDir, 'quadrokit-generate.ts'), body, 'utf8');
+}

package/package.json

@@ -1,18 +1,20 @@
 {
   "name": "create-quadrokit",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Scaffold a QuadroKit Vite + React app from a template",
   "type": "module",
   "bin": "./dist/index.mjs",
   "files": [
     "dist",
     "templates",
+    "template-common",
     "biome.monorepo.json"
   ],
   "scripts": {
     "build": "tsc -p tsconfig.build.json && bun ../scripts/rename-dist-js-to-mjs.ts dist",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "prepublishOnly": "bun run scripts/sync-for-publish.ts && bun run build"
+    "prepublishOnly": "bun run scripts/sync-template-common-into-packages.ts && bun run scripts/sync-for-publish.ts && bun run build",
+    "sync:template-common": "bun run scripts/sync-template-common-into-packages.ts"
   },
   "dependencies": {
     "prompts": "^2.4.2"

package/template-common/.cursor/rules/commitlint-conventional.mdc

@@ -0,0 +1,47 @@
+---
+description: Commit messages must follow Conventional Commits (commitlint @commitlint/config-conventional)
+alwaysApply: true
+---
+
+# Git commits (Conventional Commits / commitlint)
+
+When proposing or writing **commit messages** (including one-line suggestions, full messages, or PR squash titles), use **Conventional Commits** compatible with **@commitlint/config-conventional**.
+
+## Header format
+
+```
+<type>(<optional-scope>): <short description>
+```
+
+- **type** (pick one): `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `build`, `ci`, `chore`, `revert`
+- **scope** (optional): lowercase, short package or area (e.g. `client`, `templates`, `ui`, `create-quadrokit`)
+- **description**: imperative mood, **lowercase**, **no trailing period**, **≤ ~72 characters** for the subject line
+
+## Breaking changes
+
+- Add `!` after type or scope: `feat(api)!: remove legacy login endpoint`
+- Or explain in the body with a line starting with `BREAKING CHANGE:`
+
+## Body and footer (when needed)
+
+- Separate body from subject with a blank line.
+- Wrap body at ~100 chars.
+- Footer: `Refs: #123` / `Fixes: #123` if applicable.
+
+## Examples
+
+```
+feat(client): add entity set release helper
+
+fix(templates): correct vite proxy target env var
+
+chore: bump biome to 2.4.10
+
+docs(readme): document ci:quick script
+```
+
+## Do not
+
+- Vague subjects: `update`, `fix stuff`, `wip`
+- End the subject line with a period
+- Use title case for the description (use sentence case / lowercase)

package/template-common/.env.example

@@ -0,0 +1,7 @@
+# Origin of your 4D web server (REST). The Vite dev server proxies /rest here.
+VITE_4D_ORIGIN=http://127.0.0.1:7080
+
+# Generator only (quadrokit:generate): multipart accessKey → 4DAdminSID cookie for fetching /rest/$catalog.
+# Not used by the browser runtime.
+# QUADROKIT_ACCESS_KEY=
+# QUADROKIT_LOGIN_URL=https://127.0.0.1:7443/api/login

package/template-common/biome.json

@@ -0,0 +1,12 @@
+{
+  "root": false,
+  "extends": "//",
+  "vcs": {
+    "enabled": true,
+    "clientKind": "git",
+    "useIgnoreFile": false
+  },
+  "files": {
+    "includes": ["**", "!**/node_modules", "!**/dist", "!**/.quadrokit"]
+  }
+}

package/template-common/postcss.config.js

@@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}

package/template-common/src/vite-env.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_4D_ORIGIN?: string
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv
+}

package/template-common/tsconfig.app.json

@@ -0,0 +1,16 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "useDefineForClassFields": true,
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "verbatimModuleSyntax": true,
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
+}

package/template-common/tsconfig.base.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true
+  }
+}

package/template-common/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "files": [],
+  "references": [{ "path": "./tsconfig.app.json" }, { "path": "./tsconfig.node.json" }]
+}

package/template-common/tsconfig.node.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "noEmit": true,
+    "moduleDetection": "force",
+    "types": ["node"]
+  },
+  "include": ["vite.config.ts", "tailwind.config.ts"]
+}

package/templates/admin-shell/.env.example

@@ -1,2 +1,7 @@
 # Origin of your 4D web server (REST). The Vite dev server proxies /rest here.
 VITE_4D_ORIGIN=http://127.0.0.1:7080
+
+# Generator only (quadrokit:generate): multipart accessKey → 4DAdminSID cookie for fetching /rest/$catalog.
+# Not used by the browser runtime.
+# QUADROKIT_ACCESS_KEY=
+# QUADROKIT_LOGIN_URL=https://127.0.0.1:7443/api/login

package/templates/admin-shell/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "quadrokit:generate": "node scripts/quadrokit-generate.mjs",
+    "quadrokit:generate": "quadrokit-client generate",
     "dev": "vite",
     "build": "tsc -b && vite build",
     "preview": "vite preview",

package/templates/admin-shell/tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "useDefineForClassFields": true,

package/templates/admin-shell/tsconfig.base.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true
+  }
+}

package/templates/admin-shell/tsconfig.node.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
     "noEmit": true,

package/templates/dashboard/.env.example

@@ -1,2 +1,7 @@
 # Origin of your 4D web server (REST). The Vite dev server proxies /rest here.
 VITE_4D_ORIGIN=http://127.0.0.1:7080
+
+# Generator only (quadrokit:generate): multipart accessKey → 4DAdminSID cookie for fetching /rest/$catalog.
+# Not used by the browser runtime.
+# QUADROKIT_ACCESS_KEY=
+# QUADROKIT_LOGIN_URL=https://127.0.0.1:7443/api/login

package/templates/dashboard/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "quadrokit:generate": "node scripts/quadrokit-generate.mjs",
+    "quadrokit:generate": "quadrokit-client generate",
     "dev": "vite",
     "build": "tsc -b && vite build",
     "preview": "vite preview",

package/templates/dashboard/tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "useDefineForClassFields": true,

package/templates/dashboard/tsconfig.base.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true
+  }
+}

package/templates/dashboard/tsconfig.node.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
     "noEmit": true,

package/templates/ecommerce/.env.example

@@ -1,2 +1,7 @@
 # Origin of your 4D web server (REST). The Vite dev server proxies /rest here.
 VITE_4D_ORIGIN=http://127.0.0.1:7080
+
+# Generator only (quadrokit:generate): multipart accessKey → 4DAdminSID cookie for fetching /rest/$catalog.
+# Not used by the browser runtime.
+# QUADROKIT_ACCESS_KEY=
+# QUADROKIT_LOGIN_URL=https://127.0.0.1:7443/api/login

package/templates/ecommerce/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "quadrokit:generate": "node scripts/quadrokit-generate.mjs",
+    "quadrokit:generate": "quadrokit-client generate",
     "dev": "vite",
     "build": "tsc -b && vite build",
     "preview": "vite preview",

package/templates/ecommerce/tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "useDefineForClassFields": true,

package/templates/ecommerce/tsconfig.base.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true
+  }
+}

package/templates/ecommerce/tsconfig.node.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
     "noEmit": true,

package/templates/website/.env.example

@@ -1,2 +1,7 @@
 # Origin of your 4D web server (REST). The Vite dev server proxies /rest here.
 VITE_4D_ORIGIN=http://127.0.0.1:7080
+
+# Generator only (quadrokit:generate): multipart accessKey → 4DAdminSID cookie for fetching /rest/$catalog.
+# Not used by the browser runtime.
+# QUADROKIT_ACCESS_KEY=
+# QUADROKIT_LOGIN_URL=https://127.0.0.1:7443/api/login

package/templates/website/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "quadrokit:generate": "node scripts/quadrokit-generate.mjs",
+    "quadrokit:generate": "quadrokit-client generate",
     "dev": "vite",
     "build": "tsc -b && vite build",
     "preview": "vite preview",

package/templates/website/tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "useDefineForClassFields": true,

package/templates/website/tsconfig.base.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true
+  }
+}

package/templates/website/tsconfig.node.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
     "noEmit": true,