upgrading webpack fixes the issue with broken mobile frontend (and hacky fix which breaks desktop in turn)

2020-10-14 14:20:06 +07:00 · 2020-10-14 14:20:06 +07:00 · 1ac1bf12a2
parent b50638e85c
commit 1ac1bf12a2
3 changed files with 3588 additions and 609 deletions
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@ -7,10 +7,6 @@ fi

 npm run webpack

-# problem with circular dependencies: https://github.com/webpack/webpack/issues/9173
-# source issue: https://github.com/zadam/trilium/issues/1300
-find ./src/public/app-dist -type f -exec sed -i 's/const /var /g' {} +
-
 DIR=$1

 rm -rf $DIR
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -86,8 +86,8 @@
    "jsdoc": "3.6.6",
    "lorem-ipsum": "2.0.3",
    "rcedit": "2.2.0",
-    "webpack": "5.0.0-beta.32",
-    "webpack-cli": "4.0.0-beta.8"
+    "webpack": "5.1.0",
+    "webpack-cli": "4.0.0"
  },
  "optionalDependencies": {
    "electron-installer-debian": "2.0.1"