From 48e19d01495731d36c04dfd6a5d57c40c5f3735b Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 15 Apr 2020 21:49:36 +0200 Subject: [PATCH] fix webpack buidl --- bin/build-linux-x64.sh | 2 +- bin/build-mac-x64.sh | 2 +- bin/build-win-x64.sh | 2 +- issue_template.md | 2 +- package-lock.json | 8 ++++---- package.json | 2 +- webpack-desktop.config.js | 2 +- webpack-mobile.config.js | 2 +- webpack-setup.config.js | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bin/build-linux-x64.sh b/bin/build-linux-x64.sh index 688d00f7a..10efd6d02 100755 --- 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 index 553b813c7..b3e864ab2 100755 --- 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 index 1e14d38ae..5776acc56 100755 --- 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 index 2a0a8df83..70c4c8e9a 100644 --- 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 index ce8f98684..0527ce0da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.41.2-beta", + "version": "0.41.3-beta", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1416,9 +1416,9 @@ } }, "async-mutex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.1.tgz", - "integrity": "sha512-8GAyGD9/Fr4TgMigfCAXsyjvPturIqHDDw7Mim6DtNRbwxY2ul/D4b4CF1qjaMvomd/SJs/8EM23M+RGDEpaKA==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.2.tgz", + "integrity": "sha512-L1wZNK83y16khj/Fqezy+FfOp5KuywxypF/C2aYfAN3NOMLYdAVKRk3UDklqv+ngX+O+tNSEkPX+FxprxELsMA==", "requires": { "tslib": "^1.11.1" } diff --git a/package.json b/package.json index 0c05925f8..f7579bac5 100644 --- 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 index 6a3f02b38..50da85162 100644 --- 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 index 4a62db4c8..370afe252 100644 --- 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 index fe336a4c2..3b370bf57 100644 --- 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' },