@bleedingdev/modern-js-create 3.2.0-ultramodern.9 → 3.2.0-ultramodern.91

package/template/package.json.handlebars

@@ -1,57 +1,66 @@
 {
   "name": "{{packageName}}",
   "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "packageManager": "pnpm@{{pnpmVersion}}",
   "scripts": {
     "reset": "npx rimraf node_modules ./**/node_modules",
     "dev": "modern dev",
     "build": "modern build",
     "serve": "modern serve",
+    "test": "rstest run",
     "typecheck": "node -e \"const fs = require('node:fs'); const { execFileSync, spawnSync } = require('node:child_process'); const bin = execFileSync('effect-tsgo', ['get-exe-path'], { encoding: 'utf8' }).trim(); if (process.platform !== 'win32') fs.chmodSync(bin, 0o755); const result = spawnSync(bin, ['--noEmit', '-p', 'tsconfig.json'], { stdio: 'inherit' }); process.exit(result.status ?? 1);\"",
+    "i18n:check": "node ./scripts/check-i18n-strings.mjs",
+{{#unless isSubproject}}
     "skills:install": "node ./scripts/bootstrap-agent-skills.mjs",
     "skills:check": "node ./scripts/bootstrap-agent-skills.mjs --check",
-    "ultramodern:check": "{{#unless isSubproject}}pnpm format:check && pnpm lint && {{/unless}}pnpm typecheck{{#unless isSubproject}} && pnpm skills:check{{/unless}} && node ./scripts/validate-ultramodern.mjs"{{#unless isSubproject}},
+    "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 .",
     "format:check": "oxfmt --check .",
     "lint": "oxlint .",
-    "lint:fix": "oxlint . --fix",
-    "prepare": "simple-git-hooks"{{/unless}}
+    "lint:fix": "oxlint . --fix"{{/unless}}
   },
-  "engines": {
-    "node": ">=20"
-  }{{#unless isSubproject}},
-  "lint-staged": {
-    "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}": [
-      "oxfmt --write",
-      "oxlint --fix"
-    ]
-  },
-  "simple-git-hooks": {
-    "pre-commit": "npx lint-staged"
-  }{{/unless}},
   "dependencies": {
-    "@modern-js/runtime": "{{runtimeVersion}}"{{#if isTanstackRouter}},
-    "@modern-js/plugin-tanstack": "{{pluginTanstackVersion}}",
-    "@tanstack/react-router": "1.170.1"{{/if}},
-    "react": "^19.2.3",
-    "react-dom": "^19.2.0"
+    "@modern-js/plugin-i18n": "{{pluginI18nVersion}}",
+{{#if isTanstackRouter}}    "@modern-js/plugin-tanstack": "{{pluginTanstackVersion}}",
+{{/if}}
+    "@modern-js/runtime": "{{runtimeVersion}}",
+{{#if isTanstackRouter}}    "@tanstack/react-router": "{{tanstackRouterVersion}}",
+{{/if}}
+    "i18next": "26.2.0",
+    "react": "^19.2.6",
+    "react-dom": "^19.2.6",
+    "react-i18next": "17.0.8"
   },
   "devDependencies": {
+    "@effect/tsgo": "0.13.0",
+    "@modern-js/adapter-rstest": "{{adapterRstestVersion}}",
     "@modern-js/app-tools": "{{appToolsVersion}}",
-    "@modern-js/tsconfig": "{{tsconfigVersion}}"{{#if enableBff}},
-    "@modern-js/plugin-bff": "{{pluginBffVersion}}"{{/if}}{{#if enableTailwind}},
-    "@tailwindcss/postcss": "^4.1.18",
-    "postcss": "^8.5.6",
-    "tailwindcss": "^4.1.18"{{/if}},
-    "@effect/tsgo": "0.7.3",
-    "@typescript/native-preview": "7.0.0-dev.20260518.1",
+{{#if enableBff}}    "@modern-js/plugin-bff": "{{pluginBffVersion}}",
+{{/if}}    "@modern-js/tsconfig": "{{tsconfigVersion}}",
+    "@rstest/core": "0.10.3",
+{{#if enableTailwind}}
+    "@tailwindcss/postcss": "^{{tailwindPostcssVersion}}",
+{{/if}}
     "@types/node": "^20",
     "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.6"{{#unless isSubproject}},
-    "oxlint": "1.65.0",
-    "oxfmt": "0.50.0",
-    "ultracite": "7.7.0",
-    "lint-staged": "~15.4.0",
-    "simple-git-hooks": "^2.11.1"{{/unless}},
-    "rimraf": "^6.0.1"
+    "@types/react-dom": "^19.1.6",
+    "@typescript/native-preview": "7.0.0-dev.20260527.2",
+    "happy-dom": "^20.9.0",
+{{#unless isSubproject}}
+    "lefthook": "^2.1.9",
+    "oxfmt": "0.51.0",
+    "oxlint": "1.66.0",
+{{/unless}}{{#if enableTailwind}}    "postcss": "^8.5.6",
+{{/if}}    "rimraf": "^6.1.3"{{#if enableTailwind}},
+    "tailwindcss": "^{{tailwindVersion}}"{{/if}}{{#unless isSubproject}},
+    "ultracite": "7.7.0"{{/unless}}
+  },
+  "engines": {
+    "node": ">=20",
+    "pnpm": ">={{pnpmVersion}} <11.6.0"
   }
 }

package/template/pnpm-workspace.yaml

@@ -0,0 +1,29 @@
+minimumReleaseAge: 1440
+minimumReleaseAgeStrict: true
+minimumReleaseAgeIgnoreMissingTime: false
+minimumReleaseAgeExclude:
+  - '@bleedingdev/modern-js-*'
+trustPolicy: no-downgrade
+trustPolicyIgnoreAfter: 1440
+blockExoticSubdeps: true
+engineStrict: true
+pmOnFail: error
+verifyDepsBeforeRun: error
+strictDepBuilds: true
+
+allowBuilds:
+  '@swc/core': true
+  core-js: true
+  esbuild: true
+  lefthook: true
+  msgpackr-extract: true
+  sharp: true
+  workerd: true
+onlyBuiltDependencies:
+  - '@swc/core'
+  - core-js
+  - esbuild
+  - lefthook
+  - msgpackr-extract
+  - sharp
+  - workerd

package/template/rstest.config.mts

@@ -0,0 +1,5 @@
+import { defineConfig } from '@rstest/core';
+
+export default defineConfig({
+  testEnvironment: 'node',
+});

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

@@ -8,43 +8,134 @@ const lockPath = path.join(root, '.agents/skills-lock.json');
 const checkOnly = process.argv.includes('--check');
 const force = process.argv.includes('--force');
 
-function readJson(filePath) {
-  return JSON.parse(fs.readFileSync(filePath, 'utf8'));
-}
+const readJson = (filePath) => JSON.parse(fs.readFileSync(filePath, 'utf-8'));
 
-function run(command, args, options = {}) {
-  return execFileSync(command, args, {
+const run = (command, args, options = {}) =>
+  execFileSync(command, args, {
     cwd: options.cwd ?? root,
-    encoding: 'utf8',
+    encoding: 'utf-8',
     stdio: options.stdio ?? ['ignore', 'pipe', 'pipe'],
   });
-}
 
-function cloneSource(source, targetDir) {
-  const repo = source.repository.replace(/^https:\/\/github.com\//, '');
+const commandExists = (command) => {
   try {
-    run('gh', ['repo', 'clone', repo, targetDir, '--', '--depth', '1'], {
-      stdio: 'inherit',
-    });
+    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', ['clone', '--depth', '1', source.repository, targetDir], {
-      stdio: 'inherit',
+    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,
+    maxRetries: 5,
+    recursive: true,
+    retryDelay: 100,
+  });
+
+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;
   }
-}
 
-function resolveSkillDir(sourceRoot, skillName) {
+  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]);
+  }
+};
+
+const resolveSkillDir = (sourceRoot, skillName) => {
   const candidates = [
     path.join(sourceRoot, skillName),
     path.join(sourceRoot, 'skills', skillName),
     path.join(sourceRoot, 'skills', 'engineering', skillName),
     path.join(sourceRoot, 'skills', 'productivity', skillName),
   ];
-  return candidates.find(candidate =>
-    fs.existsSync(path.join(candidate, 'SKILL.md')),
-  );
-}
+  return candidates.find((candidate) => fs.existsSync(path.join(candidate, 'SKILL.md')));
+};
 
 if (!fs.existsSync(lockPath)) {
   console.error('Missing .agents/skills-lock.json');
@@ -53,38 +144,69 @@ if (!fs.existsSync(lockPath)) {
 
 const lock = readJson(lockPath);
 const installDir = path.join(root, lock.installDir ?? '.agents/skills');
-const privateSources = (lock.sources ?? []).filter(
-  source => source.install === 'clone-if-authorized',
+const sources = lock.sources ?? [];
+const requiredCloneSources = sources.filter((source) => source.install === 'clone');
+const optionalCloneSources = sources.filter(
+  (source) => source.install === 'clone-if-authorized',
+);
+const requiredSkills = [
+  ...(lock.baseline ?? []),
+  ...requiredCloneSources.flatMap((source) => source.baseline ?? []),
+].filter(
+  (skill, index, skills) =>
+    skills.findIndex((candidate) => candidate.name === skill.name) === index,
 );
 
 if (checkOnly) {
-  const missing = privateSources.flatMap(source =>
+  const missingRequired = requiredSkills
+    .map((skill) => skill.name)
+    .filter((skillName) => !fs.existsSync(path.join(installDir, skillName, 'SKILL.md')));
+  const missingOptional = optionalCloneSources.flatMap((source) =>
     (source.baseline ?? [])
-      .map(skill => skill.name)
-      .filter(skillName => !fs.existsSync(path.join(installDir, skillName, 'SKILL.md'))),
+      .map((skill) => skill.name)
+      .filter((skillName) => !fs.existsSync(path.join(installDir, skillName, 'SKILL.md'))),
   );
-  if (missing.length > 0) {
+
+  if (missingRequired.length > 0) {
+    console.error(
+      `Required agent skills not installed: ${missingRequired.join(', ')}. Run pnpm skills:install.`,
+    );
+    process.exit(1);
+  }
+
+  if (missingOptional.length > 0) {
     console.warn(
-      `Private skills not installed: ${missing.join(', ')}. Run pnpm skills:install if you have access.`,
+      `Private skills not installed: ${missingOptional.join(', ')}. Run pnpm skills:install if you have access.`,
     );
   } else {
-    console.log('Agent skills are installed.');
+    console.log('Required and private agent skills are installed.');
+    process.exit(0);
   }
+  console.log('Required agent skills are installed.');
   process.exit(0);
 }
 
 fs.mkdirSync(installDir, { recursive: true });
+installGit();
 
-for (const source of privateSources) {
+for (const source of [...requiredCloneSources, ...optionalCloneSources]) {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ultramodern-skills-'));
   try {
-    cloneSource(source, tempDir);
+    try {
+      cloneSource(source, tempDir);
+    } catch (error) {
+      if (source.install === 'clone-if-authorized') {
+        console.warn(
+          `Skipping ${source.repository}; current developer may not have access.`,
+        );
+        continue;
+      }
+      throw error;
+    }
     for (const skill of source.baseline ?? []) {
       const sourceSkillDir = resolveSkillDir(tempDir, skill.name);
       if (!sourceSkillDir) {
-        throw new Error(
-          `Skill ${skill.name} not found in ${source.repository}`,
-        );
+        throw new Error(`Skill ${skill.name} not found in ${source.repository}`);
       }
       const targetSkillDir = path.join(installDir, skill.name);
       if (fs.existsSync(targetSkillDir)) {
@@ -92,12 +214,15 @@ for (const source of privateSources) {
           console.log(`Skipping existing ${skill.name}`);
           continue;
         }
-        fs.rmSync(targetSkillDir, { recursive: true, force: true });
+        removeTree(targetSkillDir);
       }
       fs.cpSync(sourceSkillDir, targetSkillDir, { recursive: true });
       console.log(`Installed ${skill.name}`);
     }
   } finally {
-    fs.rmSync(tempDir, { recursive: true, force: true });
+    removeTree(tempDir);
   }
 }
+
+initializeGitRepository();
+installLefthook();

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

@@ -0,0 +1,94 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+const root = process.cwd();
+const scanRoots = ['src'].map((scanRoot) => path.join(root, scanRoot));
+const ignoredDirectories = new Set(['.modern', '.modernjs', 'dist', 'node_modules']);
+const visibleAttributePattern =
+  /\s(?:aria-label|alt|placeholder|title)=["']([^"']*[A-Za-z][^"']*)["']/gu;
+const jsxTextPattern = />([^<>{}]*[A-Za-z][^<>{}]*)</gu;
+
+const collectFiles = (directory) => {
+  if (!fs.existsSync(directory)) {
+    return [];
+  }
+
+  const files = [];
+  for (const entry of fs.readdirSync(directory, { withFileTypes: true })) {
+    if (entry.isDirectory()) {
+      if (!ignoredDirectories.has(entry.name)) {
+        files.push(...collectFiles(path.join(directory, entry.name)));
+      }
+      continue;
+    }
+
+    if (entry.isFile() && /\.(jsx|tsx)$/u.test(entry.name) && !entry.name.endsWith('.d.ts')) {
+      files.push(path.join(directory, entry.name));
+    }
+  }
+  return files;
+};
+
+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);
+  const currentLineEnd = lineEnd === -1 ? content.length : lineEnd;
+  const previousLineStart = content.lastIndexOf('\n', Math.max(0, lineStart - 2)) + 1;
+  const nextLineEnd = content.indexOf('\n', currentLineEnd + 1);
+  const context = content.slice(
+    previousLineStart,
+    nextLineEnd === -1 ? content.length : nextLineEnd,
+  );
+  return /i18n-ignore/u.test(context);
+};
+
+const violations = [];
+for (const filePath of scanRoots.flatMap(collectFiles)) {
+  const content = fs.readFileSync(filePath, 'utf-8');
+  for (const match of content.matchAll(visibleAttributePattern)) {
+    if (!isIgnoredLine(content, match.index ?? 0)) {
+      violations.push({
+        filePath,
+        line: lineNumberForIndex(content, match.index ?? 0),
+        text: match[1].trim(),
+      });
+    }
+  }
+
+  for (const match of content.matchAll(jsxTextPattern)) {
+    const text = match[1].replaceAll(/\s+/gu, ' ').trim();
+    if (
+      text &&
+      !isIgnoredLine(content, match.index ?? 0) &&
+      !isCodeElementText(content, match.index ?? 0)
+    ) {
+      violations.push({
+        filePath,
+        line: lineNumberForIndex(content, match.index ?? 0),
+        text,
+      });
+    }
+  }
+}
+
+if (violations.length > 0) {
+  console.error('Hardcoded user-visible JSX strings found. Move copy to locale JSON files.');
+  for (const violation of violations) {
+    console.error(
+      `${path.relative(root, violation.filePath)}:${violation.line} ${JSON.stringify(
+        violation.text,
+      )}`,
+    );
+  }
+  process.exit(1);
+}
+
+console.log('No hardcoded user-visible JSX strings found.');