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

This commit is contained in:
Vanessa 2022-07-13 11:44:09 +08:00
commit 1c6ade429b
2 changed files with 1071 additions and 1086 deletions

View file

@ -4,7 +4,7 @@
"description": "A local-first personal knowledge management system, supports fine-grained block-level reference, and Markdown WYSIWYG.",
"homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js",
"packageManager": "pnpm@7.5.0",
"packageManager": "pnpm@7.5.1",
"scripts": {
"lint": "eslint . --fix --ext .ts",
"dev": "webpack --mode development",
@ -46,43 +46,43 @@
}
],
"devDependencies": {
"@babel/core": "^7.15.5",
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.15.6",
"@babel/runtime": "^7.17.8",
"@babel/core": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.18.6",
"@babel/preset-env": "^7.18.6",
"@babel/runtime": "^7.18.6",
"@simonwep/pickr": "^1.8.2",
"@types/node": "^17.0.35",
"@typescript-eslint/eslint-plugin": "^5.27.0",
"@typescript-eslint/parser": "^5.27.0",
"babel-loader": "^8.2.2",
"@types/node": "^17.0.45",
"@typescript-eslint/eslint-plugin": "^5.30.6",
"@typescript-eslint/parser": "^5.30.6",
"babel-loader": "^8.2.5",
"blueimp-md5": "^2.19.0",
"clean-webpack-plugin": "^4.0.0",
"css-loader": "^6.3.0",
"dayjs": "^1.10.7",
"css-loader": "^6.7.1",
"dayjs": "^1.11.3",
"electron": "19.0.8",
"electron-builder": "^23.3.1",
"encoding": "^0.1.13",
"eslint": "^8.16.0",
"eslint": "^8.19.0",
"file-loader": "^6.2.0",
"html-loader": "^2.1.2",
"html-webpack-plugin": "^5.3.2",
"html-webpack-plugin": "^5.5.0",
"iconv-lite": "^0.6.3",
"ifdef-loader": "^2.3.0",
"ifdef-loader": "^2.3.2",
"mini-css-extract-plugin": "2.3.0",
"path-browserify": "^1.0.1",
"safer-buffer": "^2.1.2",
"sass": "^1.52.1",
"sass-loader": "^12.1.0",
"terser-webpack-plugin": "^5.2.4",
"ts-loader": "^9.2.6",
"typescript": "^4.4.3",
"webpack": "^5.54.0",
"webpack-bundle-analyzer": "^4.4.2",
"webpack-cli": "^4.8.0"
"sass": "^1.53.0",
"sass-loader": "^12.6.0",
"terser-webpack-plugin": "^5.3.3",
"ts-loader": "^9.3.1",
"typescript": "^4.7.4",
"webpack": "^5.73.0",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.10.0"
},
"dependencies": {
"@electron/remote": "^2.0.1",
"@electron/remote": "^2.0.8",
"electron-fetch": "^1.7.4",
"pnpm": "^7.5.0"
"pnpm": "^7.5.1"
}
}

2109
app/pnpm-lock.yaml generated

File diff suppressed because it is too large Load diff