@bleedingdev/modern-js-create 3.2.0-ultramodern.13 → 3.2.0-ultramodern.14

package/dist/index.js

@@ -1416,7 +1416,7 @@ const LocalizedHead = () => {
 function createShellPage() {
     return `import { Helmet } from '@modern-js/runtime/head';
 import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
-import { useLocation } from '@modern-js/runtime/tanstack-router';
+import { useLocation } from '@modern-js/plugin-tanstack/runtime';
 import { useTranslation } from 'react-i18next';
 
 const remotes = ['remote-commerce', 'remote-identity', 'remote-design-system'];
@@ -1462,7 +1462,7 @@ export default function ShellHome() {
 function createRemotePage(app) {
     return `import { Helmet } from '@modern-js/runtime/head';
 import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
-import { useLocation } from '@modern-js/runtime/tanstack-router';
+import { useLocation } from '@modern-js/plugin-tanstack/runtime';
 import { useTranslation } from 'react-i18next';
 
 ${createLocalizedHeadComponent()}
@@ -2028,7 +2028,6 @@ const templateIdPattern = /^[a-z0-9][a-z0-9._-]*$/;
 const packageNamePattern = /^(?:@[a-z0-9._-]+\/)?[a-z0-9._-]+$/;
 const requiredDeniedPaths = [
     '.git/**',
-    '.github/**',
     '.npmrc',
     '.yarnrc',
     '.env',
@@ -2211,6 +2210,7 @@ function createBuiltinTemplateManifest(version) {
             allowedPaths: [
                 '.agents/**',
                 '.browserslistrc',
+                '.github/**',
                 '.gitignore',
                 '.modernjs/**',
                 '.nvmrc',
@@ -2223,10 +2223,12 @@ function createBuiltinTemplateManifest(version) {
                 'oxlint.config.ts',
                 'package.json',
                 'postcss.config.mjs',
+                'rstest.config.mts',
                 "scripts/**",
                 'shared/**',
                 'src/**',
                 'tailwind.config.ts',
+                'tests/**',
                 'tsconfig.json'
             ],
             deniedPaths: requiredDeniedPaths,
@@ -2255,10 +2257,13 @@ function createBuiltinTemplateManifest(version) {
             postMaterializationValidation: [
                 'ultramodern-contract-check',
                 'dependency-install-with-lifecycle-deny',
+                'package-source-retained',
+                'rstest-smoke-tests',
                 'template-manifest-retained'
             ],
             expectedCommands: [
                 "pnpm install --ignore-scripts",
+                'pnpm test',
                 'pnpm run ultramodern:check'
             ]
         }
@@ -2487,6 +2492,45 @@ function singleAppModernPackageSpecifier(packageName, packageSource, useWorkspac
     if ('install' !== packageSource.strategy || !packageSource.aliasScope) return packageSource.modernPackageVersion;
     return `npm:${src_modernAliasPackageName(packageName, packageSource)}@${packageSource.modernPackageVersion}`;
 }
+const singleAppModernPackages = [
+    '@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'
+];
+function createSingleAppPackageSourceEvidence(packageSource, useWorkspaceProtocol) {
+    const strategy = useWorkspaceProtocol ? 'workspace' : 'install';
+    const specifier = useWorkspaceProtocol ? 'workspace:*' : packageSource.modernPackageVersion;
+    const aliases = 'install' === strategy && packageSource.aliasScope ? Object.fromEntries(singleAppModernPackages.map((packageName)=>[
+            packageName,
+            src_modernAliasPackageName(packageName, packageSource)
+        ])) : void 0;
+    return {
+        schemaVersion: 1,
+        preset: 'presetUltramodern',
+        strategy,
+        modernPackages: {
+            specifier,
+            packages: singleAppModernPackages,
+            ...packageSource.registry ? {
+                registry: packageSource.registry
+            } : {},
+            ...aliases ? {
+                aliases
+            } : {}
+        }
+    };
+}
+function writeSingleAppPackageSourceEvidence(targetDir, packageSource, useWorkspaceProtocol) {
+    const evidencePath = node_path.join(targetDir, '.modernjs', 'ultramodern-package-source.json');
+    node_fs.mkdirSync(node_path.dirname(evidencePath), {
+        recursive: true
+    });
+    node_fs.writeFileSync(evidencePath, `${JSON.stringify(createSingleAppPackageSourceEvidence(packageSource, useWorkspaceProtocol), null, 2)}\n`);
+}
 function isDirectoryEmpty(dirPath) {
     if (!node_fs.existsSync(dirPath)) return false;
     try {
@@ -2609,6 +2653,7 @@ async function main() {
         version: useWorkspaceProtocol ? 'workspace:*' : packageSource.modernPackageVersion,
         runtimeVersion: singleAppModernPackageSpecifier('@modern-js/runtime', packageSource, useWorkspaceProtocol),
         appToolsVersion: singleAppModernPackageSpecifier('@modern-js/app-tools', packageSource, useWorkspaceProtocol),
+        adapterRstestVersion: singleAppModernPackageSpecifier('@modern-js/adapter-rstest', packageSource, useWorkspaceProtocol),
         tsconfigVersion: singleAppModernPackageSpecifier('@modern-js/tsconfig', packageSource, useWorkspaceProtocol),
         pluginTanstackVersion: singleAppModernPackageSpecifier('@modern-js/plugin-tanstack', packageSource, useWorkspaceProtocol),
         pluginBffVersion: singleAppModernPackageSpecifier('@modern-js/plugin-bff', packageSource, useWorkspaceProtocol),
@@ -2622,6 +2667,14 @@ async function main() {
     const targetPackageJson = node_path.join(targetDir, 'package.json');
     const packageJson = JSON.parse(node_fs.readFileSync(targetPackageJson, 'utf-8'));
     packageJson.name = generatedPackageName;
+    packageJson.modernjs = {
+        ...packageJson.modernjs ?? {},
+        preset: 'presetUltramodern',
+        packageSource: {
+            strategy: useWorkspaceProtocol ? 'workspace' : 'install',
+            config: './.modernjs/ultramodern-package-source.json'
+        }
+    };
     if (isSubproject) {
         delete packageJson['lint-staged'];
         delete packageJson['simple-git-hooks'];
@@ -2644,6 +2697,7 @@ async function main() {
     }
     node_fs.writeFileSync(targetPackageJson, `${JSON.stringify(packageJson, null, 2)}\n`);
     writeTemplateManifestEvidence(targetDir, templateManifest);
+    writeSingleAppPackageSourceEvidence(targetDir, packageSource, useWorkspaceProtocol);
     const dim = '\x1b[2m\x1b[3m';
     const reset = '\x1b[0m';
     console.log(`${i18n.t(localeKeys.message.success)}\n`);
@@ -2660,6 +2714,7 @@ function copyTemplate(src, dest, options) {
     });
     const excludeInSubproject = [
         '.agents',
+        '.github',
         '.gitignore.handlebars',
         'AGENTS.md',
         '.npmrc',
@@ -2689,6 +2744,7 @@ function copyTemplate(src, dest, options) {
                     version: options.version,
                     runtimeVersion: options.runtimeVersion,
                     appToolsVersion: options.appToolsVersion,
+                    adapterRstestVersion: options.adapterRstestVersion,
                     tsconfigVersion: options.tsconfigVersion,
                     pluginTanstackVersion: options.pluginTanstackVersion,
                     pluginBffVersion: options.pluginBffVersion,
@@ -2700,7 +2756,7 @@ function copyTemplate(src, dest, options) {
                     useHonoBff: 'hono' === options.bffRuntime,
                     bffRuntime: options.bffRuntime,
                     enableTailwind: options.enableTailwind,
-                    routerImportPath: 'tanstack' === options.routerFramework ? 'tanstack-router' : 'router'
+                    routerRuntimeImport: 'tanstack' === options.routerFramework ? '@modern-js/plugin-tanstack/runtime' : '@modern-js/runtime/router'
                 });
                 if (0 === rendered.trim().length) continue;
                 destPath = destPath.replace(/\.handlebars$/, '');

package/package.json

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

package/template/.github/workflows/ultramodern-gates.yml.handlebars

@@ -21,7 +21,7 @@ jobs:
           cache: pnpm
 
       - name: Install Dependencies
-        run: pnpm install
+        run: pnpm install --ignore-scripts
 
       - name: Validate Ultramodern Contract
         run: pnpm run ultramodern:check

package/template/package.json.handlebars

@@ -1,17 +1,22 @@
 {
   "name": "{{packageName}}",
   "version": "0.1.0",
+  "private": true,
   "type": "module",
+  "packageManager": "pnpm@11.1.2",
   "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 && pnpm i18n:check{{#unless isSubproject}} && pnpm skills:check{{/unless}} && node ./scripts/validate-ultramodern.mjs"{{#unless isSubproject}},
+{{/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 .",
@@ -32,16 +37,20 @@
   },
   "devDependencies": {
     "@effect/tsgo": "0.7.3",
+    "@modern-js/adapter-rstest": "{{adapterRstestVersion}}",
     "@modern-js/app-tools": "{{appToolsVersion}}",
 {{#if enableBff}}    "@modern-js/plugin-bff": "{{pluginBffVersion}}",
 {{/if}}    "@modern-js/tsconfig": "{{tsconfigVersion}}",
+    "@rstest/core": "0.10.0",
 {{#if enableTailwind}}
     "@tailwindcss/postcss": "^4.1.18",
 {{/if}}
+    "@testing-library/jest-dom": "^6.9.1",
     "@types/node": "^20",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@typescript/native-preview": "7.0.0-dev.20260518.1",
+    "happy-dom": "^20.8.9",
 {{#unless isSubproject}}
     "lint-staged": "~15.4.0",
     "oxfmt": "0.50.0",
@@ -62,6 +71,15 @@
     ]
   }{{/unless}},
   "engines": {
-    "node": ">=20"
+    "node": ">=20",
+    "pnpm": ">=11.0.0"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "@swc/core",
+      "core-js",
+      "esbuild",
+      "msgpackr-extract"
+    ]
   }
 }

package/template/rstest.config.mts

@@ -0,0 +1,8 @@
+import { withModernConfig } from '@modern-js/adapter-rstest';
+import { defineConfig } from '@rstest/core';
+
+export default defineConfig({
+  extends: withModernConfig(),
+  testEnvironment: 'happy-dom',
+  setupFiles: ['./tests/rstest.setup.ts'],
+});

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

@@ -3,6 +3,11 @@ import path from 'node:path';
 
 const configPath = path.resolve(process.cwd(), 'modern.config.ts');
 const templateManifestPath = path.resolve(process.cwd(), '.modernjs/mv-template-manifest.json');
+const packageSourcePath = path.resolve(
+  process.cwd(),
+  '.modernjs/ultramodern-package-source.json',
+);
+const isSubproject = {{isSubproject}};
 
 if (!fs.existsSync(configPath)) {
   console.error('modern.config.ts not found');
@@ -37,7 +42,6 @@ if (!fs.existsSync(templateManifestPath)) {
 const templateManifest = JSON.parse(fs.readFileSync(templateManifestPath, 'utf-8'));
 const requiredDeniedPaths = [
   '.git/**',
-  '.github/**',
   '.npmrc',
   '.yarnrc',
   '.env',
@@ -48,19 +52,28 @@ const requiredDeniedPaths = [
 const requiredPostMaterialization = [
   'ultramodern-contract-check',
   'dependency-install-with-lifecycle-deny',
+  'package-source-retained',
+  'rstest-smoke-tests',
   'template-manifest-retained',
 ];
 const requiredPaths = [
+{{#unless isSubproject}}
   'AGENTS.md',
   '.agents/skills-lock.json',
+  '.github/workflows/ultramodern-gates.yml',
   'oxlint.config.ts',
   'oxfmt.config.ts',
   'scripts/bootstrap-agent-skills.mjs',
+{{/unless}}
+  '.modernjs/ultramodern-package-source.json',
+  'rstest.config.mts',
   'scripts/check-i18n-strings.mjs',
   'config/public/locales/en/translation.json',
   'config/public/locales/cs/translation.json',
   'src/modern-app-env.d.ts',
   'src/routes/[lang]/page.tsx',
+  'tests/rstest.setup.ts',
+  'tests/ultramodern.contract.test.ts',
 ];
 const manifestErrors = [];
 
@@ -86,12 +99,22 @@ for (const token of [
   'hrefLang="x-default"',
   'localizedPath(',
   '<a',
+{{#if isTanstackRouter}}
+  "@modern-js/plugin-tanstack/runtime",
+{{/if}}
 ]) {
   if (!pageContent.includes(token)) {
     console.error(`Localized route is missing ${token}`);
     process.exit(1);
   }
 }
+{{#if isTanstackRouter}}
+const deprecatedTanstackRuntime = '@modern-js/runtime/' + 'tanstack-router';
+if (pageContent.includes(deprecatedTanstackRuntime)) {
+  console.error('Localized route must import TanStack runtime from @modern-js/plugin-tanstack/runtime');
+  process.exit(1);
+}
+{{/if}}
 
 if (templateManifest.schemaVersion !== 1) {
   manifestErrors.push('schemaVersion');
@@ -139,22 +162,32 @@ if (manifestErrors.length > 0) {
 const packageJson = JSON.parse(
   fs.readFileSync(path.resolve(process.cwd(), 'package.json'), 'utf-8'),
 );
+const packageSource = JSON.parse(fs.readFileSync(packageSourcePath, 'utf-8'));
 const unresolvedTemplateMarker = String.fromCodePoint(123, 123);
 if (JSON.stringify(packageJson).includes(unresolvedTemplateMarker)) {
   console.error('package.json contains unresolved template markers');
   process.exit(1);
 }
+if (JSON.stringify(packageSource).includes(unresolvedTemplateMarker)) {
+  console.error('package source metadata contains unresolved template markers');
+  process.exit(1);
+}
+{{#unless isSubproject}}
 const skillsLock = JSON.parse(
   fs.readFileSync(path.resolve(process.cwd(), '.agents/skills-lock.json'), 'utf-8'),
 );
+{{/unless}}
 const requiredScripts = {
+  'i18n:check': 'node ./scripts/check-i18n-strings.mjs',
+  test: 'rstest run',
+{{#unless isSubproject}}
   format: 'oxfmt .',
   'format:check': 'oxfmt --check .',
-  'i18n:check': 'node ./scripts/check-i18n-strings.mjs',
   lint: 'oxlint .',
   'lint:fix': 'oxlint . --fix',
   'skills:check': 'node ./scripts/bootstrap-agent-skills.mjs --check',
   'skills:install': 'node ./scripts/bootstrap-agent-skills.mjs',
+{{/unless}}
 };
 
 for (const [scriptName, scriptCommand] of Object.entries(requiredScripts)) {
@@ -172,6 +205,112 @@ if (
   process.exit(1);
 }
 
+if (!packageJson.scripts?.['ultramodern:check']?.includes('pnpm test')) {
+  console.error('ultramodern:check must run the generated Rstest suite');
+  process.exit(1);
+}
+
+if (packageJson.private !== true) {
+  console.error('Generated app package must be private by default');
+  process.exit(1);
+}
+
+if (packageJson.packageManager !== 'pnpm@11.1.2') {
+  console.error('Generated app package must pin pnpm@11.1.2');
+  process.exit(1);
+}
+
+if (packageJson.engines?.pnpm !== '>=11.0.0') {
+  console.error('Generated app package must require pnpm >=11.0.0');
+  process.exit(1);
+}
+
+if (packageJson.modernjs?.preset !== 'presetUltramodern') {
+  console.error('package.json must declare presetUltramodern metadata');
+  process.exit(1);
+}
+
+if (
+  packageJson.modernjs?.packageSource?.config !== './.modernjs/ultramodern-package-source.json'
+) {
+  console.error('package.json must retain package source metadata location');
+  process.exit(1);
+}
+
+if (packageSource.schemaVersion !== 1) {
+  console.error('Package source metadata must use schemaVersion 1');
+  process.exit(1);
+}
+
+if (packageSource.preset !== 'presetUltramodern') {
+  console.error('Package source metadata must declare presetUltramodern');
+  process.exit(1);
+}
+
+if (packageSource.strategy !== 'workspace' && packageSource.strategy !== 'install') {
+  console.error('Package source strategy must be workspace or install');
+  process.exit(1);
+}
+
+const expectedModernPackages = [
+  '@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',
+];
+
+for (const packageName of expectedModernPackages) {
+  if (!packageSource.modernPackages?.packages?.includes(packageName)) {
+    console.error(`Package source metadata must include ${packageName}`);
+    process.exit(1);
+  }
+}
+
+const expectedModernSpecifier = packageSource.modernPackages?.specifier;
+if (typeof expectedModernSpecifier !== 'string' || expectedModernSpecifier.length === 0) {
+  console.error('Package source metadata must provide a Modern package specifier');
+  process.exit(1);
+}
+
+const expectedModernDependency = (packageName) => {
+  const alias = packageSource.modernPackages?.aliases?.[packageName];
+  return typeof alias === 'string'
+    ? `npm:${alias}@${expectedModernSpecifier}`
+    : expectedModernSpecifier;
+};
+
+for (const packageName of [
+  '@modern-js/runtime',
+  '@modern-js/plugin-i18n',
+  '@modern-js/plugin-tanstack',
+]) {
+  if (
+    packageJson.dependencies?.[packageName] &&
+    packageJson.dependencies[packageName] !== expectedModernDependency(packageName)
+  ) {
+    console.error(`Dependency ${packageName} must match package source metadata`);
+    process.exit(1);
+  }
+}
+
+for (const packageName of [
+  '@modern-js/app-tools',
+  '@modern-js/adapter-rstest',
+  '@modern-js/tsconfig',
+  '@modern-js/plugin-bff',
+]) {
+  if (
+    packageJson.devDependencies?.[packageName] &&
+    packageJson.devDependencies[packageName] !== expectedModernDependency(packageName)
+  ) {
+    console.error(`Dev dependency ${packageName} 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}`);
@@ -181,10 +320,16 @@ for (const dependency of ['@modern-js/plugin-i18n', 'i18next', 'react-i18next'])
 
 for (const dependency of [
   '@effect/tsgo',
+  '@modern-js/adapter-rstest',
+  '@rstest/core',
+  '@testing-library/jest-dom',
   '@typescript/native-preview',
+  'happy-dom',
+{{#unless isSubproject}}
   'oxlint',
   'oxfmt',
   'ultracite',
+{{/unless}}
 ]) {
   if (!packageJson.devDependencies?.[dependency]) {
     console.error(`Missing devDependency: ${dependency}`);
@@ -192,6 +337,7 @@ for (const dependency of [
   }
 }
 
+{{#unless isSubproject}}
 const privateSource = skillsLock.sources?.find(
   (source) => source.repository === 'https://github.com/TechsioCZ/skills',
 );
@@ -202,5 +348,6 @@ for (const skillName of ['plan-graph', 'dag', 'subagent-graph', 'helm', 'debugge
     process.exit(1);
   }
 }
+{{/unless}}
 
 console.log('Ultramodern contract check passed.');

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

@@ -1,6 +1,6 @@
 import { Helmet } from '@modern-js/runtime/head';
 import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
-import { useLocation } from '@modern-js/runtime/{{routerImportPath}}';
+import { useLocation } from '{{routerRuntimeImport}}';
 {{#if useEffectBff}}import effectBff from '@api/effect/index';
 import { Effect } from '@modern-js/plugin-bff/effect-client';
 import { useEffect, useState } from 'react';

package/template/src/routes/layout.tsx.handlebars

@@ -1,4 +1,4 @@
-import { Outlet } from '@modern-js/runtime/{{routerImportPath}}';
+import { Outlet } from '{{routerRuntimeImport}}';
 
 export default function Layout() {
   return (

package/template/tests/rstest.setup.ts

@@ -0,0 +1,4 @@
+import { expect } from '@rstest/core';
+import * as jestDomMatchers from '@testing-library/jest-dom/matchers';
+
+expect.extend(jestDomMatchers);

package/template/tests/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "types": ["@testing-library/jest-dom", "@rstest/core/globals"]
+  },
+  "include": ["./"]
+}

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

@@ -0,0 +1,67 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { describe, expect, test } from '@rstest/core';
+
+const root = process.cwd();
+const readText = (relativePath: string) =>
+  fs.readFileSync(path.join(root, relativePath), 'utf-8');
+const readJson = <T>(relativePath: string): T =>
+  JSON.parse(readText(relativePath)) as T;
+
+describe('generated UltraModern contract', () => {
+  test('keeps localized route metadata and Rstest wiring', () => {
+    expect(fs.existsSync(path.join(root, 'src/routes/[lang]/page.tsx'))).toBe(
+      true,
+    );
+    expect(fs.existsSync(path.join(root, 'src/routes/page.tsx'))).toBe(false);
+
+    const page = readText('src/routes/[lang]/page.tsx');
+    expect(page).toContain('rel="canonical"');
+    expect(page).toContain('rel="alternate"');
+    expect(page).toContain('hrefLang="x-default"');
+    expect(page).toContain('localizedPath(');
+
+    const config = readText('rstest.config.mts');
+    expect(config).toContain("withModernConfig()");
+    expect(config).toContain("testEnvironment: 'happy-dom'");
+  });
+
+  test('retains package-source metadata for generated Modern.js packages', () => {
+    const packageJson = readJson<{
+      dependencies?: Record<string, string>;
+      devDependencies?: Record<string, string>;
+      modernjs?: {
+        packageSource?: {
+          config?: string;
+        };
+        preset?: string;
+      };
+    }>('package.json');
+    const packageSource = readJson<{
+      modernPackages?: {
+        packages?: string[];
+        specifier?: string;
+      };
+      strategy?: string;
+    }>('.modernjs/ultramodern-package-source.json');
+
+    expect(packageJson.modernjs?.preset).toBe('presetUltramodern');
+    expect(packageJson.modernjs?.packageSource?.config).toBe(
+      './.modernjs/ultramodern-package-source.json',
+    );
+    expect(packageSource.strategy).toMatch(/^(workspace|install)$/u);
+    expect(packageSource.modernPackages?.packages).toContain(
+      '@modern-js/runtime',
+    );
+    expect(packageSource.modernPackages?.packages).toContain(
+      '@modern-js/app-tools',
+    );
+    expect(packageSource.modernPackages?.packages).toContain(
+      '@modern-js/adapter-rstest',
+    );
+    expect(packageSource.modernPackages?.specifier).toBeTruthy();
+    expect(
+      packageJson.devDependencies?.['@modern-js/adapter-rstest'],
+    ).toBeTruthy();
+  });
+});

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

@@ -120,6 +120,8 @@ for (const appDirectory of [
 const rootPackage = readJson('package.json');
 const packageSource = readJson('.modernjs/ultramodern-package-source.json');
 const skillsLock = readJson('.agents/skills-lock.json');
+const pnpmWorkspace = readText('pnpm-workspace.yaml');
+const deprecatedTanstackRuntime = '@modern-js/runtime/' + 'tanstack-router';
 const expectedModernSpecifier =
   packageSource.strategy === 'install' ? packageSource.modernPackages?.specifier : 'workspace:*';
 
@@ -138,6 +140,16 @@ assert(rootPackage.private === true, 'Root package must be private');
 assert(rootPackage.modernjs?.preset === 'presetUltramodern', 'Root must declare presetUltramodern');
 assert(rootPackage.packageManager === 'pnpm@11.1.2', 'Root must pin pnpm 11.1.2');
 assert(rootPackage.engines?.pnpm === '>=11.0.0', 'Root must require pnpm >=11');
+for (const requiredSnippet of [
+  'packages:\n  - apps/*\n  - apps/remotes/*\n  - services/*\n  - packages/*',
+  "allowBuilds:\n  '@swc/core': true\n  core-js: true\n  esbuild: true\n  msgpackr-extract: true",
+  "onlyBuiltDependencies:\n  - '@swc/core'\n  - core-js\n  - esbuild\n  - msgpackr-extract",
+]) {
+  assert(
+    pnpmWorkspace.includes(requiredSnippet),
+    `pnpm-workspace.yaml must retain ${requiredSnippet.split('\n')[0]}`,
+  );
+}
 assert(
   rootPackage.modernjs?.packageSource?.config === './.modernjs/ultramodern-package-source.json',
   'Root must point to the UltraModern package source metadata',
@@ -330,6 +342,14 @@ for (const routePath of [
   assert(route.includes('rel="alternate"'), `${routePath} must emit alternate locale metadata`);
   assert(route.includes('hrefLang="x-default"'), `${routePath} must emit x-default metadata`);
   assert(route.includes('localizedPath('), `${routePath} must build localized URLs`);
+  assert(
+    route.includes('@modern-js/plugin-tanstack/runtime'),
+    `${routePath} must import TanStack runtime from @modern-js/plugin-tanstack/runtime`,
+  );
+  assert(
+    !route.includes(deprecatedTanstackRuntime),
+    `${routePath} must not import deprecated TanStack runtime path`,
+  );
 }
 
 const shellMf = readText('apps/shell-super-app/module-federation.config.ts');