@bleedingdev/modern-js-create 3.2.0-ultramodern.55 → 3.2.0-ultramodern.57

package/dist/index.js

@@ -1507,6 +1507,7 @@ ${bffConfig}      output: {
             localisedUrls: ultramodernLocalisedUrls as Record<string, Record<string, string>>,
             ignoreRedirectRoutes: [
               '/@mf-types',
+              '/assets',
               '/bundles',
               '${effectApiPrefix(app)}',
               '/locales',
@@ -1547,7 +1548,7 @@ ${bffPluginEntry}        moduleFederationPlugin(),
         : {}),
       server: {
         port,
-        publicDir: './locales',
+        publicDir: ['./locales', './assets'],
         ssr: {
           mode: 'stream',
           moduleFederationAppSSR: true,
@@ -2144,35 +2145,66 @@ function createCommerceAssetSvg(title, palette) {
 </svg>
 `;
 }
+const commerceAssetPublicRoot = 'assets/ultramodern';
+function commerceAssetPublicPath(filename) {
+    return `${commerceAssetPublicRoot}/${filename}`;
+}
+function commerceAssetUrl(filename) {
+    return `/${commerceAssetPublicRoot}/${filename}`;
+}
 function commerceAssetsForApp(app) {
     if ('shell' === app.kind) return {
-        'src/assets/hero-field.svg': createCommerceAssetSvg('Tractor crossing cultivated fields', {
+        [commerceAssetPublicPath('hero-field.svg')]: createCommerceAssetSvg('Tractor crossing cultivated fields', {
             accent: '#d6b85d',
             ground: '#84ad58',
             sky: '#9fd6e8',
             tractor: '#005f73'
+        }),
+        [commerceAssetPublicPath('autonomy.svg')]: createCommerceAssetSvg('Autonomous tractor concept', {
+            accent: '#c26a2e',
+            ground: '#668f55',
+            sky: '#d5e7de',
+            tractor: '#f2a51a'
+        }),
+        [commerceAssetPublicPath('field-loader.svg')]: createCommerceAssetSvg('Field Loader 112 tractor', {
+            accent: '#d6b85d',
+            ground: '#84ad58',
+            sky: '#9fd6e8',
+            tractor: '#00624b'
+        }),
+        [commerceAssetPublicPath('orchard.svg')]: createCommerceAssetSvg('Orchard tractor between tight rows', {
+            accent: '#b45b2d',
+            ground: '#6f9b4a',
+            sky: '#c9ebff',
+            tractor: '#1d5d9b'
+        }),
+        [commerceAssetPublicPath('vineyard.svg')]: createCommerceAssetSvg('Vineyard narrow tractor', {
+            accent: '#b88d58',
+            ground: '#5e8a45',
+            sky: '#f1dcb9',
+            tractor: '#914d76'
         })
     };
     if ('remote-explore' === app.id) return {
-        'src/assets/autonomy.svg': createCommerceAssetSvg('Autonomous tractor concept', {
+        [commerceAssetPublicPath('autonomy.svg')]: createCommerceAssetSvg('Autonomous tractor concept', {
             accent: '#c26a2e',
             ground: '#668f55',
             sky: '#d5e7de',
             tractor: '#f2a51a'
         }),
-        'src/assets/field-loader.svg': createCommerceAssetSvg('Field Loader 112 tractor', {
+        [commerceAssetPublicPath('field-loader.svg')]: createCommerceAssetSvg('Field Loader 112 tractor', {
             accent: '#d6b85d',
             ground: '#84ad58',
             sky: '#9fd6e8',
             tractor: '#00624b'
         }),
-        'src/assets/orchard.svg': createCommerceAssetSvg('Orchard tractor between tight rows', {
+        [commerceAssetPublicPath('orchard.svg')]: createCommerceAssetSvg('Orchard tractor between tight rows', {
             accent: '#b45b2d',
             ground: '#6f9b4a',
             sky: '#c9ebff',
             tractor: '#1d5d9b'
         }),
-        'src/assets/vineyard.svg': createCommerceAssetSvg('Vineyard narrow tractor', {
+        [commerceAssetPublicPath('vineyard.svg')]: createCommerceAssetSvg('Vineyard narrow tractor', {
             accent: '#b88d58',
             ground: '#5e8a45',
             sky: '#f1dcb9',
@@ -2180,7 +2212,7 @@ function commerceAssetsForApp(app) {
         })
     };
     if ('remote-decide' === app.id) return {
-        'src/assets/field-loader.svg': createCommerceAssetSvg('Field Loader 112 tractor detail', {
+        [commerceAssetPublicPath('field-loader.svg')]: createCommerceAssetSvg('Field Loader 112 tractor detail', {
             accent: '#d6b85d',
             ground: '#84ad58',
             sky: '#9fd6e8',
@@ -2343,12 +2375,13 @@ function createShellPage() {
     return `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
 import { Helmet } from '@modern-js/runtime/head';
 import { useLocation } from '@modern-js/plugin-tanstack/runtime';
-import heroField from '../../assets/hero-field.svg';
 import ShellFrame from '../shell-frame';
 import { StorePicker } from '../remote-components';
 import { ultramodernLocalisedUrls } from '../ultramodern-route-metadata';
 import { ultramodernUiMarker } from '../../ultramodern-build';
 
+const heroField = '${commerceAssetUrl('hero-field.svg')}';
+
 ${createLocalizedHeadComponent()}
 export default function ShellHome() {
   const { i18nInstance, language } = useModernI18n();
@@ -2976,16 +3009,12 @@ export default function Header() {
 }
 `;
     if ('remote-explore' === app.id && './Recommendations' === expose) return `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
-import autonomyImage from '../assets/autonomy.svg';
-import fieldLoaderImage from '../assets/field-loader.svg';
-import orchardImage from '../assets/orchard.svg';
-import vineyardImage from '../assets/vineyard.svg';
 
 const tractors = [
-  { badge: 'explore.recommendations.bestRows', image: orchardImage, name: 'Orchard Tractor', slug: 'orchard-tractor' },
-  { badge: 'explore.recommendations.aiFirst', image: autonomyImage, name: 'Autonomy Retrofit Kit', slug: 'autonomy-retrofit-kit' },
-  { badge: 'explore.recommendations.loaderReady', image: fieldLoaderImage, name: 'Field Loader 112', slug: 'field-loader-112' },
-  { badge: 'explore.recommendations.vineyard', image: vineyardImage, name: 'Vineyard Narrow 80', slug: 'vineyard-narrow-80' },
+  { badge: 'explore.recommendations.bestRows', image: '${commerceAssetUrl('orchard.svg')}', name: 'Orchard Tractor', slug: 'orchard-tractor' },
+  { badge: 'explore.recommendations.aiFirst', image: '${commerceAssetUrl('autonomy.svg')}', name: 'Autonomy Retrofit Kit', slug: 'autonomy-retrofit-kit' },
+  { badge: 'explore.recommendations.loaderReady', image: '${commerceAssetUrl('field-loader.svg')}', name: 'Field Loader 112', slug: 'field-loader-112' },
+  { badge: 'explore.recommendations.vineyard', image: '${commerceAssetUrl('vineyard.svg')}', name: 'Vineyard Narrow 80', slug: 'vineyard-narrow-80' },
 ] as const;
 
 export default function Recommendations() {
@@ -3009,8 +3038,9 @@ export default function Recommendations() {
 }
 `;
     if ('remote-explore' === app.id && './StorePicker' === expose) return `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
-import fieldLoaderImage from '../assets/field-loader.svg';
-import vineyardImage from '../assets/vineyard.svg';
+
+const fieldLoaderImage = '${commerceAssetUrl('field-loader.svg')}';
+const vineyardImage = '${commerceAssetUrl('vineyard.svg')}';
 
 export default function StorePicker() {
   const { i18nInstance } = useModernI18n();
@@ -3042,9 +3072,10 @@ export default function StorePicker() {
     if ('./Widget' === expose) return createRemoteWidget(app);
     const componentName = `${toPascalCase(app.domain ?? app.id)}${toPascalCase(expose.replace(/^\.\//u, ''))}`;
     if ('remote-decide' === app.id && './ProductPage' === expose) return `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
-import fieldLoaderImage from '../assets/field-loader.svg';
 import { AddToCart, Recommendations } from './remote-components';
 
+const fieldLoaderImage = '${commerceAssetUrl('field-loader.svg')}';
+
 export default function ${componentName}() {
   const { i18nInstance } = useModernI18n();
   const t = i18nInstance['t'].bind(i18nInstance);
@@ -4460,7 +4491,10 @@ function createAppGeneratedContract(scope, app, apps, enableTailwind) {
                 appI18nNamespace(app),
                 'translation'
             ],
-            publicDir: './locales',
+            publicDir: [
+                './locales',
+                './assets'
+            ],
             localisedUrls: createLocalisedUrlsMap(app),
             resourceOwnership: {
                 ownerAppId: app.id,
@@ -5358,9 +5392,9 @@ main().then(
 );
 `;
 }
-function writeGeneratedWorkspaceScripts(targetDir, scope, enableTailwind) {
+function writeGeneratedWorkspaceScripts(targetDir, scope, enableTailwind, remotes = remoteApps) {
     writeFileReplacing(targetDir, "scripts/assert-mf-types.mjs", createAssertMfTypesScript());
-    writeFileReplacing(targetDir, "scripts/validate-ultramodern-workspace.mjs", createWorkspaceValidationScript(scope, enableTailwind));
+    writeFileReplacing(targetDir, "scripts/validate-ultramodern-workspace.mjs", createWorkspaceValidationScript(scope, enableTailwind, remotes));
     writeFileReplacing(targetDir, "scripts/proof-cloudflare-version.mjs", createCloudflareVersionProofScript());
 }
 function writeApp(targetDir, scope, app, packageSource, enableTailwind) {
@@ -5583,6 +5617,7 @@ function remoteTopologyEntry(scope, remote) {
         ...effectApiTopologyMetadata(remote) ? {
             api: effectApiTopologyMetadata(remote)
         } : {},
+        cloudflare: createCloudflareDeployContract(scope, remote),
         ownership: remote.ownership
     };
 }
@@ -5596,6 +5631,7 @@ function ownershipEntry(scope, owner) {
 }
 function remotesFromTopology(topology, ports) {
     return (topology.remotes ?? []).map((remote)=>{
+        const packageSuffix = remote.package?.split('/').at(-1) ?? remote.id;
         const effectApi = remote.api?.effect ? {
             stem: 'string' == typeof remote.api.effect.basePath ? remote.api.effect.basePath.split('/').filter(Boolean).at(-1) ?? remote.domain ?? String(remote.id).replace(/^remote-/, '') : remote.domain ?? String(remote.id).replace(/^remote-/, ''),
             prefix: remote.api.effect.bff?.prefix ?? `/${remote.domain ?? String(remote.id).replace(/^remote-/, '')}-api`,
@@ -5606,8 +5642,8 @@ function remotesFromTopology(topology, ports) {
         } : void 0;
         return {
             id: remote.id,
-            directory: '',
-            packageSuffix: remote.package?.split('/').at(-1) ?? remote.id,
+            directory: 'string' == typeof remote.path ? remote.path : `apps/remotes/${packageSuffix}`,
+            packageSuffix,
             displayName: remote.id,
             kind: remote.kind ?? 'vertical',
             domain: remote.domain ?? String(remote.id).replace(/^remote-/, ''),
@@ -5681,16 +5717,18 @@ function addUltramodernMicroVertical(options) {
         writeJsonFile(topologyPath, topology);
         writeJsonFile(ownershipPath, ownership);
         writeJsonFile(overlayPath, overlay);
+        const updatedRemotes = remotesFromTopology(topology, overlay.ports);
         writeJsonFile(node_path.join(options.workspaceRoot, GENERATED_CONTRACT_PATH), createGeneratedContract(scope, [
             {
                 ...shellApp,
-                remoteRefs: remotesFromTopology(topology, overlay.ports).map((remote)=>remote.id)
+                remoteRefs: updatedRemotes.map((remote)=>remote.id)
             },
-            ...remotesFromTopology(topology, overlay.ports)
+            ...updatedRemotes
         ], enableTailwind));
         const shellConfigPath = node_path.join(options.workspaceRoot, `${shellApp.directory}/module-federation.config.ts`);
-        writeFileReplacing(options.workspaceRoot, `${shellApp.directory}/module-federation.config.ts`, createShellModuleFederationConfig(remotesFromTopology(topology, overlay.ports)));
+        writeFileReplacing(options.workspaceRoot, `${shellApp.directory}/module-federation.config.ts`, createShellModuleFederationConfig(updatedRemotes));
         if (!node_fs.existsSync(shellConfigPath)) throw new Error('Shell Module Federation config was not regenerated');
+        writeGeneratedWorkspaceScripts(options.workspaceRoot, scope, enableTailwind, updatedRemotes);
         addShellZephyrDependency(options.workspaceRoot, scope, remote);
         addShellWorkspaceDependency(options.workspaceRoot, scope, remote);
         addRootDevScript(options.workspaceRoot, scope, remote.packageSuffix, name);

package/package.json

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