@module-federation/vite 1.2.0 → 1.2.2

package/lib/index.cjs

@@ -330,12 +330,34 @@ function removePathFromNpmPackage(packageString) {
   // 返回匹配到的包名，如果没有匹配到则返回原字符串
   return match ? match[0] : packageString;
 }
+/**
+ * Tries to find the package.json's version of a shared package
+ * if `package.json` is not declared in `exports`
+ * @param {string} sharedName
+ * @returns {string | undefined}
+ */
+function searchPackageVersion(sharedName) {
+  try {
+    var sharedPath = require.resolve(sharedName);
+    var potentialPackageJsonDir = path__namespace.dirname(sharedPath);
+    var rootDir = path__namespace.parse(potentialPackageJsonDir).root;
+    while (path__namespace.parse(potentialPackageJsonDir).base !== 'node_modules' && potentialPackageJsonDir !== rootDir) {
+      var potentialPackageJson = path__namespace.join(potentialPackageJsonDir, 'package.json');
+      if (fs__namespace.existsSync(potentialPackageJson)) {
+        return require(potentialPackageJson).version;
+      }
+      potentialPackageJsonDir = path__namespace.dirname(potentialPackageJsonDir);
+    }
+  } catch (_) {}
+  return undefined;
+}
 function normalizeShareItem(key, shareItem) {
   var version;
   try {
     version = require(path__namespace.join(removePathFromNpmPackage(key), 'package.json')).version;
   } catch (e) {
-    console.log(e);
+    version = searchPackageVersion(key);
+    if (!version) console.error(e);
   }
   if (typeof shareItem === 'string') {
     return {
@@ -1214,7 +1236,7 @@ function proxySharedModule(options) {
             writePreBuildLibPath(source);
             addUsedShares(source);
             writeLocalSharedImportMap();
-            return this.resolve(loadSharePath);
+            return this.resolve(loadSharePath, importer);
           }
         };
       }));
@@ -1233,7 +1255,7 @@ function proxySharedModule(options) {
             try {
               var _this = this;
               var pkgName = VirtualModule.findModule(PREBUILD_TAG, source).name;
-              return Promise.resolve(_this.resolve(pkgName).then(function (item) {
+              return Promise.resolve(_this.resolve(pkgName, importer).then(function (item) {
                 return item.id;
               })).then(function (result) {
                 if (!result.includes(_config.cacheDir)) {
@@ -1243,7 +1265,7 @@ function proxySharedModule(options) {
                 // Fix localSharedImportMap import id
                 var _resolve = _this.resolve;
                 return Promise.resolve(savePrebuild.get(pkgName)).then(function (_savePrebuild$get) {
-                  return Promise.resolve(_resolve.call(_this, _savePrebuild$get));
+                  return Promise.resolve(_resolve.call(_this, _savePrebuild$get, importer));
                 });
               });
             } catch (e) {

package/lib/index.esm.js

@@ -306,12 +306,34 @@ function removePathFromNpmPackage(packageString) {
   // 返回匹配到的包名，如果没有匹配到则返回原字符串
   return match ? match[0] : packageString;
 }
+/**
+ * Tries to find the package.json's version of a shared package
+ * if `package.json` is not declared in `exports`
+ * @param {string} sharedName
+ * @returns {string | undefined}
+ */
+function searchPackageVersion(sharedName) {
+  try {
+    var sharedPath = require.resolve(sharedName);
+    var potentialPackageJsonDir = path.dirname(sharedPath);
+    var rootDir = path.parse(potentialPackageJsonDir).root;
+    while (path.parse(potentialPackageJsonDir).base !== 'node_modules' && potentialPackageJsonDir !== rootDir) {
+      var potentialPackageJson = path.join(potentialPackageJsonDir, 'package.json');
+      if (fs.existsSync(potentialPackageJson)) {
+        return require(potentialPackageJson).version;
+      }
+      potentialPackageJsonDir = path.dirname(potentialPackageJsonDir);
+    }
+  } catch (_) {}
+  return undefined;
+}
 function normalizeShareItem(key, shareItem) {
   var version;
   try {
     version = require(path.join(removePathFromNpmPackage(key), 'package.json')).version;
   } catch (e) {
-    console.log(e);
+    version = searchPackageVersion(key);
+    if (!version) console.error(e);
   }
   if (typeof shareItem === 'string') {
     return {
@@ -1190,7 +1212,7 @@ function proxySharedModule(options) {
             writePreBuildLibPath(source);
             addUsedShares(source);
             writeLocalSharedImportMap();
-            return this.resolve(loadSharePath);
+            return this.resolve(loadSharePath, importer);
           }
         };
       }));
@@ -1209,7 +1231,7 @@ function proxySharedModule(options) {
             try {
               var _this = this;
               var pkgName = VirtualModule.findModule(PREBUILD_TAG, source).name;
-              return Promise.resolve(_this.resolve(pkgName).then(function (item) {
+              return Promise.resolve(_this.resolve(pkgName, importer).then(function (item) {
                 return item.id;
               })).then(function (result) {
                 if (!result.includes(_config.cacheDir)) {
@@ -1219,7 +1241,7 @@ function proxySharedModule(options) {
                 // Fix localSharedImportMap import id
                 var _resolve = _this.resolve;
                 return Promise.resolve(savePrebuild.get(pkgName)).then(function (_savePrebuild$get) {
-                  return Promise.resolve(_resolve.call(_this, _savePrebuild$get));
+                  return Promise.resolve(_resolve.call(_this, _savePrebuild$get, importer));
                 });
               });
             } catch (e) {

package/lib/index.modern.js

@@ -279,12 +279,34 @@ function removePathFromNpmPackage(packageString) {
   // 返回匹配到的包名，如果没有匹配到则返回原字符串
   return match ? match[0] : packageString;
 }
+/**
+ * Tries to find the package.json's version of a shared package
+ * if `package.json` is not declared in `exports`
+ * @param {string} sharedName
+ * @returns {string | undefined}
+ */
+function searchPackageVersion(sharedName) {
+  try {
+    const sharedPath = require.resolve(sharedName);
+    let potentialPackageJsonDir = path.dirname(sharedPath);
+    const rootDir = path.parse(potentialPackageJsonDir).root;
+    while (path.parse(potentialPackageJsonDir).base !== 'node_modules' && potentialPackageJsonDir !== rootDir) {
+      const potentialPackageJson = path.join(potentialPackageJsonDir, 'package.json');
+      if (fs.existsSync(potentialPackageJson)) {
+        return require(potentialPackageJson).version;
+      }
+      potentialPackageJsonDir = path.dirname(potentialPackageJsonDir);
+    }
+  } catch (_) {}
+  return undefined;
+}
 function normalizeShareItem(key, shareItem) {
   let version;
   try {
     version = require(path.join(removePathFromNpmPackage(key), 'package.json')).version;
   } catch (e) {
-    console.log(e);
+    version = searchPackageVersion(key);
+    if (!version) console.error(e);
   }
   if (typeof shareItem === 'string') {
     return {
@@ -1264,7 +1286,7 @@ function proxySharedModule(options) {
             writePreBuildLibPath(source);
             addUsedShares(source);
             writeLocalSharedImportMap();
-            return this.resolve(loadSharePath);
+            return this.resolve(loadSharePath, importer);
           }
         };
       }));
@@ -1281,13 +1303,13 @@ function proxySharedModule(options) {
           replacement: '$1',
           async customResolver(source, importer) {
             const pkgName = VirtualModule.findModule(PREBUILD_TAG, source).name;
-            const result = await this.resolve(pkgName).then(item => item.id);
+            const result = await this.resolve(pkgName, importer).then(item => item.id);
             if (!result.includes(_config.cacheDir)) {
               // save pre-bunding module id
               savePrebuild.set(pkgName, Promise.resolve(result));
             }
             // Fix localSharedImportMap import id
-            return await this.resolve(await savePrebuild.get(pkgName));
+            return await this.resolve(await savePrebuild.get(pkgName), importer);
           }
         };
       }));

package/lib/index.umd.js

@@ -328,12 +328,34 @@
     // 返回匹配到的包名，如果没有匹配到则返回原字符串
     return match ? match[0] : packageString;
   }
+  /**
+   * Tries to find the package.json's version of a shared package
+   * if `package.json` is not declared in `exports`
+   * @param {string} sharedName
+   * @returns {string | undefined}
+   */
+  function searchPackageVersion(sharedName) {
+    try {
+      var sharedPath = require.resolve(sharedName);
+      var potentialPackageJsonDir = path__namespace.dirname(sharedPath);
+      var rootDir = path__namespace.parse(potentialPackageJsonDir).root;
+      while (path__namespace.parse(potentialPackageJsonDir).base !== 'node_modules' && potentialPackageJsonDir !== rootDir) {
+        var potentialPackageJson = path__namespace.join(potentialPackageJsonDir, 'package.json');
+        if (fs__namespace.existsSync(potentialPackageJson)) {
+          return require(potentialPackageJson).version;
+        }
+        potentialPackageJsonDir = path__namespace.dirname(potentialPackageJsonDir);
+      }
+    } catch (_) {}
+    return undefined;
+  }
   function normalizeShareItem(key, shareItem) {
     var version;
     try {
       version = require(path__namespace.join(removePathFromNpmPackage(key), 'package.json')).version;
     } catch (e) {
-      console.log(e);
+      version = searchPackageVersion(key);
+      if (!version) console.error(e);
     }
     if (typeof shareItem === 'string') {
       return {
@@ -1212,7 +1234,7 @@
               writePreBuildLibPath(source);
               addUsedShares(source);
               writeLocalSharedImportMap();
-              return this.resolve(loadSharePath);
+              return this.resolve(loadSharePath, importer);
             }
           };
         }));
@@ -1231,7 +1253,7 @@
               try {
                 var _this = this;
                 var pkgName = VirtualModule.findModule(PREBUILD_TAG, source).name;
-                return Promise.resolve(_this.resolve(pkgName).then(function (item) {
+                return Promise.resolve(_this.resolve(pkgName, importer).then(function (item) {
                   return item.id;
                 })).then(function (result) {
                   if (!result.includes(_config.cacheDir)) {
@@ -1241,7 +1263,7 @@
                   // Fix localSharedImportMap import id
                   var _resolve = _this.resolve;
                   return Promise.resolve(savePrebuild.get(pkgName)).then(function (_savePrebuild$get) {
-                    return Promise.resolve(_resolve.call(_this, _savePrebuild$get));
+                    return Promise.resolve(_resolve.call(_this, _savePrebuild$get, importer));
                   });
                 });
               } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "source": "src/index.ts",