fix: node_module types for CLI tool

Author: steven-pribilinskiy

src/helpers/compileTypes.ts

@@ -98,30 +98,22 @@ export function rewritePathsWithExposedFederatedModules(
   outFile: string,
   typings: string,
 ): void {
-  const declareRegex = /declare module "(.*)"/g;
-  const moduleImportPaths: string[] = [];
+  const regexDeclareModule = /declare module "(.*)"/g;
+  const declaredModulePaths: string[] = [];
 
+  // Collect all instances of `declare module "..."`
   let execResults: null | string[] = [];
-  while ((execResults = declareRegex.exec(typings)) !== null) {
-    moduleImportPaths.push(execResults[1]);
+  while ((execResults = regexDeclareModule.exec(typings)) !== null) {
+    declaredModulePaths.push(execResults[1]);
   }
 
   let typingsUpdated: string = typings;
 
-  // Support aliases in paths (e.g. @/)
-  // Aliases are not included in emitted declarations thus they have to be removed from the exposed path
-  const aliasPaths = Object.values(getTSConfigCompilerOptions().paths || {}).map(alias => alias[0]);
-  function substituteAliases(modulePath: string): string {
-    aliasPaths.forEach(aliasPath => {
-      modulePath = modulePath.replace(aliasPath, '');
-    });
-    return modulePath;
-  }
-
   // Replace and prefix paths by exposed remote names
-  moduleImportPaths.forEach((importPath) => {
+  declaredModulePaths.forEach((importPath) => {
+    // Aliases are not included in the emitted declarations hence the need to use `endsWith`
     const [exposedModuleKey, ...exposedModuleNameAliases] = Object.keys(federationConfig.exposes)
-      .filter(key => federationConfig.exposes[key].endsWith(substituteAliases(importPath)))
+      .filter(key => federationConfig.exposes[key].endsWith(importPath))
       .map(key => key.replace(/^\.\//, ''));
 
     let federatedModulePath = exposedModuleKey
@@ -143,6 +135,8 @@ export function rewritePathsWithExposedFederatedModules(
     ].join('\n');
   });
 
+  typingsUpdated = includeTypesFromNodeModules(federationConfig, typingsUpdated);
+
   mkdirp.sync(path.dirname(outFile));
   fs.writeFileSync(outFile, typingsUpdated.replace(/\r\n/g, '\n'));
 }

src/plugin.ts

@@ -8,11 +8,7 @@ import {
   DIR_EMITTED_TYPES
 } from './constants';
 import { getRemoteManifestUrls } from './helpers/cloudbedsRemoteManifests';
-import {
-  compileTypes,
-  includeTypesFromNodeModules,
-  rewritePathsWithExposedFederatedModules
-} from './helpers/compileTypes';
+import { compileTypes, rewritePathsWithExposedFederatedModules } from './helpers/compileTypes';
 import { downloadTypes } from './helpers/downloadTypes';
 import { getLoggerHint, setLogger } from './helpers/logger';
 import { isEveryUrlValid } from './helpers/validation';
@@ -66,8 +62,7 @@ export class ModuleFederationTypesPlugin implements WebpackPluginInstance {
     const compileTypesHook = () => {
       const { isSuccess, typeDefinitions } = compileTypes(exposes as string[], outFile);
       if (isSuccess) {
-        const typings = includeTypesFromNodeModules(federationPluginOptions as FederationConfig, typeDefinitions);
-        rewritePathsWithExposedFederatedModules(federationPluginOptions as FederationConfig, outFile, typings);
+        rewritePathsWithExposedFederatedModules(federationPluginOptions as FederationConfig, outFile, typeDefinitions);
       } else {
         logger.warn('Failed to compile types for exposed modules.', getLoggerHint(compiler));
       }