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

package/dist/esm/ultramodern-workspace/demo-components.js

@@ -10,8 +10,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>
@@ -84,13 +83,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: '${shellApp.id}',
       classification,
-      entry: typeof window === 'undefined' ? undefined : window.location.href,
+      ...(telemetryEntry === undefined ? {} : { entry: telemetryEntry }),
       error,
       eventName: 'mf.client.remote.fallback',
       exportName: 'default',
@@ -103,7 +103,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',
@@ -112,7 +112,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>;
   };
@@ -167,8 +167,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="${shellApp.mfName}" data-modern-mf-expose="shell/Header">
@@ -178,8 +177,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')}">
@@ -189,8 +187,7 @@ export const StatusBadge = () => {
 };
 
 export const VerticalShowcase = () => {
-  const { i18nInstance } = useModernI18n();
-  const t = i18nInstance['t'].bind(i18nInstance);
+  const { t } = useModernI18n();
 
   if (widgetCount === 0) {
     return (
@@ -212,36 +209,36 @@ ${showcaseItems}
 }
 function createRemotePage(app) {
     const tw = createTw(tailwindPrefixForApp(app));
-    const listEffectItems = `list${toPascalCase(effectApiStem(app))}`;
-    const effectBffImport = appHasEffectApi(app) ? `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
+    const listApiItems = `list${toPascalCase(effectApiStem(app))}`;
+    const apiImport = 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/${effectApiStem(app)}-client';
+} from '../../api/${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 = appHasEffectApi(app) ? `  const [effectApiStatus, setEffectApiStatus] = useState('pending');
+    const apiState = 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');
           },
         }),
       ),
@@ -253,13 +250,12 @@ import { ultramodernUiMarker } from '../../ultramodern-build';
   }, []);
 
 ` : '';
-    const effectBffMarkup = appHasEffectApi(app) ? `      <p data-testid="effect-bff-status">{effectApiStatus}</p>
+    const apiMarkup = appHasEffectApi(app) ? `      <p data-testid="api-status">{apiStatus}</p>
 ` : '';
-    return `${effectBffImport}
+    return `${apiImport}
 export default function ${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')}">
@@ -280,7 +276,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>
   );
 }
 `;
@@ -304,8 +300,7 @@ function createRemoteEntry(app) {
     return `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
 
 export default function ${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">
@@ -323,8 +318,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">
@@ -343,8 +337,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/esm/ultramodern-workspace/descriptors.js

@@ -1,5 +1,5 @@
 import { packageName, toCamelCase, toEnvSegment, toKebabCase, toPascalCase } from "./naming.js";
-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',
@@ -130,4 +130,4 @@ function createCloudflarePublicUrlEnv(app) {
 function appI18nNamespace(app) {
     return 'shell' === app.kind ? 'shell' : app.domain ?? app.id;
 }
-export { GENERATED_CONTRACT_PATH, appHasEffectApi, appI18nNamespace, createCloudflarePublicUrlEnv, createCloudflareWorkerName, createModuleFederationRemoteContracts, createNeutralOwnership, createRemoteManifestEnv, createShellHost, createVerticalDescriptor, effectApiPrefix, effectApiStem, remoteDependencyAlias, resolveRemoteRefs, sharedPackages, shellApp, verticalEffectApps, zephyrRemoteDependency };
+export { ULTRAMODERN_CONFIG_PATH, appHasEffectApi, appI18nNamespace, createCloudflarePublicUrlEnv, createCloudflareWorkerName, createModuleFederationRemoteContracts, createNeutralOwnership, createRemoteManifestEnv, createShellHost, createVerticalDescriptor, effectApiPrefix, effectApiStem, remoteDependencyAlias, resolveRemoteRefs, sharedPackages, shellApp, verticalEffectApps, zephyrRemoteDependency };