fix(enhanced): use default runtime export (#3601)

Author: 2heal1

.changeset/chatty-months-share.md

@@ -0,0 +1,5 @@
+---
+'@module-federation/enhanced': patch
+---
+
+fix(enhanced): use default runtime export

packages/enhanced/src/lib/container/runtime/FederationRuntimePlugin.ts

@@ -47,12 +47,6 @@ const BundlerRuntimePath = require.resolve(
 const RuntimePath = require.resolve('@module-federation/runtime', {
   paths: [RuntimeToolsPath],
 });
-const EmbeddedRuntimePath = require.resolve(
-  '@module-federation/runtime/embedded',
-  {
-    paths: [RuntimeToolsPath],
-  },
-);
 
 const federationGlobal = getFederationGlobalScope(RuntimeGlobals);
 
@@ -330,17 +324,28 @@ class FederationRuntimePlugin {
     );
   }
 
-  setRuntimeAlias(compiler: Compiler) {
-    const { experiments, implementation } = this.options || {};
-    let runtimePath = EmbeddedRuntimePath;
+  getRuntimeAlias(compiler: Compiler) {
+    const { implementation } = this.options || {};
+    let runtimePath = RuntimePath;
+    const alias: any = compiler.options.resolve.alias || {};
 
-    if (implementation) {
-      runtimePath = require.resolve(`@module-federation/runtime/embedded`, {
-        paths: [implementation],
-      });
+    if (alias['@module-federation/runtime$']) {
+      runtimePath = alias['@module-federation/runtime$'];
+    } else {
+      if (implementation) {
+        runtimePath = require.resolve(`@module-federation/runtime`, {
+          paths: [implementation],
+        });
+      }
     }
 
+    return runtimePath;
+  }
+
+  setRuntimeAlias(compiler: Compiler) {
+    const { implementation } = this.options || {};
     const alias: any = compiler.options.resolve.alias || {};
+    const runtimePath = this.getRuntimeAlias(compiler);
     alias['@module-federation/runtime$'] =
       alias['@module-federation/runtime$'] || runtimePath;
     alias['@module-federation/runtime-tools$'] =
@@ -408,11 +413,12 @@ class FederationRuntimePlugin {
 
     new HoistContainerReferences().apply(compiler);
 
+    const runtimePath = this.getRuntimeAlias(compiler);
     new compiler.webpack.NormalModuleReplacementPlugin(
       /@module-federation\/runtime/,
       (resolveData) => {
         if (/webpack-bundler-runtime/.test(resolveData.contextInfo.issuer)) {
-          resolveData.request = RuntimePath;
+          resolveData.request = runtimePath;
 
           if (resolveData.createData) {
             resolveData.createData.request = resolveData.request;

packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts

@@ -100,13 +100,6 @@ export class NextFederationPlugin {
         (message) => /your target environment does not appear/.test(message),
       ];
     }
-    compiler.hooks.afterPlugins.tap('PatchAliasWebpackPlugin', () => {
-      compiler.options.resolve.alias = {
-        ...compiler.options.resolve.alias,
-        //useing embedded runtime
-        // '@module-federation/runtime$': runtimeESMPath,
-      };
-    });
   }
 
   private validateOptions(compiler: Compiler): boolean {

packages/runtime/__tests__/sync.spec.ts

@@ -39,11 +39,6 @@
       "import": "./dist/core.esm.mjs",
       "require": "./dist/core.cjs.js"
     },
-    "./embedded": {
-      "types": "./dist/embedded.cjs.d.ts",
-      "import": "./dist/embedded.esm.mjs",
-      "require": "./dist/embedded.cjs.js"
-    },
     "./*": "./*"
   },
   "typesVersions": {

packages/runtime/package.json

@@ -14,8 +14,7 @@
         "main": "packages/runtime/src/index.ts",
         "additionalEntryPoints": [
           "packages/runtime/src/types.ts",
-          "packages/runtime/src/helpers.ts",
-          "packages/runtime/src/embedded.ts"
+          "packages/runtime/src/helpers.ts"
         ],
         "tsConfig": "packages/runtime/tsconfig.lib.json",
         "assets": [],

packages/runtime/project.json

@@ -8,7 +8,6 @@ module.exports = (rollupConfig, projectOptions) => {
     index: 'packages/runtime/src/index.ts',
     types: 'packages/runtime/src/types.ts',
     helpers: 'packages/runtime/src/helpers.ts',
-    embedded: 'packages/runtime/src/embedded.ts',
     core: 'packages/runtime/src/core.ts',
   };