refactor: default entry name should be index (#7779)

Author: yimingjfe

packages/runtime/plugin-i18n/src/runtime/context.tsx

@@ -138,11 +138,6 @@ export const useModernI18n = (
         // Update i18n instance
         await i18nInstance.changeLanguage(newLang);
 
-        // Update context language state
-        if (updateLanguage) {
-          updateLanguage(newLang);
-        }
-
         // Update URL if locale detection is enabled, we're in browser, and router is available
         if (
           enableLocaleDetection &&
@@ -174,6 +169,8 @@ export const useModernI18n = (
 
           // Use history API to navigate without page reload
           window.history.pushState(null, '', newUrl);
+        } else if (updateLanguage) {
+          updateLanguage(newLang);
         }
       } catch (error) {
         console.error('Failed to change language:', error);

packages/runtime/plugin-i18n/src/runtime/utils.ts

@@ -1,7 +1,12 @@
+import { getGlobalBasename } from '@modern-js/runtime/context';
 import { MAIN_ENTRY_NAME } from '@modern-js/utils/universal/constants';
 
-export const getEntryPath = (entryName: string = MAIN_ENTRY_NAME) => {
-  return entryName === MAIN_ENTRY_NAME ? '' : `/${entryName}`;
+export const getEntryPath = (entryName?: string): string => {
+  const basename = getGlobalBasename();
+  if (basename) {
+    return basename === '/' ? '' : basename;
+  }
+  return '';
 };
 /**
  * Helper function to get language from current pathname

packages/runtime/plugin-runtime/src/cli/code.ts

@@ -188,13 +188,16 @@ export const generateCode = async (
         // runtime-global-context.js
         let contextCode = '';
         if (!config.server.rsc || entrypoint.nestedRoutesEntry) {
+          const route = serverRoutes.find(r => r.entryName === entryName);
+          const basename = route?.urlPath || '/';
           contextCode = template.runtimeGlobalContext({
             entryName,
             srcDirectory,
             internalSrcAlias,
             metaName,
             entry,
             customEntry,
+            basename,
           });
         } else {
           const AppProxyPath = path.join(

packages/runtime/plugin-runtime/src/cli/template.ts

@@ -267,13 +267,15 @@ export const runtimeGlobalContext = ({
   metaName,
   entry,
   customEntry,
+  basename,
 }: {
   entryName: string;
   srcDirectory: string;
   internalSrcAlias: string;
   metaName: string;
   entry: string;
   customEntry?: boolean;
+  basename?: string;
 }) => {
   return `import { setGlobalContext } from '@${metaName}/runtime/context'
 
@@ -289,9 +291,11 @@ import App from '${
   }';
 
 const entryName = '${entryName}';
+const basename = '${basename || '/'}';
 setGlobalContext({
   entryName,
   App,
+  basename,
 });`;
 };
 

packages/runtime/plugin-runtime/src/core/context/index.ts

@@ -30,6 +30,10 @@ interface GlobalContext {
    * page router _app.tsx export layout app
    */
   layoutApp?: React.ComponentType;
+  /**
+   * Entry basename for routing
+   */
+  basename?: string;
 
   internalRuntimeContext?: InternalRuntimeContext<RuntimeExtends>;
   /**
@@ -64,6 +68,7 @@ export function setGlobalContext(
   globalContext.routes = context.routes;
   globalContext.appInit = context.appInit;
   globalContext.layoutApp = context.layoutApp;
+  globalContext.basename = context.basename;
   globalContext.RSCRoot = context.RSCRoot;
   globalContext.isRscClient = context.isRscClient;
   globalContext.enableRsc = context.enableRsc;
@@ -98,3 +103,7 @@ export function getGlobalRoutes(): undefined | (NestedRoute | PageRoute)[] {
 export function getGlobalLayoutApp() {
   return globalContext.layoutApp;
 }
+
+export function getGlobalBasename() {
+  return globalContext.basename;
+}

packages/runtime/plugin-runtime/src/router/cli/code/templates.ts

@@ -558,6 +558,7 @@ export const runtimeGlobalContext = async ({
   internalSrcAlias,
   globalApp,
   rscType = false,
+  basename,
 }: {
   entryName: string;
   metaName: string;
@@ -566,6 +567,7 @@ export const runtimeGlobalContext = async ({
   internalSrcAlias: string;
   globalApp?: string | false;
   rscType?: 'server' | 'client' | false;
+  basename?: string;
 }) => {
   const imports = [
     `import { setGlobalContext } from '@${metaName}/runtime/context';`,
@@ -619,11 +621,13 @@ export const runtimeGlobalContext = async ({
     import { routes } from './routes';
 
     const entryName = '${entryName}';
+    const basename = '${basename || '/'}';
       setGlobalContext({
         entryName,
         layoutApp,
         routes,
         appInit,
+        basename,
         isRscClient: true,
         enableRsc: true,
       });
@@ -634,11 +638,13 @@ export const runtimeGlobalContext = async ({
     import { routes } from './routes';
 
     const entryName = '${entryName}';
+    const basename = '${basename || '/'}';
       setGlobalContext({
         entryName,
         layoutApp,
         routes,
         appInit,
+        basename,
         enableRsc: ${enableRsc},
       });
     `;

packages/runtime/plugin-runtime/src/router/cli/handler.ts

@@ -34,6 +34,10 @@ export async function handleGeneratorEntryCode(
   await Promise.all(
     entrypoints.map(async entrypoint => {
       if (entrypoint.nestedRoutesEntry || entrypoint.pageRoutesEntry) {
+        const route = appContext.serverRoutes.find(
+          r => r.entryName === entrypoint.entryName,
+        );
+        const basename = route?.urlPath || '/';
         generatorRegisterCode(
           internalDirectory,
           entrypoint.entryName,
@@ -45,6 +49,7 @@ export async function handleGeneratorEntryCode(
             internalSrcAlias: appContext.internalSrcAlias,
             globalApp: entrypoint.fileSystemRoutes?.globalApp,
             rscType: enableRsc ? 'client' : undefined,
+            basename,
           }),
         );
         if (enableRsc) {
@@ -59,6 +64,7 @@ export async function handleGeneratorEntryCode(
               internalSrcAlias: appContext.internalSrcAlias,
               globalApp: entrypoint.fileSystemRoutes?.globalApp,
               rscType: 'server',
+              basename,
             }),
           );
         }

packages/solutions/app-tools/src/builder/shared/builderPlugins/adapterHtml.ts

@@ -6,12 +6,11 @@ import type {
   RsbuildPlugin,
   RspackChain,
 } from '@rsbuild/core';
-import type { HtmlUserConfig } from '../../../types/config/html';
 import { BottomTemplatePlugin } from '../bundlerPlugins';
 import type { BuilderOptions } from '../types';
 
 const createVirtualModule = (content: string) =>
-  `data:text/javascript,${content}`;
+  `data:text/javascript;charset=utf-8,${encodeURIComponent(content)}`;
 
 export const builderPluginAdapterHtml = (
   options: BuilderOptions,

packages/solutions/app-tools/src/config/default.ts

@@ -1,4 +1,4 @@
-import { MAIN_ENTRY_NAME } from '@modern-js/utils';
+import { DEFAULT_ENTRY_NAME, MAIN_ENTRY_NAME } from '@modern-js/utils';
 import type { AppUserConfig } from '../types';
 import type { AppToolsContext } from '../types/plugin';
 import { getAutoInjectEnv } from '../utils/env';
@@ -37,7 +37,7 @@ export function createDefaultConfig(
     alias: Record<string, string>;
   } = {
     entries: undefined,
-    mainEntryName: MAIN_ENTRY_NAME,
+    mainEntryName: DEFAULT_ENTRY_NAME,
     enableAsyncEntry: false,
     disableDefaultEntries: false,
     entriesDir: './src',

packages/solutions/app-tools/src/plugins/analyze/getServerRoutes.ts

@@ -129,6 +129,7 @@ const collectHtmlRoutes = (
     server: { baseUrl, routes, ssr, ssrByEntries, rsc },
     deploy,
   } = config;
+
   const { packageName } = appContext;
   const workerSSR = deploy?.worker?.ssr;