Skip to content

Commit

Permalink
chore: 迁移到 pnpm + monorepo, tsconfig 结构优化
Browse files Browse the repository at this point in the history
  • Loading branch information
Mereithhh committed Mar 10, 2023
1 parent 7ce9293 commit 3be68d0
Show file tree
Hide file tree
Showing 35 changed files with 5,308 additions and 50,000 deletions.
8 changes: 4 additions & 4 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages": [
"packages/*"
],
"version": "0.0.0"
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useWorkspaces": true,
"version": "0.0.0",
"npmClient": "pnpm"
}
13 changes: 11 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
"scripts": {
"clean": "rm -rf node_modules && rm -rf packages/*/node_modules && rm -rf packages/*/dist",
"build:test": "act -j test --secret-file=.env",
"dev": "node scripts/dev.js",
"build:server": "lerna run build --scope=@vanblog/server",
"build:website": "lerna run build --scope=@vanblog/theme-default",
"build:admin": "lerna run build --scope=@vanblog/admin",
"dev": "lerna run dev --scope @vanblog/server --scope @vanblog/admin --parallel",
"dev:server": "lerna run dev:noweb --scope @vanblog/server",
"dev:website": "lerna run dev --scope @vanblog/theme-default",
"dev:admin": "lerna run dev --scope @vanblog/admin",
"docs:build": "vuepress build docs",
"docs:clean-dev": "vuepress dev docs --clean-cache",
"docs:dev": "vuepress dev docs",
Expand All @@ -23,12 +29,15 @@
"devDependencies": {
"@vuepress/client": "2.0.0-beta.61",
"@vuepress/utils": "2.0.0-beta.61",
"lerna": "^4.0.0",
"lerna": "^6.5.1",
"standard-version": "^9.5.0",
"vue": "^3.2.47",
"vuepress": "2.0.0-beta.61",
"vuepress-plugin-redirect": "2.0.0-beta.185",
"vuepress-plugin-search-pro": "2.0.0-beta.185",
"vuepress-theme-hope": "2.0.0-beta.185"
},
"dependencies": {
"cross-env": "^7.0.3"
}
}
1 change: 1 addition & 0 deletions packages/admin/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
auto-install-peers = true
2 changes: 0 additions & 2 deletions packages/admin/.yarnrc.yml

This file was deleted.

1 change: 1 addition & 0 deletions packages/admin/jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"baseUrl": ".",
"composite": true,
"paths": {
"@/*": ["./src/*"]
}
Expand Down
9 changes: 6 additions & 3 deletions packages/admin/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "ant-design-pro",
"name": "@vanblog/admin",
"version": "5.2.0",
"private": true,
"description": "An out-of-box UI solution for enterprise applications",
"scripts": {
"analyze": "cross-env ANALYZE=1 umi build",
"build": " umi build",
"build": "cross-env NODE_OPTIONS=--openssl-legacy-provider umi build",
"deploy": "npm run build && npm run gh-pages",
"dev": "npm run start:dev",
"dev": "cross-env NODE_OPTIONS=--openssl-legacy-provider npm run start:dev",
"gh-pages": "gh-pages -d dist",
"i18n-remove": "pro i18n-remove --locale=zh-CN --write",
"postinstall": "umi g tmp",
Expand Down Expand Up @@ -70,11 +70,14 @@
"antd": "^4.19.0",
"antd-img-crop": "^4.2.4",
"btoa": "^1.2.1",
"bytemd": "^1.20.2",
"classnames": "^2.3.0",
"copy-to-clipboard": "^3.3.2",
"emoji-mart": "^5.2.1",
"front-matter": "^4.0.2",
"highlight.js": "^11.6.0",
"js-sha256": "^0.9.0",
"katex": "^0.16.4",
"lodash": "^4.17.0",
"moment": "^2.29.0",
"monaco-editor": "^0.34.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/src/pages/Article/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ export default () => {
}}
editable={false}
columnsState={{
persistenceKey: 'van-blog-article-table',
persistenceType: 'localStorage',
// persistenceKey: 'van-blog-article-table',
// persistenceType: 'localStorage',
value: colKeys,
onChange(value) {
setColKeys(value);
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/src/pages/Draft/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ export default () => {
}}
editable={false}
columnsState={{
persistenceKey: 'van-blog-draft-table',
persistenceType: 'localStorage',
// persistenceKey: 'van-blog-draft-table',
// persistenceType: 'localStorage',
value: colKeys,
onChange(value) {
setColKeys(value);
Expand Down
Loading

0 comments on commit 3be68d0

Please sign in to comment.