@module-federation/vite 1.0.0-alpha-6cae9ab → 1.0.0-alpha-51eeeb6

package/lib/index.cjs

@@ -29,7 +29,8 @@ var path__namespace = /*#__PURE__*/_interopNamespace(path);
 var MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
 
 var addEntry = function addEntry(_ref) {
-  var entryPath = _ref.entryPath,
+  var entryName = _ref.entryName,
+    entryPath = _ref.entryPath,
     fileName = _ref.fileName;
   var entryFiles = [];
   var htmlFilePath;
@@ -78,7 +79,9 @@ var addEntry = function addEntry(_ref) {
     buildStart: function buildStart() {
       var _this$emitFile;
       var hasHash = fileName == null || fileName.includes == null ? void 0 : fileName.includes("[hash");
-      this.emitFile((_this$emitFile = {}, _this$emitFile[hasHash ? "name" : "fileName"] = fileName, _this$emitFile.type = 'chunk', _this$emitFile.id = entryPath, _this$emitFile.preserveSignature = 'strict', _this$emitFile));
+      this.emitFile((_this$emitFile = {
+        name: entryName
+      }, _this$emitFile[hasHash ? "name" : "fileName"] = fileName, _this$emitFile.type = 'chunk', _this$emitFile.id = entryPath, _this$emitFile.preserveSignature = 'strict', _this$emitFile));
       if (htmlFilePath) {
         var htmlContent = fs__namespace.readFileSync(htmlFilePath, 'utf-8');
         var scriptRegex = /<script\s+[^>]*src=["']([^"']+)["'][^>]*>/gi;
@@ -264,6 +267,7 @@ function writeLocalSharedImportMap(pkgList) {
     return "\n        " + JSON.stringify(pkg) + ": async () => {\n          let pkg = await import(\"" + getPreBuildLibPath(pkg) + "\")\n          return pkg\n        }\n      ";
   }).join(",") + "\n    }\n    ");
 }
+var LOAD_SHARE_TAG = "__mf__loadShare_";
 /**
  * generate loadShare virtual module
  */
@@ -271,7 +275,7 @@ var cacheMap1 = {};
 function getLoadShareModulePath(pkg) {
   var _getNormalizeModuleFe2 = getNormalizeModuleFederationOptions(),
     name = _getNormalizeModuleFe2.name;
-  if (!cacheMap1[pkg]) cacheMap1[pkg] = npmPackageNameToFileName(name) + "_" + ("__mf__loadShare_" + npmPackageNameToFileName(pkg) + ".js");
+  if (!cacheMap1[pkg]) cacheMap1[pkg] = npmPackageNameToFileName(name) + "_" + ("" + LOAD_SHARE_TAG + npmPackageNameToFileName(pkg) + ".js");
   var filename = cacheMap1[pkg];
   return path.resolve(emptyNpmDir, filename);
 }
@@ -413,6 +417,24 @@ function pluginProxyRemotes (options) {
   };
 }
 
+function wrapManualChunks(output, manualChunksCb) {
+  if (!output.manualChunks) output.manualChunks = {};
+  var wrapManualChunks = function wrapManualChunks(original) {
+    return function (id) {
+      var args = [].slice.call(arguments, 1);
+      var customRes = manualChunksCb == null ? void 0 : manualChunksCb.apply(void 0, [id].concat(args));
+      if (customRes) return customRes;
+      if (typeof original === 'function') {
+        return original.apply(void 0, [id].concat(args));
+      }
+      if (typeof original === 'object' && original) {
+        return original[id];
+      }
+    };
+  };
+  output.manualChunks = wrapManualChunks(output.manualChunks);
+}
+
 function proxySharedModule(options) {
   var _options$shared = options.shared,
     shared = _options$shared === void 0 ? {} : _options$shared,
@@ -426,29 +448,47 @@ function proxySharedModule(options) {
     config: function config(_config, _ref) {
       var _config$resolve$alias, _config$resolve$alias2;
       var command = _ref.command;
+      if (!_config.build) _config.build = {};
+      if (!_config.build.rollupOptions) _config.build.rollupOptions = {};
+      var rollupOptions = _config.build.rollupOptions;
+      if (!rollupOptions.output) rollupOptions.output = {};
       // config?.optimizeDeps?.include?.push?.("an-empty-js-file");
       // config.optimizeDeps.needsInterop.push('an-empty-js-file');
+      wrapManualChunks(_config.build.rollupOptions.output, function (id) {
+        if (id.includes("node_modules/@module-federation/runtime")) {
+          return "@module-federation/runtime";
+        }
+        if (id.includes(LOAD_SHARE_TAG) || id.includes("__mf__prebuildwrap_")) {
+          return id.split("/").pop();
+        }
+      });
       (_config$resolve$alias = _config.resolve.alias).push.apply(_config$resolve$alias, Object.keys(shared).map(function (key) {
-        var _config$optimizeDeps;
+        var _config$optimizeDeps, _config$optimizeDeps2;
         _config == null || (_config$optimizeDeps = _config.optimizeDeps) == null || (_config$optimizeDeps = _config$optimizeDeps.include) == null || _config$optimizeDeps.push == null || _config$optimizeDeps.push(getPreBuildLibPath(key));
         // write proxyFile
         writeLoadShareModule(key, shared[key], command);
         var preBuildLibPath = getLoadShareModulePath(key);
+        _config == null || (_config$optimizeDeps2 = _config.optimizeDeps) == null || (_config$optimizeDeps2 = _config$optimizeDeps2.needsInterop) == null || _config$optimizeDeps2.push(key);
         return {
           // Intercept all dependency requests to the proxy module
           // Dependency requests issued by localSharedImportMap are allowed without proxying.
           find: new RegExp("^" + key + "$"),
           replacement: preBuildLibPath,
           customResolver: function customResolver(source, importer) {
+            var _config$optimizeDeps3;
             if (importer.includes("node_modules/" + key + "/")) {
               return this.resolve(key);
             }
+            _config == null || (_config$optimizeDeps3 = _config.optimizeDeps) == null || (_config$optimizeDeps3 = _config$optimizeDeps3.needsInterop) == null || _config$optimizeDeps3.push(preBuildLibPath);
             return this.resolve(preBuildLibPath);
           }
         };
       }));
       (_config$resolve$alias2 = _config.resolve.alias).push.apply(_config$resolve$alias2, Object.keys(shared).map(function (key) {
-        return {
+        return command === "build" ? {
+          find: new RegExp("^" + getPreBuildLibPath(key) + "$"),
+          replacement: key
+        } : {
           find: new RegExp("^" + getPreBuildLibPath(key) + "$"),
           customResolver: function customResolver(source, importer) {
             return this.resolve(key);
@@ -543,39 +583,6 @@ var aliasToArrayPlugin = {
   }
 };
 
-var normalizeBuildPlugin = (function (singleChunkModules) {
-  return {
-    name: 'normalizeBuild',
-    config: function config(_config, _ref) {
-      if (!_config.build) _config.build = {};
-      if (!_config.build.rollupOptions) _config.build.rollupOptions = {};
-      var rollupOptions = _config.build.rollupOptions;
-      if (!rollupOptions.output) rollupOptions.output = {};
-      normalizeManualChunks(rollupOptions.output, singleChunkModules);
-    }
-  };
-});
-function normalizeManualChunks(output, singleChunkModules) {
-  var pattern = new RegExp("node_modules/(" + singleChunkModules.join('|') + ")/");
-  if (!output.manualChunks) output.manualChunks = {};
-  var wrapManualChunks = function wrapManualChunks(original) {
-    return function (id) {
-      var _ref2 = id.match(pattern) || [],
-        moduleName = _ref2[1];
-      if (moduleName) {
-        return moduleName;
-      }
-      if (typeof original === 'function') {
-        return original.apply(void 0, [id].concat([].slice.call(arguments, 1)));
-      }
-      if (typeof original === 'object' && original) {
-        return original[id];
-      }
-    };
-  };
-  output.manualChunks = wrapManualChunks(output.manualChunks);
-}
-
 var normalizeOptimizeDepsPlugin = {
   name: 'normalizeOptimizeDeps',
   config: function config(_config, _ref) {
@@ -595,7 +602,7 @@ function federation(mfUserOptions) {
     shared = options.shared,
     filename = options.filename;
   if (!name) throw new Error("name is required");
-  return [aliasToArrayPlugin, normalizeOptimizeDepsPlugin, normalizeBuildPlugin([].concat(Object.keys(shared), ["@module-federation/runtime"]))].concat(addEntry({
+  return [aliasToArrayPlugin, normalizeOptimizeDepsPlugin].concat(addEntry({
     entryName: 'remoteEntry',
     entryPath: WRAP_REMOTE_ENTRY_PATH,
     fileName: filename

package/lib/index.esm.js

@@ -7,7 +7,8 @@ import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 
 var addEntry = function addEntry(_ref) {
-  var entryPath = _ref.entryPath,
+  var entryName = _ref.entryName,
+    entryPath = _ref.entryPath,
     fileName = _ref.fileName;
   var entryFiles = [];
   var htmlFilePath;
@@ -56,7 +57,9 @@ var addEntry = function addEntry(_ref) {
     buildStart: function buildStart() {
       var _this$emitFile;
       var hasHash = fileName == null || fileName.includes == null ? void 0 : fileName.includes("[hash");
-      this.emitFile((_this$emitFile = {}, _this$emitFile[hasHash ? "name" : "fileName"] = fileName, _this$emitFile.type = 'chunk', _this$emitFile.id = entryPath, _this$emitFile.preserveSignature = 'strict', _this$emitFile));
+      this.emitFile((_this$emitFile = {
+        name: entryName
+      }, _this$emitFile[hasHash ? "name" : "fileName"] = fileName, _this$emitFile.type = 'chunk', _this$emitFile.id = entryPath, _this$emitFile.preserveSignature = 'strict', _this$emitFile));
       if (htmlFilePath) {
         var htmlContent = fs.readFileSync(htmlFilePath, 'utf-8');
         var scriptRegex = /<script\s+[^>]*src=["']([^"']+)["'][^>]*>/gi;
@@ -242,6 +245,7 @@ function writeLocalSharedImportMap(pkgList) {
     return "\n        " + JSON.stringify(pkg) + ": async () => {\n          let pkg = await import(\"" + getPreBuildLibPath(pkg) + "\")\n          return pkg\n        }\n      ";
   }).join(",") + "\n    }\n    ");
 }
+var LOAD_SHARE_TAG = "__mf__loadShare_";
 /**
  * generate loadShare virtual module
  */
@@ -249,7 +253,7 @@ var cacheMap1 = {};
 function getLoadShareModulePath(pkg) {
   var _getNormalizeModuleFe2 = getNormalizeModuleFederationOptions(),
     name = _getNormalizeModuleFe2.name;
-  if (!cacheMap1[pkg]) cacheMap1[pkg] = npmPackageNameToFileName(name) + "_" + ("__mf__loadShare_" + npmPackageNameToFileName(pkg) + ".js");
+  if (!cacheMap1[pkg]) cacheMap1[pkg] = npmPackageNameToFileName(name) + "_" + ("" + LOAD_SHARE_TAG + npmPackageNameToFileName(pkg) + ".js");
   var filename = cacheMap1[pkg];
   return resolve(emptyNpmDir, filename);
 }
@@ -391,6 +395,24 @@ function pluginProxyRemotes (options) {
   };
 }
 
+function wrapManualChunks(output, manualChunksCb) {
+  if (!output.manualChunks) output.manualChunks = {};
+  var wrapManualChunks = function wrapManualChunks(original) {
+    return function (id) {
+      var args = [].slice.call(arguments, 1);
+      var customRes = manualChunksCb == null ? void 0 : manualChunksCb.apply(void 0, [id].concat(args));
+      if (customRes) return customRes;
+      if (typeof original === 'function') {
+        return original.apply(void 0, [id].concat(args));
+      }
+      if (typeof original === 'object' && original) {
+        return original[id];
+      }
+    };
+  };
+  output.manualChunks = wrapManualChunks(output.manualChunks);
+}
+
 function proxySharedModule(options) {
   var _options$shared = options.shared,
     shared = _options$shared === void 0 ? {} : _options$shared,
@@ -404,29 +426,47 @@ function proxySharedModule(options) {
     config: function config(_config, _ref) {
       var _config$resolve$alias, _config$resolve$alias2;
       var command = _ref.command;
+      if (!_config.build) _config.build = {};
+      if (!_config.build.rollupOptions) _config.build.rollupOptions = {};
+      var rollupOptions = _config.build.rollupOptions;
+      if (!rollupOptions.output) rollupOptions.output = {};
       // config?.optimizeDeps?.include?.push?.("an-empty-js-file");
       // config.optimizeDeps.needsInterop.push('an-empty-js-file');
+      wrapManualChunks(_config.build.rollupOptions.output, function (id) {
+        if (id.includes("node_modules/@module-federation/runtime")) {
+          return "@module-federation/runtime";
+        }
+        if (id.includes(LOAD_SHARE_TAG) || id.includes("__mf__prebuildwrap_")) {
+          return id.split("/").pop();
+        }
+      });
       (_config$resolve$alias = _config.resolve.alias).push.apply(_config$resolve$alias, Object.keys(shared).map(function (key) {
-        var _config$optimizeDeps;
+        var _config$optimizeDeps, _config$optimizeDeps2;
         _config == null || (_config$optimizeDeps = _config.optimizeDeps) == null || (_config$optimizeDeps = _config$optimizeDeps.include) == null || _config$optimizeDeps.push == null || _config$optimizeDeps.push(getPreBuildLibPath(key));
         // write proxyFile
         writeLoadShareModule(key, shared[key], command);
         var preBuildLibPath = getLoadShareModulePath(key);
+        _config == null || (_config$optimizeDeps2 = _config.optimizeDeps) == null || (_config$optimizeDeps2 = _config$optimizeDeps2.needsInterop) == null || _config$optimizeDeps2.push(key);
         return {
           // Intercept all dependency requests to the proxy module
           // Dependency requests issued by localSharedImportMap are allowed without proxying.
           find: new RegExp("^" + key + "$"),
           replacement: preBuildLibPath,
           customResolver: function customResolver(source, importer) {
+            var _config$optimizeDeps3;
             if (importer.includes("node_modules/" + key + "/")) {
               return this.resolve(key);
             }
+            _config == null || (_config$optimizeDeps3 = _config.optimizeDeps) == null || (_config$optimizeDeps3 = _config$optimizeDeps3.needsInterop) == null || _config$optimizeDeps3.push(preBuildLibPath);
             return this.resolve(preBuildLibPath);
           }
         };
       }));
       (_config$resolve$alias2 = _config.resolve.alias).push.apply(_config$resolve$alias2, Object.keys(shared).map(function (key) {
-        return {
+        return command === "build" ? {
+          find: new RegExp("^" + getPreBuildLibPath(key) + "$"),
+          replacement: key
+        } : {
           find: new RegExp("^" + getPreBuildLibPath(key) + "$"),
           customResolver: function customResolver(source, importer) {
             return this.resolve(key);
@@ -521,39 +561,6 @@ var aliasToArrayPlugin = {
   }
 };
 
-var normalizeBuildPlugin = (function (singleChunkModules) {
-  return {
-    name: 'normalizeBuild',
-    config: function config(_config, _ref) {
-      if (!_config.build) _config.build = {};
-      if (!_config.build.rollupOptions) _config.build.rollupOptions = {};
-      var rollupOptions = _config.build.rollupOptions;
-      if (!rollupOptions.output) rollupOptions.output = {};
-      normalizeManualChunks(rollupOptions.output, singleChunkModules);
-    }
-  };
-});
-function normalizeManualChunks(output, singleChunkModules) {
-  var pattern = new RegExp("node_modules/(" + singleChunkModules.join('|') + ")/");
-  if (!output.manualChunks) output.manualChunks = {};
-  var wrapManualChunks = function wrapManualChunks(original) {
-    return function (id) {
-      var _ref2 = id.match(pattern) || [],
-        moduleName = _ref2[1];
-      if (moduleName) {
-        return moduleName;
-      }
-      if (typeof original === 'function') {
-        return original.apply(void 0, [id].concat([].slice.call(arguments, 1)));
-      }
-      if (typeof original === 'object' && original) {
-        return original[id];
-      }
-    };
-  };
-  output.manualChunks = wrapManualChunks(output.manualChunks);
-}
-
 var normalizeOptimizeDepsPlugin = {
   name: 'normalizeOptimizeDeps',
   config: function config(_config, _ref) {
@@ -573,7 +580,7 @@ function federation(mfUserOptions) {
     shared = options.shared,
     filename = options.filename;
   if (!name) throw new Error("name is required");
-  return [aliasToArrayPlugin, normalizeOptimizeDepsPlugin, normalizeBuildPlugin([].concat(Object.keys(shared), ["@module-federation/runtime"]))].concat(addEntry({
+  return [aliasToArrayPlugin, normalizeOptimizeDepsPlugin].concat(addEntry({
     entryName: 'remoteEntry',
     entryPath: WRAP_REMOTE_ENTRY_PATH,
     fileName: filename

package/lib/index.modern.js

@@ -60,6 +60,7 @@ const addEntry = ({
     buildStart() {
       const hasHash = fileName == null || fileName.includes == null ? void 0 : fileName.includes("[hash");
       this.emitFile({
+        name: entryName,
         [hasHash ? "name" : "fileName"]: fileName,
         type: 'chunk',
         id: entryPath,
@@ -257,6 +258,7 @@ function writeLocalSharedImportMap(pkgList) {
     }
     `);
 }
+const LOAD_SHARE_TAG = "__mf__loadShare_";
 /**
  * generate loadShare virtual module
  */
@@ -265,7 +267,7 @@ function getLoadShareModulePath(pkg) {
   const {
     name
   } = getNormalizeModuleFederationOptions();
-  if (!cacheMap1[pkg]) cacheMap1[pkg] = npmPackageNameToFileName(name) + "_" + `__mf__loadShare_${npmPackageNameToFileName(pkg)}.js`;
+  if (!cacheMap1[pkg]) cacheMap1[pkg] = npmPackageNameToFileName(name) + "_" + `${LOAD_SHARE_TAG}${npmPackageNameToFileName(pkg)}.js`;
   const filename = cacheMap1[pkg];
   return resolve(emptyNpmDir, filename);
 }
@@ -494,6 +496,21 @@ function pluginProxyRemotes (options) {
   };
 }
 
+function wrapManualChunks(output, manualChunksCb) {
+  if (!output.manualChunks) output.manualChunks = {};
+  const wrapManualChunks = original => (id, ...args) => {
+    const customRes = manualChunksCb == null ? void 0 : manualChunksCb(id, ...args);
+    if (customRes) return customRes;
+    if (typeof original === 'function') {
+      return original(id, ...args);
+    }
+    if (typeof original === 'object' && original) {
+      return original[id];
+    }
+  };
+  output.manualChunks = wrapManualChunks(output.manualChunks);
+}
+
 function proxySharedModule(options) {
   let {
     shared = {},
@@ -508,29 +525,49 @@ function proxySharedModule(options) {
     config(config, {
       command
     }) {
+      if (!config.build) config.build = {};
+      if (!config.build.rollupOptions) config.build.rollupOptions = {};
+      let {
+        rollupOptions
+      } = config.build;
+      if (!rollupOptions.output) rollupOptions.output = {};
       // config?.optimizeDeps?.include?.push?.("an-empty-js-file");
       // config.optimizeDeps.needsInterop.push('an-empty-js-file');
+      wrapManualChunks(config.build.rollupOptions.output, id => {
+        if (id.includes("node_modules/@module-federation/runtime")) {
+          return "@module-federation/runtime";
+        }
+        if (id.includes(LOAD_SHARE_TAG) || id.includes("__mf__prebuildwrap_")) {
+          return id.split("/").pop();
+        }
+      });
       config.resolve.alias.push(...Object.keys(shared).map(key => {
-        var _config$optimizeDeps;
+        var _config$optimizeDeps, _config$optimizeDeps2;
         config == null || (_config$optimizeDeps = config.optimizeDeps) == null || (_config$optimizeDeps = _config$optimizeDeps.include) == null || _config$optimizeDeps.push == null || _config$optimizeDeps.push(getPreBuildLibPath(key));
         // write proxyFile
         writeLoadShareModule(key, shared[key], command);
         const preBuildLibPath = getLoadShareModulePath(key);
+        config == null || (_config$optimizeDeps2 = config.optimizeDeps) == null || (_config$optimizeDeps2 = _config$optimizeDeps2.needsInterop) == null || _config$optimizeDeps2.push(key);
         return {
           // Intercept all dependency requests to the proxy module
           // Dependency requests issued by localSharedImportMap are allowed without proxying.
           find: new RegExp(`^${key}$`),
           replacement: preBuildLibPath,
           customResolver(source, importer) {
+            var _config$optimizeDeps3;
             if (importer.includes(`node_modules/${key}/`)) {
               return this.resolve(key);
             }
+            config == null || (_config$optimizeDeps3 = config.optimizeDeps) == null || (_config$optimizeDeps3 = _config$optimizeDeps3.needsInterop) == null || _config$optimizeDeps3.push(preBuildLibPath);
             return this.resolve(preBuildLibPath);
           }
         };
       }));
       config.resolve.alias.push(...Object.keys(shared).map(key => {
-        return {
+        return command === "build" ? {
+          find: new RegExp(`^${getPreBuildLibPath(key)}$`),
+          replacement: key
+        } : {
           find: new RegExp(`^${getPreBuildLibPath(key)}$`),
           customResolver(source, importer) {
             return this.resolve(key);
@@ -631,38 +668,6 @@ var aliasToArrayPlugin = {
   }
 };
 
-var normalizeBuildPlugin = (singleChunkModules => ({
-  name: 'normalizeBuild',
-  config: (config, {
-    command
-  }) => {
-    if (!config.build) config.build = {};
-    if (!config.build.rollupOptions) config.build.rollupOptions = {};
-    let {
-      rollupOptions
-    } = config.build;
-    if (!rollupOptions.output) rollupOptions.output = {};
-    normalizeManualChunks(rollupOptions.output, singleChunkModules);
-  }
-}));
-function normalizeManualChunks(output, singleChunkModules) {
-  const pattern = new RegExp(`node_modules/(${singleChunkModules.join('|')})/`);
-  if (!output.manualChunks) output.manualChunks = {};
-  const wrapManualChunks = original => (id, ...args) => {
-    const [_, moduleName] = id.match(pattern) || [];
-    if (moduleName) {
-      return moduleName;
-    }
-    if (typeof original === 'function') {
-      return original(id, ...args);
-    }
-    if (typeof original === 'object' && original) {
-      return original[id];
-    }
-  };
-  output.manualChunks = wrapManualChunks(output.manualChunks);
-}
-
 var normalizeOptimizeDepsPlugin = {
   name: 'normalizeOptimizeDeps',
   config: (config, {
@@ -689,7 +694,7 @@ function federation(mfUserOptions) {
     filename
   } = options;
   if (!name) throw new Error("name is required");
-  return [aliasToArrayPlugin, normalizeOptimizeDepsPlugin, normalizeBuildPlugin([...Object.keys(shared), "@module-federation/runtime"]), ...addEntry({
+  return [aliasToArrayPlugin, normalizeOptimizeDepsPlugin, ...addEntry({
     entryName: 'remoteEntry',
     entryPath: WRAP_REMOTE_ENTRY_PATH,
     fileName: filename

package/lib/index.umd.js

@@ -28,7 +28,8 @@
   var MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
 
   var addEntry = function addEntry(_ref) {
-    var entryPath = _ref.entryPath,
+    var entryName = _ref.entryName,
+      entryPath = _ref.entryPath,
       fileName = _ref.fileName;
     var entryFiles = [];
     var htmlFilePath;
@@ -77,7 +78,9 @@
       buildStart: function buildStart() {
         var _this$emitFile;
         var hasHash = fileName == null || fileName.includes == null ? void 0 : fileName.includes("[hash");
-        this.emitFile((_this$emitFile = {}, _this$emitFile[hasHash ? "name" : "fileName"] = fileName, _this$emitFile.type = 'chunk', _this$emitFile.id = entryPath, _this$emitFile.preserveSignature = 'strict', _this$emitFile));
+        this.emitFile((_this$emitFile = {
+          name: entryName
+        }, _this$emitFile[hasHash ? "name" : "fileName"] = fileName, _this$emitFile.type = 'chunk', _this$emitFile.id = entryPath, _this$emitFile.preserveSignature = 'strict', _this$emitFile));
         if (htmlFilePath) {
           var htmlContent = fs__namespace.readFileSync(htmlFilePath, 'utf-8');
           var scriptRegex = /<script\s+[^>]*src=["']([^"']+)["'][^>]*>/gi;
@@ -263,6 +266,7 @@
       return "\n        " + JSON.stringify(pkg) + ": async () => {\n          let pkg = await import(\"" + getPreBuildLibPath(pkg) + "\")\n          return pkg\n        }\n      ";
     }).join(",") + "\n    }\n    ");
   }
+  var LOAD_SHARE_TAG = "__mf__loadShare_";
   /**
    * generate loadShare virtual module
    */
@@ -270,7 +274,7 @@
   function getLoadShareModulePath(pkg) {
     var _getNormalizeModuleFe2 = getNormalizeModuleFederationOptions(),
       name = _getNormalizeModuleFe2.name;
-    if (!cacheMap1[pkg]) cacheMap1[pkg] = npmPackageNameToFileName(name) + "_" + ("__mf__loadShare_" + npmPackageNameToFileName(pkg) + ".js");
+    if (!cacheMap1[pkg]) cacheMap1[pkg] = npmPackageNameToFileName(name) + "_" + ("" + LOAD_SHARE_TAG + npmPackageNameToFileName(pkg) + ".js");
     var filename = cacheMap1[pkg];
     return path.resolve(emptyNpmDir, filename);
   }
@@ -412,6 +416,24 @@
     };
   }
 
+  function wrapManualChunks(output, manualChunksCb) {
+    if (!output.manualChunks) output.manualChunks = {};
+    var wrapManualChunks = function wrapManualChunks(original) {
+      return function (id) {
+        var args = [].slice.call(arguments, 1);
+        var customRes = manualChunksCb == null ? void 0 : manualChunksCb.apply(void 0, [id].concat(args));
+        if (customRes) return customRes;
+        if (typeof original === 'function') {
+          return original.apply(void 0, [id].concat(args));
+        }
+        if (typeof original === 'object' && original) {
+          return original[id];
+        }
+      };
+    };
+    output.manualChunks = wrapManualChunks(output.manualChunks);
+  }
+
   function proxySharedModule(options) {
     var _options$shared = options.shared,
       shared = _options$shared === void 0 ? {} : _options$shared,
@@ -425,29 +447,47 @@
       config: function config(_config, _ref) {
         var _config$resolve$alias, _config$resolve$alias2;
         var command = _ref.command;
+        if (!_config.build) _config.build = {};
+        if (!_config.build.rollupOptions) _config.build.rollupOptions = {};
+        var rollupOptions = _config.build.rollupOptions;
+        if (!rollupOptions.output) rollupOptions.output = {};
         // config?.optimizeDeps?.include?.push?.("an-empty-js-file");
         // config.optimizeDeps.needsInterop.push('an-empty-js-file');
+        wrapManualChunks(_config.build.rollupOptions.output, function (id) {
+          if (id.includes("node_modules/@module-federation/runtime")) {
+            return "@module-federation/runtime";
+          }
+          if (id.includes(LOAD_SHARE_TAG) || id.includes("__mf__prebuildwrap_")) {
+            return id.split("/").pop();
+          }
+        });
         (_config$resolve$alias = _config.resolve.alias).push.apply(_config$resolve$alias, Object.keys(shared).map(function (key) {
-          var _config$optimizeDeps;
+          var _config$optimizeDeps, _config$optimizeDeps2;
           _config == null || (_config$optimizeDeps = _config.optimizeDeps) == null || (_config$optimizeDeps = _config$optimizeDeps.include) == null || _config$optimizeDeps.push == null || _config$optimizeDeps.push(getPreBuildLibPath(key));
           // write proxyFile
           writeLoadShareModule(key, shared[key], command);
           var preBuildLibPath = getLoadShareModulePath(key);
+          _config == null || (_config$optimizeDeps2 = _config.optimizeDeps) == null || (_config$optimizeDeps2 = _config$optimizeDeps2.needsInterop) == null || _config$optimizeDeps2.push(key);
           return {
             // Intercept all dependency requests to the proxy module
             // Dependency requests issued by localSharedImportMap are allowed without proxying.
             find: new RegExp("^" + key + "$"),
             replacement: preBuildLibPath,
             customResolver: function customResolver(source, importer) {
+              var _config$optimizeDeps3;
               if (importer.includes("node_modules/" + key + "/")) {
                 return this.resolve(key);
               }
+              _config == null || (_config$optimizeDeps3 = _config.optimizeDeps) == null || (_config$optimizeDeps3 = _config$optimizeDeps3.needsInterop) == null || _config$optimizeDeps3.push(preBuildLibPath);
               return this.resolve(preBuildLibPath);
             }
           };
         }));
         (_config$resolve$alias2 = _config.resolve.alias).push.apply(_config$resolve$alias2, Object.keys(shared).map(function (key) {
-          return {
+          return command === "build" ? {
+            find: new RegExp("^" + getPreBuildLibPath(key) + "$"),
+            replacement: key
+          } : {
             find: new RegExp("^" + getPreBuildLibPath(key) + "$"),
             customResolver: function customResolver(source, importer) {
               return this.resolve(key);
@@ -542,39 +582,6 @@
     }
   };
 
-  var normalizeBuildPlugin = (function (singleChunkModules) {
-    return {
-      name: 'normalizeBuild',
-      config: function config(_config, _ref) {
-        if (!_config.build) _config.build = {};
-        if (!_config.build.rollupOptions) _config.build.rollupOptions = {};
-        var rollupOptions = _config.build.rollupOptions;
-        if (!rollupOptions.output) rollupOptions.output = {};
-        normalizeManualChunks(rollupOptions.output, singleChunkModules);
-      }
-    };
-  });
-  function normalizeManualChunks(output, singleChunkModules) {
-    var pattern = new RegExp("node_modules/(" + singleChunkModules.join('|') + ")/");
-    if (!output.manualChunks) output.manualChunks = {};
-    var wrapManualChunks = function wrapManualChunks(original) {
-      return function (id) {
-        var _ref2 = id.match(pattern) || [],
-          moduleName = _ref2[1];
-        if (moduleName) {
-          return moduleName;
-        }
-        if (typeof original === 'function') {
-          return original.apply(void 0, [id].concat([].slice.call(arguments, 1)));
-        }
-        if (typeof original === 'object' && original) {
-          return original[id];
-        }
-      };
-    };
-    output.manualChunks = wrapManualChunks(output.manualChunks);
-  }
-
   var normalizeOptimizeDepsPlugin = {
     name: 'normalizeOptimizeDeps',
     config: function config(_config, _ref) {
@@ -594,7 +601,7 @@
       shared = options.shared,
       filename = options.filename;
     if (!name) throw new Error("name is required");
-    return [aliasToArrayPlugin, normalizeOptimizeDepsPlugin, normalizeBuildPlugin([].concat(Object.keys(shared), ["@module-federation/runtime"]))].concat(addEntry({
+    return [aliasToArrayPlugin, normalizeOptimizeDepsPlugin].concat(addEntry({
       entryName: 'remoteEntry',
       entryPath: WRAP_REMOTE_ENTRY_PATH,
       fileName: filename

package/lib/utils/wrapManualChunks.d.ts

@@ -0,0 +1 @@
+export declare function wrapManualChunks(output: any, manualChunksCb: Function): void;

package/lib/virtualModules/virtualShared_preBuild.d.ts

@@ -8,5 +8,6 @@ export declare function getPreBuildLibPath(pkg: string): string;
 export declare function getLocalSharedImportMapId(): string;
 export declare function getLocalSharedImportMapPath(): string;
 export declare function writeLocalSharedImportMap(pkgList: string[]): void;
+export declare const LOAD_SHARE_TAG = "__mf__loadShare_";
 export declare function getLoadShareModulePath(pkg: string): string;
 export declare function writeLoadShareModule(pkg: string, shareItem: ShareItem, command: string): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.0.0-alpha-6cae9ab",
+  "version": "1.0.0-alpha-51eeeb6",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "source": "src/index.ts",
@@ -38,7 +38,7 @@
   "homepage": "https://github.com/module-federation/vite#readme",
   "packageManager": "pnpm@9.1.3",
   "dependencies": {
-    "@module-federation/runtime": "^0.3.5",
+    "@module-federation/runtime": "^0.5.0",
     "@rollup/pluginutils": "^5.1.0",
     "an-empty-js-file": "1.0.0",
     "estree-walker": "^2",
@@ -51,6 +51,6 @@
     "mime-types": "^2.1.35",
     "pretty-quick": "^4.0.0",
     "rimraf": "^6.0.1",
-    "vite": "^5.4.0"
+    "vite": "^5.4.1"
   }
 }

package/lib/utils/normalizeBuild.d.ts

@@ -1,8 +0,0 @@
-import { UserConfig } from 'vite';
-declare const _default: (singleChunkModules: string[]) => {
-    name: string;
-    config: (config: UserConfig, { command }: {
-        command: string;
-    }) => void;
-};
-export default _default;