@bleedingdev/modern-js-create 3.2.0-ultramodern.80 → 3.2.0-ultramodern.82

package/dist/index.js

@@ -984,8 +984,8 @@ function createRootPackageJson(scope, packageSource, remotes = []) {
             build: `${remoteBuildPrefix}ULTRAMODERN_ZEPHYR=false pnpm --filter "./apps/shell-super-app" run build && pnpm ultramodern:assert-mf-types`,
             format: "oxfmt . '!repos/**'",
             'format:check': "oxfmt --check . '!repos/**'",
-            lint: 'oxlint .',
-            'lint:fix': 'oxlint . --fix',
+            lint: 'oxlint apps verticals packages',
+            'lint:fix': 'oxlint apps verticals packages --fix',
             typecheck: `pnpm -r --filter "@${scope}/*" typecheck`,
             'cloudflare:build': `${remoteCloudflareBuildPrefix}pnpm --filter "./apps/shell-super-app" run cloudflare:build && pnpm ultramodern:assert-mf-types`,
             'cloudflare:deploy': `${remoteCloudflareDeployPrefix}pnpm --filter "./apps/shell-super-app" run cloudflare:deploy`,
@@ -1309,7 +1309,10 @@ if (
 export default defineConfig(
   presetUltramodern(
     {
-${bffConfig}      output: {
+${bffConfig}      html: {
+        outputStructure: 'flat',
+      },
+      output: {
         assetPrefix: siteUrl,
         disableTsChecker: true,
         distPath: {
@@ -1320,13 +1323,10 @@ ${bffConfig}      output: {
       },
       performance: {
         rsdoctor: {
-          enabled: process.env['ULTRAMODERN_RSDOCTOR'] === 'true',
           disableClientServer: true,
+          enabled: process.env['ULTRAMODERN_RSDOCTOR'] === 'true',
         },
       },
-      html: {
-        outputStructure: 'flat',
-      },
       plugins: [
         appTools(),
         tanstackRouterPlugin(),
@@ -1335,12 +1335,8 @@ ${bffConfig}      output: {
             enabled: true,
             loadPath: '/locales/{{lng}}/{{ns}}.json',
           },
-          reactI18next: false,
           localeDetection: {
             fallbackLanguage: 'en',
-            languages: ['en', 'cs'],
-            localePathRedirect: true,
-            localisedUrls: ultramodernLocalisedUrls as Record<string, Record<string, string>>,
             ignoreRedirectRoutes: [
               '/@mf-types',
               '/assets',
@@ -1353,7 +1349,11 @@ ${bffConfig}      output: {
               '/static',
               '/zephyr-manifest.json',
             ],
+            languages: ['en', 'cs'],
+            localePathRedirect: true,
+            localisedUrls: ultramodernLocalisedUrls as Record<string, Record<string, string>>,
           },
+          reactI18next: false,
         }),
 ${bffPluginEntry}        moduleFederationPlugin(),
         zephyrRspackPlugin(),
@@ -1389,10 +1389,10 @@ ${bffPluginEntry}        moduleFederationPlugin(),
         },
       },
       source: {
-        mainEntryName: 'index',
         globalVars: {
           ULTRAMODERN_SITE_URL: siteUrl,
         },
+        mainEntryName: 'index',
       },
     },
     {
@@ -1464,13 +1464,13 @@ const cloudflareWorkersDevSubdomain =
 const requireCloudflarePublicUrls =
   process.env['ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS'] === 'true';
 
-function createRemoteManifestUrl(options: {
+const createRemoteManifestUrl = (options: {
   manifestEnv: string;
-  publicUrlEnv: string;
-  workerName: string;
   mfName: string;
   port: number;
-}) {
+  publicUrlEnv: string;
+  workerName: string;
+}) => {
   const configuredManifest = process.env[options.manifestEnv]?.trim();
   if (configuredManifest !== undefined && configuredManifest.length > 0) {
     return configuredManifest;
@@ -1492,19 +1492,19 @@ function createRemoteManifestUrl(options: {
   }
 
   return \`\${options.mfName}@http://localhost:\${options.port}/mf-manifest.json\`;
-}
+};
 
 `;
 }
 function createModuleFederationRemotesConfig(scope, app, remotes = []) {
-    const remoteEntries = resolveRemoteRefs(app, remotes).map((remote)=>{
+    const remoteEntries = resolveRemoteRefs(app, remotes).toSorted((left, right)=>remoteDependencyAlias(left).localeCompare(remoteDependencyAlias(right))).map((remote)=>{
         const key = remoteDependencyAlias(remote);
         return `    ${key}: createRemoteManifestUrl({
       manifestEnv: '${createRemoteManifestEnv(remote)}',
-      publicUrlEnv: '${createCloudflarePublicUrlEnv(remote)}',
-      workerName: '${createCloudflareWorkerName(scope, remote)}',
       mfName: '${remote.mfName}',
       port: ${remote.port},
+      publicUrlEnv: '${createCloudflarePublicUrlEnv(remote)}',
+      workerName: '${createCloudflareWorkerName(scope, remote)}',
     }),`;
     }).join('\n');
     if (!remoteEntries) return '';
@@ -1532,7 +1532,6 @@ const reactDomVersion = (require('react-dom/package.json') as { version: string
 
 ${createModuleFederationRemoteUrlHelpers(shellHost, remotes)}
 export default createModuleFederationConfig({
-  treeShakingSharedExcludePlugins: ['RspackModuleFederationPlugin'],
   dev: {
     disableDynamicRemoteTypeHints: true,
   },
@@ -1545,6 +1544,7 @@ export default createModuleFederationConfig({
   filename: 'remoteEntry.js',
   name: '${shellApp.mfName}',
 ${createModuleFederationRemotesConfig(scope, shellHost, remotes)}${createSharedModuleFederationConfig()},
+  treeShakingSharedExcludePlugins: ['RspackModuleFederationPlugin'],
 });
 `;
 }
@@ -1587,7 +1587,6 @@ const reactDomVersion = (require('react-dom/package.json') as { version: string
 
 ${createModuleFederationRemoteUrlHelpers(app, remotes)}
 export default createModuleFederationConfig({
-  treeShakingSharedExcludePlugins: ['RspackModuleFederationPlugin'],
   dev: {
     disableDynamicRemoteTypeHints: true,
   },
@@ -1601,6 +1600,7 @@ export default createModuleFederationConfig({
   filename: 'remoteEntry.js',
   name: '${app.mfName}',
 ${createModuleFederationRemotesConfig(scope, app, remotes)}${createSharedModuleFederationConfig()},
+  treeShakingSharedExcludePlugins: ['RspackModuleFederationPlugin'],
 });
 `;
 }
@@ -1963,7 +1963,7 @@ function createTw(prefix) {
 function workspaceAssetsForApp(_app) {
     return {};
 }
-function createLocalizedHeadComponent(includeLocationSuffix = true) {
+function createLocalizedHeadComponent() {
     return `const fallbackLanguage = 'en';
 const supportedLanguages = ['en', 'cs'] as const;
 type SupportedLanguage = (typeof supportedLanguages)[number];
@@ -2078,23 +2078,6 @@ const absoluteUrl = (pathname: string) => {
   return \`\${origin}\${pathname}\`;
 };
 
-${includeLocationSuffix ? `const locationSuffix = (location: {
-  hash?: unknown;
-  search?: unknown;
-  searchStr?: unknown;
-}) => {
-  let locationSearch = '';
-  if (typeof location.searchStr === 'string') {
-    locationSearch = location.searchStr;
-  } else if (typeof location.search === 'string') {
-    locationSearch = location.search;
-  }
-  const locationHash = typeof location.hash === 'string' ? location.hash : '';
-
-  return \`\${locationSearch}\${locationHash}\`;
-};
-` : ''}
-
 const LocalizedHead = () => {
   const location = useLocation();
   const canonicalPath = localizedPath(location.pathname, fallbackLanguage);
@@ -2131,7 +2114,7 @@ import { VerticalShowcase } from '../vertical-components';
 import { ultramodernLocalisedUrls } from '../ultramodern-route-metadata';
 import { ultramodernUiMarker } from '../../ultramodern-build';
 
-${createLocalizedHeadComponent(false)}
+${createLocalizedHeadComponent()}
 export default function ShellHome() {
   const { i18nInstance } = useModernI18n();
   const t = i18nInstance['t'].bind(i18nInstance);
@@ -3321,11 +3304,11 @@ function createEffectSharedApiContract(service) {
     const apiPrefix = effectApiPrefix(service);
     return `export const ${markerSchemaExport} = Schema.Struct({
   appId: Schema.String,
-  packageName: Schema.String,
-  version: Schema.String,
   build: Schema.String,
   deployProfile: Schema.String,
+  packageName: Schema.String,
   surface: Schema.String,
+  version: Schema.String,
 });
 
 export const ${schemaExport} = Schema.Struct({
@@ -3361,13 +3344,13 @@ export const ${notFoundSchemaExport} = ${notFoundErrorExport}.pipe(
   HttpApiSchema.status(404),
 );
 
-export type OperationContext = {
+export interface OperationContext {
+  method: string;
   operationId: string;
   routePath: string;
-  method: string;
   source: string;
   traceId?: string;
-};
+}
 
 export const ${apiExport} = HttpApi.make('${apiName}').add(
   HttpApiGroup.make('${groupName}')
@@ -3388,11 +3371,11 @@ export const ${apiExport} = HttpApi.make('${apiName}').add(
     )
     .add(
       HttpApiEndpoint.get('get', '/effect/${stem}/:id', {
+        error: ${notFoundSchemaExport},
         params: {
           id: Schema.String,
         },
         success: ${schemaExport},
-        error: ${notFoundSchemaExport},
       }),
     )
     .add(
@@ -3406,28 +3389,28 @@ export const ${apiExport} = HttpApi.make('${apiName}').add(
 );
 
 export const ${groupName}OperationContexts = {
-  list: {
-    operationId: '${apiName}:${groupName}:list',
+  create: {
+    method: 'POST',
+    operationId: '${apiName}:${groupName}:create',
     routePath: '/effect/${stem}',
-    method: 'GET',
-    source: 'generated-client',
-  },
-  readiness: {
-    operationId: '${apiName}:${groupName}:readiness',
-    routePath: '/effect/${stem}/readiness',
-    method: 'GET',
     source: 'generated-client',
   },
   get: {
+    method: 'GET',
     operationId: '${apiName}:${groupName}:get',
     routePath: '/effect/${stem}/:id',
-    method: 'GET',
     source: 'generated-client',
   },
-  create: {
-    operationId: '${apiName}:${groupName}:create',
+  list: {
+    method: 'GET',
+    operationId: '${apiName}:${groupName}:list',
     routePath: '/effect/${stem}',
-    method: 'POST',
+    source: 'generated-client',
+  },
+  readiness: {
+    method: 'GET',
+    operationId: '${apiName}:${groupName}:readiness',
+    routePath: '/effect/${stem}/readiness',
     source: 'generated-client',
   },
 } satisfies Record<string, OperationContext>;
@@ -3464,8 +3447,8 @@ import {
   ${apiExport},
   ${groupName}OperationContexts,
   ${notFoundErrorExport},
-  type OperationContext,
 } from '${contractImportPath}';
+import type { OperationContext } from '${contractImportPath}';
 
 const ${groupName}Items = [
   {
@@ -3522,10 +3505,15 @@ const ${groupName}Layer = HttpApiBuilder.group(
         ),
       )
       .handle('get', ({ params }) => {
-        const item = ${groupName}Items.find(item => item.id === params.id);
-        return (item !== undefined
-          ? Effect.succeed(item)
-          : Effect.fail(new ${notFoundErrorExport}({ id: params.id }))).pipe(
+        const matchedItem = ${groupName}Items.find(
+          candidate => candidate.id === params.id,
+        );
+        const result =
+          matchedItem === undefined
+            ? Effect.fail(new ${notFoundErrorExport}({ id: params.id }))
+            : Effect.succeed(matchedItem);
+
+        return result.pipe(
             Effect.withSpan('ultramodern.effect.${groupName}.get', {
               attributes: operationAttributes(${groupName}OperationContexts.get),
               kind: 'server',
@@ -3537,8 +3525,8 @@ const ${groupName}Layer = HttpApiBuilder.group(
           item: {
             id: \`generated-${stem}-\${payload.title
               .toLowerCase()
-              .replaceAll(/[^a-z0-9]+/g, '-')
-              .replaceAll(/^-|-$/g, '')}\`,
+              .replaceAll(/[^a-z0-9]+/gu, '-')
+              .replaceAll(/^-|-$/gu, '')}\`,
             marker: ultramodernApiMarker,
             title: payload.title,
           },

package/package.json

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