Browse Source

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

Vanessa 2 years ago
parent
commit
e59c630bac
3 changed files with 4 additions and 13 deletions
  1. 3 4
      app/package.json
  2. 0 8
      app/pnpm-lock.yaml
  3. 1 1
      kernel/model/file.go

+ 3 - 4
app/package.json

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

+ 0 - 8
app/pnpm-lock.yaml

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

+ 1 - 1
kernel/model/file.go

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