create-basalt 1.13.0 → 1.14.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { randomBytes } from 'node:crypto';
 import { mkdir, readdir, writeFile } from 'node:fs/promises';
 import { dirname, join, resolve } from 'node:path';
-import { appTest, appTs, dbTs, devEnvFile, devTs, dockerfile, dockerignore, envExample, envTs, gitignore, mcpJson, basaltBin, packageJson, pnpmWorkspaceYaml, prismaConfigTs, prismaSchema, prismaSeedTs, readme, routesTs, serverTs, tsconfigBuildJson, tsconfigJson, } from './templates.js';
+import { appTest, appTs, dbTs, devEnvFile, devTs, dockerfile, dockerignore, envExample, envTs, deployConfigTs, gitignore, mcpJson, basaltBin, packageJson, pnpmWorkspaceYaml, prismaConfigTs, prismaSchema, prismaSeedTs, readme, routesTs, serverTs, tsconfigBuildJson, tsconfigJson, } from './templates.js';
 import { uiFiles } from './templates-ui.js';
 import { INSECURE_SECRET } from './project/doctor.js';
 import { createManifest, MANIFEST_PATH, serializeManifest } from './project/manifest.js';
@@ -51,6 +51,7 @@ export function scaffoldFiles(options) {
         'README.md': readme(options),
         'pnpm-workspace.yaml': pnpmWorkspaceYaml(options),
         'src/env.ts': envTs(options),
+        'deploy.config.ts': deployConfigTs(options),
         'src/app.ts': appTs(options),
         'src/routes.ts': routesTs(options),
         'src/server.ts': serverTs(),

package/dist/project/add.js

@@ -2,7 +2,7 @@ import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { basaltBin } from '../bin-template.js';
 import { collectDependencies, resolveFileVersions, resolveLatestVersions, } from '../latest-versions.js';
-import { appTs, BASALT_PROJECT_SCRIPT, gitignore, mcpJson, pnpmWorkspaceYaml, readme, readmeCliSection, readmeMcpSection, readmeUiSection, routesTs, versionOf, webDevScript, } from '../templates.js';
+import { appTs, BASALT_PROJECT_SCRIPT, gitignore, mcpJson, pnpmWorkspaceYaml, readme, deployConfigTs, readmeCliSection, readmeMcpSection, readmeUiSection, routesTs, versionOf, webDevScript, } from '../templates.js';
 import { uiFiles } from '../templates-ui.js';
 import { createManifest, extendManifest, isPristine, MANIFEST_PATH, serializeManifest } from './manifest.js';
 import { mergePackageJson } from './package-json.js';
@@ -255,6 +255,10 @@ export async function planAdd(ctx, feature, options = {}) {
         const ignore = await readOptional(ctx.dir, '.gitignore');
         plannedEdit(b, '.gitignore', ignore, ignore === undefined ? gitignore(next) : ensureGitignore(ignore, ['node_modules/', 'dist/']), 'ignore web/ build output');
         await plannedReadme(b, regenOptions, '## Web UI', readmeUiSection(next));
+        // The deploy builds web/ too (served as web/dist by the proxy).
+        if ((await readOptional(ctx.dir, 'deploy.config.ts')) !== undefined) {
+            await plannedSource(b, 'deploy.config.ts', regenOptions ? () => deployConfigTs(regenOptions) : undefined, (source) => (/\bweb:/.test(source) ? source : /build: \{ ([^}\n]*) \}/.test(source) ? source.replace(/build: \{ ([^}\n]*) \}/, "build: { $1, web: 'web' }") : undefined), "add web: 'web' to build in deploy.config.ts, so the deploy builds the frontend.");
+        }
         b.notes.push('No CORS change needed: the Vite dev server proxies /api to the API on :3000.');
     }
     if (feature === 'cli') {

package/dist/templates.d.ts

@@ -155,6 +155,18 @@ export declare function mcpJson(_options: ProjectOptions): string;
  * `certs/server.key` through.
  */
 export declare function dockerignore(): string;
+/**
+ * The C4 owner label `@basaltkit/deploy` names everything with
+ * (`[a-z][a-z0-9-]{1,30}`), from the package name.
+ */
+export declare function deployAppName(name: string): string;
+/**
+ * `deploy.config.ts` (RFC 0007 §3): what `basalt-deploy init` writes for this
+ * scaffold — PM2 behind Apache, a dedicated Postgres when the app has one, the
+ * compiled build, the app's own secret generated on the server. Typed by
+ * src/env.ts. The domain is the one thing to change.
+ */
+export declare function deployConfigTs(options: ProjectOptions): string;
 export declare function gitignore(options: ProjectOptions): string;
 /**
  * pnpm settings: esbuild's build script is required by tsx; with --prisma,

package/dist/templates.js

@@ -111,6 +111,9 @@ export function packageJson(options) {
         // The project commands (\`pnpm basalt update | add | doctor | info\`) — dev
         // tooling with no dependencies of its own, never imported by the app.
         'create-basalt': versionOf('create-basalt'),
+        // Production deploy (deploy.config.ts): dev tooling, run on the server as
+        // `node node_modules/@basaltkit/deploy/dist/bin.js run`, never imported by the app.
+        '@basaltkit/deploy': versionOf('@basaltkit/deploy'),
     };
     for (const pkg of ['@types/node', 'pino-pretty', 'tsx', 'typescript', 'vitest']) {
         devDependencies[pkg] = thirdPartyVersionOf(pkg);
@@ -1286,6 +1289,64 @@ export function mcpJson(_options) {
 export function dockerignore() {
     return DOCKERIGNORE;
 }
+/**
+ * The C4 owner label `@basaltkit/deploy` names everything with
+ * (`[a-z][a-z0-9-]{1,30}`), from the package name.
+ */
+export function deployAppName(name) {
+    // Trimmed in linear time: an anchored `-+$` regex backtracks on long runs of '-'.
+    const base = name.replace(/^@[^/]+\//, '').toLowerCase().replace(/[^a-z0-9]+/g, '-');
+    let start = 0;
+    while (start < base.length && !(base[start] >= 'a' && base[start] <= 'z'))
+        start++;
+    let end = Math.min(base.length, start + 31);
+    while (end > start && base[end - 1] === '-')
+        end--;
+    const slug = base.slice(start, end);
+    return /^[a-z][a-z0-9-]{1,30}$/.test(slug) ? slug : 'app';
+}
+/**
+ * `deploy.config.ts` (RFC 0007 §3): what `basalt-deploy init` writes for this
+ * scaffold — PM2 behind Apache, a dedicated Postgres when the app has one, the
+ * compiled build, the app's own secret generated on the server. Typed by
+ * src/env.ts. The domain is the one thing to change.
+ */
+export function deployConfigTs(options) {
+    const app = deployAppName(options.name);
+    const helpers = ['apache', 'defineDeploy', ...(options.prisma ? ['dockerInfra'] : []), 'pm2', ...(options.auth ? ['secret'] : [])];
+    const build = [...(options.prisma ? [`prisma: ['prisma.config.ts']`] : []), `script: 'build'`, ...(options.ui ? [`web: 'web'`] : [])];
+    return `/**
+ * Production deploy with @basaltkit/deploy, on one Linux server. Holds no secrets.
+ *
+ *   node node_modules/@basaltkit/deploy/dist/bin.js check   # this file, without a server (CI)
+ *   node node_modules/@basaltkit/deploy/dist/bin.js plan    # on the server: what run would do
+ *   node node_modules/@basaltkit/deploy/dist/bin.js run
+ *
+ * Rewrite it from the project at any time:
+ *   node node_modules/@basaltkit/deploy/dist/bin.js init --force --domain=<host>
+ */
+import type { env } from './src/env.js'
+import { ${helpers.join(', ')} } from '@basaltkit/deploy'
+
+export default defineDeploy<typeof env>({
+  app: '${app}',
+  domain: '${app}.example.com', // the domain the app answers on
+
+  env: {
+    schema: 'src/env.ts',
+    fixed: { NODE_ENV: 'production', HOST: '127.0.0.1' },${options.auth ? `
+    generate: { APP_SECRET: secret(32) },` : ''}
+  },${options.prisma ? `
+  infra: dockerInfra('${app}', { redis: false }),` : ''}
+  build: { ${build.join(', ')} },${options.prisma ? `
+  migrate: { central: true },` : ''}
+
+  runtime: pm2(),
+  proxy: apache(),
+  health: { path: '/health' },
+})
+`;
+}
 export function gitignore(options) {
     return `node_modules/
 dist/

package/dist/versions.js

@@ -11,6 +11,7 @@ export const SCAFFOLD_VERSIONS = {
     '@basaltkit/cli': '^1.4.1',
     '@basaltkit/config': '^1.1.2',
     '@basaltkit/core': '^1.6.0',
+    '@basaltkit/deploy': '^0.3.0',
     '@basaltkit/env': '^3.1.1',
     '@basaltkit/events': '^1.3.0',
     '@basaltkit/fastify': '^3.0.0',
@@ -27,5 +28,5 @@ export const SCAFFOLD_VERSIONS = {
     '@basaltkit/tenancy': '^4.0.0',
     '@basaltkit/tenancy-prisma': '^3.0.0',
     '@basaltkit/testing': '^3.0.0',
-    'create-basalt': '^1.13.0',
+    'create-basalt': '^1.14.0',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-basalt",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "engines": {
     "node": ">=22.5.0"
   },
@@ -32,25 +32,26 @@
     "typescript": "^7.0.2",
     "vitest": "^5.0.1",
     "zod": "^4.6.5",
+    "@basaltkit/auth": "^5.0.0",
     "@basaltkit/auth-prisma": "^3.0.0",
     "@basaltkit/cli": "^1.4.1",
     "@basaltkit/config": "^1.1.2",
     "@basaltkit/core": "^1.6.0",
-    "@basaltkit/auth": "^5.0.0",
-    "@basaltkit/events": "^1.3.0",
     "@basaltkit/env": "^3.1.1",
+    "@basaltkit/events": "^1.3.0",
     "@basaltkit/fastify": "^3.0.0",
-    "@basaltkit/mcp": "^6.0.0",
-    "@basaltkit/prisma": "^4.0.0",
     "@basaltkit/generator": "^1.6.0",
     "@basaltkit/logger": "^1.3.0",
+    "@basaltkit/prisma": "^4.0.0",
     "@basaltkit/subscriptions": "^6.0.0",
-    "@basaltkit/subscriptions-prisma": "^4.0.0",
+    "@basaltkit/deploy": "^0.3.0",
+    "@basaltkit/mcp": "^6.0.0",
     "@basaltkit/teams": "^4.1.1",
-    "@basaltkit/teams-prisma": "^1.1.0",
-    "@basaltkit/tenancy": "^4.0.0",
+    "@basaltkit/subscriptions-prisma": "^4.0.0",
     "@basaltkit/tenancy-prisma": "^3.0.0",
+    "@basaltkit/teams-prisma": "^1.1.0",
     "@basaltkit/testing": "^3.0.0",
+    "@basaltkit/tenancy": "^4.0.0",
     "@basaltkit/tsconfig": "^0.24.0"
   },
   "publishConfig": {