create-vista-app 0.3.0 → 0.3.3

package/bin/cli.js

@@ -70,17 +70,24 @@ const explicitFlashpack = rawArgs.includes('--flashpack');
 const explicitDefaultEngine = rawArgs.includes('--default-engine');
 const explicitEngine = getFlagValue('--engine');
 const explicitPackageManager = getExplicitPackageManagerFromArgs(rawArgs);
+const explicitSrcDir =
+  rawArgs.includes('--src-dir') || rawArgs.includes('--src')
+    ? true
+    : rawArgs.includes('--no-src-dir')
+      ? false
+      : undefined;
 
 if (process.argv.includes('--help') || process.argv.includes('-h')) {
   console.log(`
 Usage:
-  ${usageCommand} [--typed-api] [--skip-install] [--no-git] [--yes] [--no-deploy-templates] [--engine <default|flashpack>] [--flashpack] [--default-engine] [--package-manager <npm|pnpm|yarn|bun>] [--npm|--pnpm|--yarn|--bun]
+  ${usageCommand} [--typed-api] [--skip-install] [--no-git] [--yes] [--no-deploy-templates] [--engine <default|flashpack>] [--flashpack] [--default-engine] [--src-dir|--no-src-dir] [--package-manager <npm|pnpm|yarn|bun>] [--npm|--pnpm|--yarn|--bun]
 
 Example:
   npx create-vista-app@latest my-vista-app
   npx create-vista-app@latest
   npx create-vista-app@latest my-vista-app --typed-api
   npx create-vista-app@latest my-vista-app --flashpack
+  npx create-vista-app@latest my-vista-app --src-dir
   npx create-vista-app@latest my-vista-app --package-manager pnpm
 `);
   process.exit(0);
@@ -91,6 +98,16 @@ if (explicitFlashpack && explicitDefaultEngine) {
   process.exit(1);
 }
 
+if (rawArgs.includes('--src-dir') && rawArgs.includes('--no-src-dir')) {
+  console.error('Error: use only one of --src-dir or --no-src-dir.');
+  process.exit(1);
+}
+
+if (rawArgs.includes('--src') && rawArgs.includes('--no-src-dir')) {
+  console.error('Error: use only one of --src / --src-dir or --no-src-dir.');
+  process.exit(1);
+}
+
 if (explicitEngine && !['default', 'flashpack'].includes(explicitEngine)) {
   console.error(`Error: unsupported engine "${explicitEngine}". Use "default" or "flashpack".`);
   process.exit(1);
@@ -124,12 +141,13 @@ async function resolveProjectName() {
   }
   return value;
 }
-async function confirmProceed(projectName, projectDir, engine, packageManager) {
+async function confirmProceed(projectName, projectDir, engine, packageManager, useSrcDir) {
   if (assumeYes || !canPrompt) return true;
+  const layout = useSrcDir ? 'src/app' : 'app';
   const response = await prompts({
     type: 'confirm',
     name: 'proceed',
-    message: `Create Vista app "${projectName}" in ${projectDir} (engine: ${engine}, package manager: ${packageManager})?`,
+    message: `Create Vista app "${projectName}" in ${projectDir} (engine: ${engine}, layout: ${layout}, package manager: ${packageManager})?`,
     initial: true,
   });
   return response.proceed !== false;
@@ -168,6 +186,25 @@ async function resolveEngineChoice() {
   return value;
 }
 
+async function resolveSrcDirChoice() {
+  if (typeof explicitSrcDir === 'boolean') return explicitSrcDir;
+  if (assumeYes || !canPrompt) return false;
+
+  const response = await prompts({
+    type: 'confirm',
+    name: 'useSrcDir',
+    message: 'Would you like to use a `src/` directory?',
+    initial: false,
+  });
+
+  if (typeof response.useSrcDir !== 'boolean') {
+    console.log('Aborted.');
+    process.exit(0);
+  }
+
+  return response.useSrcDir;
+}
+
 async function resolvePackageManagerChoice() {
   if (explicitPackageManager) return explicitPackageManager;
   if (assumeYes || !canPrompt) return detectedPackageManager;
@@ -277,15 +314,27 @@ function applyEngineToVistaConfig(projectDir, selectedEngine) {
   fs.writeFileSync(configPath, patched);
 }
 
-function applyReadmeSelections(projectDir, selectedEngine, useTypedApi) {
+function applyReadmeSelections(projectDir, selectedEngine, useTypedApi, useSrcDir = false) {
   const readmePath = path.join(projectDir, 'README.md');
   if (!fs.existsSync(readmePath)) return;
 
-  const source = fs.readFileSync(readmePath, 'utf8');
-  const patched = source
+  let source = fs.readFileSync(readmePath, 'utf8');
+  source = source
     .replace(/__VISTA_ENGINE__/g, selectedEngine)
     .replace(/__VISTA_TYPED_API__/g, useTypedApi ? 'enabled' : 'disabled');
-  fs.writeFileSync(readmePath, patched);
+
+  if (useSrcDir) {
+    source = source
+      .replace(/Add pages under `app`\./g, 'Add pages under `src/app`.')
+      .replace(/`app\/api\/\*\*\/route\.ts`/g, '`src/app/api/**/route.ts`')
+      .replace(/`app\/agents\//g, '`src/app/agents/')
+      .replace(
+        /```\napp\/\n├── root\.tsx[\s\S]*?vista\.config\.ts\n```/,
+        '```\nsrc/\n├── app/\n│   ├── root.tsx        # Root layout\n│   ├── index.tsx       # Home → /\n│   ├── globals.css\n│   └── about/page.tsx  # → /about\n└── components/\npublic/\nvista.config.ts\n```'
+      );
+  }
+
+  fs.writeFileSync(readmePath, source);
 }
 
 function applyFlashpackStarterTheme(projectDir) {
@@ -295,6 +344,56 @@ function applyFlashpackStarterTheme(projectDir) {
   }
 }
 
+/**
+ * Move app/ + components/ under src/ (Next-style layout).
+ * Call after all template overlays so flashpack/typed files move too.
+ */
+function applySrcDirectoryLayout(projectDir) {
+  const srcDir = path.join(projectDir, 'src');
+  fs.mkdirSync(srcDir, { recursive: true });
+
+  const moves = [
+    ['app', path.join('src', 'app')],
+    ['components', path.join('src', 'components')],
+  ];
+
+  for (const [fromRel, toRel] of moves) {
+    const from = path.join(projectDir, fromRel);
+    const to = path.join(projectDir, toRel);
+    if (!fs.existsSync(from)) continue;
+    if (fs.existsSync(to)) {
+      // Merge: move children into existing target
+      for (const entry of fs.readdirSync(from)) {
+        const srcPath = path.join(from, entry);
+        const destPath = path.join(to, entry);
+        if (fs.existsSync(destPath)) {
+          fs.rmSync(destPath, { recursive: true, force: true });
+        }
+        fs.renameSync(srcPath, destPath);
+      }
+      fs.rmSync(from, { recursive: true, force: true });
+    } else {
+      fs.renameSync(from, to);
+    }
+  }
+
+  // Point @/* at src/* for the common import alias.
+  const tsconfigPath = path.join(projectDir, 'tsconfig.json');
+  if (fs.existsSync(tsconfigPath)) {
+    try {
+      const tsconfig = JSON.parse(fs.readFileSync(tsconfigPath, 'utf8'));
+      tsconfig.compilerOptions = tsconfig.compilerOptions || {};
+      tsconfig.compilerOptions.paths = {
+        ...(tsconfig.compilerOptions.paths || {}),
+        '@/*': ['./src/*'],
+      };
+      fs.writeFileSync(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}\n`);
+    } catch {
+      // Keep scaffold resilient if tsconfig is unexpected.
+    }
+  }
+}
+
 function applyDeployTemplates(projectDir, options = {}) {
   const deployTemplateDir = path.join(__dirname, '../template/deploy');
   if (!fs.existsSync(deployTemplateDir)) return;
@@ -318,6 +417,7 @@ async function main() {
   const currentDir = process.cwd();
   const projectName = await resolveProjectName();
   const selectedEngine = await resolveEngineChoice();
+  const useSrcDir = await resolveSrcDirChoice();
   const selectedPackageManager = await resolvePackageManagerChoice();
   const projectDir = path.join(currentDir, projectName);
 
@@ -325,7 +425,8 @@ async function main() {
     projectName,
     projectDir,
     selectedEngine,
-    selectedPackageManager
+    selectedPackageManager,
+    useSrcDir
   );
   if (!proceed) {
     console.log('Aborted.');
@@ -352,7 +453,7 @@ async function main() {
   }
 
   applyEngineToVistaConfig(projectDir, selectedEngine);
-  applyReadmeSelections(projectDir, selectedEngine, useTypedApiStarter);
+  applyReadmeSelections(projectDir, selectedEngine, useTypedApiStarter, useSrcDir);
   if (selectedEngine === 'flashpack') {
     applyFlashpackStarterTheme(projectDir);
   }
@@ -361,6 +462,11 @@ async function main() {
     console.log('Added deployment templates (render.yaml, Dockerfile).');
   }
 
+  if (useSrcDir) {
+    applySrcDirectoryLayout(projectDir);
+    console.log('Using src/ directory layout (src/app, src/components).');
+  }
+
   console.log('Scaffolding complete.');
 
   // 3. Setup Dependencies (production-ready)
@@ -378,7 +484,7 @@ async function main() {
       react: '^19.0.0',
       'react-dom': '^19.0.0',
       'react-server-dom-webpack': '^19.0.0',
-      vista: useLocal ? 'file:../packages/vista' : 'npm:@vistagenic/vista@latest',
+      vista: useLocal ? 'file:../packages/vista' : 'npm:@vistagenic/vista@0.3.3',
       'lucide-react': '^0.468.0',
       // CSS build (needed in production for vista build)
       postcss: '^8.0.0',
@@ -500,6 +606,7 @@ coverage/
   console.log(`
 ✨ Success! Created ${projectName} at ${projectDir}
 Engine: ${selectedEngine}
+Layout: ${useSrcDir ? 'src/app' : 'app'}
 Package manager: ${selectedPackageManager}
 
 Get started by running:
@@ -525,6 +632,7 @@ module.exports = {
   applyEngineToVistaConfig,
   applyReadmeSelections,
   applyFlashpackStarterTheme,
+  applySrcDirectoryLayout,
 };
 
 if (require.main === module) {

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "create-vista-app",
-  "version": "0.3.0",
-  "description": "Create Vista applications with one command",
-  "bin": {
-    "create-vista-app": "./bin/cli.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Mantitup-Org/vista.git",
-    "directory": "packages/create-vista-app"
-  },
-  "author": "Vista Team",
-  "license": "MIT",
-  "keywords": [
-    "create",
-    "vista",
-    "react",
-    "scaffold",
-    "cli"
-  ],
-  "files": [
-    "bin",
-    "template",
-    "template-typed"
-  ],
-  "dependencies": {
-    "fs-extra": "^11.1.1",
-    "picocolors": "^1.0.0",
-    "prompts": "^2.4.2"
-  },
-  "devDependencies": {
-    "@types/react": "^19.0.0",
-    "@types/react-dom": "^19.0.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0"
-  },
-  "gitHead": "d1b9f715d6365d8e1f553e96b752fbce8d98df7c"
-}
+{
+  "name": "create-vista-app",
+  "version": "0.3.3",
+  "description": "Create Vista applications with one command",
+  "bin": {
+    "create-vista-app": "./bin/cli.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Mantitup-Org/vista.git",
+    "directory": "packages/create-vista-app"
+  },
+  "author": "Vista Team",
+  "license": "MIT",
+  "keywords": [
+    "create",
+    "vista",
+    "react",
+    "scaffold",
+    "cli"
+  ],
+  "files": [
+    "bin",
+    "template",
+    "template-typed"
+  ],
+  "dependencies": {
+    "fs-extra": "^11.1.1",
+    "picocolors": "^1.0.0",
+    "prompts": "^2.4.2"
+  },
+  "devDependencies": {
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  },
+  "gitHead": "d1b9f715d6365d8e1f553e96b752fbce8d98df7c"
+}

package/template/deploy/Dockerfile

@@ -11,7 +11,8 @@ FROM node:20-alpine AS runner
 WORKDIR /app
 ENV NODE_ENV=production
 ENV PORT=3003
-COPY --from=builder /app/.vista ./.vista
 COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/.vista ./.vista
 EXPOSE 3003
 CMD ["node", ".vista/standalone/server.js"]

package/template/deploy/netlify.toml

@@ -1,7 +1,22 @@
 [build]
   command = "npm run build"
   publish = ".vista/deploy/netlify"
+  functions = "netlify/functions"
+
+[functions]
+  node_bundler = "none"
+  included_files = ["netlify/functions/.vista/**", "netlify/functions/node_modules/**"]
 
 [dev]
   command = "npm run dev"
   port = 3003
+
+[[redirects]]
+  from = "/_vista/*"
+  to = "/_vista/:splat"
+  status = 200
+
+[[redirects]]
+  from = "/*"
+  to = "/.netlify/functions/ssr"
+  status = 200

package/template/deploy/vercel.json

@@ -1,16 +1,7 @@
 {
   "version": 2,
   "buildCommand": "npm run build",
-  "outputDirectory": ".vista",
-  "framework": null,
   "installCommand": "npm install --legacy-peer-deps --no-audit --no-fund",
-  "devCommand": "npm run dev",
-  "routes": [
-    { "handle": "filesystem" },
-    { "src": "^/_vista/(.*)$", "dest": "/$1" },
-    { "src": "^/(?:rsc|_rsc)/?$", "dest": "/static/pages/index.rsc" },
-    { "src": "^/(?:rsc|_rsc)/(.+)$", "dest": "/static/pages/$1.rsc" },
-    { "src": "^/$", "dest": "/static/pages/index.html" },
-    { "src": "^/(.+)$", "dest": "/static/pages/$1.html" }
-  ]
+  "framework": null,
+  "devCommand": "npm run dev"
 }

package/template/deploy/wrangler.toml

@@ -1,3 +1,19 @@
 name = "my-vista-app"
-compatibility_date = "2024-09-01"
-pages_build_output_dir = ".vista/deploy/cloudflare"
+compatibility_date = "2026-09-20"
+main = ".vista/deploy/cloudflare/worker.js"
+
+[vars]
+VISTA_RUNTIME = "standalone"
+
+[[containers]]
+class_name = "VistaSSR"
+image = "./Dockerfile"
+max_instances = 4
+
+[[durable_objects.bindings]]
+name = "VISTA_SSR"
+class_name = "VistaSSR"
+
+[[migrations]]
+tag = "v1"
+new_sqlite_classes = ["VistaSSR"]