Let webpack resolve nested node_modules like node does

graylog2-web-interface/webpack.preflight.ts

@@ -14,17 +14,17 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
 const path = require('path');
 
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { merge } = require('webpack-merge');
 const { EsbuildPlugin } = require('esbuild-loader');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 const { DEFAULT_API_URL } = require('./webpack.vendor');
 const supportedBrowsers = require('./supportedBrowsers');
 const core = require('./webpack/core');
 
 const ROOT_PATH = path.resolve(__dirname);
 const APP_PATH = path.resolve(ROOT_PATH, 'src');
@@ -51,7 +51,7 @@
   resolve: {
     // you can now require('file') instead of require('file.coffee')
     extensions: ['.js', '.json', '.jsx', '.ts', '.tsx'],
-    modules: [APP_PATH, path.resolve(ROOT_PATH, 'node_modules'), path.resolve(ROOT_PATH, 'public')],
+    modules: [APP_PATH, 'node_modules', path.resolve(ROOT_PATH, 'node_modules'), path.resolve(ROOT_PATH, 'public')],
   },
   module: {
     rules: core.rules(TARGET, supportedBrowsers),

graylog2-web-interface/webpack/core.js

@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
 const path = require('path');
 
 const webpack = require('webpack');
 const { merge } = require('webpack-merge');
@@ -134,7 +134,10 @@
     resolve: {
       // you can now require('file') instead of require('file.coffee')
       extensions: ['.js', '.json', '.jsx', '.ts', '.tsx'],
-      modules: [appPath, path.resolve(rootPath, 'node_modules'), path.resolve(rootPath, 'public')],
+      // The bare `node_modules` entry makes webpack walk up from the importing module like node does.
+      // Without it only the hoisted top-level copy is ever found, so nested versions kept apart on
+      // purpose get flattened into one, which can turn peer dependencies into require cycles.
+      modules: [appPath, 'node_modules', path.resolve(rootPath, 'node_modules'), path.resolve(rootPath, 'public')],
       alias: {
         '@graylog/server-api': path.resolve(webInterfaceRoot, 'target', 'api'),
       },