@bleedingdev/modern-js-create 3.2.0-ultramodern.85 → 3.2.0-ultramodern.87

package/dist/index.js

@@ -1,3 +1,4 @@
+import { execFileSync } from "node:child_process";
 import node_crypto from "node:crypto";
 import node_fs from "node:fs";
 import node_path from "node:path";
@@ -1010,7 +1011,7 @@ function createRootPackageJson(scope, packageSource, remotes = []) {
             'ultramodern:assert-mf-types': "node ./scripts/assert-mf-types.mjs",
             'ultramodern:check': "node ./scripts/validate-ultramodern-workspace.mjs",
             'ultramodern:i18n-boundaries': "node ./scripts/check-ultramodern-i18n-boundaries.mjs",
-            postinstall: "oxfmt . '!repos/**' && node ./scripts/bootstrap-agent-skills.mjs && node ./scripts/setup-agent-reference-repos.mjs && (git rev-parse --is-inside-work-tree >/dev/null 2>&1 && lefthook install || true)",
+            postinstall: "oxfmt . '!repos/**' && node ./scripts/bootstrap-agent-skills.mjs && node ./scripts/setup-agent-reference-repos.mjs",
             check: 'pnpm format:check && pnpm lint && pnpm typecheck && pnpm skills:check && pnpm ultramodern:i18n-boundaries && pnpm ultramodern:check'
         },
         engines: {
@@ -1178,6 +1179,7 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
         private: true,
         name: ultramodern_workspace_packageName(scope, app.packageSuffix),
         version: '0.1.0',
+        type: 'module',
         scripts: {
             dev: 'modern dev',
             build: app.exposes ? `ULTRAMODERN_ZEPHYR=false modern build && node ${relativeRootFor(app.directory)}/scripts/assert-mf-types.mjs` : 'ULTRAMODERN_ZEPHYR=false modern build',
@@ -4876,7 +4878,7 @@ assert(rootPackage.scripts?.['cloudflare:deploy'] === expectedCloudflareDeploySc
 assert(rootPackage.scripts?.['cloudflare:proof'] === 'node ./scripts/proof-cloudflare-version.mjs --out .codex/reports/cloudflare-version-proof/public-url-proof.json', 'Root must expose cloudflare:proof');
 assert(rootPackage.scripts?.['skills:install'] === 'node ./scripts/bootstrap-agent-skills.mjs', 'Root must expose skills:install');
 assert(rootPackage.scripts?.['skills:check'] === 'node ./scripts/bootstrap-agent-skills.mjs --check', 'Root must expose skills:check');
-assert(rootPackage.scripts?.postinstall === "oxfmt . '!repos/**' && node ./scripts/bootstrap-agent-skills.mjs && node ./scripts/setup-agent-reference-repos.mjs && (git rev-parse --is-inside-work-tree >/dev/null 2>&1 && lefthook install || true)", 'Root postinstall must format, bootstrap agent skills, install reference repositories, and enable hooks last');
+assert(rootPackage.scripts?.postinstall === "oxfmt . '!repos/**' && node ./scripts/bootstrap-agent-skills.mjs && node ./scripts/setup-agent-reference-repos.mjs", 'Root postinstall must format, bootstrap agent skills, initialize git/hooks, and install reference repositories');
 
 const expectedAppIds = ['shell-super-app', ...fullStackVerticals.map(vertical => vertical.id)];
 const expectedCloudflareCompatibilityFlags = ['nodejs_compat', 'global_fetch_strictly_public'];
@@ -4906,6 +4908,7 @@ assert(
     JSON.stringify(expectedZephyrDependencies),
   'Shell Zephyr dependencies must reference every vertical package',
 );
+assert(shellPackage.type === 'module', 'Shell package must use ESM module mode');
 const shellContract = generatedContract.apps?.find(app => app.id === 'shell-super-app');
 assert(shellContract?.deploy?.cloudflare?.workerName === expectedWorkerName('shell-super-app'), 'Shell Cloudflare workerName is incorrect');
 assert(shellContract?.deploy?.cloudflare?.publicUrlEnv === 'ULTRAMODERN_PUBLIC_URL_SHELL_SUPER_APP', 'Shell Cloudflare public URL env is incorrect');
@@ -4932,6 +4935,7 @@ assert(!('effectServices' in topology), 'Default APIs must be vertical-owned, no
 for (const vertical of fullStackVerticals) {
   const packageJson = readJson(\`\${vertical.path}/package.json\`);
   assert(packageJson.name === vertical.packageName, \`\${vertical.id} package name is incorrect\`);
+  assert(packageJson.type === 'module', \`\${vertical.id} package must use ESM module mode\`);
   assert(packageJson.scripts?.['cloudflare:deploy'] === 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true pnpm run cloudflare:build && wrangler deploy --config .output/wrangler.json', \`\${vertical.id} must expose cloudflare:deploy\`);
   assert(packageJson.scripts?.['cloudflare:proof']?.includes(\`--app \${vertical.id}\`), \`\${vertical.id} must expose cloudflare:proof\`);
   assert(packageJson.dependencies?.['@modern-js/plugin-bff'], \`\${vertical.id} must depend on plugin-bff\`);
@@ -6236,6 +6240,91 @@ function writeSingleAppPackageSourceEvidence(targetDir, packageSource, useWorksp
     });
     node_fs.writeFileSync(evidencePath, `${JSON.stringify(createSingleAppPackageSourceEvidence(packageSource, useWorkspaceProtocol), null, 2)}\n`);
 }
+function runSetupCommand(command, args, options = {}) {
+    return execFileSync(command, args, {
+        cwd: options.cwd,
+        encoding: 'utf-8',
+        stdio: options.stdio ?? [
+            'ignore',
+            'pipe',
+            'pipe'
+        ]
+    });
+}
+function commandExists(command) {
+    try {
+        runSetupCommand(command, [
+            '--version'
+        ], {
+            stdio: 'ignore'
+        });
+        return true;
+    } catch  {
+        return false;
+    }
+}
+function installGitForGeneratedProject() {
+    if (commandExists('git')) return;
+    const runShell = (script)=>runSetupCommand('sh', [
+            '-lc',
+            script
+        ], {
+            stdio: 'inherit'
+        });
+    const sudo = 'function' == typeof process.getuid && 0 === process.getuid() ? '' : 'sudo ';
+    if (commandExists('brew')) runSetupCommand('brew', [
+        'install',
+        'git'
+    ], {
+        stdio: 'inherit'
+    });
+    else if ('linux' === process.platform && commandExists('apt-get')) runShell(`${sudo}apt-get update && ${sudo}apt-get install -y git`);
+    else if ('linux' === process.platform && commandExists('dnf')) runShell(`${sudo}dnf install -y git`);
+    else if ('linux' === process.platform && commandExists('yum')) runShell(`${sudo}yum install -y git`);
+    else if ('linux' === process.platform && commandExists('apk')) runShell('apk add --no-cache git');
+    if (!commandExists('git')) throw new Error('Git is required for UltraModern setup. Install git and rerun create, or run pnpm skills:install after installing git.');
+}
+function isInsideGitWorkTree(targetDir) {
+    try {
+        return 'true' === runSetupCommand('git', [
+            'rev-parse',
+            '--is-inside-work-tree'
+        ], {
+            cwd: targetDir
+        }).trim();
+    } catch  {
+        return false;
+    }
+}
+function initializeGeneratedGitRepository(targetDir) {
+    installGitForGeneratedProject();
+    if (isInsideGitWorkTree(targetDir)) return;
+    try {
+        runSetupCommand('git', [
+            'init',
+            '-b',
+            'main'
+        ], {
+            cwd: targetDir,
+            stdio: 'inherit'
+        });
+    } catch  {
+        runSetupCommand('git', [
+            'init'
+        ], {
+            cwd: targetDir,
+            stdio: 'inherit'
+        });
+        runSetupCommand('git', [
+            'branch',
+            '-M',
+            'main'
+        ], {
+            cwd: targetDir,
+            stdio: 'inherit'
+        });
+    }
+}
 function isDirectoryEmpty(dirPath) {
     if (!node_fs.existsSync(dirPath)) return false;
     try {
@@ -6361,6 +6450,7 @@ async function main() {
             enableTailwind: detectTailwindFlag(),
             packageSource: detectUltramodernPackageSource(args, ultramodernPackageVersion, createPackage)
         });
+        initializeGeneratedGitRepository(targetDir);
         const dim = '\x1b[2m\x1b[3m';
         const reset = '\x1b[0m';
         console.log(`${i18n.t(localeKeys.message.success)}\n`);
@@ -6445,6 +6535,7 @@ async function main() {
     node_fs.writeFileSync(targetPackageJson, `${JSON.stringify(packageJson, null, 2)}\n`);
     writeTemplateManifestEvidence(targetDir, templateManifest);
     writeSingleAppPackageSourceEvidence(targetDir, packageSource, useWorkspaceProtocol);
+    if (!isSubproject) initializeGeneratedGitRepository(targetDir);
     const dim = '\x1b[2m\x1b[3m';
     const reset = '\x1b[0m';
     console.log(`${i18n.t(localeKeys.message.success)}\n`);

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.2.0-ultramodern.85",
+  "version": "3.2.0-ultramodern.87",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/index.js",
   "bin": {
@@ -41,7 +41,7 @@
     "@types/node": "^25.9.1",
     "@typescript/native-preview": "7.0.0-dev.20260527.2",
     "tsx": "^4.22.3",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.85"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.87"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -54,6 +54,6 @@
     "start": "node ./dist/index.js"
   },
   "ultramodern": {
-    "frameworkVersion": "3.2.0-ultramodern.85"
+    "frameworkVersion": "3.2.0-ultramodern.87"
   }
 }

package/template/api/effect/index.ts.handlebars

@@ -4,18 +4,29 @@
   Layer,
   defineEffectBff,
 } from '@modern-js/plugin-bff/effect-server';
+import type { HttpApi, HttpApiGroup } from '@modern-js/plugin-bff/effect-server';
 import { bffEffectApi } from '../../shared/effect/api';
 
-const greetingsLayer = HttpApiBuilder.group(bffEffectApi, 'greetings', (handlers) =>
-  handlers.handle('hello', () =>
-    Effect.succeed({
-      message: 'Hello from Effect HttpApi',
-      runtime: 'effect' as const,
-    }),
-  ),
+type ApiGroups<TApi> = TApi extends HttpApi.HttpApi<string, infer TGroups> ? TGroups : never;
+type GreetingsHandlers = HttpApiBuilder.Handlers.FromGroup<
+  HttpApiGroup.WithName<ApiGroups<typeof bffEffectApi>, 'greetings'>
+>;
+
+const greetingsLayer = HttpApiBuilder.group(
+  bffEffectApi,
+  'greetings',
+  (handlers: GreetingsHandlers) =>
+    handlers.handle('hello', () =>
+      Effect.succeed({
+        message: 'Hello from Effect HttpApi',
+        runtime: 'effect' as const,
+      }),
+    ),
 );
 
-const layer = HttpApiBuilder.layer(bffEffectApi).pipe(Layer.provide(greetingsLayer));
+const layer = HttpApiBuilder.layer(bffEffectApi).pipe(
+  Layer.provide(greetingsLayer),
+);
 
 export default defineEffectBff({
   api: bffEffectApi,

package/template/scripts/bootstrap-agent-skills.mjs

@@ -96,15 +96,34 @@ const removeTree = (dir) =>
   });
 
 const cloneSource = (source, targetDir) => {
+  if (source.commit) {
+    run('git', ['init', targetDir]);
+    run('git', ['remote', 'add', 'origin', source.repository], {
+      cwd: targetDir,
+    });
+    run('git', ['fetch', '--depth', '1', '--quiet', 'origin', source.commit], {
+      cwd: targetDir,
+    });
+    run(
+      'git',
+      [
+        '-c',
+        'advice.detachedHead=false',
+        'checkout',
+        '--detach',
+        '--quiet',
+        'FETCH_HEAD',
+      ],
+      { cwd: targetDir },
+    );
+    return;
+  }
+
   const repo = source.repository.replace(/^https:\/\/github.com\//u, '');
   try {
-    run('gh', ['repo', 'clone', repo, targetDir, '--', '--depth', '1'], {
-      stdio: 'inherit',
-    });
+    run('gh', ['repo', 'clone', repo, targetDir, '--', '--depth', '1', '--quiet']);
   } catch {
-    run('git', ['clone', '--depth', '1', source.repository, targetDir], {
-      stdio: 'inherit',
-    });
+    run('git', ['clone', '--depth', '1', '--quiet', source.repository, targetDir]);
   }
 };
 

package/template/src/routes/[lang]/page.tsx.handlebars

@@ -7,6 +7,9 @@ import { useEffect, useState } from 'react';
 {{/if}}
 import { useTranslation } from 'react-i18next';
 
+{{#if useEffectBff}}type GreetingResponse = Awaited<ReturnType<typeof effectBff.client.greetings.hello>>;
+
+{{/if}}
 const fallbackLanguage = 'en';
 const supportedLanguages = ['en', 'cs'] as const;
 type SupportedLanguage = (typeof supportedLanguages)[number];
@@ -62,7 +65,7 @@ const Index = () => {
     let mounted = true;
     Effect.runFork(
       Effect.promise(() => effectBff.client.greetings.hello({})).pipe(
-        Effect.tap((data) =>
+        Effect.tap((data: GreetingResponse) =>
           Effect.sync(() => {
             if (mounted) {
               setEffectMessage(data.message);

package/template-workspace/AGENTS.md

@@ -11,7 +11,7 @@ instructions, not optional reading.
 - `pnpm typecheck` runs effect-tsgo as the TypeScript checker.
 - `pnpm check` runs formatting, linting, effect-tsgo, private-skill availability checks, and the generated workspace contract.
 - Generated Codex stop hooks and subagent-stop hooks run `pnpm format && pnpm lint:fix && pnpm check`.
-- `postinstall` formats the generated tree, installs agent skills and reference repos, then installs `lefthook` when the workspace is inside a Git worktree. Generated `lefthook.yml` runs `pnpm format && pnpm lint:fix && pnpm check` on pre-commit; pre-push runs `pnpm check`.
+- `postinstall` formats the generated tree, initializes Git when needed, installs agent skills and reference repos, then installs `lefthook`. Generated `lefthook.yml` runs `pnpm format && pnpm lint:fix && pnpm check` on pre-commit; pre-push runs `pnpm check`.
 
 ## Localized Routes
 

package/template-workspace/scripts/bootstrap-agent-skills.mjs

@@ -17,6 +17,85 @@ const run = (command, args, options = {}) =>
     stdio: options.stdio ?? ['ignore', 'pipe', 'pipe'],
   });
 
+const commandExists = command => {
+  try {
+    run(command, ['--version'], { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const runShell = script =>
+  run('sh', ['-lc', script], {
+    stdio: 'inherit',
+  });
+
+const installGit = () => {
+  if (commandExists('git')) {
+    return;
+  }
+
+  if (commandExists('brew')) {
+    run('brew', ['install', 'git'], { stdio: 'inherit' });
+  } else if (process.platform === 'linux' && commandExists('apt-get')) {
+    const sudo =
+      typeof process.getuid === 'function' && process.getuid() === 0
+        ? ''
+        : 'sudo ';
+    runShell(`${sudo}apt-get update && ${sudo}apt-get install -y git`);
+  } else if (process.platform === 'linux' && commandExists('dnf')) {
+    const sudo =
+      typeof process.getuid === 'function' && process.getuid() === 0
+        ? ''
+        : 'sudo ';
+    runShell(`${sudo}dnf install -y git`);
+  } else if (process.platform === 'linux' && commandExists('yum')) {
+    const sudo =
+      typeof process.getuid === 'function' && process.getuid() === 0
+        ? ''
+        : 'sudo ';
+    runShell(`${sudo}yum install -y git`);
+  } else if (process.platform === 'linux' && commandExists('apk')) {
+    runShell('apk add --no-cache git');
+  }
+
+  if (!commandExists('git')) {
+    throw new Error(
+      'Git is required for UltraModern setup. Install git and run pnpm skills:install again.',
+    );
+  }
+};
+
+const isInsideGitWorkTree = () => {
+  try {
+    return run('git', ['rev-parse', '--is-inside-work-tree']).trim() === 'true';
+  } catch {
+    return false;
+  }
+};
+
+const initializeGitRepository = () => {
+  if (isInsideGitWorkTree()) {
+    return;
+  }
+
+  try {
+    run('git', ['init', '-b', 'main'], { stdio: 'inherit' });
+  } catch {
+    run('git', ['init'], { stdio: 'inherit' });
+    run('git', ['branch', '-M', 'main'], { stdio: 'inherit' });
+  }
+};
+
+const installLefthook = () => {
+  try {
+    run('lefthook', ['install'], { stdio: 'inherit' });
+  } catch (error) {
+    console.warn(`Unable to install lefthook hooks: ${error.message}`);
+  }
+};
+
 const removeTree = dir =>
   fs.rmSync(dir, {
     force: true,
@@ -26,32 +105,50 @@ const removeTree = dir =>
   });
 
 const cloneSource = (source, targetDir) => {
-  const repo = source.repository.replace(/^https:\/\/github.com\//u, '');
-  try {
-    run('gh', ['repo', 'clone', repo, targetDir, '--', '--depth', '1'], {
-      stdio: 'inherit',
+  if (source.commit) {
+    run('git', ['init', targetDir]);
+    run('git', ['remote', 'add', 'origin', source.repository], {
+      cwd: targetDir,
     });
-  } catch {
-    run('git', ['clone', '--depth', '1', source.repository, targetDir], {
-      stdio: 'inherit',
+    run('git', ['fetch', '--depth', '1', '--quiet', 'origin', source.commit], {
+      cwd: targetDir,
     });
+    run(
+      'git',
+      [
+        '-c',
+        'advice.detachedHead=false',
+        'checkout',
+        '--detach',
+        '--quiet',
+        'FETCH_HEAD',
+      ],
+      { cwd: targetDir },
+    );
+    return;
   }
-  if (source.commit) {
-    try {
-      run('git', ['checkout', source.commit], {
-        cwd: targetDir,
-        stdio: 'inherit',
-      });
-    } catch {
-      run('git', ['fetch', '--depth', '1', 'origin', source.commit], {
-        cwd: targetDir,
-        stdio: 'inherit',
-      });
-      run('git', ['checkout', source.commit], {
-        cwd: targetDir,
-        stdio: 'inherit',
-      });
-    }
+
+  const repo = source.repository.replace(/^https:\/\/github.com\//u, '');
+  try {
+    run('gh', [
+      'repo',
+      'clone',
+      repo,
+      targetDir,
+      '--',
+      '--depth',
+      '1',
+      '--quiet',
+    ]);
+  } catch {
+    run('git', [
+      'clone',
+      '--depth',
+      '1',
+      '--quiet',
+      source.repository,
+      targetDir,
+    ]);
   }
 };
 
@@ -124,6 +221,8 @@ if (checkOnly) {
 }
 
 fs.mkdirSync(installDir, { recursive: true });
+installGit();
+initializeGitRepository();
 
 for (const source of [...requiredCloneSources, ...optionalCloneSources]) {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ultramodern-skills-'));
@@ -161,3 +260,5 @@ for (const source of [...requiredCloneSources, ...optionalCloneSources]) {
     removeTree(tempDir);
   }
 }
+
+installLefthook();