From 25e8be8588318176f7c1b800fcf164488ba94acf Mon Sep 17 00:00:00 2001
From: "yutian.yz" <yutian.yz@alibaba-inc.com>
Date: Fri, 17 Dec 2021 14:45:21 +0800
Subject: [PATCH] fix: handle webpack loader and esm module

---
 tools/electron/build/webpack.extension-host.config.js | 4 ++++
 tools/electron/build/webpack.node.config.js           | 1 +
 2 files changed, 5 insertions(+)

diff --git a/tools/electron/build/webpack.extension-host.config.js b/tools/electron/build/webpack.extension-host.config.js
index 8cc7ea6dca..40ad60a7c8 100644
--- a/tools/electron/build/webpack.extension-host.config.js
+++ b/tools/electron/build/webpack.extension-host.config.js
@@ -35,6 +35,8 @@ const nodeTarget = {
           configFile: tsConfigPath,
         },
       },
+      { test: /\.css$/, loader: require.resolve('null-loader') },
+      { test: /\.less$/, loader: require.resolve('null-loader') },
     ],
   },
   externals: [
@@ -84,6 +86,8 @@ const workerTarget = {
           configFile: tsConfigPath,
         },
       },
+      { test: /\.css$/, loader: require.resolve('null-loader') },
+      { test: /\.less$/, loader: require.resolve('null-loader') },
     ],
   },
   externals: [
diff --git a/tools/electron/build/webpack.node.config.js b/tools/electron/build/webpack.node.config.js
index 49a7152a65..fc24111349 100644
--- a/tools/electron/build/webpack.node.config.js
+++ b/tools/electron/build/webpack.node.config.js
@@ -19,6 +19,7 @@ module.exports = {
   node: false,
   resolve: {
     extensions: ['.ts', '.tsx', '.js', '.json', '.less'],
+    mainFields: ['loader', 'main'],
     plugins: [
       new TsconfigPathsPlugin({
         configFile: tsConfigPath,