fix(cli): Bring back webpack5 dependency module resolution (#171)

* fix(cli): Fix webpack5 dependency module resolution * Revert back to historical solution * Reduces changes * put back filter
Bojagi · Mar 16, 2021 · e5674e6 · e5674e6
1 parent cab367a
commit e5674e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/packages/cli/src/steps/compile/dependencies.spec.ts b/packages/cli/src/steps/compile/dependencies.spec.ts
@@ -14,6 +14,7 @@ describe.each([[4], [5]])('Webpack version %s', webpackMajorVersion => {
           ],
           modules: webpackCompilationOutput().modules,
           webpackMajorVersion,
+          compilation: webpackCompilationOutput(),
           projectGitPath: `${process.cwd()}`,
         })
       ).toEqual(compilationDependencies());

diff --git a/packages/cli/src/steps/compile/dependencies.ts b/packages/cli/src/steps/compile/dependencies.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 import { Dependency, DependencyReference, LocalDependency } from '../../types';
 
 export function getDependencies(
-  { dependencyPackages, modules, webpackMajorVersion, projectGitPath },
+  { dependencyPackages, modules, projectGitPath, compilation, webpackMajorVersion },
   initial = {}
 ) {
   return modules
@@ -15,6 +15,9 @@ export function getDependencies(
       }
 
       const subDependencies = module.dependencies
+        .map(dep =>
+          webpackMajorVersion > 4 ? { ...dep, module: compilation.moduleGraph.getModule(dep) } : dep
+        )
         .filter(dep => dep.module)
         .filter(dep => !!dep.module.request || !!dep.module.resource)
         .filter(onlyUnique)
@@ -36,8 +39,8 @@ export function getDependencies(
             dependencyPackages,
             modules: subDependencies.map(dep => dep.module),
             webpackMajorVersion,
-
             projectGitPath,
+            compilation,
           },
           result
         ),

diff --git a/packages/cli/src/steps/compile/runWebpackCompiler.ts b/packages/cli/src/steps/compile/runWebpackCompiler.ts
@@ -59,6 +59,7 @@ export const runWebpackCompiler = ({
         const dependencies = getDependencies({
           dependencyPackages,
           webpackMajorVersion,
+          compilation: output.compilation,
           modules: componentModules,
           projectGitPath,
         });