@bleedingdev/modern-js-create 3.4.0-ultramodern.15 → 3.4.0-ultramodern.17

package/dist/cjs/ultramodern-tooling/config.cjs

@@ -124,6 +124,7 @@ function normalizeCompactConfig(workspaceRoot, sourcePath, config) {
                         role: 'remote' === app.moduleFederation.role ? 'remote' : 'host',
                         name: 'string' == typeof app.moduleFederation.name ? app.moduleFederation.name : void 0,
                         exposes: Array.isArray(app.moduleFederation.exposes) ? app.moduleFederation.exposes.filter((expose)=>'string' == typeof expose) : void 0,
+                        exposePaths: null === app.moduleFederation.exposePaths || 'object' != typeof app.moduleFederation.exposePaths || Array.isArray(app.moduleFederation.exposePaths) ? void 0 : Object.fromEntries(Object.entries(app.moduleFederation.exposePaths).filter((entry)=>'string' == typeof entry[0] && 'string' == typeof entry[1])),
                         verticalRefs: Array.isArray(app.moduleFederation.verticalRefs) ? app.moduleFederation.verticalRefs.filter((ref)=>'string' == typeof ref) : void 0,
                         hostOnly: true === app.moduleFederation.hostOnly,
                         noExposes: true === app.moduleFederation.noExposes
@@ -212,10 +213,15 @@ function workspaceAppsFromToolingConfig(config) {
         };
         const domain = app.domain ?? app.id;
         const packageSuffix = app.packageSuffix ?? domain;
-        const exposes = Object.fromEntries((app.moduleFederation?.exposes ?? []).map((expose)=>[
+        const exposePaths = app.moduleFederation?.exposePaths ?? {};
+        const exposes = Object.fromEntries((app.moduleFederation?.exposes ?? []).map((expose)=>{
+            const configuredPath = exposePaths[expose];
+            const inferredPath = './Route' === expose ? './src/federation-entry.tsx' : './Widget' === expose ? `./src/components/${domain}-widget.tsx` : `./src/components/${(0, naming_cjs_namespaceObject.toKebabCase)(expose.replace(/^\.\//u, ''))}.tsx`;
+            return [
                 expose,
-                './Route' === expose ? './src/federation-entry.tsx' : './Widget' === expose ? `./src/components/${domain}-widget.tsx` : ''
-            ]));
+                configuredPath ?? inferredPath
+            ];
+        }));
         return {
             id: app.id,
             directory: app.path,

package/dist/esm/ultramodern-tooling/config.js

@@ -80,6 +80,7 @@ function normalizeCompactConfig(workspaceRoot, sourcePath, config) {
                         role: 'remote' === app.moduleFederation.role ? 'remote' : 'host',
                         name: 'string' == typeof app.moduleFederation.name ? app.moduleFederation.name : void 0,
                         exposes: Array.isArray(app.moduleFederation.exposes) ? app.moduleFederation.exposes.filter((expose)=>'string' == typeof expose) : void 0,
+                        exposePaths: null === app.moduleFederation.exposePaths || 'object' != typeof app.moduleFederation.exposePaths || Array.isArray(app.moduleFederation.exposePaths) ? void 0 : Object.fromEntries(Object.entries(app.moduleFederation.exposePaths).filter((entry)=>'string' == typeof entry[0] && 'string' == typeof entry[1])),
                         verticalRefs: Array.isArray(app.moduleFederation.verticalRefs) ? app.moduleFederation.verticalRefs.filter((ref)=>'string' == typeof ref) : void 0,
                         hostOnly: true === app.moduleFederation.hostOnly,
                         noExposes: true === app.moduleFederation.noExposes
@@ -168,10 +169,15 @@ function workspaceAppsFromToolingConfig(config) {
         };
         const domain = app.domain ?? app.id;
         const packageSuffix = app.packageSuffix ?? domain;
-        const exposes = Object.fromEntries((app.moduleFederation?.exposes ?? []).map((expose)=>[
+        const exposePaths = app.moduleFederation?.exposePaths ?? {};
+        const exposes = Object.fromEntries((app.moduleFederation?.exposes ?? []).map((expose)=>{
+            const configuredPath = exposePaths[expose];
+            const inferredPath = './Route' === expose ? './src/federation-entry.tsx' : './Widget' === expose ? `./src/components/${domain}-widget.tsx` : `./src/components/${toKebabCase(expose.replace(/^\.\//u, ''))}.tsx`;
+            return [
                 expose,
-                './Route' === expose ? './src/federation-entry.tsx' : './Widget' === expose ? `./src/components/${domain}-widget.tsx` : ''
-            ]));
+                configuredPath ?? inferredPath
+            ];
+        }));
         return {
             id: app.id,
             directory: app.path,

package/dist/esm-node/ultramodern-tooling/config.js

@@ -81,6 +81,7 @@ function normalizeCompactConfig(workspaceRoot, sourcePath, config) {
                         role: 'remote' === app.moduleFederation.role ? 'remote' : 'host',
                         name: 'string' == typeof app.moduleFederation.name ? app.moduleFederation.name : void 0,
                         exposes: Array.isArray(app.moduleFederation.exposes) ? app.moduleFederation.exposes.filter((expose)=>'string' == typeof expose) : void 0,
+                        exposePaths: null === app.moduleFederation.exposePaths || 'object' != typeof app.moduleFederation.exposePaths || Array.isArray(app.moduleFederation.exposePaths) ? void 0 : Object.fromEntries(Object.entries(app.moduleFederation.exposePaths).filter((entry)=>'string' == typeof entry[0] && 'string' == typeof entry[1])),
                         verticalRefs: Array.isArray(app.moduleFederation.verticalRefs) ? app.moduleFederation.verticalRefs.filter((ref)=>'string' == typeof ref) : void 0,
                         hostOnly: true === app.moduleFederation.hostOnly,
                         noExposes: true === app.moduleFederation.noExposes
@@ -169,10 +170,15 @@ function workspaceAppsFromToolingConfig(config) {
         };
         const domain = app.domain ?? app.id;
         const packageSuffix = app.packageSuffix ?? domain;
-        const exposes = Object.fromEntries((app.moduleFederation?.exposes ?? []).map((expose)=>[
+        const exposePaths = app.moduleFederation?.exposePaths ?? {};
+        const exposes = Object.fromEntries((app.moduleFederation?.exposes ?? []).map((expose)=>{
+            const configuredPath = exposePaths[expose];
+            const inferredPath = './Route' === expose ? './src/federation-entry.tsx' : './Widget' === expose ? `./src/components/${domain}-widget.tsx` : `./src/components/${toKebabCase(expose.replace(/^\.\//u, ''))}.tsx`;
+            return [
                 expose,
-                './Route' === expose ? './src/federation-entry.tsx' : './Widget' === expose ? `./src/components/${domain}-widget.tsx` : ''
-            ]));
+                configuredPath ?? inferredPath
+            ];
+        }));
         return {
             id: app.id,
             directory: app.path,

package/dist/types/ultramodern-tooling/config.d.ts

@@ -15,6 +15,7 @@ export type UltramodernToolingConfigApp = {
         role?: 'host' | 'remote';
         name?: string;
         exposes?: string[];
+        exposePaths?: Record<string, string>;
         verticalRefs?: string[];
         hostOnly?: boolean;
         noExposes?: boolean;

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.4.0-ultramodern.15",
+  "version": "3.4.0-ultramodern.17",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/esm-node/index.js",
   "bin": {
@@ -77,7 +77,7 @@
     "@modern-js/codesmith": "2.6.9",
     "oxfmt": "0.55.0",
     "ultracite": "7.8.3",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.4.0-ultramodern.15"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.4.0-ultramodern.17"
   },
   "devDependencies": {
     "@rslib/core": "0.23.0",
@@ -99,6 +99,6 @@
     "test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests"
   },
   "ultramodern": {
-    "frameworkVersion": "3.4.0-ultramodern.15"
+    "frameworkVersion": "3.4.0-ultramodern.17"
   }
 }

package/templates/workspace-scripts/ultramodern-cloudflare-proof.mjs

@@ -6,6 +6,20 @@ function normalizeUrlWithTrailingSlash(url) {
   return url.endsWith('/') ? url : `${url}/`;
 }
 
+function resolveModuleFederationPublicPath(publicPath, manifestUrl) {
+  if (typeof publicPath !== 'string' || publicPath.trim().length === 0) {
+    return undefined;
+  }
+
+  try {
+    return normalizeUrlWithTrailingSlash(
+      new URL(publicPath.trim(), manifestUrl).toString(),
+    );
+  } catch {
+    return undefined;
+  }
+}
+
 async function fetchText(url) {
   const response = await fetch(url);
   return {
@@ -721,7 +735,8 @@ async function validateModuleFederationManifestEvidence(evidence, app, publicUrl
   const budgets = qualityGates.budgets ?? {};
 
   const manifestRoute = routes.mfManifest ?? '/mf-manifest.json';
-  const manifest = await fetchText(joinUrl(publicUrl, manifestRoute));
+  const manifestUrl = joinUrl(publicUrl, manifestRoute);
+  const manifest = await fetchText(manifestUrl);
   const manifestJson = parseMaybeJson(manifest.body);
   evidence.assertions.push({
     type: 'mf-manifest',
@@ -754,17 +769,26 @@ async function validateModuleFederationManifestEvidence(evidence, app, publicUrl
     manifest.accessControlAllowOrigin === '*',
     `${app.id} MF manifest is missing Cloudflare CORS headers`,
   );
-  const expectedPublicPath = normalizeUrlWithTrailingSlash(publicUrl);
+  const expectedPublicPath = normalizeUrlWithTrailingSlash(
+    new URL('.', manifestUrl).toString(),
+  );
   const manifestPublicPath = manifestJson?.metaData?.publicPath;
+  const resolvedPublicPath = resolveModuleFederationPublicPath(
+    manifestPublicPath,
+    manifestUrl,
+  );
   evidence.assertions.push({
     type: 'mf-manifest-public-path',
     expected: expectedPublicPath,
     actual: manifestPublicPath,
-    status: manifestPublicPath === expectedPublicPath ? 'pass' : 'fail',
+    resolved: resolvedPublicPath,
+    status: resolvedPublicPath === expectedPublicPath ? 'pass' : 'fail',
   });
   assert(
-    manifestPublicPath === expectedPublicPath,
-    `${app.id} MF manifest publicPath must resolve remote assets from ${expectedPublicPath}`,
+    resolvedPublicPath === expectedPublicPath,
+    `${app.id} MF manifest publicPath must resolve remote assets from ${expectedPublicPath}; got ${String(
+      manifestPublicPath,
+    )}`,
   );
 }
 
@@ -848,4 +872,4 @@ async function validateApp(app, publicUrl) {
   return evidence;
 }
 
-export { validateApp };
+export { resolveModuleFederationPublicPath, validateApp };