fix: add protocol in node automaticly (#2560)

module-federation · Jun 4, 2024 · 80af3f3 · 80af3f3
1 parent 28a2f58
commit 80af3f3
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 9 deletions.
diff --git a/.changeset/eleven-seals-deny.md b/.changeset/eleven-seals-deny.md
@@ -0,0 +1,5 @@
+---
+'@module-federation/runtime': patch
+---
+
+fix: add protocol in node automaticly
diff --git a/.changeset/seven-pans-argue.md b/.changeset/seven-pans-argue.md
@@ -0,0 +1,6 @@
+---
+'@module-federation/manifest': patch
+'@module-federation/sdk': patch
+---
+
+fix: get remoteEntry type from options
diff --git a/packages/manifest/src/StatsManager.ts b/packages/manifest/src/StatsManager.ts
@@ -11,6 +11,7 @@ import {
   Stats,
   StatsAssets,
   moduleFederationPlugin,
+  RemoteEntryType,
 } from '@module-federation/sdk';
 import { Compilation, Compiler, StatsCompilation, StatsModule } from 'webpack';
 import {
@@ -116,7 +117,9 @@ class StatsManager {
         name: getRemoteEntryName(),
         path: '',
         // same as the types supported by runtime, currently only global/var/script is supported
-        type: 'global',
+        type:
+          (this._options?.library?.type as RemoteEntryType | undefined) ||
+          'global',
       },
       types: getTypesMetaInfo(this._options, compiler.context),
       globalName: globalName,

diff --git a/packages/runtime/src/plugins/snapshot/index.ts b/packages/runtime/src/plugins/snapshot/index.ts
@@ -1,7 +1,11 @@
 import { ModuleInfo, getResourceUrl } from '@module-federation/sdk';
-
 import { FederationRuntimePlugin } from '../../type/plugin';
-import { error, isPureRemoteEntry, isRemoteInfoWithEntry } from '../../utils';
+import {
+  error,
+  isBrowserEnv,
+  isPureRemoteEntry,
+  isRemoteInfoWithEntry,
+} from '../../utils';
 import { PreloadOptions, RemoteInfo } from '../../type';
 import { preloadAssets } from '../../utils/preload';
 
@@ -14,7 +18,11 @@ export function assignRemoteInfo(
   }
   const { remoteEntry } = remoteSnapshot;
 
-  const entryUrl = getResourceUrl(remoteSnapshot, remoteEntry);
+  let entryUrl = getResourceUrl(remoteSnapshot, remoteEntry);
+
+  if (!isBrowserEnv() && !entryUrl.startsWith('http')) {
+    entryUrl = `https:${entryUrl}`;
+  }
 
   remoteInfo.type = remoteSnapshot.remoteEntryType;
   remoteInfo.entryGlobalName = remoteSnapshot.globalName;

diff --git a/packages/runtime/src/utils/load.ts b/packages/runtime/src/utils/load.ts
@@ -77,7 +77,7 @@ export async function loadEntryScript({
         return entryExports;
       })
       .catch((e) => {
-        return e;
+        throw e;
       });
   }
 
@@ -101,7 +101,7 @@ export async function loadEntryScript({
       return entryExports;
     })
     .catch((e) => {
-      return e;
+      throw e;
     });
 }
 
@@ -126,7 +126,7 @@ export async function getRemoteEntry({
   }
 
   if (!globalLoading[uniqueKey]) {
-    if (type === 'esm') {
+    if (['esm', 'module'].includes(type)) {
       globalLoading[uniqueKey] = loadEsmEntry({
         entry,
         remoteEntryExports,

diff --git a/packages/sdk/src/types/stats.ts b/packages/sdk/src/types/stats.ts
@@ -1,7 +1,25 @@
-import { MFModuleType } from '../constant';
 import type { RemoteWithEntry, RemoteWithVersion } from './common';
 
-export type RemoteEntryType = 'esm' | 'global';
+export type RemoteEntryType =
+  | 'var'
+  | 'module'
+  | 'assign'
+  | 'assign-properties'
+  | 'this'
+  | 'window'
+  | 'self'
+  | 'global'
+  | 'commonjs'
+  | 'commonjs2'
+  | 'commonjs-module'
+  | 'commonjs-static'
+  | 'amd'
+  | 'amd-require'
+  | 'umd'
+  | 'umd2'
+  | 'jsonp'
+  | 'system'
+  | string;
 
 interface ResourceInfo {
   path: string;