mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-02-16 12:08:07 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
d160254af7
3 changed files with 8 additions and 7 deletions
|
|
@ -80,6 +80,6 @@
|
|||
"webpack-cli": "^4.10.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@electron/remote": "^2.1.2"
|
||||
"@electron/remote": "^2.1.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
10
app/pnpm-lock.yaml
generated
10
app/pnpm-lock.yaml
generated
|
|
@ -9,8 +9,8 @@ importers:
|
|||
.:
|
||||
dependencies:
|
||||
'@electron/remote':
|
||||
specifier: ^2.1.2
|
||||
version: 2.1.2(electron@37.2.0)
|
||||
specifier: ^2.1.3
|
||||
version: 2.1.3(electron@37.2.0)
|
||||
devDependencies:
|
||||
'@eslint/eslintrc':
|
||||
specifier: ^3.3.1
|
||||
|
|
@ -151,8 +151,8 @@ packages:
|
|||
engines: {node: '>=12.13.0'}
|
||||
hasBin: true
|
||||
|
||||
'@electron/remote@2.1.2':
|
||||
resolution: {integrity: sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==}
|
||||
'@electron/remote@2.1.3':
|
||||
resolution: {integrity: sha512-XlpxC8S4ttj/v2d+PKp9na/3Ev8bV7YWNL7Cw5b9MAWgTphEml7iYgbc7V0r9D6yDOfOkj06bchZgOZdlWJGNA==}
|
||||
peerDependencies:
|
||||
electron: '>= 13.0.0'
|
||||
|
||||
|
|
@ -2858,7 +2858,7 @@ snapshots:
|
|||
- bluebird
|
||||
- supports-color
|
||||
|
||||
'@electron/remote@2.1.2(electron@37.2.0)':
|
||||
'@electron/remote@2.1.3(electron@37.2.0)':
|
||||
dependencies:
|
||||
electron: 37.2.0
|
||||
|
||||
|
|
|
|||
|
|
@ -242,12 +242,13 @@ func prepareWriteTree(tree *parse.Tree) (data []byte, filePath string, err error
|
|||
tree.Root.SetIALAttr("type", "doc")
|
||||
renderer := render.NewJSONRenderer(tree, luteEngine.RenderOptions)
|
||||
data = renderer.Render()
|
||||
data = bytes.ReplaceAll(data, []byte("\\u0000"), []byte(""))
|
||||
data = bytes.ReplaceAll(data, []byte("\u0000"), []byte(""))
|
||||
|
||||
if !util.UseSingleLineSave {
|
||||
buf := bytes.Buffer{}
|
||||
buf.Grow(1024 * 1024 * 2)
|
||||
if err = json.Indent(&buf, data, "", "\t"); err != nil {
|
||||
logging.LogErrorf("json indent failed: %s", err)
|
||||
return
|
||||
}
|
||||
data = buf.Bytes()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue