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

package/dist/index.js

@@ -619,6 +619,19 @@ function sortJsonValue(value) {
     return value;
 }
 const ULTRAMODERN_WORKSPACE_FLAG = '--ultramodern-workspace';
+const FIRST_VERTICAL_PORT = 4101;
+const TAILWIND_PREFIX_DIGIT_WORDS = [
+    'zero',
+    'one',
+    'two',
+    'three',
+    'four',
+    'five',
+    'six',
+    'seven',
+    'eight',
+    'nine'
+];
 function isRecord(value) {
     return null !== value && 'object' == typeof value && !Array.isArray(value);
 }
@@ -1115,6 +1128,7 @@ function createTsConfigBase() {
             verbatimModuleSyntax: true,
             strict: true,
             noEmit: true,
+            allowImportingTsExtensions: true,
             allowJs: true,
             esModuleInterop: true,
             noUncheckedIndexedAccess: true,
@@ -1228,6 +1242,7 @@ function createAppModernConfig(scope, app) {
     const bffImport = appHasEffectApi(app) ? "import { bffPlugin } from '@modern-js/plugin-bff';\n" : '';
     const bffConfig = appHasEffectApi(app) ? `      bff: {
         effect: {
+          entry: './api/effect/index',
           openapi: {
             path: '/openapi.json',
           },
@@ -1916,9 +1931,9 @@ function createCssTokenImport(scope) {
     return `@import '${ultramodern_workspace_packageName(scope, 'shared-design-tokens')}/tokens.css';\n`;
 }
 function createTailwindPrefix(raw) {
-    const prefix = raw.toLowerCase().replace(/[^a-z]/gu, '');
-    if (!prefix) throw new Error(`Cannot derive a Tailwind prefix from ${raw}`);
-    return prefix;
+    const normalized = raw.toLowerCase().replace(/[^a-z0-9]/gu, '');
+    if (!normalized) throw new Error(`Cannot derive a Tailwind prefix from ${raw}`);
+    return normalized.replace(/[0-9]/gu, (digit)=>TAILWIND_PREFIX_DIGIT_WORDS[Number(digit)]);
 }
 function tailwindPrefixForApp(app) {
     if ('shell' === app.kind) return 'shell';
@@ -3450,7 +3465,7 @@ function createEffectServiceEntry(scope, service, contractImportPath = ultramode
   HttpApiBuilder,
   Layer,
 } from '@modern-js/plugin-bff/effect-edge';
-import { ultramodernApiMarker } from '../../src/ultramodern-build';
+import { ultramodernApiMarker } from '../../src/ultramodern-build.ts';
 import {
   ${apiExport},
   ${groupName}OperationContexts,
@@ -4693,6 +4708,7 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
             mfName: remote.mfName,
             apiPrefix: remote.effectApi.prefix,
             tailwindPrefix: tailwindPrefixForApp(remote),
+            zephyrAlias: remoteDependencyAlias(remote),
             packageName: ultramodern_workspace_packageName(scope, remote.packageSuffix),
             exposes: Object.keys(remote.exposes ?? {}),
             componentPaths: Object.keys(remote.exposes ?? {}).map((expose)=>remoteComponentOutputPath(remote, expose)).filter((componentPath)=>Boolean(componentPath)),
@@ -4881,7 +4897,7 @@ assert(generatedContract.cssFederation?.sharedDesignTokens?.ssr?.firstPaintRequi
 const shellPackage = readJson('apps/shell-super-app/package.json');
 const expectedZephyrDependencies = Object.fromEntries(
   fullStackVerticals.map(vertical => [
-    vertical.domain,
+    vertical.zephyrAlias,
     \`\${vertical.packageName}@workspace:*\`,
   ]),
 );
@@ -4925,7 +4941,7 @@ for (const vertical of fullStackVerticals) {
     fullStackVerticals
       .filter(candidate => vertical.verticalRefs.includes(candidate.id))
       .map(candidate => [
-        candidate.domain,
+        candidate.zephyrAlias,
         \`\${candidate.packageName}@workspace:*\`,
       ]),
   );
@@ -4968,7 +4984,7 @@ for (const vertical of fullStackVerticals) {
   assert(contractEntry?.styling?.federation?.owner?.id === vertical.id, \`\${vertical.id} CSS federation owner is missing\`);
   assert(contractEntry?.styling?.federation?.role === 'vertical-css', \`\${vertical.id} must own only vertical CSS\`);
   assert(contractEntry?.styling?.federation?.rootSelector === \`[data-app-id="\${vertical.id}"]\`, \`\${vertical.id} CSS root selector is incorrect\`);
-  assert(contractEntry?.styling?.federation?.classPrefix === \`\${vertical.domain}:\`, \`\${vertical.id} CSS class prefix is incorrect\`);
+  assert(contractEntry?.styling?.federation?.classPrefix === \`\${vertical.tailwindPrefix}:\`, \`\${vertical.id} CSS class prefix is incorrect\`);
   assert(contractEntry?.styling?.federation?.layers?.owned?.includes(\`ultramodern-vertical-\${vertical.domain}\`), \`\${vertical.id} vertical CSS layer is missing\`);
   assert(!contractEntry?.styling?.federation?.layers?.owned?.includes('ultramodern-shell-base'), \`\${vertical.id} must not own shell base CSS\`);
   assert(contractEntry?.styling?.federation?.entrypoints?.federationEntry === 'src/federation-entry.tsx', \`\${vertical.id} CSS contract must include federation entry\`);
@@ -5372,7 +5388,7 @@ function writeApp(targetDir, scope, app, packageSource, enableTailwind, remotes
     }
     if (appHasEffectApi(resolvedApp)) {
         writeFile(targetDir, `${resolvedApp.directory}/shared/effect/api.ts`, createEffectSharedApi(resolvedApp));
-        writeFile(targetDir, `${resolvedApp.directory}/api/effect/index.ts`, createEffectServiceEntry(scope, resolvedApp, '../../shared/effect/api'));
+        writeFile(targetDir, `${resolvedApp.directory}/api/effect/index.ts`, createEffectServiceEntry(scope, resolvedApp, '../../shared/effect/api.ts'));
         writeFile(targetDir, `${resolvedApp.directory}/src/effect/${resolvedApp.effectApi.stem}-client.ts`, createEffectClient(resolvedApp, '../../shared/effect/api'));
     }
     if ('vertical' === resolvedApp.kind) {
@@ -5462,7 +5478,7 @@ function assertValidVerticalName(name) {
 }
 function nextAvailablePort(ports) {
     const numericPorts = Object.values(ports).filter((value)=>'number' == typeof value && Number.isFinite(value));
-    return Math.max(3030, ...numericPorts) + 1;
+    return Math.max(FIRST_VERTICAL_PORT - 1, ...numericPorts) + 1;
 }
 function assertCanCreate(workspaceRoot, relativePath) {
     if (node_fs.existsSync(node_path.join(workspaceRoot, relativePath))) throw new Error(`Refusing to overwrite existing path: ${relativePath}`);

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.2.0-ultramodern.83",
+  "version": "3.2.0-ultramodern.85",
   "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.83"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.85"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -54,6 +54,6 @@
     "start": "node ./dist/index.js"
   },
   "ultramodern": {
-    "frameworkVersion": "3.2.0-ultramodern.83"
+    "frameworkVersion": "3.2.0-ultramodern.85"
   }
 }

package/template/AGENTS.md

@@ -10,7 +10,7 @@ This project is generated for Codex-first UltraModern.js work.
 - `pnpm i18n:check` rejects hardcoded user-visible JSX text.
 - `pnpm ultramodern:check` verifies the generated contract.
 - Generated Codex stop hooks and subagent-stop hooks run `pnpm format && pnpm lint:fix && pnpm ultramodern:check`.
-- `postinstall` installs `lefthook` when the app is inside a Git worktree. Generated `lefthook.yml` runs `pnpm format && pnpm lint:fix && pnpm ultramodern:check` on pre-commit; pre-push runs `pnpm ultramodern:check`.
+- `postinstall` formats the generated tree, installs private orchestration skills when available, initializes a Git repository when needed, and installs `lefthook`. Generated `lefthook.yml` runs `pnpm format && pnpm lint:fix && pnpm ultramodern:check` on pre-commit; pre-push runs `pnpm ultramodern:check`.
 
 ## Internationalization
 

package/template/oxfmt.config.ts

@@ -3,6 +3,13 @@ import ultracite from 'ultracite/oxfmt';
 
 export default defineConfig({
   extends: [ultracite],
-  ignorePatterns: ['dist', 'node_modules', '.modern', '.modernjs', '**/routeTree.gen.ts'],
+  ignorePatterns: [
+    '.agents',
+    'dist',
+    'node_modules',
+    '.modern',
+    '.modernjs',
+    '**/routeTree.gen.ts',
+  ],
   singleQuote: true,
 });

package/template/oxlint.config.ts

@@ -8,5 +8,12 @@ export default defineConfig({
     node: true,
   },
   extends: [core, react],
-  ignorePatterns: ['dist', 'node_modules', '.modern', '.modernjs', '**/routeTree.gen.ts'],
+  ignorePatterns: [
+    '.agents',
+    'dist',
+    'node_modules',
+    '.modern',
+    '.modernjs',
+    '**/routeTree.gen.ts',
+  ],
 });

package/template/package.json.handlebars

@@ -15,7 +15,7 @@
 {{#unless isSubproject}}
     "skills:install": "node ./scripts/bootstrap-agent-skills.mjs",
     "skills:check": "node ./scripts/bootstrap-agent-skills.mjs --check",
-    "postinstall": "node ./scripts/bootstrap-agent-skills.mjs && (git rev-parse --is-inside-work-tree >/dev/null 2>&1 && lefthook install || true)",
+    "postinstall": "oxfmt . && node ./scripts/bootstrap-agent-skills.mjs",
 {{/unless}}
     "ultramodern:check": "{{#unless isSubproject}}pnpm format:check && pnpm lint && {{/unless}}pnpm typecheck && pnpm i18n:check && pnpm test{{#unless isSubproject}} && pnpm skills:check{{/unless}} && node ./scripts/validate-ultramodern.mjs"{{#unless isSubproject}},
     "format": "oxfmt .",
@@ -41,7 +41,7 @@
     "@modern-js/app-tools": "{{appToolsVersion}}",
 {{#if enableBff}}    "@modern-js/plugin-bff": "{{pluginBffVersion}}",
 {{/if}}    "@modern-js/tsconfig": "{{tsconfigVersion}}",
-    "@rstest/core": "0.10.2",
+    "@rstest/core": "0.10.3",
 {{#if enableTailwind}}
     "@tailwindcss/postcss": "^{{tailwindPostcssVersion}}",
 {{/if}}

package/template/pnpm-workspace.yaml

@@ -19,3 +19,11 @@ allowBuilds:
   msgpackr-extract: true
   sharp: true
   workerd: true
+onlyBuiltDependencies:
+  - '@swc/core'
+  - core-js
+  - esbuild
+  - lefthook
+  - msgpackr-extract
+  - sharp
+  - workerd

package/template/rstest.config.mts

@@ -1,7 +1,5 @@
-import { withModernConfig } from '@modern-js/adapter-rstest';
 import { defineConfig } from '@rstest/core';
 
 export default defineConfig({
-  extends: withModernConfig(),
-  testEnvironment: 'happy-dom',
+  testEnvironment: 'node',
 });

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

@@ -17,6 +17,76 @@ 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,
@@ -98,6 +168,7 @@ if (checkOnly) {
 }
 
 fs.mkdirSync(installDir, { recursive: true });
+installGit();
 
 for (const source of [...requiredCloneSources, ...optionalCloneSources]) {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ultramodern-skills-'));
@@ -133,3 +204,6 @@ for (const source of [...requiredCloneSources, ...optionalCloneSources]) {
     removeTree(tempDir);
   }
 }
+
+initializeGitRepository();
+installLefthook();

package/template/scripts/check-i18n-strings.mjs

@@ -30,6 +30,13 @@ const collectFiles = (directory) => {
 };
 
 const lineNumberForIndex = (content, index) => content.slice(0, index).split('\n').length;
+const isCodeElementText = (content, index) => {
+  const tagStart = content.lastIndexOf('<', index);
+  if (tagStart === -1) {
+    return false;
+  }
+  return /^<code(?:\s|>)/u.test(content.slice(tagStart, index));
+};
 const isIgnoredLine = (content, index) => {
   const lineStart = content.lastIndexOf('\n', index) + 1;
   const lineEnd = content.indexOf('\n', index);
@@ -58,7 +65,11 @@ for (const filePath of scanRoots.flatMap(collectFiles)) {
 
   for (const match of content.matchAll(jsxTextPattern)) {
     const text = match[1].replaceAll(/\s+/gu, ' ').trim();
-    if (text && !isIgnoredLine(content, match.index ?? 0)) {
+    if (
+      text &&
+      !isIgnoredLine(content, match.index ?? 0) &&
+      !isCodeElementText(content, match.index ?? 0)
+    ) {
       violations.push({
         filePath,
         line: lineNumberForIndex(content, match.index ?? 0),

package/template/scripts/validate-ultramodern.mjs.handlebars

@@ -9,21 +9,19 @@ const packageSourcePath = path.resolve(
   '.modernjs/ultramodern-package-source.json',
 );
 const readPnpmConfig = (key) => {
-  const env = { ...process.env };
-  for (const envKey of Object.keys(env)) {
-    if (/^(?:npm|pnpm)_config_/i.test(envKey)) {
-      delete env[envKey];
-    }
-  }
+  const env = Object.fromEntries(
+    Object.entries(process.env).filter(
+      ([envKey]) => !/^(?:npm|pnpm)_config_/iu.test(envKey),
+    ),
+  );
   const output = execFileSync('pnpm', ['config', 'get', key, '--json'], {
     cwd: process.cwd(),
-    env,
     encoding: 'utf-8',
+    env,
     stdio: ['ignore', 'pipe', 'pipe'],
   }).trim();
   return output ? JSON.parse(output) : undefined;
 };
-const isSubproject = {{isSubproject}};
 const enableTailwind = {{enableTailwind}};
 const expectedPnpmVersion = '{{pnpmVersion}}';
 const activePnpmVersion = execFileSync('pnpm', ['--version'], {
@@ -131,14 +129,13 @@ if (fs.existsSync(path.resolve(process.cwd(), 'src/routes/page.tsx'))) {
   process.exit(1);
 }
 
-if (!enableTailwind) {
-  if (
-    fs.existsSync(path.resolve(process.cwd(), 'postcss.config.mjs')) ||
-    fs.existsSync(path.resolve(process.cwd(), 'tailwind.config.ts'))
-  ) {
-    console.error('Tailwind config files must not be written when Tailwind is disabled');
-    process.exit(1);
-  }
+if (
+  !enableTailwind &&
+  (fs.existsSync(path.resolve(process.cwd(), 'postcss.config.mjs')) ||
+    fs.existsSync(path.resolve(process.cwd(), 'tailwind.config.ts')))
+) {
+  console.error('Tailwind config files must not be written when Tailwind is disabled');
+  process.exit(1);
 }
 
 {{#unless isSubproject}}
@@ -259,17 +256,19 @@ const skillsLock = JSON.parse(
 );
 {{/unless}}
 const requiredScripts = {
-  'i18n:check': 'node ./scripts/check-i18n-strings.mjs',
-  test: 'rstest run',
 {{#unless isSubproject}}
   format: 'oxfmt .',
   'format:check': 'oxfmt --check .',
+{{/unless}}
+  'i18n:check': 'node ./scripts/check-i18n-strings.mjs',
+{{#unless isSubproject}}
   lint: 'oxlint .',
   'lint:fix': 'oxlint . --fix',
+  postinstall: 'oxfmt . && node ./scripts/bootstrap-agent-skills.mjs',
   'skills:check': 'node ./scripts/bootstrap-agent-skills.mjs --check',
   'skills:install': 'node ./scripts/bootstrap-agent-skills.mjs',
-  postinstall: 'node ./scripts/bootstrap-agent-skills.mjs && (git rev-parse --is-inside-work-tree >/dev/null 2>&1 && lefthook install || true)',
 {{/unless}}
+  test: 'rstest run',
 };
 
 for (const [scriptName, scriptCommand] of Object.entries(requiredScripts)) {
@@ -369,8 +368,11 @@ if (
   console.error('pnpm allowBuilds must approve only the generated app build dependencies');
   process.exit(1);
 }
-if (readPnpmConfig('onlyBuiltDependencies') !== undefined) {
-  console.error('pnpm onlyBuiltDependencies must not be set');
+if (
+  JSON.stringify(readPnpmConfig('onlyBuiltDependencies')) !==
+  JSON.stringify(['@swc/core', 'core-js', 'esbuild', 'lefthook', 'msgpackr-extract', 'sharp', 'workerd'])
+) {
+  console.error('pnpm onlyBuiltDependencies must approve only the generated app build dependencies');
   process.exit(1);
 }
 

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

@@ -121,16 +121,12 @@ const Index = () => {
           <p className="name">{t('home.name')}</p>
         </div>
         <p className="description{{#if enableTailwind}} text-emerald-700 font-semibold{{/if}}">
-          {t('home.description.intro')} <code className="code">presetUltramodern(...)</code>{' '}
-          {/* i18n-ignore technical token */}
+          {t('home.description.intro')}{' '}
+          <code className="code">presetUltramodern(...)</code>{' '}
           {t('home.description.afterPreset')}{' '}
-          <code className="code">modern.config.ts</code>
-          {/* i18n-ignore technical token */}
-          {' '}
+          <code className="code">modern.config.ts</code>{' '}
           {t('home.description.afterConfig')}{' '}
-          <code className="code">pnpm run ultramodern:check</code>
-          {/* i18n-ignore technical token */}
-          {' '}
+          <code className="code">pnpm run ultramodern:check</code>{' '}
           {t('home.description.end')}
         </p>
 {{#if useEffectBff}}

package/template/tailwind.config.ts.handlebars

@@ -2,9 +2,9 @@
 
 export default {
   content: ['./src/**/*.{js,ts,jsx,tsx}'],
+  plugins: [],
   theme: {
     extend: {},
   },
-  plugins: [],
 } satisfies Config;
 {{/if}}