From 9a02c7393654ac1a33c4ca684ce95e52c2fbeeae Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@axim.org>
Date: Thu, 18 Sep 2025 13:44:54 -0400
Subject: [PATCH] fix: Use the default merge for webpack config.

The smart merge feature has been dropped from the webpack-merge library
that we were using. Use the basic merge feature instead since we're not
actually doing anything too complicated.

Also don't return null from the WorkerConfig as it can't be correctly
merged.
---
 webpack.common.config.js | 4 ++--
 webpack.dev.config.js    | 2 +-
 webpack.prod.config.js   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webpack.common.config.js b/webpack.common.config.js
index 8deea2b4f6..36ac75708c 100644
--- a/webpack.common.config.js
+++ b/webpack.common.config.js
@@ -88,11 +88,11 @@ var workerConfig = function() {
             }
         };
     } catch (err) {
-        return null;
+        return {};
     }
 };
 
-module.exports = Merge.smart({
+module.exports = Merge.merge({
     web: {
         context: __dirname,
 
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
index 6fe7a0199a..6c97866757 100644
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -9,7 +9,7 @@ var _ = require('underscore');
 
 var commonConfig = require('./webpack.common.config.js');
 
-module.exports = _.values(Merge.smart(commonConfig, {
+module.exports = _.values(Merge.merge(commonConfig, {
     web: {
         output: {
             filename: '[name].js'
diff --git a/webpack.prod.config.js b/webpack.prod.config.js
index 4626700130..1a75d11890 100644
--- a/webpack.prod.config.js
+++ b/webpack.prod.config.js
@@ -10,7 +10,7 @@ const TerserPlugin = require("terser-webpack-plugin");
 
 var commonConfig = require('./webpack.common.config.js');
 
-var optimizedConfig = Merge.smart(commonConfig, {
+var optimizedConfig = Merge.merge(commonConfig, {
     web: {
         output: {
             filename: '[name].[chunkhash].js'
@@ -49,7 +49,7 @@ var optimizedConfig = Merge.smart(commonConfig, {
 // gone.
 
 // Step 1: Alter the bundle output names to omit the chunkhash.
-var requireCompatConfig = Merge.smart(optimizedConfig, {
+var requireCompatConfig = Merge.merge(optimizedConfig, {
     web: {
         output: {
             filename: '[name].js'