update webpack

dist/electron.js.LICENSE.txt

@@ -0,0 +1,13 @@
+/**
+ * @preserve
+ * JS Implementation of incremental MurmurHash3 (r150) (as of May 10, 2013)
+ *
+ * @author <a href="mailto:jensyt@gmail.com">Jens Taylor</a>
+ * @see http://github.com/homebrewing/brauhaus-diff
+ * @author <a href="mailto:gary.court@gmail.com">Gary Court</a>
+ * @see http://github.com/garycourt/murmurhash-js
+ * @author <a href="mailto:aappleby@gmail.com">Austin Appleby</a>
+ * @see http://sites.google.com/site/murmurhash/
+ */
+
+/** @license URI.js v4.2.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */

dist/index.js.LICENSE.txt

@@ -0,0 +1,117 @@
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+
+/*!
+    localForage -- Offline Storage, Improved
+    Version 1.7.3
+    https://localforage.github.io/localForage
+    (c) 2013-2017 Mozilla, Apache License 2.0
+*/
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * cookie
+ * Copyright(c) 2012-2014 Roman Shtylman
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/*!
+ * escape-html
+ * Copyright(c) 2012-2013 TJ Holowaychuk
+ * Copyright(c) 2015 Andreas Lubbe
+ * Copyright(c) 2015 Tiancheng "Timothy" Gu
+ * MIT Licensed
+ */
+
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+/*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
+
+/*! https://mths.be/punycode v1.4.1 by @mathias */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/**
+ * [js-md5]{@link https://github.com/emn178/js-md5}
+ *
+ * @namespace md5
+ * @version 0.7.3
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2014-2017
+ * @license MIT
+ */
+
+/** @license React v0.19.1
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react-dom-server.browser.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */

electron-builder-mas.yml

@@ -1,5 +1,5 @@
 appId: DevHYLiu.FluentReader
-buildVersion: 28
+buildVersion: 29
 productName: Fluent Reader
 copyright: Copyright © 2020 Haoyuan Liu
 files:
@@ -33,7 +33,7 @@ mac:
         - pt_BR
         - pt_PT
         - cs
-    minimumSystemVersion: 10.14.0
+    minimumSystemVersion: 10.15.0
 mas:
     entitlements: build/entitlements.mas.plist
     entitlementsInherit: build/entitlements.mas.inherit.plist

package.json

@@ -25,15 +25,13 @@
     "@types/react": "^16.9.35",
     "@types/react-dom": "^16.9.8",
     "@types/react-redux": "^7.1.9",
-    "rss-parser": "^3.13.0",
     "electron": "^27.0.0",
     "electron-builder": "^23.0.3",
     "electron-react-devtools": "^0.5.3",
     "electron-store": "^5.2.0",
     "electron-window-state": "^5.0.3",
     "font-list": "^1.4.2",
-    "hard-source-webpack-plugin": "^0.13.1",
+    "html-webpack-plugin": "^5.5.3",
-    "html-webpack-plugin": "^4.3.0",
     "js-md5": "^0.7.3",
     "lovefield": "^2.1.12",
     "nedb": "^1.8.0",
@@ -47,9 +45,13 @@
     "redux-devtools": "^3.5.0",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
+    "rss-parser": "^3.13.0",
     "ts-loader": "^7.0.4",
     "typescript": "^4.3.5",
-    "webpack": "^4.43.0",
+    "webpack": "^5.89.0",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^5.1.4"
+  },
+  "dependencies": {
+    "node-polyfill-webpack-plugin": "^2.0.1"
   }
 }

src/main/utils.ts

@@ -45,24 +45,30 @@ export function setUtilsListeners(manager: WindowManager) {
         openExternal(url, background)
     })
 
-    ipcMain.handle("show-error-box", async (_, title, content, copy?: string) => {
+    ipcMain.handle(
-        if (manager.hasWindow() && copy != null) {
+        "show-error-box",
-            const response = await dialog.showMessageBox(manager.mainWindow, {
+        async (_, title, content, copy?: string) => {
-                type: 'error',
+            if (manager.hasWindow() && copy != null) {
-                title: title,
+                const response = await dialog.showMessageBox(
-                message: title,
+                    manager.mainWindow,
-                detail: content,
+                    {
-                buttons: ["OK", copy],
+                        type: "error",
-                cancelId: 0,
+                        title: title,
-                defaultId: 0,
+                        message: title,
-            })
+                        detail: content,
-            if (response.response === 1) {
+                        buttons: ["OK", copy],
-                clipboard.writeText(`${title}: ${content}`);
+                        cancelId: 0,
+                        defaultId: 0,
+                    }
+                )
+                if (response.response === 1) {
+                    clipboard.writeText(`${title}: ${content}`)
+                }
+            } else {
+                dialog.showErrorBox(title, content)
             }
-        } else {
-            dialog.showErrorBox(title, content)
         }
-    })
+    )
 
     ipcMain.handle(
         "show-message-box",

webpack.config.js

@@ -1,5 +1,5 @@
 const HtmlWebpackPlugin = require("html-webpack-plugin")
-const HardSourceWebpackPlugin = require("hard-source-webpack-plugin")
+const NodePolyfillPlugin = require("node-polyfill-webpack-plugin")
 
 module.exports = [
     {
@@ -26,7 +26,6 @@ module.exports = [
         node: {
             __dirname: false,
         },
-        plugins: [new HardSourceWebpackPlugin()],
     },
     {
         mode: "production",
@@ -48,7 +47,6 @@ module.exports = [
             path: __dirname + "/dist",
             filename: "preload.js",
         },
-        plugins: [new HardSourceWebpackPlugin()],
     },
     {
         mode: "production",
@@ -75,7 +73,7 @@ module.exports = [
             filename: "index.js",
         },
         plugins: [
-            new HardSourceWebpackPlugin(),
+            new NodePolyfillPlugin(),
             new HtmlWebpackPlugin({
                 template: "./src/index.html",
             }),