@olonjs/cli 3.0.155 → 3.0.157

package/assets/src_tenant_alpha.sh

@@ -1817,9 +1817,9 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^1.1.22",
-    "@olonjs/react": "^0.1.5",
-    "@olonjs/studio": "^0.1.5",
+    "@olonjs/core": "^1.1.25",
+    "@olonjs/react": "^0.1.8",
+    "@olonjs/studio": "^0.1.8",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",

package/assets/templates/alpha/src_tenant.sh

@@ -1817,9 +1817,9 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^1.1.22",
-    "@olonjs/react": "^0.1.5",
-    "@olonjs/studio": "^0.1.5",
+    "@olonjs/core": "^1.1.25",
+    "@olonjs/react": "^0.1.8",
+    "@olonjs/studio": "^0.1.8",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",

package/assets/templates/next/src_tenant.sh

@@ -334,32 +334,32 @@ body {
 END_OF_FILE_CONTENT
 echo "Creating app/layout.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "app/layout.tsx"
-import type { Metadata } from 'next';
-import type { ReactNode } from 'react';
-import { getFileSiteBundle } from '@/lib/loaders/getFileSiteConfig';
-import { serializeThemeRootCss } from '@/lib/css/serializeThemeRootCss';
-import './globals.css';
-
-export const metadata: Metadata = {
-  title: 'OlonJS Next Starter',
-  description: 'RSC visitors + admin client island (ADR-0017)',
-};
-
-export default function RootLayout({ children }: { children: ReactNode }) {
-  const { themeConfig } = getFileSiteBundle();
-  const themeCss = serializeThemeRootCss(themeConfig);
-
-  return (
-    <html lang="en">
-      <head>
-        {themeCss ? (
-          <style id="olon-theme-vars" dangerouslySetInnerHTML={{ __html: themeCss }} />
-        ) : null}
-      </head>
-      <body className="min-h-screen bg-background text-foreground antialiased">{children}</body>
-    </html>
-  );
-}
+import type { Metadata } from 'next';
+import type { ReactNode } from 'react';
+import { getFileSiteBundle } from '@/lib/loaders/getFileSiteConfig';
+import { serializeThemeRootCss } from '@/lib/css/serializeThemeRootCss';
+import './globals.css';
+
+export const metadata: Metadata = {
+  title: 'OlonJS Next Starter',
+  description: 'RSC visitors + admin client island (ADR-0017)',
+};
+
+export default function RootLayout({ children }: { children: ReactNode }) {
+  const { themeConfig } = getFileSiteBundle();
+  const themeCss = serializeThemeRootCss(themeConfig);
+
+  return (
+    <html lang="en">
+      <head>
+        {themeCss ? (
+          <style id="olon-theme-vars" dangerouslySetInnerHTML={{ __html: themeCss }} />
+        ) : null}
+      </head>
+      <body className="min-h-screen bg-background text-foreground antialiased">{children}</body>
+    </html>
+  );
+}
 
 END_OF_FILE_CONTENT
 echo "Creating app/not-found.tsx..."
@@ -455,6 +455,15 @@ const publicPageJsonRewrites = [
 const nextConfig: NextConfig = {
   reactStrictMode: true,
   transpilePackages: ['@olonjs/next', '@olonjs/core', '@olonjs/react', '@olonjs/studio'],
+  /**
+   * Visitor/admin loaders read `src/data/**` via runtime `fs` (`getFilePages`, etc.).
+   * Those JSON files are never statically imported, so NFT omits them from the
+   * Vercel serverless bundle unless we force-include them — otherwise
+   * `getFilePages()` returns {} and the site shows EmptyTenantView.
+   */
+  outputFileTracingIncludes: {
+    '/*': ['./src/data/**/*'],
+  },
   async rewrites() {
     return publicPageJsonRewrites;
   },
@@ -472,19 +481,20 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
   "type": "module",
   "scripts": {
     "dev": "next dev",
+    "prebuild": "node scripts/sync-pages-to-public.mjs",
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
     "test": "vitest run",
     "typecheck": "tsc --noEmit",
-    "dist": "bash ./src2Code.sh --template next app src middleware.ts next.config.ts postcss.config.mjs tsconfig.json package.json next-env.d.ts vitest.config.ts",
+    "dist": "bash ./src2Code.sh --template next app src scripts middleware.ts next.config.ts postcss.config.mjs tsconfig.json package.json next-env.d.ts vitest.config.ts",
     "dist:dna": "npm run dist"
   },
   "dependencies": {
-    "@olonjs/core": "^1.1.22",
-    "@olonjs/next": "^0.0.2",
-    "@olonjs/react": "^0.1.5",
-    "@olonjs/studio": "^0.1.5",
+    "@olonjs/core": "^1.1.25",
+    "@olonjs/next": "^0.0.5",
+    "@olonjs/react": "^0.1.8",
+    "@olonjs/studio": "^0.1.8",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
     "next": "^15.5.0",
@@ -517,6 +527,57 @@ const config = {
 
 export default config;
 
+END_OF_FILE_CONTENT
+mkdir -p "scripts"
+echo "Creating scripts/sync-pages-to-public.mjs..."
+cat << 'END_OF_FILE_CONTENT' > "scripts/sync-pages-to-public.mjs"
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+/**
+ * Mirror Vite/alpha Save2Repo publish surface:
+ * src/data/pages → public/pages
+ * src/data/collections → public/collections
+ * src/data/config/site.json → public/config/site.json
+ *
+ * Required so static boot can HTTP-fetch same-origin published JSON without
+ * hitting the /*.json → /api/public-page rewrite loop (afterFiles only skips
+ * when a real file exists under public/).
+ */
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const rootDir = path.resolve(__dirname, '..');
+const sourceDir = path.join(rootDir, 'src', 'data', 'pages');
+const targetDir = path.join(rootDir, 'public', 'pages');
+const sourceCollectionsDir = path.join(rootDir, 'src', 'data', 'collections');
+const targetCollectionsDir = path.join(rootDir, 'public', 'collections');
+const sourceSiteConfigPath = path.join(rootDir, 'src', 'data', 'config', 'site.json');
+const targetConfigDir = path.join(rootDir, 'public', 'config');
+const targetSiteConfigPath = path.join(targetConfigDir, 'site.json');
+
+if (!fs.existsSync(sourceDir)) {
+  console.warn('[sync-pages-to-public] Source directory not found:', sourceDir);
+  process.exit(0);
+}
+
+fs.rmSync(targetDir, { recursive: true, force: true });
+fs.mkdirSync(targetDir, { recursive: true });
+fs.cpSync(sourceDir, targetDir, { recursive: true });
+
+fs.rmSync(targetCollectionsDir, { recursive: true, force: true });
+if (fs.existsSync(sourceCollectionsDir)) {
+  fs.mkdirSync(targetCollectionsDir, { recursive: true });
+  fs.cpSync(sourceCollectionsDir, targetCollectionsDir, { recursive: true });
+}
+
+if (fs.existsSync(sourceSiteConfigPath)) {
+  fs.mkdirSync(targetConfigDir, { recursive: true });
+  fs.cpSync(sourceSiteConfigPath, targetSiteConfigPath);
+}
+
+console.log('[sync-pages-to-public] Synced pages, collections, and site config to public/');
+
 END_OF_FILE_CONTENT
 mkdir -p "src"
 mkdir -p "src/collections"

package/package.json

@@ -1,47 +1,47 @@
 {
-    "name": "@olonjs/cli",
-    "version": "3.0.155",
-    "description": "The Sovereign CLI Engine for OlonJS.",
-    "type": "module",
-    "bin": {
-        "olonjs": "./src/index.js",
-        "jsonpages": "./src/index.js"
-    },
-    "files": [
-        "src",
-        "assets/src_tenant_alpha.sh",
-        "assets/templates"
-    ],
-    "author": "JsonPages Team",
-    "license": "MIT",
-    "homepage": "https://github.com/olonjs/npm-jpcore#readme",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/olonjs/npm-jpcore.git",
-        "directory": "packages/cli"
-    },
-    "bugs": {
-        "url": "https://github.com/olonjs/npm-jpcore/issues"
-    },
-    "publishConfig": {
-        "access": "public"
-    },
-    "scripts": {
-        "build": "tsc -p .",
-        "test": "node --test src/**/*.test.js",
-        "check:templates": "node ../../scripts/check-cli-templates.mjs"
-    },
-    "dependencies": {
-        "@olonjs/stack": "^1.0.0",
-        "chalk": "^5.3.0",
-        "commander": "^12.1.0",
-        "execa": "^9.0.2",
-        "fs-extra": "^11.2.0",
-        "ora": "^8.0.1"
-    },
-    "devDependencies": {
-        "@types/fs-extra": "^11.0.4",
-        "@types/node": "^22.13.1",
-        "typescript": "^5.7.3"
-    }
+  "name": "@olonjs/cli",
+  "version": "3.0.157",
+  "description": "The Sovereign CLI Engine for OlonJS.",
+  "type": "module",
+  "bin": {
+    "olonjs": "./src/index.js",
+    "jsonpages": "./src/index.js"
+  },
+  "files": [
+    "src",
+    "assets/src_tenant_alpha.sh",
+    "assets/templates"
+  ],
+  "author": "JsonPages Team",
+  "license": "MIT",
+  "homepage": "https://github.com/olonjs/npm-jpcore#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/olonjs/npm-jpcore.git",
+    "directory": "packages/cli"
+  },
+  "bugs": {
+    "url": "https://github.com/olonjs/npm-jpcore/issues"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc -p .",
+    "test": "node --test src/**/*.test.js",
+    "check:templates": "node ../../scripts/check-cli-templates.mjs"
+  },
+  "dependencies": {
+    "@olonjs/stack": "^1.0.0",
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "execa": "^9.0.2",
+    "fs-extra": "^11.2.0",
+    "ora": "^8.0.1"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^22.13.1",
+    "typescript": "^5.7.3"
+  }
 }