Skip to content

Commit 134b15b

Browse files
committed
chore: 开启 yarn workspaces,解决依赖问题
1 parent d83d1f1 commit 134b15b

File tree

4 files changed

+16638
-497
lines changed

4 files changed

+16638
-497
lines changed

lerna.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"packages": [
3-
"packages/taro-ui",
4-
"packages/taro-ui-demo",
5-
"packages/taro-ui-demo-rn"
3+
"packages/taro-ui"
64
],
75
"command": {
86
"publish": {
@@ -14,5 +12,6 @@
1412
}
1513
},
1614
"version": "3.1.0-beta.4",
17-
"npmClient": "yarn"
15+
"npmClient": "yarn",
16+
"useWorkspaces": true
1817
}

package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"url": "[email protected]:nervjs/taro-ui.git"
1010
},
1111
"license": "MIT",
12+
"workspaces": {
13+
"packages": [
14+
"packages/*"
15+
]
16+
},
1217
"scripts": {
1318
"bootstrap": "lerna bootstrap",
1419
"build": "lerna run build",
@@ -43,6 +48,9 @@
4348
"stylelint-scss": "^3.16.0",
4449
"typescript": "~3.7.2"
4550
},
51+
"resolutions": {
52+
"sharp": "^0.28.3"
53+
},
4654
"husky": {
4755
"hooks": {
4856
"pre-commit": "lint-staged",

packages/taro-ui/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,12 @@
7878
"typescript": "^3.8.3"
7979
},
8080
"peerDependencies": {
81+
"@tarojs/taro": ">=3",
8182
"@tarojs/components": ">=3",
8283
"@tarojs/react": ">=3",
8384
"react": ">=16.13.0",
84-
"react-dom": ">=16.13.0"
85+
"react-dom": ">=16.13.0",
86+
"react-native": ">=0.62.0"
8587
},
8688
"gitHead": "c33cc7fbb734f0dbdd6e305dda1bc8300e5adbe2"
8789
}

0 commit comments

Comments
 (0)