@bleedingdev/modern-js-create 3.2.0-ultramodern.108 → 3.2.0-ultramodern.110

package/dist/types/ultramodern-checks/cli/i18n-check.d.ts

@@ -0,0 +1,9 @@
+type SingleAppI18nCheckOptions = {
+    readonly cwd?: string;
+    readonly targets?: readonly string[];
+};
+export declare const SINGLE_APP_I18N_SUCCESS = "No hardcoded user-visible JSX strings found.";
+export declare const SINGLE_APP_I18N_FAILURE = "Hardcoded user-visible JSX strings found. Move copy to locale JSON files.";
+export declare const runSingleAppI18nCheck: ({ cwd, targets, }?: SingleAppI18nCheckOptions) => number;
+export declare const main: () => void;
+export {};

package/dist/types/ultramodern-checks/cli/oxlint.d.ts

@@ -0,0 +1,22 @@
+type OxlintRuleConfig = string | readonly [
+    string,
+    {
+        readonly [key: string]: unknown;
+    }
+];
+type OxlintRules = {
+    readonly [ruleName: string]: OxlintRuleConfig;
+};
+type OxlintRulesOptions = {
+    readonly cwd: string;
+    readonly targets: readonly string[];
+    readonly rules: OxlintRules;
+};
+type OxlintRulesResult = {
+    readonly exitCode: number;
+    readonly stdout: string;
+    readonly stderr: string;
+};
+export declare const runOxlintRules: ({ cwd, targets, rules, }: OxlintRulesOptions) => OxlintRulesResult;
+export declare const printOxlintOutput: ({ stdout, stderr, }: OxlintRulesResult) => void;
+export {};

package/dist/types/ultramodern-checks/cli/workspace-source-check.d.ts

@@ -0,0 +1,8 @@
+type WorkspaceSourceCheckOptions = {
+    readonly cwd?: string;
+    readonly sourceRoots?: readonly string[];
+};
+export declare const WORKSPACE_SOURCE_SUCCESS = "UltraModern i18n and boundary guardrails validated";
+export declare const runWorkspaceSourceCheck: ({ cwd, sourceRoots, }?: WorkspaceSourceCheckOptions) => number;
+export declare const main: () => void;
+export {};

package/dist/types/ultramodern-checks/index.d.ts

@@ -0,0 +1,3 @@
+export { runSingleAppI18nCheck } from './cli/i18n-check';
+export { runWorkspaceSourceCheck } from './cli/workspace-source-check';
+export { default as oxlintPlugin } from './oxlint-plugin';

package/dist/types/ultramodern-checks/oxlint-plugin.d.ts

@@ -0,0 +1,63 @@
+type AstNode = {
+    readonly type?: string;
+    readonly parent?: AstNode;
+    readonly loc?: {
+        readonly start?: {
+            readonly line?: number;
+        };
+        readonly end?: {
+            readonly line?: number;
+        };
+    };
+    readonly value?: unknown;
+    readonly raw?: unknown;
+    readonly name?: unknown;
+    readonly openingElement?: AstNode;
+    readonly expression?: AstNode;
+    readonly expressions?: readonly AstNode[];
+    readonly quasis?: readonly AstNode[];
+    readonly test?: AstNode;
+    readonly consequent?: AstNode;
+    readonly alternate?: AstNode;
+    readonly arguments?: readonly AstNode[];
+    readonly callee?: AstNode;
+    readonly object?: AstNode;
+    readonly property?: AstNode;
+    readonly computed?: boolean;
+};
+type RuleContext = {
+    readonly options?: readonly unknown[];
+    readonly filename?: string;
+    getSourceCode?: () => {
+        readonly text?: string;
+        getAllComments?: () => readonly AstNode[];
+        getText?: (node: AstNode) => string;
+    };
+    report: (descriptor: {
+        readonly node: AstNode;
+        readonly message: string;
+    }) => void;
+};
+type Rule = {
+    readonly meta: {
+        readonly type: string;
+        readonly docs: {
+            readonly description: string;
+        };
+        readonly schema: unknown[];
+    };
+    create(context: RuleContext): Record<string, (node: AstNode) => void>;
+};
+declare const plugin: {
+    meta: {
+        name: string;
+    };
+    rules: {
+        'no-hardcoded-jsx-text': Rule;
+        'no-legacy-mf-boundary-attributes': Rule;
+        'no-literal-visible-jsx-attributes': Rule;
+        'no-manual-locale-copy-branching': Rule;
+        'no-split-translation-keys': Rule;
+    };
+};
+export default plugin;

package/dist/types/ultramodern-package-source.d.ts

@@ -3,8 +3,8 @@ export declare const BLEEDINGDEV_CREATE_PACKAGE = "@bleedingdev/modern-js-create
 export declare const BLEEDINGDEV_PACKAGE_SCOPE = "bleedingdev";
 export declare const BLEEDINGDEV_PACKAGE_NAME_PREFIX = "modern-js-";
 export declare const BLEEDINGDEV_FRAMEWORK_VERSION_ENV = "MODERN_CREATE_ULTRAMODERN_FRAMEWORK_VERSION";
-export declare const ULTRAMODERN_SINGLE_APP_MODERN_PACKAGES: readonly ['@modern-js/runtime', '@modern-js/app-tools', '@modern-js/tsconfig', '@modern-js/plugin-i18n', '@modern-js/plugin-tanstack', '@modern-js/plugin-bff', '@modern-js/adapter-rstest'];
-export declare const ULTRAMODERN_WORKSPACE_MODERN_PACKAGES: readonly ['@modern-js/app-tools', '@modern-js/plugin-bff', '@modern-js/plugin-i18n', '@modern-js/plugin-tanstack', '@modern-js/runtime'];
+export declare const ULTRAMODERN_SINGLE_APP_MODERN_PACKAGES: readonly ['@modern-js/create', '@modern-js/runtime', '@modern-js/app-tools', '@modern-js/tsconfig', '@modern-js/plugin-i18n', '@modern-js/plugin-tanstack', '@modern-js/plugin-bff', '@modern-js/adapter-rstest'];
+export declare const ULTRAMODERN_WORKSPACE_MODERN_PACKAGES: readonly ['@modern-js/create', '@modern-js/app-tools', '@modern-js/plugin-bff', '@modern-js/plugin-i18n', '@modern-js/plugin-tanstack', '@modern-js/runtime'];
 export type UltramodernPackageSourceStrategy = 'workspace' | 'install';
 export type ResolvedUltramodernPackageSource = {
     strategy: UltramodernPackageSourceStrategy;

package/package.json

@@ -21,14 +21,50 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.2.0-ultramodern.108",
+  "version": "3.2.0-ultramodern.110",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/index.js",
+  "main": "./dist/esm-node/index.js",
   "bin": {
     "create": "bin/run.js"
   },
+  "typesVersions": {
+    "*": {
+      ".": [
+        "./dist/types/index.d.ts"
+      ],
+      "ultramodern-checks": [
+        "./dist/types/ultramodern-checks/index.d.ts"
+      ],
+      "ultramodern-checks/oxlint-plugin": [
+        "./dist/types/ultramodern-checks/oxlint-plugin.d.ts"
+      ]
+    }
+  },
   "exports": {
-    ".": "./dist/index.js"
+    ".": {
+      "types": "./dist/types/index.d.ts",
+      "node": {
+        "import": "./dist/esm-node/index.js",
+        "require": "./dist/cjs/index.cjs"
+      },
+      "default": "./dist/esm-node/index.js"
+    },
+    "./ultramodern-checks": {
+      "types": "./dist/types/ultramodern-checks/index.d.ts",
+      "node": {
+        "import": "./dist/esm-node/ultramodern-checks/index.js",
+        "require": "./dist/cjs/ultramodern-checks/index.cjs"
+      },
+      "default": "./dist/esm-node/ultramodern-checks/index.js"
+    },
+    "./ultramodern-checks/oxlint-plugin": {
+      "types": "./dist/types/ultramodern-checks/oxlint-plugin.d.ts",
+      "node": {
+        "import": "./dist/esm-node/ultramodern-checks/oxlint-plugin.js",
+        "require": "./dist/cjs/ultramodern-checks/oxlint-plugin.cjs"
+      },
+      "default": "./dist/esm-node/ultramodern-checks/oxlint-plugin.js"
+    }
   },
   "files": [
     "template",
@@ -36,12 +72,16 @@
     "dist",
     "bin.js"
   ],
+  "dependencies": {
+    "oxlint": "1.68.0"
+  },
   "devDependencies": {
     "@rslib/core": "0.21.5",
     "@types/node": "^25.9.1",
     "@typescript/native-preview": "7.0.0-dev.20260606.1",
     "tsx": "^4.22.3",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.108"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.110",
+    "@scripts/rstest-config": "2.66.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -49,11 +89,12 @@
   },
   "modern:source": "./src/index.ts",
   "scripts": {
-    "build": "rslib build && pnpm -w tsgo:dts \"$PWD\"",
-    "dev": "rslib build -w",
-    "start": "node ./dist/index.js"
+    "build": "rm -rf dist && rslib build -c rslibconfig.mts && pnpm -w tsgo:dts \"$PWD\"",
+    "dev": "rslib build -c rslibconfig.mts -w",
+    "start": "node ./dist/esm-node/index.js",
+    "test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests"
   },
   "ultramodern": {
-    "frameworkVersion": "3.2.0-ultramodern.108"
+    "frameworkVersion": "3.2.0-ultramodern.110"
   }
 }

package/template/package.json.handlebars

@@ -17,11 +17,11 @@
     "skills:check": "node ./scripts/bootstrap-agent-skills.mjs --check",
     "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}},
+    "ultramodern:check": "pnpm format:check && pnpm lint && pnpm typecheck && pnpm i18n:check && pnpm test{{#unless isSubproject}} && pnpm skills:check{{/unless}} && node ./scripts/validate-ultramodern.mjs",
     "format": "oxfmt .",
     "format:check": "oxfmt --check .",
     "lint": "oxlint .",
-    "lint:fix": "oxlint . --fix"{{/unless}}
+    "lint:fix": "oxlint . --fix"
   },
   "dependencies": {
     "@modern-js/plugin-i18n": "{{pluginI18nVersion}}",
@@ -39,6 +39,7 @@
     "@effect/tsgo": "{{effectTsgoVersion}}",
     "@modern-js/adapter-rstest": "{{adapterRstestVersion}}",
     "@modern-js/app-tools": "{{appToolsVersion}}",
+    "@modern-js/create": "{{createVersion}}",
 {{#if enableBff}}    "@modern-js/plugin-bff": "{{pluginBffVersion}}",
 {{/if}}    "@modern-js/tsconfig": "{{tsconfigVersion}}",
     "@rstest/core": "{{rstestCoreVersion}}",
@@ -52,12 +53,13 @@
     "happy-dom": "{{happyDomVersion}}",
 {{#unless isSubproject}}
     "lefthook": "^2.1.9",
+{{/unless}}
     "oxfmt": "{{oxfmtVersion}}",
     "oxlint": "{{oxlintVersion}}",
-{{/unless}}{{#if enableTailwind}}    "postcss": "{{postcssVersion}}",
+{{#if enableTailwind}}    "postcss": "{{postcssVersion}}",
 {{/if}}    "rimraf": "^6.1.3"{{#if enableTailwind}},
-    "tailwindcss": "^{{tailwindVersion}}"{{/if}}{{#unless isSubproject}},
-    "ultracite": "{{ultraciteVersion}}"{{/unless}}
+    "tailwindcss": "^{{tailwindVersion}}"{{/if}},
+    "ultracite": "{{ultraciteVersion}}"
   },
   "engines": {
     "node": ">=20",

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

@@ -1,206 +1,3 @@
-import fs from 'node:fs';
-import path from 'node:path';
+import { runSingleAppI18nCheck } from '@modern-js/create/ultramodern-checks';
 
-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 jsxIntrinsicTags = new Set([
-  'a',
-  'abbr',
-  'address',
-  'area',
-  'article',
-  'aside',
-  'audio',
-  'b',
-  'blockquote',
-  'body',
-  'br',
-  'button',
-  'canvas',
-  'caption',
-  'cite',
-  'code',
-  'col',
-  'colgroup',
-  'data',
-  'datalist',
-  'dd',
-  'del',
-  'details',
-  'dfn',
-  'dialog',
-  'div',
-  'dl',
-  'dt',
-  'em',
-  'fieldset',
-  'figcaption',
-  'figure',
-  'footer',
-  'form',
-  'h1',
-  'h2',
-  'h3',
-  'h4',
-  'h5',
-  'h6',
-  'head',
-  'header',
-  'hr',
-  'html',
-  'i',
-  'iframe',
-  'img',
-  'input',
-  'label',
-  'legend',
-  'li',
-  'link',
-  'main',
-  'mark',
-  'menu',
-  'meta',
-  'meter',
-  'nav',
-  'ol',
-  'option',
-  'p',
-  'picture',
-  'pre',
-  'progress',
-  'q',
-  'script',
-  'section',
-  'select',
-  'small',
-  'source',
-  'span',
-  'strong',
-  'style',
-  'summary',
-  'svg',
-  'table',
-  'tbody',
-  'td',
-  'template',
-  'textarea',
-  'tfoot',
-  'th',
-  'thead',
-  'time',
-  'title',
-  'tr',
-  'u',
-  'ul',
-  'video',
-]);
-
-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 isJsxTagEnd = (content, index) => {
-  const tagStart = content.lastIndexOf('<', index);
-  if (tagStart === -1 || content.slice(tagStart + 1, index).includes('<')) {
-    return false;
-  }
-  const match = content
-    .slice(tagStart, index + 1)
-    .match(/^<\/?\s*([A-Za-z][\w:.-]*)\b[^<>]*>$/u);
-  if (!match) {
-    return false;
-  }
-  const [, tagName] = match;
-  return (
-    /^[A-Z]/u.test(tagName) ||
-    tagName.includes('-') ||
-    jsxIntrinsicTags.has(tagName)
-  );
-};
-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)) {
-    const [, visibleText] = match;
-    if (!isIgnoredLine(content, match.index ?? 0)) {
-      violations.push({
-        filePath,
-        line: lineNumberForIndex(content, match.index ?? 0),
-        text: visibleText.trim(),
-      });
-    }
-  }
-
-  for (const match of content.matchAll(jsxTextPattern)) {
-    const [, jsxText] = match;
-    const text = jsxText.replaceAll(/\s+/gu, ' ').trim();
-    if (
-      text &&
-      !isIgnoredLine(content, match.index ?? 0) &&
-      isJsxTagEnd(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.');
+process.exitCode = runSingleAppI18nCheck();

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

@@ -97,12 +97,12 @@ const requiredPaths = [
   '.github/renovate.json',
   '.github/workflows/ultramodern-gates.yml',
   'lefthook.yml',
-  'oxlint.config.ts',
-  'oxfmt.config.ts',
   'scripts/bootstrap-agent-skills.mjs',
 {{/unless}}
   '.mise.toml',
   '.modernjs/ultramodern-package-source.json',
+  'oxlint.config.ts',
+  'oxfmt.config.ts',
   'pnpm-workspace.yaml',
   'rstest.config.mts',
   'scripts/check-i18n-strings.mjs',
@@ -349,14 +349,12 @@ const skillsLock = JSON.parse(
 );
 {{/unless}}
 const requiredScripts = {
-{{#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',
+{{#unless isSubproject}}
   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',
@@ -371,6 +369,15 @@ for (const [scriptName, scriptCommand] of Object.entries(requiredScripts)) {
   }
 }
 
+const i18nCheckScript = readText('scripts/check-i18n-strings.mjs');
+if (
+  !i18nCheckScript.includes("from '@modern-js/create/ultramodern-checks'") ||
+  !i18nCheckScript.includes('runSingleAppI18nCheck')
+) {
+  console.error('i18n:check must call @modern-js/create/ultramodern-checks');
+  process.exit(1);
+}
+
 if (
   !packageJson.scripts?.typecheck?.includes('effect-tsgo') ||
   !packageJson.scripts.typecheck.includes('get-exe-path')
@@ -379,8 +386,10 @@ if (
   process.exit(1);
 }
 
-if (!packageJson.scripts?.['ultramodern:check']?.includes('pnpm test')) {
-  console.error('ultramodern:check must run the generated Rstest suite');
+const expectedUltramodernCheck =
+  'pnpm format:check && pnpm lint && pnpm typecheck && pnpm i18n:check && pnpm test{{#unless isSubproject}} && pnpm skills:check{{/unless}} && node ./scripts/validate-ultramodern.mjs';
+if (packageJson.scripts?.['ultramodern:check'] !== expectedUltramodernCheck) {
+  console.error('ultramodern:check must run format, lint, typecheck, i18n, tests, and contract validation');
   process.exit(1);
 }
 
@@ -572,6 +581,14 @@ for (const section of ['dependencies', 'devDependencies']) {
   }
 }
 
+if (
+  packageJson.devDependencies?.['@modern-js/create'] !==
+  expectedModernDependency('@modern-js/create')
+) {
+  console.error('devDependencies.@modern-js/create must match package source metadata');
+  process.exit(1);
+}
+
 for (const dependency of ['@modern-js/plugin-i18n', 'i18next', 'react-i18next']) {
   if (!packageJson.dependencies?.[dependency]) {
     console.error(`Missing dependency: ${dependency}`);
@@ -582,6 +599,7 @@ for (const dependency of ['@modern-js/plugin-i18n', 'i18next', 'react-i18next'])
 for (const dependency of [
   '@effect/tsgo',
   '@modern-js/adapter-rstest',
+  '@modern-js/create',
   '@rstest/core',
   '@typescript/native-preview',
   'happy-dom',
@@ -590,11 +608,11 @@ for (const dependency of [
   'postcss',
   'tailwindcss',
 {{/if}}
-{{#unless isSubproject}}
-  'lefthook',
   'oxlint',
   'oxfmt',
   'ultracite',
+{{#unless isSubproject}}
+  'lefthook',
 {{/unless}}
 ]) {
   if (!packageJson.devDependencies?.[dependency]) {

package/template/tests/ultramodern.contract.test.ts.handlebars

@@ -15,6 +15,8 @@ describe('generated UltraModern contract', () => {
     );
     expect(fs.existsSync(path.join(root, 'src/routes/page.tsx'))).toBe(false);
     expect(fs.existsSync(path.join(root, 'src/routes/layout.tsx'))).toBe(true);
+    expect(fs.existsSync(path.join(root, 'oxlint.config.ts'))).toBe(true);
+    expect(fs.existsSync(path.join(root, 'oxfmt.config.ts'))).toBe(true);
 {{#if enableTailwind}}
     expect(fs.existsSync(path.join(root, 'postcss.config.mjs'))).toBe(true);
     expect(fs.existsSync(path.join(root, 'tailwind.config.ts'))).toBe(true);
@@ -86,6 +88,7 @@ describe('generated UltraModern contract', () => {
     const packageJson = readJson<{
       dependencies?: Record<string, string>;
       devDependencies?: Record<string, string>;
+      scripts?: Record<string, string>;
       modernjs?: {
         packageSource?: {
           config?: string;
@@ -125,6 +128,22 @@ describe('generated UltraModern contract', () => {
     expect(
       packageJson.devDependencies?.['@modern-js/adapter-rstest'],
     ).toBeTruthy();
+    expect(
+      packageJson.devDependencies?.['@modern-js/create'],
+    ).toBeTruthy();
+    expect(readText('scripts/check-i18n-strings.mjs')).toContain(
+      "from '@modern-js/create/ultramodern-checks'",
+    );
+    expect(packageJson.scripts?.format).toBe('oxfmt .');
+    expect(packageJson.scripts?.['format:check']).toBe('oxfmt --check .');
+    expect(packageJson.scripts?.lint).toBe('oxlint .');
+    expect(packageJson.scripts?.['lint:fix']).toBe('oxlint . --fix');
+    expect(packageJson.scripts?.['ultramodern:check']).toContain(
+      'pnpm format:check && pnpm lint',
+    );
+    expect(packageJson.devDependencies?.oxfmt).toBe('0.53.0');
+    expect(packageJson.devDependencies?.oxlint).toBe('1.68.0');
+    expect(packageJson.devDependencies?.ultracite).toBe('7.8.1');
 {{#if enableTailwind}}
     expect(packageJson.devDependencies?.tailwindcss).toBe('^4.3.0');
     expect(packageJson.devDependencies?.['@tailwindcss/postcss']).toBe(