zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-11-10 09:02:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

upgrades

Browse source
This commit is contained in:
zadam 2022-05-24 21:34:32 +02:00
parent 541d451168
commit 53e9c8cdac
9 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitpod.yml
View file

@ -2,7 +2,7 @@ image:
file: .gitpod.dockerfile file: .gitpod.dockerfile
tasks: tasks:
- before: nvm install 16.14.2 && nvm use 16.14.2 - before: nvm install 16.15.0 && nvm use 16.15.0
init: npm install init: npm install
command: npm run start-server command: npm run start-server

2
Dockerfile
View file

@ -1,5 +1,5 @@
# !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!! # !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!!
FROM node:16.14.2-alpine FROM node:16.15.0-alpine
# Create app directory # Create app directory
WORKDIR /usr/src/app WORKDIR /usr/src/app

2
bin/build-server.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PKG_DIR=dist/trilium-linux-x64-server PKG_DIR=dist/trilium-linux-x64-server
NODE_VERSION=16.14.2 NODE_VERSION=16.15.0
if [ "$1" != "DONTCOPY" ] if [ "$1" != "DONTCOPY" ]
then then

4
bin/copy-trilium.sh
View file

@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then
exit 1 exit 1
fi fi
n exec 16.14.2 npm run webpack n exec 16.15.0 npm run webpack
DIR=$1 DIR=$1
@ -30,7 +30,7 @@ cp -r electron.js $DIR/
cp webpack-* $DIR/ cp webpack-* $DIR/
# run in subshell (so we return to original dir) # run in subshell (so we return to original dir)
(cd $DIR && n exec 16.14.2 npm install --only=prod) (cd $DIR && n exec 16.15.0 npm install --only=prod)
# cleanup of useless files in dependencies # cleanup of useless files in dependencies
rm -r $DIR/node_modules/image-q/demo rm -r $DIR/node_modules/image-q/demo

2
dump-db/README.md
View file

@ -6,7 +6,7 @@ It is meant as a last resort solution when the standard mean to access your data
## Installation ## Installation
This tool requires node.js, testing has been done on 16.14.2, but it will probably work on other versions as well. This tool requires node.js, testing has been done on 16.15.0, but it will probably work on other versions as well.
``` ```
npm install npm install

28
package-lock.json generated
View file

@ -32,7 +32,7 @@
"express-rate-limit": "6.4.0", "express-rate-limit": "6.4.0",
"express-session": "1.17.3", "express-session": "1.17.3",
"fs-extra": "10.1.0", "fs-extra": "10.1.0",
"helmet": "5.0.2", "helmet": "5.1.0",
"html": "1.0.0", "html": "1.0.0",
"html2plaintext": "2.1.4", "html2plaintext": "2.1.4",
"http-proxy-agent": "5.0.0", "http-proxy-agent": "5.0.0",
@ -46,7 +46,7 @@
"jsdom": "19.0.0", "jsdom": "19.0.0",
"mime-types": "2.1.35", "mime-types": "2.1.35",
"multer": "1.4.4", "multer": "1.4.4",
"node-abi": "3.15.0", "node-abi": "3.21.0",
"normalize-strings": "1.1.1", "normalize-strings": "1.1.1",
"open": "8.4.0", "open": "8.4.0",
"portscanner": "2.2.0", "portscanner": "2.2.0",
@ -5759,9 +5759,9 @@
} }
}, },
"node_modules/helmet": { "node_modules/helmet": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.2.tgz", "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.1.0.tgz",
"integrity": "sha512-QWlwUZZ8BtlvwYVTSDTBChGf8EOcQ2LkGMnQJxSzD1mUu8CCjXJZq/BXP8eWw4kikRnzlhtYo3lCk0ucmYA3Vg==", "integrity": "sha512-klsunXs8rgNSZoaUrNeuCiWUxyc+wzucnEnFejUg3/A+CaF589k9qepLZZ1Jehnzig7YbD4hEuscGXuBY3fq+g==",
"engines": { "engines": {
"node": ">=12.0.0" "node": ">=12.0.0"
} }
@ -7413,9 +7413,9 @@
"dev": true "dev": true
}, },
"node_modules/node-abi": { "node_modules/node-abi": {
"version": "3.15.0", "version": "3.21.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.21.0.tgz",
"integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", "integrity": "sha512-0ChvtQmmNYzXju0fjG0Vfg72q2D8FxUhluvV9uqivtXsKblSekJE2juxfg+9HoSgqPMqCmVEC/GHHtGzi4xYTg==",
"dependencies": { "dependencies": {
"semver": "^7.3.5" "semver": "^7.3.5"
}, },
@ -15303,9 +15303,9 @@
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
}, },
"helmet": { "helmet": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.2.tgz", "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.1.0.tgz",
"integrity": "sha512-QWlwUZZ8BtlvwYVTSDTBChGf8EOcQ2LkGMnQJxSzD1mUu8CCjXJZq/BXP8eWw4kikRnzlhtYo3lCk0ucmYA3Vg==" "integrity": "sha512-klsunXs8rgNSZoaUrNeuCiWUxyc+wzucnEnFejUg3/A+CaF589k9qepLZZ1Jehnzig7YbD4hEuscGXuBY3fq+g=="
}, },
"hosted-git-info": { "hosted-git-info": {
"version": "2.8.9", "version": "2.8.9",
@ -16577,9 +16577,9 @@
"dev": true "dev": true
}, },
"node-abi": { "node-abi": {
"version": "3.15.0", "version": "3.21.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.21.0.tgz",
"integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", "integrity": "sha512-0ChvtQmmNYzXju0fjG0Vfg72q2D8FxUhluvV9uqivtXsKblSekJE2juxfg+9HoSgqPMqCmVEC/GHHtGzi4xYTg==",
"requires": { "requires": {
"semver": "^7.3.5" "semver": "^7.3.5"
} }

6
package.json
View file

@ -25,6 +25,7 @@
"postinstall": "rimraf ./node_modules/canvas" "postinstall": "rimraf ./node_modules/canvas"
}, },
"dependencies": { "dependencies": {
"@electron/remote": "2.0.8",
"@excalidraw/excalidraw": "0.11.0", "@excalidraw/excalidraw": "0.11.0",
"archiver": "5.3.1", "archiver": "5.3.1",
"async-mutex": "0.3.2", "async-mutex": "0.3.2",
@ -41,13 +42,12 @@
"electron-dl": "3.3.1", "electron-dl": "3.3.1",
"electron-find": "1.0.7", "electron-find": "1.0.7",
"electron-window-state": "5.0.3", "electron-window-state": "5.0.3",
"@electron/remote": "2.0.8",
"express": "4.18.1", "express": "4.18.1",
"express-partial-content": "1.0.2", "express-partial-content": "1.0.2",
"express-rate-limit": "6.4.0", "express-rate-limit": "6.4.0",
"express-session": "1.17.3", "express-session": "1.17.3",
"fs-extra": "10.1.0", "fs-extra": "10.1.0",
"helmet": "5.0.2", "helmet": "5.1.0",
"html": "1.0.0", "html": "1.0.0",
"html2plaintext": "2.1.4", "html2plaintext": "2.1.4",
"http-proxy-agent": "5.0.0", "http-proxy-agent": "5.0.0",
@ -61,7 +61,7 @@
"jsdom": "19.0.0", "jsdom": "19.0.0",
"mime-types": "2.1.35", "mime-types": "2.1.35",
"multer": "1.4.4", "multer": "1.4.4",
"node-abi": "3.15.0", "node-abi": "3.21.0",
"normalize-strings": "1.1.1", "normalize-strings": "1.1.1",
"open": "8.4.0", "open": "8.4.0",
"portscanner": "2.2.0", "portscanner": "2.2.0",

1
src/public/app/services/app_context.js
View file

@ -11,7 +11,6 @@ import Component from "../widgets/component.js";
import keyboardActionsService from "./keyboard_actions.js"; import keyboardActionsService from "./keyboard_actions.js";
import MobileScreenSwitcherExecutor from "../widgets/mobile_widgets/mobile_screen_switcher.js"; import MobileScreenSwitcherExecutor from "../widgets/mobile_widgets/mobile_screen_switcher.js";
import MainTreeExecutors from "./main_tree_executors.js"; import MainTreeExecutors from "./main_tree_executors.js";
import protectedSessionHolder from "./protected_session_holder.js";
import toast from "./toast.js"; import toast from "./toast.js";
class AppContext extends Component { class AppContext extends Component {

1
trilium.iml
View file

@ -14,6 +14,7 @@
<excludeFolder url="file://$MODULE_DIR$/docs" /> <excludeFolder url="file://$MODULE_DIR$/docs" />
<excludeFolder url="file://$MODULE_DIR$/bin/better-sqlite3" /> <excludeFolder url="file://$MODULE_DIR$/bin/better-sqlite3" />
<excludeFolder url="file://$MODULE_DIR$/data" /> <excludeFolder url="file://$MODULE_DIR$/data" />
<excludeFolder url="file://$MODULE_DIR$/.flatpak-builder" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />