From 7efc54424a7cfd1721b29044bcf9740591a65195 Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Wed, 10 Jun 2020 23:38:19 +0300
Subject: [PATCH] continue fighting with webpack/ts configs

---
 src/renderer/webpack.renderer.js | 10 ++++++----
 tsconfig.json                    |  6 ++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/renderer/webpack.renderer.js b/src/renderer/webpack.renderer.js
index 397bcd6262..f198b56e0e 100644
--- a/src/renderer/webpack.renderer.js
+++ b/src/renderer/webpack.renderer.js
@@ -2,7 +2,8 @@
 const path = require("path");
 
 module.exports = function (config, env) {
-  const {rules} = config.module;
+  const {module, plugins} = config;
+  const {rules} = module;
 
   // localization support
   // https://lingui.js.org/guides/typescript.html
@@ -13,8 +14,9 @@ module.exports = function (config, env) {
   patchLoader(".tsx", "ts-loader", loader => {
     loader.options = Object.assign({}, loader.options, {
       compilerOptions: {
-        jsx: "preserve",
-        target: "es2016",
+        jsx: "preserve", // @lingui/babel-preset-react
+        target: "es2016", // @lingui/babel-preset-react
+        module: "esnext", // https://webpack.js.org/guides/code-splitting/#dynamic-imports
       }
     })
     return ["babel-loader", loader]
@@ -41,7 +43,7 @@ module.exports = function (config, env) {
       let loader = typeof loaders[index] === "string" ? {loader: loaders[index]} : loaders[index];
       loaders[index] = updater(loader);
       rule.use = loaders.flat();
-      console.info(`Patched renderer's webpack loader "${loaderName}"`);
+      console.info(`Patched renderer's webpack loader "${loaderName}"`, loader);
     }
   }
 
diff --git a/tsconfig.json b/tsconfig.json
index 823a9cf224..cb46074bf4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,8 @@
     "baseUrl": ".",
     "outDir": "./dist",
     "jsx": "react",
+    "target": "es2017",
+    "module": "CommonJS",
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
     "moduleResolution": "Node",
     "sourceMap": true,
@@ -26,6 +28,10 @@
       ]
     }
   },
+  "include": [
+    "src/**/*",
+    "types/*"
+  ],
   "ts-node": {
     "compilerOptions": {
       "module": "CommonJS"