create-fff-app 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fff-app",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Scaffold a new fff-stack project",
   "bin": {
     "create-fff-app": "src/index.ts"

package/src/index.ts

@@ -17,12 +17,29 @@ const bundledTemplate  = join(import.meta.dir, '../template');
 const monorepTemplate  = join(import.meta.dir, '../../../template');
 const TEMPLATE_DIR     = existsSync(monorepTemplate) ? monorepTemplate : bundledTemplate;
 const SKIP_DIRS    = new Set(['obj', 'bin', 'node_modules', '.git', 'dist']);
+const SKIP_EXTS    = new Set(['.js', '.js.map']);
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
+function transformContent(filename: string, content: string): string {
+  if (filename === 'package.json') {
+    // Replace monorepo file: reference with published npm version
+    content = content.replace(
+      /"@fff-stack\/fjsx-compiler":\s*"file:[^"]+"/g,
+      '"@fff-stack/fjsx-compiler": "^0.1.0"'
+    );
+  }
+  return content;
+}
+
+function hasFjsx(dir: string): boolean {
+  try { return readdirSync(dir).some(f => f.endsWith('.fjsx')); } catch { return false; }
+}
+
 function copyDir(src: string, dest: string, projectName: string) {
   const entries = readdirSync(src, { withFileTypes: true });
   mkdirSync(dest, { recursive: true });
+  const fjsxDir = hasFjsx(src);
 
   for (const entry of entries) {
     if (SKIP_DIRS.has(entry.name)) continue;
@@ -33,8 +50,11 @@ function copyDir(src: string, dest: string, projectName: string) {
     if (entry.isDirectory()) {
       copyDir(srcPath, destPath, projectName);
     } else {
+      // Skip FJSX-generated JS/map files in directories that contain .fjsx sources
+      const ext = entry.name.endsWith('.js.map') ? '.js.map' : entry.name.slice(entry.name.lastIndexOf('.'));
+      if (fjsxDir && SKIP_EXTS.has(ext)) continue;
       const raw = readFileSync(srcPath, 'utf-8');
-      const content = raw.replace(/fff-stack-app/g, projectName);
+      const content = transformContent(entry.name, raw.replace(/fff-stack-app/g, projectName));
       // npm strips .gitignore from published packages; stored as "gitignore"
       const outName = entry.name === 'gitignore' ? '.gitignore' : entry.name;
       const outPath = join(dirname(destPath), outName);
@@ -110,6 +130,9 @@ ${cdStep}
     ${dim('# Install JS dependencies')}
     ${cyan('bun install')}
 
+    ${dim('# Install Fable (F# → JS compiler)')}
+    ${cyan('dotnet tool restore')}
+
     ${dim('# Set up Cloudflare D1 (run once)')}
     ${cyan('wrangler d1 create ' + projectName + '-db')}
     ${dim('# → copy the database_id into wrangler.toml')}

package/template/src/server/Endpoints/Pages/Templates.fs

@@ -4,24 +4,23 @@ open Fable.Core
 open Fable.Core.JsInterop
 
 // ── Compiled FJSX page template modules ──────────────────────────────────────
-// These static imports are resolved at Worker startup.
-// The FJSX files must be compiled first:
-//   fjsx --dir src/server/Endpoints/Pages --out dist/server/Endpoints/Pages
+// Paths are relative to THIS source file so Fable generates correct dist-relative
+// imports. FJSX output goes to dist/server/Pages/ (4 dirs up from here, then dist/).
+// Run: fjsx --dir src/server/Endpoints/Pages --out dist/server/Pages
 
-[<ImportAll("./Layout.js")>]
+[<ImportAll("../../../../dist/server/Pages/Layout.js")>]
 let private layoutMod : obj = jsNative
 
-[<ImportAll("./EmployeeList.js")>]
+[<ImportAll("../../../../dist/server/Pages/EmployeeList.js")>]
 let private employeeListMod : obj = jsNative
 
-[<ImportAll("./EmployeeNew.js")>]
+[<ImportAll("../../../../dist/server/Pages/EmployeeNew.js")>]
 let private employeeNewMod : obj = jsNative
 
-[<ImportAll("./About.js")>]
+[<ImportAll("../../../../dist/server/Pages/About.js")>]
 let private aboutMod : obj = jsNative
 
-
-[<ImportAll("./EmployeeEdit.js")>]
+[<ImportAll("../../../../dist/server/Pages/EmployeeEdit.js")>]
 let private employeeEditMod : obj = jsNative
 // ── Render helpers ────────────────────────────────────────────────────────────
 

package/template/src/server/Server.fsproj

@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FffStack.Server" Version="0.1.2" />
+    <PackageReference Include="FffStack.Server" Version="0.1.3" />
   </ItemGroup>
 
 </Project>

package/template/src/server/Worker.fs

@@ -42,4 +42,4 @@ router.OnError(fun _ctx ex ->
 
 // ── Cloudflare Workers entry point ────────────────────────────────────────────
 
-router.ExportAsWorkerDefault()
+Router.exportWorkerDefault (router.AsFetchHandler())