create-trokky 0.1.5 → 0.1.6

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

@@ -134,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 = [
@@ -150,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') {

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);

package/package.json

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