gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix webpack buidl

Browse Source
This commit is contained in:
zadam 2020-04-15 21:49:36 +02:00
parent f97c9e3619
commit 48e19d0149
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build-linux-x64.sh
View File

@ -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/sqlite3/lib/binding/*
rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/* 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 -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/ cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/

2
bin/build-mac-x64.sh
View File

@ -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/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/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 ./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

2
bin/build-win-x64.sh
View File

@ -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/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/
cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/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 ./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

2
issue_template.md
View File

@ -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 * `/home/[user]/.local/share/trilium-data/log` for Linux
* `C:\Users\[user]\AppData\Roaming\trilium-data\log` for Windows Vista and up * `C:\Users\[user]\AppData\Roaming\trilium-data\log` for Windows Vista and up

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.41.2-beta", "version": "0.41.3-beta",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -1416,9 +1416,9 @@
} }
}, },
"async-mutex": { "async-mutex": {
"version": "0.2.1", "version": "0.2.2",
"resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.1.tgz", "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.2.2.tgz",
"integrity": "sha512-8GAyGD9/Fr4TgMigfCAXsyjvPturIqHDDw7Mim6DtNRbwxY2ul/D4b4CF1qjaMvomd/SJs/8EM23M+RGDEpaKA==", "integrity": "sha512-L1wZNK83y16khj/Fqezy+FfOp5KuywxypF/C2aYfAN3NOMLYdAVKRk3UDklqv+ngX+O+tNSEkPX+FxprxELsMA==",
"requires": { "requires": {
"tslib": "^1.11.1" "tslib": "^1.11.1"
} }

2
package.json
View File

@ -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" "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js && npx webpack -c webpack-setup.config.js"
}, },
"dependencies": { "dependencies": {
"async-mutex": "0.2.1", "async-mutex": "0.2.2",
"axios": "0.19.2", "axios": "0.19.2",
"body-parser": "1.19.0", "body-parser": "1.19.0",
"cls-hooked": "4.2.2", "cls-hooked": "4.2.2",

2
webpack-desktop.config.js
View File

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

2
webpack-mobile.config.js
View File

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

2
webpack-setup.config.js
View File

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