Remove lodash.merge dependency (#1911)

Remove lodash.merge dependency from webpack.config.js file, replacing it with using spread sintax (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax)

diff --git a/package.json b/package.json
index fdc1dfdaf1522b49f5422ed87a471420187cc34e..5c932a96d8ae65f4436cab54ece4d2ba0977b875 100644 (file)
--- a/package.json
+++ b/package.json
@@ -69,7 +69,6 @@
     "jwt-decode": "^3.1.2",
     "lemmy-js-client": "0.18.1",
     "lodash.isequal": "^4.5.0",
-    "lodash.merge": "^4.6.2",
     "markdown-it": "^13.0.1",
     "markdown-it-container": "^3.0.0",
     "markdown-it-emoji": "^2.0.2",

diff --git a/webpack.config.js b/webpack.config.js
index a67ed2ecf12d30ace63cab0975f1a60960860f69..267a14451912fe4699a93df47dab4946fb17b1ca 100644 (file)
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,10 +1,9 @@
 const webpack = require("webpack");
-const path = require("path");
+const { resolve } = require("path");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const nodeExternals = require("webpack-node-externals");
 const CopyPlugin = require("copy-webpack-plugin");
 const RunNodeWebpackPlugin = require("run-node-webpack-plugin");
-const merge = require("lodash.merge");
 const { ServiceWorkerPlugin } = require("service-worker-webpack");
 
 const banner = `
@@ -14,8 +13,10 @@ const banner = `
   @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL v3.0
   `;
 
-function getBase(env, mode) {
-  return {
+module.exports = (env, argv) => {
+  const mode = argv.mode;
+
+  const base = {
     output: {
       filename: "js/server.js",
       publicPath: "/",
@@ -24,8 +25,8 @@ function getBase(env, mode) {
     resolve: {
       extensions: [".js", ".jsx", ".ts", ".tsx"],
       alias: {
-        "@": path.resolve(__dirname, "src/"),
-        "@utils": path.resolve(__dirname, "src/shared/utils/"),
+        "@": resolve(__dirname, "src/"),
+        "@utils": resolve(__dirname, "src/shared/utils/"),
       },
     },
     performance: {
@@ -67,40 +68,19 @@ function getBase(env, mode) {
       }),
     ],
   };
-}
 
-const createServerConfig = (env, mode) => {
-  const base = getBase(env, mode);
-  const config = merge({}, base, {
-    mode,
+  const serverConfig = {
+    ...base,
     entry: "./src/server/index.tsx",
     output: {
       filename: "js/server.js",
     },
     target: "node",
     externals: [nodeExternals(), "inferno-helmet"],
-  });
-
-  if (mode === "development") {
-    // config.cache = {
-    //   type: "filesystem",
-    //   name: "server",
-    // };
-
-    config.plugins.push(
-      new RunNodeWebpackPlugin({
-        runOnlyInWatchMode: true,
-      })
-    );
-  }
-
-  return config;
-};
+  };
 
-const createClientConfig = (env, mode) => {
-  const base = getBase(env, mode);
-  const config = merge({}, base, {
-    mode,
+  const clientConfig = {
+    ...base,
     entry: "./src/client/index.tsx",
     output: {
       filename: "js/client.js",
@@ -158,18 +138,21 @@ const createClientConfig = (env, mode) => {
         },
       }),
     ],
-  });
+  };
+
+  if (mode === "development") {
+    // serverConfig.cache = {
+    //   type: "filesystem",
+    //   name: "server",
+    // };
 
-  if (mode === "none") {
-    const BundleAnalyzerPlugin =
-      require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
-    config.plugins.push(new BundleAnalyzerPlugin());
+    serverConfig.plugins.push(
+      new RunNodeWebpackPlugin({ runOnlyInWatchMode: true })
+    );
+  } else if (mode === "none") {
+    const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
+    serverConfig.plugins.push(new BundleAnalyzerPlugin());
   }
 
-  return config;
+  return [serverConfig, clientConfig];
 };
-
-module.exports = (env, properties) => [
-  createServerConfig(env, properties.mode || "development"),
-  createClientConfig(env, properties.mode || "development"),
-];