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

upgrade to electron 8.0.0-beta.3

Browse source
This commit is contained in:
zadam 2019-11-21 19:36:34 +01:00
parent 7084ed4fb1
commit 00c295e4bf
5 changed files with 36 additions and 4067 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<dataSource name="document.db"> <dataSource name="document.db">
<database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.16"> <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.17">
<root id="1"> <root id="1">
<ServerVersion>3.25.1</ServerVersion> <ServerVersion>3.25.1</ServerVersion>
</root> </root>

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM node:12.13.0-alpine FROM node:12.13.1-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=12.13.0 NODE_VERSION=12.13.1
if [ "$1" != "DONTCOPY" ] if [ "$1" != "DONTCOPY" ]
then then

4083
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

14
package.json
View file

@ -33,7 +33,7 @@
"electron-debug": "3.0.1", "electron-debug": "3.0.1",
"electron-dl": "1.14.0", "electron-dl": "1.14.0",
"electron-find": "1.0.6", "electron-find": "1.0.6",
"electron-spellchecker": "2.2.0", "electron-spellchecker": "2.2.1",
"electron-window-state": "5.0.3", "electron-window-state": "5.0.3",
"express": "4.17.1", "express": "4.17.1",
"express-session": "1.17.0", "express-session": "1.17.0",
@ -77,20 +77,12 @@
"ws": "7.2.0" "ws": "7.2.0"
}, },
"devDependencies": { "devDependencies": {
"electron": "6.0.12", "electron": "8.0.0-beta.3",
"electron-builder": "22.1.0", "electron-builder": "22.1.0",
"electron-compile": "6.4.4",
"electron-installer-debian": "2.0.1", "electron-installer-debian": "2.0.1",
"electron-packager": "14.1.0", "electron-packager": "14.1.0",
"electron-rebuild": "1.8.8", "electron-rebuild": "1.8.8",
"jsdoc": "3.6.3", "jsdoc": "3.6.3",
"lorem-ipsum": "2.0.3", "lorem-ipsum": "2.0.3"
"xo": "0.25.3"
},
"xo": {
"envs": [
"node",
"browser"
]
} }
} }