Skip to content

Commit 3731f3b

Browse files
committed
refactor(all): wip
affects: @varlet/cli, @varlet/eslint-config, @varlet/stylelint-config, @varlet/ui
1 parent c318eb6 commit 3731f3b

File tree

13 files changed

+656
-1272
lines changed

13 files changed

+656
-1272
lines changed

package.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"name": "varlet-monorepo",
32
"private": true,
43
"scripts": {
54
"preinstall": "npx only-allow pnpm",
@@ -58,12 +57,18 @@
5857
]
5958
},
6059
"devDependencies": {
60+
"@varlet/cli": "workspace:*",
61+
"@varlet/eslint-config": "workspace:*",
62+
"@varlet/stylelint-config": "workspace:*",
63+
"@varlet/icons": "workspace:*",
64+
"stylelint": "^13.13.1",
65+
"eslint": "^7.30.0",
66+
"husky": "^7.0.1",
6167
"surge": "^0.23.0",
6268
"cz-lerna-changelog": "^2.0.3",
6369
"execa": "^5.0.0",
6470
"lerna": "^3.22.1",
65-
"ora": "^5.4.0",
66-
"vue": "3.2.16"
71+
"ora": "^5.4.0"
6772
},
6873
"packageManager": "[email protected]"
6974
}

packages/varlet-cli/package.json

+11-12
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,27 @@
3636
"@babel/core": "^7.14.8",
3737
"@babel/preset-env": "^7.14.8",
3838
"@babel/preset-typescript": "^7.14.5",
39+
"@babel/helper-plugin-utils": "^7.14.5",
3940
"@commitlint/cli": "^11.0.0",
4041
"@commitlint/config-conventional": "^11.0.0",
4142
"@release-it/conventional-changelog": "^3.3.0",
42-
"@varlet/eslint-config": "workspace:*",
4343
"@varlet/icons": "workspace:*",
4444
"@varlet/markdown-vite-plugin": "workspace:*",
45-
"@varlet/stylelint-config": "workspace:*",
4645
"@varlet/touch-emulator": "workspace:*",
4746
"@vitejs/plugin-vue": "1.9.2",
4847
"@vitejs/plugin-vue-jsx": "1.1.8",
49-
"@vue/babel-plugin-jsx": "^1.0.7",
48+
"@vue/babel-plugin-jsx": "1.0.7",
5049
"@vue/compiler-sfc": "3.2.22",
51-
"@vue/test-utils": "^2.0.0-rc.6",
52-
"babel-jest": "26.6.3",
5350
"chalk": "^4.1.0",
5451
"chokidar": "^3.5.2",
5552
"clipboard": "^2.0.6",
5653
"commander": "^8.3.0",
5754
"commitizen": "^4.2.2",
5855
"conventional-changelog-cli": "^2.1.1",
5956
"cz-conventional-changelog": "^3.3.0",
60-
"eslint": "^7.30.0",
6157
"execa": "^5.0.0",
6258
"fs-extra": "^9.0.1",
6359
"hash-sum": "^2.0.0",
64-
"husky": "^7.0.1",
6560
"inquirer": "^8.1.2",
6661
"jest": "^26.6.3",
6762
"less": "^3.12.2",
@@ -73,13 +68,12 @@
7368
"prettier": "^2.3.2",
7469
"release-it": "^14.11.5",
7570
"slash": "^3.0.0",
76-
"stylelint": "^13.13.1",
77-
"ts-jest": "^26.5.1",
7871
"typescript": "^4.4.4",
7972
"vite": "2.6.5",
8073
"vite-plugin-html": "^2.1.0",
81-
"vue-jest": "^5.0.0-alpha.8",
82-
"vue-router": "4.0.12"
74+
"babel-jest": "26.6.3",
75+
"ts-jest": "^26.5.1",
76+
"vue-jest": "^5.0.0-alpha.8"
8377
},
8478
"devDependencies": {
8579
"@types/babel__core": "^7.1.12",
@@ -90,6 +84,11 @@
9084
"@types/lodash-es": "^4.17.5"
9185
},
9286
"peerDependencies": {
93-
"vue": "3.2.16"
87+
"@varlet/touch-emulator": "workspace:*",
88+
"@vue/test-utils": "^2.0.0-rc.18",
89+
"vue": "3.2.16",
90+
"vue-router": "4.0.12",
91+
"lodash-es": "^4.17.21",
92+
"clipboard": "^2.0.6"
9493
}
9594
}

packages/varlet-cli/site/components/utils/elements.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { isNumber, isString, toNumber, kebabCase } from './shared'
22
import type { StyleVars } from '../../utils'
3-
import { requestAnimationFrame } from '@varlet/ui/src/utils/elements'
43

54
export function getLeft(element: HTMLElement): number {
65
const { left } = element.getBoundingClientRect()

packages/varlet-eslint-config/package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,5 @@
2626
"eslint-plugin-import": "^2.22.1",
2727
"eslint-plugin-vue": "^7.1.0"
2828
},
29-
"gitHead": "42554856ff028f6f411a35f468e0f763978270b0",
30-
"peerDependencies": {
31-
"eslint": ">=7.12.1"
32-
}
29+
"gitHead": "42554856ff028f6f411a35f468e0f763978270b0"
3330
}

packages/varlet-stylelint-config/package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,5 @@
2020
"stylelint-config-prettier": "^8.0.2",
2121
"stylelint-config-standard": "^20.0.0"
2222
},
23-
"gitHead": "42554856ff028f6f411a35f468e0f763978270b0",
24-
"peerDependencies": {
25-
"stylelint": ">=13.7.2"
26-
}
23+
"gitHead": "42554856ff028f6f411a35f468e0f763978270b0"
2724
}

packages/varlet-ui/package.json

+12-3
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,22 @@
4848
"vue": "^3.2.0"
4949
},
5050
"gitHead": "ee9c3866bedad96c86365b0f9888a3a6bb781b1f",
51-
"devDependencies": {
52-
"@varlet/cli": "workspace:*"
53-
},
5451
"dependencies": {
52+
"@varlet/touch-emulator": "workspace:*",
53+
"@varlet/icons": "workspace:*",
54+
"lodash-es": "^4.17.21",
55+
"clipboard": "^2.0.6",
56+
"vue": "3.2.16",
57+
"vue-router": "4.0.12",
5558
"dayjs": "^1.10.4",
5659
"decimal.js": "^10.2.1"
5760
},
61+
"devDependencies": {
62+
"@varlet/cli": "workspace:*",
63+
"@vue/test-utils": "^2.0.0-rc.18",
64+
"@vue/compiler-sfc": "3.2.16",
65+
"@vue/runtime-core": "3.2.16"
66+
},
5867
"browserslist": [
5968
"Chrome >= 51",
6069
"iOS >= 10"

packages/varlet-ui/src/button/__tests__/__snapshots__/index.spec.js.snap

+60-30
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,55 @@ exports[`test button disabled 1`] = `
1515
`;
1616
1717
exports[`test button example 1`] = `
18-
"<div class=\\"app-type\\">主题色按钮</div><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--default var-elevation--2\\">
18+
"<div class=\\"app-type\\">主题色按钮</div>
19+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--default var-elevation--2\\">
1920
<!--v-if-->
2021
<div class=\\"var-button__content\\">默认按钮</div>
21-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--primary var-elevation--2\\">
22+
</button>
23+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--primary var-elevation--2\\">
2224
<!--v-if-->
2325
<div class=\\"var-button__content\\">主要按钮</div>
24-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--info var-elevation--2\\">
26+
</button>
27+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--info var-elevation--2\\">
2528
<!--v-if-->
2629
<div class=\\"var-button__content\\">信息按钮</div>
27-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2\\">
30+
</button>
31+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2\\">
2832
<!--v-if-->
2933
<div class=\\"var-button__content\\">成功按钮</div>
30-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--warning var-elevation--2\\">
34+
</button>
35+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--warning var-elevation--2\\">
3136
<!--v-if-->
3237
<div class=\\"var-button__content\\">警告按钮</div>
33-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--danger var-elevation--2\\">
38+
</button>
39+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--danger var-elevation--2\\">
3440
<!--v-if-->
3541
<div class=\\"var-button__content\\">危险按钮</div>
3642
</button>
37-
<div class=\\"app-type\\">文字按钮</div><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--text-primary var-button--text var-button--outline\\">
43+
<div class=\\"app-type\\">文字按钮</div>
44+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--text-primary var-button--text var-button--outline\\">
3845
<!--v-if-->
3946
<div class=\\"var-button__content\\">外边框按钮</div>
40-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--text-primary var-button--text\\">
47+
</button>
48+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--text-primary var-button--text\\">
4149
<!--v-if-->
4250
<div class=\\"var-button__content\\">纯文字按钮</div>
4351
</button>
44-
<div class=\\"app-type\\">禁用状态</div><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--disabled var-button--default var-elevation--2\\" disabled=\\"\\">
52+
<div class=\\"app-type\\">禁用状态</div>
53+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--disabled var-button--default var-elevation--2\\" disabled=\\"\\">
4554
<!--v-if-->
4655
<div class=\\"var-button__content\\">禁用状态</div>
47-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--disabled var-button--text-default var-button--text var-button--text-disabled var-button--outline\\" disabled=\\"\\">
56+
</button>
57+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--disabled var-button--text-default var-button--text var-button--text-disabled var-button--outline\\" disabled=\\"\\">
4858
<!--v-if-->
4959
<div class=\\"var-button__content\\">禁用状态</div>
50-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--disabled var-button--text-default var-button--text var-button--text-disabled\\" disabled=\\"\\">
60+
</button>
61+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--disabled var-button--text-default var-button--text var-button--text-disabled\\" disabled=\\"\\">
5162
<!--v-if-->
5263
<div class=\\"var-button__content\\">禁用状态</div>
5364
</button>
54-
<div class=\\"app-type\\">加载状态</div><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--primary var-elevation--2\\">
65+
<div class=\\"app-type\\">加载状态</div>
66+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--primary var-elevation--2\\">
5567
<div class=\\"var-loading var-button__loading\\">
5668
<!--v-if-->
5769
<div class=\\"var--box var-loading__body\\">
@@ -64,7 +76,8 @@ exports[`test button example 1`] = `
6476
</div>
6577
</div>
6678
<div class=\\"var-button__content var-button--hidden\\">加载状态</div>
67-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--info var-elevation--2\\">
79+
</button>
80+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--info var-elevation--2\\">
6881
<div class=\\"var-loading var-button__loading\\">
6982
<!--v-if-->
7083
<div class=\\"var--box var-loading__body\\">
@@ -86,7 +99,8 @@ exports[`test button example 1`] = `
8699
</div>
87100
</div>
88101
<div class=\\"var-button__content var-button--hidden\\">加载状态</div>
89-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2\\">
102+
</button>
103+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2\\">
90104
<div class=\\"var-loading var-button__loading\\">
91105
<!--v-if-->
92106
<div class=\\"var--box var-loading__body\\">
@@ -103,7 +117,8 @@ exports[`test button example 1`] = `
103117
</div>
104118
</div>
105119
<div class=\\"var-button__content var-button--hidden\\">加载状态</div>
106-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--danger var-elevation--2\\">
120+
</button>
121+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--danger var-elevation--2\\">
107122
<div class=\\"var-loading var-button__loading\\">
108123
<!--v-if-->
109124
<div class=\\"var--box var-loading__body\\">
@@ -121,7 +136,8 @@ exports[`test button example 1`] = `
121136
</div>
122137
</div>
123138
<div class=\\"var-button__content var-button--hidden\\">加载状态</div>
124-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--warning var-elevation--2\\">
139+
</button>
140+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--warning var-elevation--2\\">
125141
<div class=\\"var-loading var-button__loading\\">
126142
<!--v-if-->
127143
<div class=\\"var--box var-loading__body\\">
@@ -141,50 +157,64 @@ exports[`test button example 1`] = `
141157
</div>
142158
<div class=\\"var-button__content var-button--hidden\\">加载状态</div>
143159
</button>
144-
<div class=\\"app-type\\">按钮尺寸</div><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--primary var-elevation--2\\">
160+
<div class=\\"app-type\\">按钮尺寸</div>
161+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--primary var-elevation--2\\">
145162
<!--v-if-->
146163
<div class=\\"var-button__content\\">常规按钮</div>
147-
</button><button class=\\"var-button var--box var-button--small var--inline-flex var-button--success var-elevation--2\\">
164+
</button>
165+
<button class=\\"var-button var--box var-button--small var--inline-flex var-button--success var-elevation--2\\">
148166
<!--v-if-->
149167
<div class=\\"var-button__content\\">小型按钮</div>
150-
</button><button class=\\"var-button var--box var-button--mini var--inline-flex var-button--warning var-elevation--2\\">
168+
</button>
169+
<button class=\\"var-button var--box var-button--mini var--inline-flex var-button--warning var-elevation--2\\">
151170
<!--v-if-->
152171
<div class=\\"var-button__content\\">迷你按钮</div>
153-
</button><button class=\\"var-button var--box var-button--large var--inline-flex var-button--danger var-elevation--2\\">
172+
</button>
173+
<button class=\\"var-button var--box var-button--large var--inline-flex var-button--danger var-elevation--2\\">
154174
<!--v-if-->
155175
<div class=\\"var-button__content\\">大型按钮</div>
156176
</button>
157-
<div class=\\"app-type\\">块级按钮</div><button class=\\"var-button var--box var-button--normal var--flex var-button--block var-button--primary var-elevation--2\\">
177+
<div class=\\"app-type\\">块级按钮</div>
178+
<button class=\\"var-button var--box var-button--normal var--flex var-button--block var-button--primary var-elevation--2\\">
158179
<!--v-if-->
159180
<div class=\\"var-button__content\\">块级按钮</div>
160181
</button>
161-
<div class=\\"app-type\\">自定义颜色</div><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--default var-elevation--2\\" style=\\"color: rgb(238, 238, 238); background: rgb(105, 219, 170);\\">
182+
<div class=\\"app-type\\">自定义颜色</div>
183+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--default var-elevation--2\\" style=\\"color: rgb(238, 238, 238); background: rgb(105, 219, 170);\\">
162184
<!--v-if-->
163185
<div class=\\"var-button__content\\">背景/文字</div>
164-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--default var-elevation--2\\" style=\\"color: rgb(255, 255, 255);\\">
186+
</button>
187+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--default var-elevation--2\\" style=\\"color: rgb(255, 255, 255);\\">
165188
<!--v-if-->
166189
<div class=\\"var-button__content\\">使用渐变</div>
167190
</button>
168-
<div class=\\"app-type\\">圆形按钮</div><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--primary var-elevation--2 var-button--round\\">
191+
<div class=\\"app-type\\">圆形按钮</div>
192+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--primary var-elevation--2 var-button--round\\">
169193
<!--v-if-->
170194
<div class=\\"var-button__content\\"><i class=\\"var-icon var-icon--set var-icon-plus\\" style=\\"transition: transform 0ms;\\"></i></div>
171-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--info var-elevation--2 var-button--round\\">
195+
</button>
196+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--info var-elevation--2 var-button--round\\">
172197
<!--v-if-->
173198
<div class=\\"var-button__content\\"><i class=\\"var-icon var-icon--set var-icon-information\\" style=\\"transition: transform 0ms;\\"></i></div>
174-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2 var-button--round\\">
199+
</button>
200+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2 var-button--round\\">
175201
<!--v-if-->
176202
<div class=\\"var-button__content\\"><i class=\\"var-icon var-icon--set var-icon-check\\" style=\\"transition: transform 0ms;\\"></i></div>
177-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--warning var-elevation--2 var-button--round\\">
203+
</button>
204+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--warning var-elevation--2 var-button--round\\">
178205
<!--v-if-->
179206
<div class=\\"var-button__content\\"><i class=\\"var-icon var-icon--set var-icon-warning\\" style=\\"transition: transform 0ms;\\"></i></div>
180-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--danger var-elevation--2 var-button--round\\">
207+
</button>
208+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--danger var-elevation--2 var-button--round\\">
181209
<!--v-if-->
182210
<div class=\\"var-button__content\\"><i class=\\"var-icon var-icon--set var-icon-window-close\\" style=\\"transition: transform 0ms;\\"></i></div>
183211
</button>
184-
<div class=\\"app-type\\">注册事件</div><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2\\">
212+
<div class=\\"app-type\\">注册事件</div>
213+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2\\">
185214
<!--v-if-->
186215
<div class=\\"var-button__content\\">点击</div>
187-
</button><button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2\\">
216+
</button>
217+
<button class=\\"var-button var--box var-button--normal var--inline-flex var-button--success var-elevation--2\\">
188218
<!--v-if-->
189219
<div class=\\"var-button__content\\">触摸</div>
190220
</button>"

0 commit comments

Comments
 (0)