fix webpack buidl

yousongsun · Apr 15, 2020 · 48e19d0 · 48e19d0
1 parent f97c9e3
commit 48e19d0
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/bin/build-linux-x64.sh b/bin/build-linux-x64.sh
@@ -12,7 +12,7 @@ echo "Copying required linux-x64 binaries"
 rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
 rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
 
-rm -r $SRC_DIR/src/public/dist/*.mobile.*
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 
 cp -r bin/deps/linux-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
 cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/

diff --git a/bin/build-mac-x64.sh b/bin/build-mac-x64.sh
@@ -19,7 +19,7 @@ cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
 cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
 cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
 
-rm -r $SRC_DIR/src/public/dist/*.mobile.*
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 
 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
 

diff --git a/bin/build-win-x64.sh b/bin/build-win-x64.sh
@@ -19,7 +19,7 @@ cp bin/deps/win-x64/image/cjpeg.exe $SRC_DIR/node_modules/mozjpeg/vendor/
 cp bin/deps/win-x64/image/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/
 cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/vendor/
 
-rm -r $SRC_DIR/src/public/dist/*.mobile.*
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 
 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
 

diff --git a/issue_template.md b/issue_template.md
@@ -1,4 +1,4 @@
-For bug reports, please mention **version of the application** and include **log files** from following location:
+For bug reports, **PLEASE mention version of Trilium you're using** and also include **log files** from following location:
 
 * `/home/[user]/.local/share/trilium-data/log` for Linux
 * `C:\Users\[user]\AppData\Roaming\trilium-data\log` for Windows Vista and up

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js && npx webpack -c webpack-setup.config.js"
   },
   "dependencies": {
-    "async-mutex": "0.2.1",
+    "async-mutex": "0.2.2",
     "axios": "0.19.2",
     "body-parser": "1.19.0",
     "cls-hooked": "4.2.2",

diff --git a/webpack-desktop.config.js b/webpack-desktop.config.js
@@ -6,7 +6,7 @@ module.exports = {
         mobile: './src/public/app/desktop.js',
     },
     output: {
-        publicPath: 'dist/',
+        publicPath: 'app-dist/',
         path: path.resolve(__dirname, 'src/public/app-dist'),
         filename: 'desktop.js'
     },

diff --git a/webpack-mobile.config.js b/webpack-mobile.config.js
@@ -6,7 +6,7 @@ module.exports = {
         mobile: './src/public/app/mobile.js',
     },
     output: {
-        publicPath: '/dist/',
+        publicPath: 'app-dist/',
         path: path.resolve(__dirname, 'src/public/app-dist'),
         filename: 'mobile.js'
     },

diff --git a/webpack-setup.config.js b/webpack-setup.config.js
@@ -6,7 +6,7 @@ module.exports = {
         mobile: './src/public/app/setup.js',
     },
     output: {
-        publicPath: '/dist/',
+        publicPath: 'app-dist/',
         path: path.resolve(__dirname, 'src/public/app-dist'),
         filename: 'setup.js'
     },