@bleedingdev/modern-js-create 3.4.0-ultramodern.2 → 3.4.0-ultramodern.20

package/dist/cjs/ultramodern-workspace/demo-components.cjs

@@ -49,8 +49,7 @@ import { VerticalShowcase } from '../vertical-components';
 import { ultramodernUiMarker } from '../../ultramodern-build';
 
 export default function ShellHome() {
-  const { i18nInstance } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { t } = useModernI18n();
 
   return (
     <ShellFrame>
@@ -123,13 +122,14 @@ const loadRemoteComponent = (specifier: string) =>
 
 const createRemoteFallback = (specifier: string) =>
   ({ error }: { error: Error }) => {
-    const { i18nInstance } = useModernI18n();
-    const t = i18nInstance['t'].bind(i18nInstance);
+    const { t } = useModernI18n();
     const classification = classifyModuleFederationFallback(error);
+    const telemetryEntry =
+      typeof window === 'undefined' ? undefined : window.location.href;
     const telemetry = createModuleFederationFallbackTelemetry({
       appName: '${external_descriptors_cjs_namespaceObject.shellApp.id}',
       classification,
-      entry: typeof window === 'undefined' ? undefined : window.location.href,
+      ...(telemetryEntry === undefined ? {} : { entry: telemetryEntry }),
       error,
       eventName: 'mf.client.remote.fallback',
       exportName: 'default',
@@ -142,7 +142,7 @@ const createRemoteFallback = (specifier: string) =>
       void emitModuleFederationFallbackTelemetry({
         appName: telemetry.appName,
         classification,
-        entry: telemetry.entry,
+        ...(telemetry.entry === undefined ? {} : { entry: telemetry.entry }),
         error,
         eventName: telemetry.eventName,
         exportName: 'default',
@@ -151,7 +151,7 @@ const createRemoteFallback = (specifier: string) =>
         remote: specifier,
         status: 'degraded',
       });
-    }, [classification, error, specifier, telemetry]);
+    }, [classification, error, telemetry]);
 
     return <div className="${tw('rounded-xl border border-red-900/20 bg-red-50 px-4 py-3 text-sm font-semibold text-red-900')}" data-remote-error={error.name} {...toModuleFederationFallbackAttributes(telemetry)}>{t('shell.remoteUnavailable')}</div>;
   };
@@ -206,8 +206,7 @@ const createHydratedRemote =
 	${hydratedExports}
 
 	export const Header = () => {
-  const { i18nInstance } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { t } = useModernI18n();
 
   return (
     <header className="${tw('flex min-w-0 flex-wrap items-center gap-x-8 gap-y-2 md:flex-1')}" data-modern-boundary-id="${external_descriptors_cjs_namespaceObject.shellApp.mfName}" data-modern-mf-expose="shell/Header">
@@ -217,8 +216,7 @@ const createHydratedRemote =
 };
 
 export const StatusBadge = () => {
-  const { i18nInstance } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { t } = useModernI18n();
 
   return (
     <span className="${tw('inline-flex h-10 shrink-0 items-center justify-center rounded-full border border-stone-900/15 bg-white px-4 text-sm font-extrabold text-stone-950 shadow-lg shadow-stone-900/5')}">
@@ -228,8 +226,7 @@ export const StatusBadge = () => {
 };
 
 export const VerticalShowcase = () => {
-  const { i18nInstance } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { t } = useModernI18n();
 
   if (widgetCount === 0) {
     return (
@@ -251,36 +248,36 @@ ${showcaseItems}
 }
 function createRemotePage(app) {
     const tw = (0, external_naming_cjs_namespaceObject.createTw)((0, external_naming_cjs_namespaceObject.tailwindPrefixForApp)(app));
-    const listEffectItems = `list${(0, external_naming_cjs_namespaceObject.toPascalCase)((0, external_descriptors_cjs_namespaceObject.effectApiStem)(app))}`;
-    const effectBffImport = (0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
+    const listApiItems = `list${(0, external_naming_cjs_namespaceObject.toPascalCase)((0, external_descriptors_cjs_namespaceObject.effectApiStem)(app))}`;
+    const apiImport = (0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
 import { Link } from '@modern-js/plugin-tanstack/runtime';
 import { useEffect, useState } from 'react';
 import {
   Effect,
-  ${listEffectItems},
+  ${listApiItems},
   runEffectRequest,
-} from '../../effect/${(0, external_descriptors_cjs_namespaceObject.effectApiStem)(app)}-client';
+} from '../../api/${(0, external_descriptors_cjs_namespaceObject.effectApiStem)(app)}-client';
 import { UltramodernRouteHead } from '../ultramodern-route-head';
 import { ultramodernUiMarker } from '../../ultramodern-build';
 ` : "import { useModernI18n } from '@modern-js/plugin-i18n/runtime';\nimport { Link } from '@modern-js/plugin-tanstack/runtime';\nimport { UltramodernRouteHead } from '../ultramodern-route-head';\nimport { ultramodernUiMarker } from '../../ultramodern-build';\n";
-    const effectBffState = (0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? `  const [effectApiStatus, setEffectApiStatus] = useState('pending');
+    const apiState = (0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? `  const [apiStatus, setApiStatus] = useState('pending');
 
   useEffect(() => {
     let cancelled = false;
     void runEffectRequest(
-      ${listEffectItems}({ limit: 1 }).pipe(
+      ${listApiItems}({ limit: 1 }).pipe(
         Effect.match({
           onFailure: () => {
             if (cancelled) {
               return;
             }
-            setEffectApiStatus('unavailable');
+            setApiStatus('unavailable');
           },
           onSuccess: data => {
             if (cancelled) {
               return;
             }
-            setEffectApiStatus(data.items.at(0)?.title ?? 'empty');
+            setApiStatus(data.items.at(0)?.title ?? 'empty');
           },
         }),
       ),
@@ -292,13 +289,12 @@ import { ultramodernUiMarker } from '../../ultramodern-build';
   }, []);
 
 ` : '';
-    const effectBffMarkup = (0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? `      <p data-testid="effect-bff-status">{effectApiStatus}</p>
+    const apiMarkup = (0, external_descriptors_cjs_namespaceObject.appHasEffectApi)(app) ? `      <p data-testid="api-status">{apiStatus}</p>
 ` : '';
-    return `${effectBffImport}
+    return `${apiImport}
 export default function ${(0, external_naming_cjs_namespaceObject.toPascalCase)(app.id)}Home() {
-  const { i18nInstance, language, supportedLanguages } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
-${effectBffState}  return (
+  const { language, supportedLanguages, t } = useModernI18n();
+${apiState}  return (
     <main className="${tw('min-h-screen bg-um-canvas px-4 py-6 text-um-foreground sm:px-8')}">
       <UltramodernRouteHead />
       <nav aria-label={t('${app.domain}.language.switcher')} className="${tw('flex gap-3')}">
@@ -319,7 +315,7 @@ ${effectBffState}  return (
       <p className="${tw('sr-only')}" data-build-marker={ultramodernUiMarker.build} data-testid="ultramodern-ui-marker">
         {ultramodernUiMarker.appId}:{ultramodernUiMarker.version}
       </p>
-${effectBffMarkup}    </main>
+${apiMarkup}    </main>
   );
 }
 `;
@@ -343,8 +339,7 @@ function createRemoteEntry(app) {
     return `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
 
 export default function ${(0, external_naming_cjs_namespaceObject.toPascalCase)(domain)}Route() {
-  const { i18nInstance } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { t } = useModernI18n();
 
   return (
     <section className="${tw('rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="./Route">
@@ -362,8 +357,7 @@ function createRemoteWidget(app) {
     return `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
 
 export default function ${componentName}() {
-  const { i18nInstance } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { t } = useModernI18n();
 
   return (
     <section className="${tw('rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="./Widget">
@@ -382,8 +376,7 @@ function createRemoteExposeComponent(app, expose) {
     return `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
 
 export default function ${componentName}() {
-  const { i18nInstance } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { t } = useModernI18n();
 
   return (
     <section className="${tw('rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="${expose}">

package/dist/cjs/ultramodern-workspace/descriptors.cjs

@@ -28,7 +28,7 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    GENERATED_CONTRACT_PATH: ()=>GENERATED_CONTRACT_PATH,
+    ULTRAMODERN_CONFIG_PATH: ()=>ULTRAMODERN_CONFIG_PATH,
     appHasEffectApi: ()=>appHasEffectApi,
     appI18nNamespace: ()=>appI18nNamespace,
     createCloudflarePublicUrlEnv: ()=>createCloudflarePublicUrlEnv,
@@ -48,7 +48,7 @@ __webpack_require__.d(__webpack_exports__, {
     zephyrRemoteDependency: ()=>zephyrRemoteDependency
 });
 const external_naming_cjs_namespaceObject = require("./naming.cjs");
-const GENERATED_CONTRACT_PATH = '.modernjs/ultramodern-generated-contract.json';
+const ULTRAMODERN_CONFIG_PATH = '.modernjs/ultramodern.json';
 const shellApp = {
     id: 'shell-super-app',
     directory: 'apps/shell-super-app',
@@ -179,7 +179,7 @@ function createCloudflarePublicUrlEnv(app) {
 function appI18nNamespace(app) {
     return 'shell' === app.kind ? 'shell' : app.domain ?? app.id;
 }
-exports.GENERATED_CONTRACT_PATH = __webpack_exports__.GENERATED_CONTRACT_PATH;
+exports.ULTRAMODERN_CONFIG_PATH = __webpack_exports__.ULTRAMODERN_CONFIG_PATH;
 exports.appHasEffectApi = __webpack_exports__.appHasEffectApi;
 exports.appI18nNamespace = __webpack_exports__.appI18nNamespace;
 exports.createCloudflarePublicUrlEnv = __webpack_exports__.createCloudflarePublicUrlEnv;
@@ -198,7 +198,7 @@ exports.shellApp = __webpack_exports__.shellApp;
 exports.verticalEffectApps = __webpack_exports__.verticalEffectApps;
 exports.zephyrRemoteDependency = __webpack_exports__.zephyrRemoteDependency;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "GENERATED_CONTRACT_PATH",
+    "ULTRAMODERN_CONFIG_PATH",
     "appHasEffectApi",
     "appI18nNamespace",
     "createCloudflarePublicUrlEnv",