@module-federation/vite 1.9.5 → 1.9.7

package/lib/index.cjs

@@ -1659,9 +1659,13 @@ var normalizeDevDtsOptions = function normalizeDevDtsOptions(dts, context) {
   }, 'mfOptions.dts')(dts);
 };
 var logDtsError = function logDtsError(error, dtsOptions) {
-  if (dtsOptions && dtsOptions.displayErrorInTerminal !== false) {
-    console.error(error);
+  if (dtsOptions === false) {
+    return;
   }
+  if (typeof dtsOptions === 'object' && dtsOptions && dtsOptions.displayErrorInTerminal === false) {
+    return;
+  }
+  console.error(error);
 };
 function pluginDts(options) {
   if (options.dts === false) {
@@ -1671,6 +1675,7 @@ function pluginDts(options) {
   var resolvedConfig;
   var devWorker;
   var normalizedDevOptions;
+  var hasGeneratedBundle = false;
   var devPlugin = {
     name: 'module-federation-dts-dev',
     apply: 'serve',
@@ -1796,15 +1801,21 @@ function pluginDts(options) {
     configResolved: function configResolved(config) {
       resolvedConfig = config;
     },
-    closeBundle: function closeBundle() {
+    generateBundle: function generateBundle() {
       try {
         var _temp6 = function _temp6() {
-          var generateOptions = dtsPlugin.normalizeGenerateTypesOptions({
-            context: context,
-            outputDir: outputDir,
-            dtsOptions: normalizedDtsOptions,
-            pluginOptions: dtsModuleFederationConfig
-          });
+          var generateOptions;
+          try {
+            generateOptions = dtsPlugin.normalizeGenerateTypesOptions({
+              context: context,
+              outputDir: outputDir,
+              dtsOptions: normalizedDtsOptions,
+              pluginOptions: dtsModuleFederationConfig
+            });
+          } catch (error) {
+            logDtsError(error, normalizedDtsOptions);
+            return;
+          }
           if (!generateOptions) {
             return;
           }
@@ -1817,22 +1828,38 @@ function pluginDts(options) {
           });
           if (_temp4 && _temp4.then) return _temp4.then(function () {});
         };
+        if (hasGeneratedBundle) {
+          return Promise.resolve();
+        }
+        hasGeneratedBundle = true;
         if (!resolvedConfig) {
           return Promise.resolve();
         }
-        var normalizedDtsOptions = dtsPlugin.normalizeDtsOptions(dtsModuleFederationConfig, resolvedConfig.root);
+        var normalizedDtsOptions;
+        try {
+          normalizedDtsOptions = dtsPlugin.normalizeDtsOptions(dtsModuleFederationConfig, resolvedConfig.root);
+        } catch (error) {
+          logDtsError(error, options.dts);
+          return Promise.resolve();
+        }
         if (typeof normalizedDtsOptions !== 'object') {
           return Promise.resolve();
         }
         var context = resolvedConfig.root;
         var outputDir = resolveOutputDir(resolvedConfig);
-        var consumeOptions = dtsPlugin.normalizeConsumeTypesOptions({
-          context: context,
-          dtsOptions: normalizedDtsOptions,
-          pluginOptions: dtsModuleFederationConfig
-        });
-        var _temp5 = function (_consumeOptions$host) {
-          if (consumeOptions != null && (_consumeOptions$host = consumeOptions.host) != null && _consumeOptions$host.typesOnBuild) {
+        var consumeOptions;
+        try {
+          consumeOptions = dtsPlugin.normalizeConsumeTypesOptions({
+            context: context,
+            dtsOptions: normalizedDtsOptions,
+            pluginOptions: dtsModuleFederationConfig
+          });
+        } catch (error) {
+          logDtsError(error, normalizedDtsOptions);
+          return Promise.resolve();
+        }
+        var _temp5 = function (_consumeOptions) {
+          if ((_consumeOptions = consumeOptions) != null && (_consumeOptions = _consumeOptions.host) != null && _consumeOptions.typesOnBuild) {
             var _temp3 = _catch(function () {
               return Promise.resolve(dtsPlugin.consumeTypesAPI(consumeOptions)).then(function () {});
             }, function (error) {

package/lib/index.esm.js

@@ -1635,9 +1635,13 @@ var normalizeDevDtsOptions = function normalizeDevDtsOptions(dts, context) {
   }, 'mfOptions.dts')(dts);
 };
 var logDtsError = function logDtsError(error, dtsOptions) {
-  if (dtsOptions && dtsOptions.displayErrorInTerminal !== false) {
-    console.error(error);
+  if (dtsOptions === false) {
+    return;
   }
+  if (typeof dtsOptions === 'object' && dtsOptions && dtsOptions.displayErrorInTerminal === false) {
+    return;
+  }
+  console.error(error);
 };
 function pluginDts(options) {
   if (options.dts === false) {
@@ -1647,6 +1651,7 @@ function pluginDts(options) {
   var resolvedConfig;
   var devWorker;
   var normalizedDevOptions;
+  var hasGeneratedBundle = false;
   var devPlugin = {
     name: 'module-federation-dts-dev',
     apply: 'serve',
@@ -1772,15 +1777,21 @@ function pluginDts(options) {
     configResolved: function configResolved(config) {
       resolvedConfig = config;
     },
-    closeBundle: function closeBundle() {
+    generateBundle: function generateBundle() {
       try {
         var _temp6 = function _temp6() {
-          var generateOptions = normalizeGenerateTypesOptions({
-            context: context,
-            outputDir: outputDir,
-            dtsOptions: normalizedDtsOptions,
-            pluginOptions: dtsModuleFederationConfig
-          });
+          var generateOptions;
+          try {
+            generateOptions = normalizeGenerateTypesOptions({
+              context: context,
+              outputDir: outputDir,
+              dtsOptions: normalizedDtsOptions,
+              pluginOptions: dtsModuleFederationConfig
+            });
+          } catch (error) {
+            logDtsError(error, normalizedDtsOptions);
+            return;
+          }
           if (!generateOptions) {
             return;
           }
@@ -1793,22 +1804,38 @@ function pluginDts(options) {
           });
           if (_temp4 && _temp4.then) return _temp4.then(function () {});
         };
+        if (hasGeneratedBundle) {
+          return Promise.resolve();
+        }
+        hasGeneratedBundle = true;
         if (!resolvedConfig) {
           return Promise.resolve();
         }
-        var normalizedDtsOptions = normalizeDtsOptions(dtsModuleFederationConfig, resolvedConfig.root);
+        var normalizedDtsOptions;
+        try {
+          normalizedDtsOptions = normalizeDtsOptions(dtsModuleFederationConfig, resolvedConfig.root);
+        } catch (error) {
+          logDtsError(error, options.dts);
+          return Promise.resolve();
+        }
         if (typeof normalizedDtsOptions !== 'object') {
           return Promise.resolve();
         }
         var context = resolvedConfig.root;
         var outputDir = resolveOutputDir(resolvedConfig);
-        var consumeOptions = normalizeConsumeTypesOptions({
-          context: context,
-          dtsOptions: normalizedDtsOptions,
-          pluginOptions: dtsModuleFederationConfig
-        });
-        var _temp5 = function (_consumeOptions$host) {
-          if (consumeOptions != null && (_consumeOptions$host = consumeOptions.host) != null && _consumeOptions$host.typesOnBuild) {
+        var consumeOptions;
+        try {
+          consumeOptions = normalizeConsumeTypesOptions({
+            context: context,
+            dtsOptions: normalizedDtsOptions,
+            pluginOptions: dtsModuleFederationConfig
+          });
+        } catch (error) {
+          logDtsError(error, normalizedDtsOptions);
+          return Promise.resolve();
+        }
+        var _temp5 = function (_consumeOptions) {
+          if ((_consumeOptions = consumeOptions) != null && (_consumeOptions = _consumeOptions.host) != null && _consumeOptions.typesOnBuild) {
             var _temp3 = _catch(function () {
               return Promise.resolve(consumeTypesAPI(consumeOptions)).then(function () {});
             }, function (error) {

package/lib/index.modern.js

@@ -1694,9 +1694,13 @@ const normalizeDevDtsOptions = (dts, context) => {
   }, 'mfOptions.dts')(dts);
 };
 const logDtsError = (error, dtsOptions) => {
-  if (dtsOptions && dtsOptions.displayErrorInTerminal !== false) {
-    console.error(error);
+  if (dtsOptions === false) {
+    return;
+  }
+  if (typeof dtsOptions === 'object' && dtsOptions && dtsOptions.displayErrorInTerminal === false) {
+    return;
   }
+  console.error(error);
 };
 function pluginDts(options) {
   if (options.dts === false) {
@@ -1706,6 +1710,7 @@ function pluginDts(options) {
   let resolvedConfig;
   let devWorker;
   let normalizedDevOptions;
+  let hasGeneratedBundle = false;
   const devPlugin = {
     name: 'module-federation-dts-dev',
     apply: 'serve',
@@ -1820,35 +1825,57 @@ function pluginDts(options) {
     configResolved(config) {
       resolvedConfig = config;
     },
-    async closeBundle() {
-      var _consumeOptions$host;
+    async generateBundle() {
+      var _consumeOptions;
+      if (hasGeneratedBundle) {
+        return;
+      }
+      hasGeneratedBundle = true;
       if (!resolvedConfig) {
         return;
       }
-      const normalizedDtsOptions = normalizeDtsOptions(dtsModuleFederationConfig, resolvedConfig.root);
+      let normalizedDtsOptions;
+      try {
+        normalizedDtsOptions = normalizeDtsOptions(dtsModuleFederationConfig, resolvedConfig.root);
+      } catch (error) {
+        logDtsError(error, options.dts);
+        return;
+      }
       if (typeof normalizedDtsOptions !== 'object') {
         return;
       }
       const context = resolvedConfig.root;
       const outputDir = resolveOutputDir(resolvedConfig);
-      const consumeOptions = normalizeConsumeTypesOptions({
-        context,
-        dtsOptions: normalizedDtsOptions,
-        pluginOptions: dtsModuleFederationConfig
-      });
-      if (consumeOptions != null && (_consumeOptions$host = consumeOptions.host) != null && _consumeOptions$host.typesOnBuild) {
+      let consumeOptions;
+      try {
+        consumeOptions = normalizeConsumeTypesOptions({
+          context,
+          dtsOptions: normalizedDtsOptions,
+          pluginOptions: dtsModuleFederationConfig
+        });
+      } catch (error) {
+        logDtsError(error, normalizedDtsOptions);
+        return;
+      }
+      if ((_consumeOptions = consumeOptions) != null && (_consumeOptions = _consumeOptions.host) != null && _consumeOptions.typesOnBuild) {
         try {
           await consumeTypesAPI(consumeOptions);
         } catch (error) {
           logDtsError(error, normalizedDtsOptions);
         }
       }
-      const generateOptions = normalizeGenerateTypesOptions({
-        context,
-        outputDir,
-        dtsOptions: normalizedDtsOptions,
-        pluginOptions: dtsModuleFederationConfig
-      });
+      let generateOptions;
+      try {
+        generateOptions = normalizeGenerateTypesOptions({
+          context,
+          outputDir,
+          dtsOptions: normalizedDtsOptions,
+          pluginOptions: dtsModuleFederationConfig
+        });
+      } catch (error) {
+        logDtsError(error, normalizedDtsOptions);
+        return;
+      }
       if (!generateOptions) {
         return;
       }

package/lib/index.umd.js

@@ -1654,9 +1654,13 @@
     }, 'mfOptions.dts')(dts);
   };
   var logDtsError = function logDtsError(error, dtsOptions) {
-    if (dtsOptions && dtsOptions.displayErrorInTerminal !== false) {
-      console.error(error);
+    if (dtsOptions === false) {
+      return;
     }
+    if (typeof dtsOptions === 'object' && dtsOptions && dtsOptions.displayErrorInTerminal === false) {
+      return;
+    }
+    console.error(error);
   };
   function pluginDts(options) {
     if (options.dts === false) {
@@ -1666,6 +1670,7 @@
     var resolvedConfig;
     var devWorker;
     var normalizedDevOptions;
+    var hasGeneratedBundle = false;
     var devPlugin = {
       name: 'module-federation-dts-dev',
       apply: 'serve',
@@ -1791,15 +1796,21 @@
       configResolved: function configResolved(config) {
         resolvedConfig = config;
       },
-      closeBundle: function closeBundle() {
+      generateBundle: function generateBundle() {
         try {
           var _temp6 = function _temp6() {
-            var generateOptions = dtsPlugin.normalizeGenerateTypesOptions({
-              context: context,
-              outputDir: outputDir,
-              dtsOptions: normalizedDtsOptions,
-              pluginOptions: dtsModuleFederationConfig
-            });
+            var generateOptions;
+            try {
+              generateOptions = dtsPlugin.normalizeGenerateTypesOptions({
+                context: context,
+                outputDir: outputDir,
+                dtsOptions: normalizedDtsOptions,
+                pluginOptions: dtsModuleFederationConfig
+              });
+            } catch (error) {
+              logDtsError(error, normalizedDtsOptions);
+              return;
+            }
             if (!generateOptions) {
               return;
             }
@@ -1812,22 +1823,38 @@
             });
             if (_temp4 && _temp4.then) return _temp4.then(function () {});
           };
+          if (hasGeneratedBundle) {
+            return Promise.resolve();
+          }
+          hasGeneratedBundle = true;
           if (!resolvedConfig) {
             return Promise.resolve();
           }
-          var normalizedDtsOptions = dtsPlugin.normalizeDtsOptions(dtsModuleFederationConfig, resolvedConfig.root);
+          var normalizedDtsOptions;
+          try {
+            normalizedDtsOptions = dtsPlugin.normalizeDtsOptions(dtsModuleFederationConfig, resolvedConfig.root);
+          } catch (error) {
+            logDtsError(error, options.dts);
+            return Promise.resolve();
+          }
           if (typeof normalizedDtsOptions !== 'object') {
             return Promise.resolve();
           }
           var context = resolvedConfig.root;
           var outputDir = resolveOutputDir(resolvedConfig);
-          var consumeOptions = dtsPlugin.normalizeConsumeTypesOptions({
-            context: context,
-            dtsOptions: normalizedDtsOptions,
-            pluginOptions: dtsModuleFederationConfig
-          });
-          var _temp5 = function (_consumeOptions$host) {
-            if (consumeOptions != null && (_consumeOptions$host = consumeOptions.host) != null && _consumeOptions$host.typesOnBuild) {
+          var consumeOptions;
+          try {
+            consumeOptions = dtsPlugin.normalizeConsumeTypesOptions({
+              context: context,
+              dtsOptions: normalizedDtsOptions,
+              pluginOptions: dtsModuleFederationConfig
+            });
+          } catch (error) {
+            logDtsError(error, normalizedDtsOptions);
+            return Promise.resolve();
+          }
+          var _temp5 = function (_consumeOptions) {
+            if ((_consumeOptions = consumeOptions) != null && (_consumeOptions = _consumeOptions.host) != null && _consumeOptions.typesOnBuild) {
               var _temp3 = _catch(function () {
                 return Promise.resolve(dtsPlugin.consumeTypesAPI(consumeOptions)).then(function () {});
               }, function (error) {

package/lib/plugins/__tests__/pluginDts.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.9.5",
+  "version": "1.9.7",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "source": "src/index.ts",
@@ -9,6 +9,22 @@
   "files": [
     "lib/**/*"
   ],
+  "scripts": {
+    "prepare": "husky install",
+    "fmt": "prettier --write src",
+    "fmt.check": "prettier --check src",
+    "format": "pretty-quick",
+    "dev": "microbundle watch --no-sourcemap --compress=false",
+    "build": "rimraf lib && microbundle --no-sourcemap --compress=false",
+    "dev-rv": "pnpm -filter 'examples-rust-vite*' run dev",
+    "preview-rv": "pnpm -filter 'examples-rust-vite*' run preview",
+    "dev-vv": "pnpm -filter 'examples-vite-vite*' run dev",
+    "dev-nv": "pnpm -filter 'examples-nuxt-vite-host' -filter 'examples-vite-vite-remote' run dev",
+    "preview-vv": "pnpm -filter 'examples-vite-vite*'  run preview",
+    "multi-example": "pnpm --filter \"multi-example-*\" --parallel run start",
+    "test": "vitest",
+    "e2e": "playwright test"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/module-federation/vite.git"
@@ -28,6 +44,7 @@
     "url": "https://github.com/module-federation/vite/issues"
   },
   "homepage": "https://github.com/module-federation/vite#readme",
+  "packageManager": "pnpm@9.14.2",
   "peerDependencies": {
     "vite": "<=6"
   },
@@ -54,20 +71,5 @@
     "vite": "^5.4.3",
     "vitest": "^2.1.1",
     "wait-on": "^8.0.1"
-  },
-  "scripts": {
-    "fmt": "prettier --write src",
-    "fmt.check": "prettier --check src",
-    "format": "pretty-quick",
-    "dev": "microbundle watch --no-sourcemap --compress=false",
-    "build": "rimraf lib && microbundle --no-sourcemap --compress=false",
-    "dev-rv": "pnpm -filter 'examples-rust-vite*' run dev",
-    "preview-rv": "pnpm -filter 'examples-rust-vite*' run preview",
-    "dev-vv": "pnpm -filter 'examples-vite-vite*' run dev",
-    "dev-nv": "pnpm -filter 'examples-nuxt-vite-host' -filter 'examples-vite-vite-remote' run dev",
-    "preview-vv": "pnpm -filter 'examples-vite-vite*'  run preview",
-    "multi-example": "pnpm --filter \"multi-example-*\" --parallel run start",
-    "test": "vitest",
-    "e2e": "playwright test"
   }
-}
+}