Merge branch 'main' into fix-reduce-csp-false-positives

Author: ScriptedAlchemy

.changeset/weak-spoons-begin.md

@@ -0,0 +1,5 @@
+---
+'@module-federation/modern-js': patch
+---
+
+fix(modern-js-plugin): adjust fetch type

apps/website-new/docs/en/guide/basic/runtime.mdx

@@ -46,7 +46,7 @@ init({
       entry: "http://localhost:3006/remoteEntry.js",
       alias: "app2"
     },
-{
+    {
       name: "@demo/app4",
       entry: "http://localhost:3006/remoteEntry.mjs",
       alias: "app2",

apps/website-new/docs/en/practice/frameworks/modern/index.mdx

@@ -55,7 +55,7 @@ Modern.js also supports dependency management with `yarn` and `npm`.
 :::
 
 
-## 创建项目
+## Create Project
 
 `@modern-js/create` provides an interactive Q & A interface to initialize the project based on the results, with initialization performed according to the default settings:
 

packages/modernjs/src/cli/mfRuntimePlugins/auto-fetch-data.ts

@@ -63,18 +63,26 @@ const autoFetchData: () => FederationRuntimePlugin = () => ({
     }
 
     const dataFetchMap = getDataFetchMap();
-    const downgradeType = remoteSnapshot.modules.find(
-      (module) =>
-        module.moduleName === `${dataFetchName}${DATA_FETCH_CLIENT_SUFFIX}`,
-    )
+    const hasSSRAsset = Boolean(remoteSnapshot.ssrRemoteEntry);
+    const hasDataFetchClient = Boolean(
+      remoteSnapshot.modules.find(
+        (module) =>
+          module.moduleName === `${dataFetchName}${DATA_FETCH_CLIENT_SUFFIX}`,
+      ),
+    );
+    const downgradeType = hasDataFetchClient
       ? MF_DATA_FETCH_TYPE.FETCH_CLIENT
-      : MF_DATA_FETCH_TYPE.FETCH_SERVER;
+      : hasSSRAsset
+        ? MF_DATA_FETCH_TYPE.FETCH_SERVER
+        : MF_DATA_FETCH_TYPE.FETCH_CLIENT;
     let finalDataFetchId = dataFetchId;
 
     if (typeof window !== 'undefined') {
       finalDataFetchId =
         downgradeType === MF_DATA_FETCH_TYPE.FETCH_CLIENT
-          ? `${dataFetchId}${DATA_FETCH_CLIENT_SUFFIX}`
+          ? hasDataFetchClient
+            ? `${dataFetchId}${DATA_FETCH_CLIENT_SUFFIX}`
+            : dataFetchId
           : dataFetchId;
     }
 

packages/node/src/runtimePlugin.ts

@@ -177,6 +177,7 @@ export const resolveUrl = (
   } catch {
     const entryUrl =
       returnFromCache(remoteName) || returnFromGlobalInstances(remoteName);
+
     if (!entryUrl) return null;
 
     const url = new URL(entryUrl);