@bleedingdev/modern-js-create 3.5.0-ultramodern.2 → 3.5.0-ultramodern.21

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

@@ -486,7 +486,7 @@ const createAppConfigContract = app => ({
     'zephyrRspackPlugin',
   ],
   dev: {
-    assetPrefix: '/',
+    assetPrefix: app.kind === 'shell' ? '/' : 'app-public-origin',
   },
   output: {
     assetPrefix: {
@@ -1116,6 +1116,7 @@ const assertProjectReferenceEmitConfig = (tsConfig, packagePath) => {
   );
 };
 const assertTsConfigReferenceGraph = () => {
+  const baseTsConfig = readJson('tsconfig.base.json');
   const rootTsConfig = readJson('tsconfig.json');
   const shellTsConfig = readJson('apps/shell-super-app/tsconfig.json');
   const shellMfTypesTsConfig = readJson(
@@ -1151,6 +1152,13 @@ const assertTsConfigReferenceGraph = () => {
     'apps/shell-super-app/tsconfig.json references',
     'restore the generated shell project-reference graph',
   );
+  assert(baseTsConfig.compilerOptions?.skipLibCheck !== true, 'tsconfig.base.json must not use skipLibCheck');
+  assertSameJson(
+    shellTsConfig.include ?? [],
+    ['src', 'locales/**/*.json', 'package.json', 'shared'],
+    'apps/shell-super-app/tsconfig.json include',
+    'restore the generated shell typecheck boundary',
+  );
   assertProjectReferenceEmitConfig(
     shellTsConfig,
     'apps/shell-super-app',
@@ -1158,7 +1166,7 @@ const assertTsConfigReferenceGraph = () => {
   assertSameJson(
     shellMfTypesTsConfig,
     {
-      extends: './tsconfig.json',
+      extends: '../../tsconfig.base.json',
       include: ['src/modern-app-env.d.ts'],
     },
     'apps/shell-super-app/tsconfig.mf-types.json',
@@ -1191,11 +1199,17 @@ const assertTsConfigReferenceGraph = () => {
       `${vertical.path}/tsconfig.json references`,
       'restore the generated MicroVertical project-reference graph',
     );
+    assertSameJson(
+      verticalTsConfig.include ?? [],
+      ['src', 'locales/**/*.json', 'package.json', 'shared', 'api'],
+      `${vertical.path}/tsconfig.json include`,
+      'restore the generated MicroVertical typecheck boundary',
+    );
     assertProjectReferenceEmitConfig(verticalTsConfig, vertical.path);
     assertSameJson(
       verticalMfTypesTsConfig,
       {
-        extends: './tsconfig.json',
+        extends: '../../tsconfig.base.json',
         include: [
           'src/federation-entry.tsx',
           ...vertical.componentPaths.map(componentPath =>
@@ -1349,6 +1363,33 @@ const extractAssetPrefixExpression = modernConfig => {
   assert(match?.groups?.expression, 'modern.config.ts must assign assetPrefix');
   return match.groups.expression;
 };
+const assertTargetIsolatedBuildArtifacts = (appId, modernConfig) => {
+  assert(
+    modernConfig.includes("const buildTarget = cloudflareDeployEnabled ? 'cloudflare' : 'web';") &&
+      modernConfig.includes("const buildOutputRoot = cloudflareDeployEnabled ? 'dist-cloudflare' : 'dist';") &&
+      modernConfig.includes('const buildTempDirectory = `node_modules/.modern-js-${appId}-${buildTarget}`;') &&
+      modernConfig.includes('const buildCacheDirectory = `node_modules/.cache/rspack-${appId}-${buildTarget}`;') &&
+      modernConfig.includes('root: buildOutputRoot,') &&
+      modernConfig.includes('tempDir: buildTempDirectory,') &&
+      modernConfig.includes('cacheDigest: [appId, buildTarget],') &&
+      modernConfig.includes('cacheDirectory: buildCacheDirectory,'),
+    `${appId} must isolate build output, Modern temp files, and Rspack cache by app and build target`,
+  );
+};
+const assertCloudflareBuildSkipsDeployRebuild = (appId, packageJson) => {
+  assert(
+    packageJson.scripts?.['cloudflare:build']?.includes(
+      'ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy --skip-build',
+    ),
+    `${appId} cloudflare:build must deploy with --skip-build after the explicit Cloudflare build`,
+  );
+  assert(
+    !packageJson.scripts?.['cloudflare:build']?.includes(
+      '--target dist && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy',
+    ),
+    `${appId} cloudflare:build must not write public-surface assets into the normal web dist before deploy`,
+  );
+};
 const stripYamlInlineComment = value => {
   let quote = undefined;
   for (let index = 0; index < value.length; index += 1) {
@@ -1462,6 +1503,9 @@ const requiredPaths = [
   '.gitignore',
   'package.json',
   'pnpm-workspace.yaml',
+  'patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch',
+  'patches/@module-federation__bridge-react@{{moduleFederationVersion}}.patch',
+  'patches/effect-schema-error-type-id.patch',
   'tsconfig.json',
   'tsconfig.base.json',
   'oxlint.config.ts',
@@ -1537,6 +1581,33 @@ for (const vertical of fullStackVerticals) {
 for (const requiredPath of requiredPaths) {
   assertExists(requiredPath);
 }
+const pnpmWorkspace = readText('pnpm-workspace.yaml');
+assert(
+  pnpmWorkspace.includes("'@effect/opentelemetry': {{effectVersion}}"),
+  'pnpm-workspace.yaml must override @effect/opentelemetry to the generated Effect cohort',
+);
+assert(
+  pnpmWorkspace.includes('effect: {{effectVersion}}'),
+  'pnpm-workspace.yaml must override effect to the generated Effect cohort',
+);
+assert(
+  pnpmWorkspace.includes(
+    "'@module-federation/modern-js-v3@{{moduleFederationVersion}}': patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch",
+  ),
+  'pnpm-workspace.yaml must patch the generated Module Federation Modern.js integration cohort',
+);
+assert(
+  pnpmWorkspace.includes(
+    "'@module-federation/bridge-react@{{moduleFederationVersion}}': patches/@module-federation__bridge-react@{{moduleFederationVersion}}.patch",
+  ),
+  'pnpm-workspace.yaml must patch the generated Module Federation React bridge cohort',
+);
+assert(
+  pnpmWorkspace.includes(
+    "'effect@{{effectVersion}}': patches/effect-schema-error-type-id.patch",
+  ),
+  'pnpm-workspace.yaml must patch the generated Effect declaration cohort',
+);
 for (const oldRemotePath of oldRemotePaths) {
   assertNotExists(oldRemotePath);
 }
@@ -1751,8 +1822,17 @@ assert(JSON.stringify(generatedContract.performanceReadiness?.signals?.map(signa
 
 const shellModernConfig = readText('apps/shell-super-app/modern.config.ts');
 const shellModuleFederationConfig = readText('apps/shell-super-app/module-federation.config.ts');
+const shellModernAppEnv = readText('apps/shell-super-app/src/modern-app-env.d.ts');
+const gitignore = readText('.gitignore');
 const shellRouteHead = readText('apps/shell-super-app/src/routes/ultramodern-route-head.tsx');
 const shellRouteMetadata = readText('apps/shell-super-app/src/routes/ultramodern-route-metadata.ts');
+assert(/^\.mf\/$/mu.test(gitignore), 'Generated .gitignore must ignore root Module Federation diagnostics');
+assert(/^\*\*\/\.mf\/$/mu.test(gitignore), 'Generated .gitignore must ignore per-app Module Federation diagnostics');
+assert(/^dist-cloudflare\/$/mu.test(gitignore), 'Generated .gitignore must ignore Cloudflare build output');
+assert(shellModernAppEnv.includes("import '@modern-js/app-tools/types';"), 'Shell app env must import the framework-owned app ambient type bundle through module resolution');
+assert(/declare global \{\s*const ULTRAMODERN_SITE_URL: string;\s*\}/u.test(shellModernAppEnv), 'Shell app env must keep generated globals explicit after importing app ambient types');
+assert(!shellModernAppEnv.includes("declare module '*.svg'"), 'Shell app env must not redeclare framework-owned svg asset modules');
+assert(!shellModernAppEnv.includes("declare module '*.css'"), 'Shell app env must not redeclare framework-owned css asset modules');
 assert(shellRouteMetadata.includes('@generated by @modern-js/create'), 'Shell route metadata compatibility manifest must be marked generated');
 assert(shellRouteMetadata.includes("authoring: 'colocated-route-meta'"), 'Shell route metadata manifest must advertise colocated authoring');
 const expectedZephyrDependencies = Object.fromEntries(
@@ -1771,6 +1851,9 @@ assert(shellPackage.dependencies?.['@modern-js/plugin-bff'] === expectedModernPa
 assert(shellPackage.dependencies?.['@modern-js/plugin-i18n'] === expectedModernPackageSpecifier('@modern-js/plugin-i18n'), 'Shell plugin-i18n dependency must match package source metadata');
 assert(shellPackage.dependencies?.['@modern-js/plugin-tanstack'] === expectedModernPackageSpecifier('@modern-js/plugin-tanstack'), 'Shell plugin-tanstack dependency must match package source metadata');
 assert(shellPackage.dependencies?.['@modern-js/runtime'] === expectedModernPackageSpecifier('@modern-js/runtime'), 'Shell runtime dependency must match package source metadata');
+assert(shellPackage.scripts?.['cloudflare:deploy'] === 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true pnpm run cloudflare:build && wrangler deploy --config .output/wrangler.json', 'Shell must expose cloudflare:deploy');
+assertTargetIsolatedBuildArtifacts('shell-super-app', shellModernConfig);
+assertCloudflareBuildSkipsDeployRebuild('shell-super-app', shellPackage);
 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');
@@ -1841,12 +1924,19 @@ for (const vertical of fullStackVerticals) {
   const packageJson = readJson(`${vertical.path}/package.json`);
   const modernConfig = readText(`${vertical.path}/modern.config.ts`);
   const moduleFederationConfig = readText(`${vertical.path}/module-federation.config.ts`);
+  const modernAppEnv = readText(`${vertical.path}/src/modern-app-env.d.ts`);
   const routeHead = readText(`${vertical.path}/src/routes/ultramodern-route-head.tsx`);
   const routeMetadata = readText(`${vertical.path}/src/routes/ultramodern-route-metadata.ts`);
+  assert(modernAppEnv.includes("import '@modern-js/app-tools/types';"), `${vertical.id} app env must import the framework-owned app ambient type bundle through module resolution`);
+  assert(/declare global \{\s*const ULTRAMODERN_SITE_URL: string;\s*\}/u.test(modernAppEnv), `${vertical.id} app env must keep generated globals explicit after importing app ambient types`);
+  assert(!modernAppEnv.includes("declare module '*.svg'"), `${vertical.id} app env must not redeclare framework-owned svg asset modules`);
+  assert(!modernAppEnv.includes("declare module '*.css'"), `${vertical.id} app env must not redeclare framework-owned css asset modules`);
   assert(routeMetadata.includes('@generated by @modern-js/create'), `${vertical.id} route metadata compatibility manifest must be marked generated`);
   assert(routeMetadata.includes("authoring: 'colocated-route-meta'"), `${vertical.id} route metadata manifest must advertise colocated authoring`);
   assert(packageJson.name === vertical.packageName, `${vertical.id} package name is incorrect`);
   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`);
+  assertTargetIsolatedBuildArtifacts(vertical.id, modernConfig);
+  assertCloudflareBuildSkipsDeployRebuild(vertical.id, packageJson);
   assert(packageJson.scripts?.['cloudflare:proof']?.includes(`--app ${vertical.id}`), `${vertical.id} must expose cloudflare:proof`);
   assert(packageJson.devDependencies?.['@modern-js/app-tools'] === expectedModernPackageSpecifier('@modern-js/app-tools'), `${vertical.id} app-tools dependency must match package source metadata`);
   assert(packageJson.dependencies?.['@modern-js/plugin-bff'] === expectedModernPackageSpecifier('@modern-js/plugin-bff'), `${vertical.id} plugin-bff dependency must match package source metadata`);
@@ -1892,9 +1982,9 @@ for (const vertical of fullStackVerticals) {
   assert(!verticalAssetPrefixExpression.includes('configuredSiteUrl') && !verticalAssetPrefixExpression.includes('MODERN_PUBLIC_SITE_URL'), `${vertical.id} asset prefix must not fall back to MODERN_PUBLIC_SITE_URL`);
   assert(modernConfig.includes(`envValue('ULTRAMODERN_PUBLIC_URL_${vertical.id.replace(/-/g, '_').toUpperCase()}')`), `${vertical.id} asset prefix must read its per-app public URL`);
   assert(modernConfig.includes('inferredCloudflareUrl'), `${vertical.id} asset prefix must support workers.dev origin inference`);
-  assert(modernConfig.includes("assetPrefix: '/'"), `${vertical.id} modern.config.ts must keep dev assets origin-relative`);
+  assert(/dev:\s*\{\s*\/\/ Remote dev manifests must publish an absolute publicPath[\s\S]*?assetPrefix,\s*\}/u.test(modernConfig), `${vertical.id} modern.config.ts must publish dev assets from its own remote origin`);
   assert(modernConfig.includes('assetPrefix,'), `${vertical.id} modern.config.ts must wire output.assetPrefix to the derived asset prefix`);
-  assert(contractEntry?.config?.dev?.assetPrefix === '/', `${vertical.id} dev asset prefix must stay origin-relative`);
+  assert(contractEntry?.config?.dev?.assetPrefix === 'app-public-origin', `${vertical.id} dev asset prefix must default to its app public origin`);
   assert(contractEntry?.config?.output?.assetPrefix?.default === 'app-public-origin', `${vertical.id} asset prefix must default to its app public origin`);
   assert(JSON.stringify(contractEntry?.config?.output?.assetPrefix?.envFallbackOrder) === JSON.stringify(['MODERN_ASSET_PREFIX', 'ULTRAMODERN_ASSET_PREFIX']), `${vertical.id} asset prefix env fallback order is incorrect`);
   assert(contractEntry?.config?.output?.disableTsChecker === false, `${vertical.id} must keep the framework TypeScript checker enabled`);