@module-federation/vite 1.7.1 → 1.8.0

package/lib/index.esm.js

@@ -2,7 +2,7 @@ import defu from 'defu';
 import * as fs from 'fs';
 import { mkdirSync, writeFileSync, existsSync, writeFile } from 'fs';
 import * as path from 'pathe';
-import path__default, { resolve, basename, parse, join, dirname, relative } from 'pathe';
+import path__default, { resolve, basename, parse, join, dirname } from 'pathe';
 import { createFilter } from '@rollup/pluginutils';
 import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
@@ -98,7 +98,7 @@ var addEntry = function addEntry(_ref) {
         emitFileOptions.fileName = fileName;
       }
       emitFileId = this.emitFile(emitFileOptions);
-      if (htmlFilePath) {
+      if (htmlFilePath && fs.existsSync(htmlFilePath)) {
         var htmlContent = fs.readFileSync(htmlFilePath, 'utf-8');
         var scriptRegex = /<script\s+[^>]*src=["']([^"']+)["'][^>]*>/gi;
         var match;
@@ -137,10 +137,14 @@ var addEntry = function addEntry(_ref) {
  */
 function PluginDevProxyModuleTopLevelAwait() {
   var filterFunction = createFilter();
+  var processedFlag = '/* already-processed-by-dev-proxy-module-top-level-await */';
   return {
     name: 'dev-proxy-module-top-level-await',
     apply: 'serve',
     transform: function transform(code, id) {
+      if (code.includes(processedFlag)) {
+        return null;
+      }
       if (!code.includes('/*mf top-level-await placeholder replacement mf*/')) {
         return null;
       }
@@ -193,8 +197,9 @@ function PluginDevProxyModuleTopLevelAwait() {
           }
         }
       });
+      var transformedCode = magicString.toString();
       return {
-        code: magicString.toString(),
+        code: processedFlag + "\n" + transformedCode,
         map: magicString.generateMap({
           hires: true
         })
@@ -436,6 +441,7 @@ function normalizeModuleFederationOptions(options) {
     dev: options.dev,
     dts: options.dts,
     getPublicPath: options.getPublicPath,
+    publicPath: options.publicPath,
     shareStrategy: options.shareStrategy || 'version-first',
     ignoreOrigin: options.ignoreOrigin || false,
     virtualModuleDir: options.virtualModuleDir || '__mf__virtual'
@@ -692,9 +698,9 @@ function writeLocalSharedImportMap() {
 }
 function generateLocalSharedImportMap() {
   var options = getNormalizeModuleFederationOptions();
-  return "\n    const importMap = {\n      " + Array.from(getUsedShares()).map(function (pkg) {
+  return "\n    const importMap = {\n      " + Array.from(getUsedShares()).sort().map(function (pkg) {
     return "\n        " + JSON.stringify(pkg) + ": async () => {\n          let pkg = await import(\"" + getPreBuildLibImportId(pkg) + "\")\n          return pkg\n        }\n      ";
-  }).join(',') + "\n    }\n      const usedShared = {\n      " + Array.from(getUsedShares()).map(function (key) {
+  }).join(',') + "\n    }\n      const usedShared = {\n      " + Array.from(getUsedShares()).sort().map(function (key) {
     var shareItem = getNormalizeShareItem(key);
     if (!shareItem) return null;
     return "\n          " + JSON.stringify(key) + ": {\n            name: " + JSON.stringify(key) + ",\n            version: " + JSON.stringify(shareItem.version) + ",\n            scope: [" + JSON.stringify(shareItem.scope) + "],\n            loaded: false,\n            from: " + JSON.stringify(options.name) + ",\n            async get () {\n              usedShared[" + JSON.stringify(key) + "].loaded = true\n              const {" + JSON.stringify(key) + ": pkgDynamicImport} = importMap \n              const res = await pkgDynamicImport()\n              const exportModule = {...res}\n              // All npm packages pre-built by vite will be converted to esm\n              Object.defineProperty(exportModule, \"__esModule\", {\n                value: true,\n                enumerable: false\n              })\n              return function () {\n                return exportModule\n              }\n            },\n            shareConfig: {\n              singleton: " + shareItem.shareConfig.singleton + ",\n              requiredVersion: " + JSON.stringify(shareItem.shareConfig.requiredVersion) + "\n            }\n          }\n        ";
@@ -742,6 +748,178 @@ function initVirtualModules() {
   writeRuntimeInitStatus();
 }
 
+var ASSET_TYPES = ['js', 'css'];
+var LOAD_TIMINGS = ['sync', 'async'];
+var JS_EXTENSIONS = ['.ts', '.tsx', '.jsx', '.mjs', '.cjs'];
+/**
+ * Creates an empty asset map structure for tracking JS and CSS assets
+ * @returns Initialized asset map with sync/async arrays for JS and CSS
+ */
+var createEmptyAssetMap = function createEmptyAssetMap() {
+  return {
+    js: {
+      sync: [],
+      async: []
+    },
+    css: {
+      sync: [],
+      async: []
+    }
+  };
+};
+/**
+ * Tracks an asset in the preload map with deduplication
+ * @param map - The preload map to update
+ * @param key - The module key to track under
+ * @param fileName - The asset filename to track
+ * @param isAsync - Whether the asset is loaded async
+ * @param type - The asset type ('js' or 'css')
+ */
+var trackAsset = function trackAsset(map, key, fileName, isAsync, type) {
+  if (!map[key]) {
+    map[key] = createEmptyAssetMap();
+  }
+  var target = isAsync ? map[key][type].async : map[key][type].sync;
+  if (!target.includes(fileName)) {
+    target.push(fileName);
+  }
+};
+/**
+ * Checks if a file is a CSS file by extension
+ * @param fileName - The filename to check
+ * @returns True if file has a CSS extension (.css, .scss, .less)
+ */
+var isCSSFile = function isCSSFile(fileName) {
+  return fileName.endsWith('.css') || fileName.endsWith('.scss') || fileName.endsWith('.less');
+};
+/**
+ * Collects all CSS assets from the bundle
+ * @param bundle - The Rollup output bundle
+ * @returns Set of CSS asset filenames
+ */
+var collectCssAssets = function collectCssAssets(bundle) {
+  var cssAssets = new Set();
+  for (var _i = 0, _Object$entries = Object.entries(bundle); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _Object$entries[_i],
+      fileName = _Object$entries$_i[0],
+      fileData = _Object$entries$_i[1];
+    if (fileData.type === 'asset' && isCSSFile(fileName)) {
+      cssAssets.add(fileName);
+    }
+  }
+  return cssAssets;
+};
+/**
+ * Processes module assets and tracks them in the files map
+ * @param bundle - The Rollup output bundle
+ * @param filesMap - The preload map to populate
+ * @param moduleMatcher - Function that matches module paths to keys
+ */
+var processModuleAssets = function processModuleAssets(bundle, filesMap, moduleMatcher) {
+  for (var _i2 = 0, _Object$entries2 = Object.entries(bundle); _i2 < _Object$entries2.length; _i2++) {
+    var _Object$entries2$_i = _Object$entries2[_i2],
+      fileName = _Object$entries2$_i[0],
+      fileData = _Object$entries2$_i[1];
+    if (fileData.type !== 'chunk') continue;
+    if (!fileData.modules) continue;
+    for (var _i3 = 0, _Object$keys = Object.keys(fileData.modules); _i3 < _Object$keys.length; _i3++) {
+      var modulePath = _Object$keys[_i3];
+      var matchKey = moduleMatcher(modulePath);
+      if (!matchKey) continue;
+      // Track main JS chunk
+      trackAsset(filesMap, matchKey, fileName, false, 'js');
+      // Handle dynamic imports
+      if (fileData.dynamicImports) {
+        for (var _iterator = _createForOfIteratorHelperLoose(fileData.dynamicImports), _step; !(_step = _iterator()).done;) {
+          var dynamicImport = _step.value;
+          var importData = bundle[dynamicImport];
+          if (!importData) continue;
+          var isCss = isCSSFile(dynamicImport);
+          trackAsset(filesMap, matchKey, dynamicImport, true, isCss ? 'css' : 'js');
+        }
+      }
+    }
+  }
+};
+/**
+ * Deduplicates assets in the files map
+ * @param filesMap - The preload map to deduplicate
+ * @returns New deduplicated preload map
+ */
+var deduplicateAssets = function deduplicateAssets(filesMap) {
+  var result = {};
+  for (var _i4 = 0, _Object$entries3 = Object.entries(filesMap); _i4 < _Object$entries3.length; _i4++) {
+    var _Object$entries3$_i = _Object$entries3[_i4],
+      key = _Object$entries3$_i[0],
+      assetMaps = _Object$entries3$_i[1];
+    result[key] = createEmptyAssetMap();
+    for (var _i5 = 0, _ASSET_TYPES = ASSET_TYPES; _i5 < _ASSET_TYPES.length; _i5++) {
+      var type = _ASSET_TYPES[_i5];
+      for (var _i6 = 0, _LOAD_TIMINGS = LOAD_TIMINGS; _i6 < _LOAD_TIMINGS.length; _i6++) {
+        var timing = _LOAD_TIMINGS[_i6];
+        result[key][type][timing] = Array.from(new Set(assetMaps[type][timing]));
+      }
+    }
+  }
+  return result;
+};
+/**
+ * Builds a mapping between module files and their share keys
+ * @param shareKeys - Set of share keys to map
+ * @param resolveFn - Function to resolve module paths
+ * @returns Map of file paths to their corresponding share keys
+ */
+var buildFileToShareKeyMap = function buildFileToShareKeyMap(shareKeys, resolveFn) {
+  try {
+    var fileToShareKey = new Map();
+    return Promise.resolve(Promise.all(Array.from(shareKeys).map(function (shareKey) {
+      return resolveFn(getPreBuildLibImportId(shareKey)).then(function (resolution) {
+        var _resolution$id;
+        return {
+          shareKey: shareKey,
+          file: resolution == null || (_resolution$id = resolution.id) == null ? void 0 : _resolution$id.split('?')[0]
+        };
+      })["catch"](function () {
+        return null;
+      });
+    }))).then(function (resolutions) {
+      for (var _iterator2 = _createForOfIteratorHelperLoose(resolutions), _step2; !(_step2 = _iterator2()).done;) {
+        var resolution = _step2.value;
+        if (resolution != null && resolution.file) {
+          fileToShareKey.set(resolution.file, resolution.shareKey);
+        }
+      }
+      return fileToShareKey;
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
+/**
+ * Resolves the public path for remote entries
+ * @param options - Module Federation options
+ * @param viteBase - Vite's base config value
+ * @param originalBase - Original base config before any transformations
+ * @returns The resolved public path
+ */
+function resolvePublicPath(options, viteBase, originalBase) {
+  // Use explicitly set publicPath if provided
+  if (options.publicPath) {
+    return options.publicPath;
+  }
+  // Handle empty original base case
+  if (originalBase === '') {
+    return 'auto';
+  }
+  // Use viteBase if available, ensuring it ends with a slash
+  if (viteBase) {
+    return viteBase.replace(/\/?$/, '/');
+  }
+  // Fallback to auto if no base is specified
+  return 'auto';
+}
+
 var Manifest = function Manifest() {
   var mfOptions = getNormalizeModuleFederationOptions();
   var name = mfOptions.name,
@@ -753,21 +931,43 @@ var Manifest = function Manifest() {
     mfManifestName = 'mf-manifest.json';
   }
   if (typeof manifestOptions !== 'boolean') {
-    mfManifestName = join((manifestOptions == null ? void 0 : manifestOptions.filePath) || '', (manifestOptions == null ? void 0 : manifestOptions.fileName) || '');
+    mfManifestName = path.join((manifestOptions == null ? void 0 : manifestOptions.filePath) || '', (manifestOptions == null ? void 0 : manifestOptions.fileName) || '');
   }
-  var extensions;
   var root;
   var remoteEntryFile;
   var publicPath;
   var _command;
   var _originalConfigBase;
   var viteConfig;
+  /**
+   * Adds global CSS assets to all module exports
+   * @param filesMap - The preload map to update
+   * @param cssAssets - Set of CSS asset filenames to add
+   */
+  var addCssAssetsToAllExports = function addCssAssetsToAllExports(filesMap, cssAssets) {
+    Object.keys(filesMap).forEach(function (key) {
+      cssAssets.forEach(function (cssAsset) {
+        trackAsset(filesMap, key, cssAsset, false, 'css');
+      });
+    });
+  };
   return [{
     name: 'module-federation-manifest',
     apply: 'serve',
+    /**
+     * Stores resolved Vite config for later use
+     */
+    /**
+     * Finalizes configuration after all plugins are resolved
+     * @param config - Fully resolved Vite config
+     */
     configResolved: function configResolved(config) {
       viteConfig = config;
     },
+    /**
+     * Configures dev server middleware to handle manifest requests
+     * @param server - Vite dev server instance
+     */
     configureServer: function configureServer(server) {
       server.middlewares.use(function (req, res, next) {
         var _req$url;
@@ -815,137 +1015,85 @@ var Manifest = function Manifest() {
   }, {
     name: 'module-federation-manifest',
     enforce: 'post',
+    /**
+     * Initial plugin configuration
+     * @param config - Vite config object
+     * @param command - Current Vite command (serve/build)
+     */
     config: function config(_config, _ref) {
       var command = _ref.command;
       if (!_config.build) _config.build = {};
-      if (!_config.build.manifest) _config.build.manifest = _config.build.manifest || !!manifestOptions;
+      if (!_config.build.manifest) {
+        _config.build.manifest = _config.build.manifest || !!manifestOptions;
+      }
       _command = command;
       _originalConfigBase = _config.base;
     },
     configResolved: function configResolved(config) {
       root = config.root;
-      extensions = config.resolve.extensions || ['.mjs', '.js', '.mts', '.ts', '.jsx', '.tsx', '.json'];
       var base = config.base;
       if (_command === 'serve') {
         base = (config.server.origin || '') + config.base;
       }
-      publicPath = _originalConfigBase === '' ? 'auto' : base ? base.replace(/\/?$/, '/') : 'auto';
+      publicPath = resolvePublicPath(mfOptions, base, _originalConfigBase);
     },
+    /**
+     * Generates the module federation manifest file
+     * @param options - Rollup output options
+     * @param bundle - Generated bundle assets
+     */
     generateBundle: function generateBundle(options, bundle) {
       try {
         var _this = this;
-        // 递归查找模块的同步导入文件
-        var _findSynchronousImports = function findSynchronousImports(fileName, array) {
-          var fileData = bundle[fileName];
-          if (fileData && fileData.type === 'chunk') {
-            array.push(fileName); // 将当前文件加入预加载列表
-            // 遍历该文件的同步导入文件
-            fileData.imports.forEach(function (importedFile) {
-              if (array.indexOf(importedFile) === -1) {
-                _findSynchronousImports(importedFile, array); // 递归查找同步导入的文件
-              }
-            });
-          }
-        };
         if (!mfManifestName) return Promise.resolve();
-        var exposesModules = Object.keys(mfOptions.exposes).map(function (item) {
-          return mfOptions.exposes[item]["import"];
-        }); // 获取你提供的 moduleIds
-        var filesContainingModules = {};
-        // 帮助函数：检查模块路径是否匹配
-        var isModuleMatched = function isModuleMatched(relativeModulePath, preloadModule) {
-          // 先尝试直接匹配
-          if (relativeModulePath === preloadModule) return true;
-          // 如果 preloadModule 没有后缀，尝试添加可能的后缀进行匹配
-          for (var _iterator = _createForOfIteratorHelperLoose(extensions), _step; !(_step = _iterator()).done;) {
-            var ext = _step.value;
-            if (relativeModulePath === "" + preloadModule + ext) {
-              return true;
-            }
-          }
-          return false;
-        };
-        // 遍历打包生成的每个文件
+        var filesMap = {};
+        // First pass: Find remoteEntry file
         for (var _i = 0, _Object$entries = Object.entries(bundle); _i < _Object$entries.length; _i++) {
           var _Object$entries$_i = _Object$entries[_i],
-            fileName = _Object$entries$_i[0],
+            _ = _Object$entries$_i[0],
             fileData = _Object$entries$_i[1];
           if (mfOptions.filename.replace(/[\[\]]/g, '_').replace(/\.[^/.]+$/, '') === fileData.name || fileData.name === 'remoteEntry') {
             remoteEntryFile = fileData.fileName;
-          }
-          if (fileData.type === 'chunk') {
-            // 遍历该文件的所有模块
-            for (var _i2 = 0, _Object$keys = Object.keys(fileData.modules); _i2 < _Object$keys.length; _i2++) {
-              var modulePath = _Object$keys[_i2];
-              // 将绝对路径转换为相对于 Vite root 的相对路径
-              var relativeModulePath = relative(root, modulePath);
-              // 检查模块是否在 preloadModules 列表中
-              for (var _iterator2 = _createForOfIteratorHelperLoose(exposesModules), _step2; !(_step2 = _iterator2()).done;) {
-                var preloadModule = _step2.value;
-                var formatPreloadModule = preloadModule.replace('./', '');
-                if (isModuleMatched(relativeModulePath, formatPreloadModule)) {
-                  var _filesContainingModul;
-                  if (!filesContainingModules[preloadModule]) {
-                    filesContainingModules[preloadModule] = {
-                      sync: [],
-                      async: []
-                    };
-                  }
-                  console.log(Object.keys(fileData.modules));
-                  filesContainingModules[preloadModule].sync.push(fileName);
-                  (_filesContainingModul = filesContainingModules[preloadModule].async).push.apply(_filesContainingModul, fileData.dynamicImports || []);
-                  _findSynchronousImports(fileName, filesContainingModules[preloadModule].sync);
-                  break; // 如果找到匹配，跳出循环
-                }
-              }
-            }
+            break; // We can break early since we only need to find remoteEntry once
           }
         }
-        var fileToShareKey = {};
-        return Promise.resolve(Promise.all(Array.from(getUsedShares()).map(function (shareKey) {
-          try {
-            return Promise.resolve(_this.resolve(getPreBuildLibImportId(shareKey))).then(function (_this$resolve) {
-              var file = _this$resolve.id.split('?')[0];
-              fileToShareKey[file] = shareKey;
-            });
-          } catch (e) {
-            return Promise.reject(e);
-          }
-        }))).then(function () {
-          // 遍历打包生成的每个文件
-          for (var _i3 = 0, _Object$entries2 = Object.entries(bundle); _i3 < _Object$entries2.length; _i3++) {
-            var _Object$entries2$_i = _Object$entries2[_i3],
-              _fileName = _Object$entries2$_i[0],
-              _fileData = _Object$entries2$_i[1];
-            if (_fileData.type === 'chunk') {
-              // 遍历该文件的所有模块
-              for (var _i4 = 0, _Object$keys2 = Object.keys(_fileData.modules); _i4 < _Object$keys2.length; _i4++) {
-                var _modulePath = _Object$keys2[_i4];
-                var sharedKey = fileToShareKey[_modulePath];
-                if (sharedKey) {
-                  var _filesContainingModul2;
-                  if (!filesContainingModules[sharedKey]) {
-                    filesContainingModules[sharedKey] = {
-                      sync: [],
-                      async: []
-                    };
-                  }
-                  filesContainingModules[sharedKey].sync.push(_fileName);
-                  (_filesContainingModul2 = filesContainingModules[sharedKey].async).push.apply(_filesContainingModul2, _fileData.dynamicImports || []);
-                  _findSynchronousImports(_fileName, filesContainingModules[sharedKey].sync);
-                  break; // 如果找到匹配，跳出循环
-                }
-              }
+        // Second pass: Collect all CSS assets
+        var allCssAssets = collectCssAssets(bundle);
+        var exposesModules = Object.keys(mfOptions.exposes).map(function (item) {
+          return mfOptions.exposes[item]["import"];
+        });
+        // Process exposed modules
+        processModuleAssets(bundle, filesMap, function (modulePath) {
+          var absoluteModulePath = path.resolve(root, modulePath);
+          return exposesModules.find(function (exposeModule) {
+            var exposePath = path.resolve(root, exposeModule);
+            // First try exact path match
+            if (absoluteModulePath === exposePath) {
+              return true;
             }
-          }
-          Object.keys(filesContainingModules).forEach(function (key) {
-            filesContainingModules[key].sync = Array.from(new Set(filesContainingModules[key].sync));
-            filesContainingModules[key].async = Array.from(new Set(filesContainingModules[key].async));
+            // Then try path match without known extensions
+            var getPathWithoutKnownExt = function getPathWithoutKnownExt(filePath) {
+              var ext = path.extname(filePath);
+              return JS_EXTENSIONS.includes(ext) ? path.join(path.dirname(filePath), path.basename(filePath, ext)) : filePath;
+            };
+            var modulePathNoExt = getPathWithoutKnownExt(absoluteModulePath);
+            var exposePathNoExt = getPathWithoutKnownExt(exposePath);
+            return modulePathNoExt === exposePathNoExt;
+          });
+        });
+        // Process shared modules
+        return Promise.resolve(buildFileToShareKeyMap(getUsedShares(), _this.resolve.bind(_this))).then(function (fileToShareKey) {
+          processModuleAssets(bundle, filesMap, function (modulePath) {
+            return fileToShareKey.get(modulePath);
           });
+          // Add all CSS assets to every export
+          addCssAssetsToAllExports(filesMap, allCssAssets);
+          // Final deduplication of all assets
+          filesMap = deduplicateAssets(filesMap);
           _this.emitFile({
             type: 'asset',
             fileName: mfManifestName,
-            source: JSON.stringify(generateMFManifest(filesContainingModules))
+            source: JSON.stringify(generateMFManifest(filesMap))
           });
         });
       } catch (e) {
@@ -953,6 +1101,11 @@ var Manifest = function Manifest() {
       }
     }
   }];
+  /**
+   * Generates the final manifest JSON structure
+   * @param preloadMap - Map of module assets to include
+   * @returns Complete manifest object
+   */
   function generateMFManifest(preloadMap) {
     var options = getNormalizeModuleFederationOptions();
     var name = options.name;
@@ -961,23 +1114,23 @@ var Manifest = function Manifest() {
       path: '',
       type: 'module'
     };
-    var remotes = [];
-    var usedRemotesMap = getUsedRemotesMap();
-    Object.keys(usedRemotesMap).forEach(function (remoteKey) {
-      var usedModules = Array.from(usedRemotesMap[remoteKey]);
-      usedModules.forEach(function (moduleKey) {
-        remotes.push({
+    // Process remotes
+    var remotes = Array.from(Object.entries(getUsedRemotesMap())).flatMap(function (_ref2) {
+      var remoteKey = _ref2[0],
+        modules = _ref2[1];
+      return Array.from(modules).map(function (moduleKey) {
+        return {
           federationContainerName: options.remotes[remoteKey].entry,
           moduleName: moduleKey.replace(remoteKey, '').replace('/', ''),
           alias: remoteKey,
           entry: '*'
-        });
+        };
       });
     });
-    // @ts-ignore
+    // Process shared dependencies
     var shared = Array.from(getUsedShares()).map(function (shareKey) {
-      var _preloadMap$shareKey, _preloadMap$shareKey2;
       var shareItem = getNormalizeShareItem(shareKey);
+      var assets = preloadMap[shareKey] || createEmptyAssetMap();
       return {
         id: name + ":" + shareKey,
         name: shareKey,
@@ -985,42 +1138,40 @@ var Manifest = function Manifest() {
         requiredVersion: shareItem.shareConfig.requiredVersion,
         assets: {
           js: {
-            async: (preloadMap == null || (_preloadMap$shareKey = preloadMap[shareKey]) == null ? void 0 : _preloadMap$shareKey.async) || [],
-            sync: (preloadMap == null || (_preloadMap$shareKey2 = preloadMap[shareKey]) == null ? void 0 : _preloadMap$shareKey2.sync) || []
+            async: assets.js.async,
+            sync: assets.js.sync
           },
           css: {
-            async: [],
-            sync: []
+            async: assets.css.async,
+            sync: assets.css.sync
           }
         }
       };
-    }).filter(function (item) {
-      return item;
-    });
-    var exposes = Object.keys(options.exposes).map(function (key) {
-      var _preloadMap$sourceFil, _preloadMap$sourceFil2;
-      // assets(.css, .jpg, .svg等)其他资源, 不重要, 暂未处理
+    }).filter(Boolean);
+    // Process exposed modules
+    var exposes = Object.entries(options.exposes).map(function (_ref3) {
+      var key = _ref3[0],
+        value = _ref3[1];
       var formatKey = key.replace('./', '');
-      var sourceFile = options.exposes[key]["import"];
+      var sourceFile = value["import"];
+      var assets = preloadMap[sourceFile] || createEmptyAssetMap();
       return {
-        id: name + ':' + formatKey,
+        id: name + ":" + formatKey,
         name: formatKey,
         assets: {
           js: {
-            async: (preloadMap == null || (_preloadMap$sourceFil = preloadMap[sourceFile]) == null ? void 0 : _preloadMap$sourceFil.async) || [],
-            sync: (preloadMap == null || (_preloadMap$sourceFil2 = preloadMap[sourceFile]) == null ? void 0 : _preloadMap$sourceFil2.sync) || []
+            async: assets.js.async,
+            sync: assets.js.sync
           },
           css: {
-            sync: [],
-            async: []
+            async: assets.css.async,
+            sync: assets.css.sync
           }
         },
         path: key
       };
-    }).filter(function (item) {
-      return item;
-    }); // Filter out any null values
-    var result = {
+    }).filter(Boolean);
+    return {
       id: name,
       name: name,
       metaData: _extends({
@@ -1035,8 +1186,6 @@ var Manifest = function Manifest() {
         types: {
           path: '',
           name: ''
-          // "zip": "@mf-types.zip",
-          // "api": "@mf-types.d.ts"
         },
         globalName: name,
         pluginVersion: '0.2.5'
@@ -1049,7 +1198,6 @@ var Manifest = function Manifest() {
       remotes: remotes,
       exposes: exposes
     };
-    return result;
   }
 };
 
@@ -1153,7 +1301,8 @@ function pluginProxyRemoteEntry () {
           if (_command === 'serve') {
             var _viteConfig$server, _viteConfig$server2;
             var host = typeof ((_viteConfig$server = viteConfig.server) == null ? void 0 : _viteConfig$server.host) === 'string' && viteConfig.server.host !== '0.0.0.0' ? viteConfig.server.host : 'localhost';
-            return Promise.resolve("\n          const origin = (window && " + !options.ignoreOrigin + ") ? window.origin : \"//" + host + ":" + ((_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port) + "\"\n          const remoteEntryPromise = await import(origin + \"" + (viteConfig.base + options.filename) + "\")\n          // __tla only serves as a hack for vite-plugin-top-level-await. \n          Promise.resolve(remoteEntryPromise)\n          .then(remoteEntry => {\n            return Promise.resolve(remoteEntry.__tla)\n              .then(remoteEntry.init).catch(remoteEntry.init)\n          })\n          ");
+            var publicPath = JSON.stringify(resolvePublicPath(options, viteConfig.base) + options.filename);
+            return Promise.resolve("\n          const origin = (window && " + !options.ignoreOrigin + ") ? window.origin : \"//" + host + ":" + ((_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port) + "\"\n          const remoteEntryPromise = await import(origin + " + publicPath + ")\n          // __tla only serves as a hack for vite-plugin-top-level-await.\n          Promise.resolve(remoteEntryPromise)\n          .then(remoteEntry => {\n            return Promise.resolve(remoteEntry.__tla)\n              .then(remoteEntry.init).catch(remoteEntry.init)\n          })\n          ");
           }
           return Promise.resolve(code);
         }