create-trokky 0.1.4 → 0.1.6

package/dist/cli.js

@@ -86,6 +86,8 @@ async function main() {
             console.log(`  # ${secret.name}=   (${secret.optional ? 'optional — ' : ''}${secret.why})`);
         }
     }
+    if (config.target === 'workers')
+        console.log('  echo TROKKY_ENV=development >> .dev.vars');
     console.log('  npm install');
     console.log(config.target === 'workers' ? '  npm run build && npm run preview' : '  npm run dev');
 }

package/dist/emit.d.ts

@@ -11,7 +11,8 @@ export declare function astroConfig(config: ProjectConfig): string;
  * takes its bindings from `cloudflare:workers`, a server is handed the core through Astro locals.
  */
 export declare function pageHelper(config: ProjectConfig): string;
-export declare function wranglerConfig(config: ProjectConfig): string;
+/** `seedFiles`: the project ships public/seed/, which the sample-content seed reads through ASSETS. */
+export declare function wranglerConfig(config: ProjectConfig, seedFiles?: boolean): string;
 /** The Worker's Trokky wiring: which adapters are imported is the composition, literally. */
 export declare function workersCore(config: ProjectConfig): string;
 export declare function workersEntry(config: ProjectConfig): string;

package/dist/emit.js

@@ -56,7 +56,8 @@ export function packageJson(config) {
         else {
             scripts.dev = 'tsx watch src/server.ts';
             scripts.build = 'tsc -p tsconfig.json';
-            scripts.start = 'node dist/server.js';
+            // rootDir is the project, so tsc mirrors src/ under dist/
+            scripts.start = 'node dist/src/server.js';
         }
     }
     return JSON.stringify({
@@ -133,10 +134,14 @@ export async function load(astro: AstroGlobal): Promise<Site> {
 }
 `;
 }
-export function wranglerConfig(config) {
+/** `seedFiles`: the project ships public/seed/, which the sample-content seed reads through ASSETS. */
+export function wranglerConfig(config, seedFiles = false) {
+    // An API-only project whose sample content ships files still binds ./public: the seed reads
+    // them through the binding, and run_worker_first keeps them from being served. One whose seed
+    // has no files has no public/ at all, and wrangler refuses a missing assets directory.
     const assets = hasFrontend(config)
         ? `"./dist/client"`
-        : hasStudio(config)
+        : hasStudio(config) || seedFiles
             ? `"./public"`
             : null;
     const lines = [
@@ -149,7 +154,15 @@ export function wranglerConfig(config) {
         '  "compatibility_flags": ["nodejs_compat"],',
     ];
     if (assets) {
-        lines.push('  "assets": {', `    "directory": ${assets},`, '    "binding": "ASSETS",', '    // Every request goes through the Worker: /studio needs its config injected, and /api', '    // is not a file. Static files are fetched through the binding by the handlers.', '    "run_worker_first": true,', '    "html_handling": "none",', '    "not_found_handling": "none"', '  },');
+        lines.push('  "assets": {', `    "directory": ${assets},`, '    "binding": "ASSETS",', ...(hasStudio(config)
+            ? [
+                '    // Every request goes through the Worker: /studio needs its config injected, and /api',
+                '    // is not a file. Static files are fetched through the binding by the handlers.',
+            ]
+            : [
+                '    // Only the sample-content seed reads these, through the binding. Every request goes',
+                '    // through the Worker, which serves nothing outside /api, so none of them is public.',
+            ]), '    "run_worker_first": true,', '    "html_handling": "none",', '    "not_found_handling": "none"', '  },');
     }
     lines.push('  "d1_databases": [', `    { "binding": "DB", "database_name": ${JSON.stringify(config.name)}, "database_id": "" }`, '  ],', '  "r2_buckets": [', `    { "binding": "MEDIA", "bucket_name": ${JSON.stringify(config.name + '-media')} }`, '  ],');
     if (config.images === 'cloudflare-images') {
@@ -457,7 +470,10 @@ export function envExample(config) {
         lines.push(...comment(secret.why), `${secret.name}=`, '');
     }
     if (edge) {
-        lines.push(...comment('Local development only: keep this line in .dev.vars and never set it on the deployed'), ...comment('Worker, which must run with the production checks.'), 'TROKKY_ENV=development', '');
+        // TROKKY_ENV=development is not listed here: the deploy button offers every line of this
+        // file as a value to set on the deployed Worker, which must run with the production checks.
+        // The README adds it to the local .dev.vars instead.
+        lines.push(...comment('For local development, also add TROKKY_ENV=development to your .dev.vars (the'), ...comment('README shows how). Never set it on the deployed Worker.'), '');
     }
     if (config.data === 'postgres-data')
         lines.push('# Postgres connection string.', 'DATABASE_URL=', '');

package/dist/generate.js

@@ -54,7 +54,8 @@ export function generate(config, source) {
         tree.set('src/trokky/page.ts', emit.pageHelper(config));
     }
     if (config.target === 'workers') {
-        tree.set('wrangler.jsonc', emit.wranglerConfig(config));
+        const seedFiles = [...tree.keys()].some(k => k.startsWith('public/seed/'));
+        tree.set('wrangler.jsonc', emit.wranglerConfig(config, seedFiles));
         tree.set('src/worker.ts', emit.workersEntry(config));
         tree.set('src/trokky/core.ts', emit.workersCore(config));
         tree.set('.dev.vars.example', emit.envExample(config));
@@ -68,8 +69,9 @@ export function generate(config, source) {
     if (!hasStudio(config)) {
         tree.delete('scripts/copy-studio.mjs');
     }
-    // Seed assets are only reachable when something serves static files.
-    if (config.content === 'blank' || (config.target === 'workers' && !hasStudio(config) && !hasFrontend(config))) {
+    // Blank content has nothing to seed. Every other project reads its seed files: from disk on
+    // Node, through the assets binding on Workers (bound for API-only projects too).
+    if (config.content === 'blank') {
         for (const path of [...tree.keys()])
             if (path.startsWith('public/seed/'))
                 tree.delete(path);
@@ -99,6 +101,7 @@ Generated with \`npm create trokky@latest\`.
 
 \`\`\`
 ${edge ? `cp .dev.vars.example .dev.vars   # fill both secrets
+echo TROKKY_ENV=development >> .dev.vars
 npm install
 npm run build && npm run preview` : `cp .env.example .env             # fill both secrets
 npm install
@@ -109,16 +112,28 @@ ${edge ? `## Deploy
 
 \`\`\`
 npm run build && npm run deploy
+npx wrangler secret put TROKKY_CLAIM_SECRET
+npx wrangler secret put TROKKY_JWT_SECRET
 \`\`\`
 
+\`.dev.vars\` is not uploaded, so the deployed Worker needs its own secrets; without
+\`TROKKY_JWT_SECRET\` it answers with an error. Set the claim secret first: once the JWT secret
+is in, the site answers, and an unset claim secret leaves the claim open.
+
 Wrangler provisions the D1 database and R2 bucket named in \`wrangler.jsonc\` on first deploy.
 \`database_id\` is intentionally empty: it is bound by name.
 
 ` : ''}## The first minute
 
-Open ${hasStudio(config) ? '`/studio`' : 'the API'}. Nobody owns this instance yet, so the first
-screen asks you to **claim** it: pick a username and password, and paste \`TROKKY_CLAIM_SECRET\`.
-${config.content === 'blank' ? '' : 'Sample content appears a moment later — edit it or delete it.'}
+${hasStudio(config) ? `Open \`/studio\`. Nobody owns this instance yet, so the first screen asks you to **claim** it:
+pick a username, an email and a password, and paste \`TROKKY_CLAIM_SECRET\`.` : `Nobody owns this instance yet. **Claim** it over HTTP (on a deployed site, use its URL instead of
+localhost); the response signs you in:
+
+\`\`\`
+curl -X POST http://localhost:${edge ? '8787' : '3000'}/api/auth/claim -H 'Content-Type: application/json' \\
+  -d '{"username":"admin","email":"you@example.com","password":"<a strong password>","secret":"<TROKKY_CLAIM_SECRET>"}'
+\`\`\``}
+${config.content === 'blank' ? '' : edge ? 'Sample content appears a moment after the claim — edit it or delete it.' : 'Sample content is written at the first start — edit it or delete it.'}
 
 Without a claim secret the claim is open to whoever reaches the URL first. That is fine for the
 minute between deploying and opening the link; it is not fine for an instance left sitting.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-trokky",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Compose a Trokky project: pick the target, adapters and parts you want.",
   "type": "module",
   "license": "MIT",