revert webpack merge priority change

electron · Aug 30, 2023 · d290067 · d290067
1 parent 43ab590
commit d290067
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/plugin/webpack/src/WebpackConfig.ts b/packages/plugin/webpack/src/WebpackConfig.ts
@@ -275,7 +275,7 @@ export default class WebpackConfigGenerator {
         );
       }
     }
-    return webpackMerge({ entry, output, plugins }, rendererConfig || {}, baseConfig);
+    return webpackMerge(baseConfig, rendererConfig || {}, { entry, output, plugins });
   }
 
   async buildRendererConfigForPreloadOrSandboxedPreloadTarget(
@@ -306,7 +306,7 @@ export default class WebpackConfigGenerator {
       },
       plugins: target === RendererTarget.ElectronPreload ? [] : [new webpack.ExternalsPlugin('commonjs2', externals)],
     };
-    return webpackMerge(config, rendererConfig || {}, baseConfig);
+    return webpackMerge(baseConfig, rendererConfig || {}, config);
   }
 
   async buildRendererConfigs(entryPoints: WebpackPluginEntryPoint[], target: RendererTarget): Promise<Promise<webpack.Configuration | null>[]> {