fix: useLoader should run normally in csr when webpack build

web-infra-dev · May 9, 2024 · 0dbe37f · 0dbe37f
1 parent c61af61
commit 0dbe37f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.changeset/happy-fans-roll.md b/.changeset/happy-fans-roll.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/runtime': patch
+---
+
+fix: useLoader should run normally in csr when webpack build
+fix: useLoader 当使用 webpack 构建是，在 csr 下应该需要正常跑
diff --git a/packages/runtime/plugin-runtime/src/ssr/cli/index.ts b/packages/runtime/plugin-runtime/src/ssr/cli/index.ts
@@ -63,7 +63,6 @@ export const ssrPlugin = (): CliPlugin<AppTools> => ({
     return {
       config() {
         const appContext = api.useAppContext();
-        const userConfig = api.useConfigContext();
 
         pluginsExportsUtils = createRuntimeExportsUtils(
           appContext.internalDirectory,
@@ -93,15 +92,11 @@ export const ssrPlugin = (): CliPlugin<AppTools> => ({
             // so we only use useLoader in CSR on Rspack build temporarily.
             return (config: any) => {
               const userConfig = api.useResolvedConfigContext();
-              if (isUseSSRBundle(userConfig)) {
+              if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
                 config.plugins?.push(
                   path.join(__dirname, './babel-plugin-ssr-loader-id'),
                 );
-                if (checkUseStringSSR(userConfig)) {
-                  config.plugins?.push(
-                    require.resolve('@loadable/babel-plugin'),
-                  );
-                }
+                config.plugins?.push(require.resolve('@loadable/babel-plugin'));
               }
             };
           }
@@ -142,10 +137,7 @@ export const ssrPlugin = (): CliPlugin<AppTools> => ({
                   ]);
               }
             },
-            babel:
-              isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig as any)
-                ? babelHandler
-                : undefined,
+            babel: babelHandler,
           },
         };
       },