Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-04 15:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-02-11 21:21:54 +08:00
commit e59c630bac
3 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/package.json
View file

@ -4,14 +4,14 @@
"description": "Build Your Eternal Digital Garden",
"homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js",
"packageManager": "pnpm@7.26.1",
"packageManager": "pnpm@7.27.0",
"scripts": {
"lint": "eslint . --fix --ext .ts",
"dev": "webpack --mode development",
"dev:mobile": "webpack --mode development --config webpack.mobile.js",
"dev:desktop": "webpack --mode development --config webpack.desktop.js",
"dev:export": "webpack --mode development --config webpack.export.js",
"build": "webpack --mode production && pnpm run build:mobile && pnpm run build:desktop && pnpm run build:export",
"build": "webpack --mode production && pnpm run '/build:.*/'",
"build:mobile": "webpack --mode production --config webpack.mobile.js",
"build:desktop": "webpack --mode production --config webpack.desktop.js",
"build:export": "webpack --mode production --config webpack.export.js",
@ -81,7 +81,6 @@
},
"dependencies": {
"@electron/remote": "^2.0.9",
"electron-fetch": "^1.7.4",
"pnpm": "7.9.3"
"electron-fetch": "^1.7.4"
}
}

8
app/pnpm-lock.yaml generated
View file

@ -27,7 +27,6 @@ specifiers:
ifdef-loader: ^2.3.2
mini-css-extract-plugin: 2.3.0
path-browserify: ^1.0.1
pnpm: 7.9.3
safer-buffer: ^2.1.2
sass: ^1.53.0
sass-loader: ^12.6.0
@ -41,7 +40,6 @@ specifiers:
dependencies:
'@electron/remote': 2.0.9_electron@21.4.1
electron-fetch: 1.7.4
pnpm: 7.9.3
devDependencies:
'@babel/core': 7.18.6
@ -4269,12 +4267,6 @@ packages:
xmlbuilder: 9.0.7
dev: true
/pnpm/7.9.3:
resolution: {integrity: sha512-0hpAD1vtILw0i9gTN4ffagnScWMW9/avfZIKllBUd++fAvCss+hVgPPDd0HS9XcOT675gid4H9esGkbLdaFy+w==}
engines: {node: '>=14.6'}
hasBin: true
dev: false
/postcss-modules-extract-imports/3.0.0_postcss@8.4.14:
resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
engines: {node: ^10 || ^12 || >= 14}

2
kernel/model/file.go
View file

@ -292,7 +292,7 @@ func ListDocTree(boxID, path string, sortMode int) (ret []*File, totals int, err
}
elapsed = time.Now().Sub(start).Milliseconds()
if 500 < elapsed {
logging.LogWarnf("build docs elapsed [%dms]", elapsed)
logging.LogWarnf("build docs [%d] elapsed [%dms]", len(docs), elapsed)
}
start = time.Now()