Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set node version to 22
uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
with:
node-version: '22.x'
node-version: '22.18.0'
cache: 'pnpm'

- name: Install dependencies
Expand Down
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# vite-plus preview build registry bridge (auto-added by vp)
registry=https://registry-bridge.viteplus.dev/
16 changes: 13 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,18 @@
"packageManager": "pnpm@9.15.9",
"pnpm": {
"overrides": {
"vite": "catalog:",
"vitest": "catalog:"
"vite@*": "catalog:",
"vitest@*": "catalog:"
},
"peerDependencyRules": {
"allowAny": [
"vite",
"vitest"
],
"allowedVersions": {
"vite": "*",
"vitest": "*"
}
}
}
}
}
1 change: 1 addition & 0 deletions packages/varlet-cli/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vitest/
1 change: 1 addition & 0 deletions packages/varlet-ui/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vitest/
5 changes: 4 additions & 1 deletion packages/varlet-ui/src/sticky/Sticky.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ export default defineComponent({

onSmartMounted(async () => {
await doubleRaf()
if (!stickyEl.value) {
return
}
setupScroller()
handleScroll()
})
Expand All @@ -77,7 +80,7 @@ export default defineComponent({
function computeFixedParams(): StickyFixedParams | undefined {
const { cssMode, disabled } = props

if (disabled) {
if (disabled || !stickyEl.value || !wrapperEl.value) {
return
}

Expand Down
4 changes: 2 additions & 2 deletions packages/varlet-ui/types/select.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ export class Select extends VarComponent {
$props: SelectProps

$slots: {
'selected'(): VNode[]
selected(): VNode[]
'prepend-icon'(): VNode[]
'clear-icon'(data: SelectClearIconData): VNode[]
'append-icon'(): VNode[]
'arrow-icon'(data: SelectArrowIconData): VNode[]
'empty'(): VNode[]
empty(): VNode[]
}

focus(): void
Expand Down
2,422 changes: 1,483 additions & 939 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ catalog:
typescript: 5.6.3
vue: 3.5.21
vue-router: 4.5.1
vite: 'npm:@voidzero-dev/vite-plus-core@0.2.6'
vitest: 4.1.10
vite: npm:@voidzero-dev/vite-plus-core@0.0.0-commit.e0f77ee2353b38c77d7165d3305f9f6d705b4d62
vitest: 5.0.1
jsdom: 26.1.0
fs-extra: ^9.0.1
live-server: ^1.2.1
rimraf: ^5.0.1
tinyexec: ^0.3.0
rattail: ^2.1.1
vite-plus: 0.2.6
vite-plus: 0.0.0-commit.e0f77ee2353b38c77d7165d3305f9f6d705b4d62
'@types/node': ^20.19.0
'@vitest/coverage-istanbul': 4.1.10
'@vitest/coverage-istanbul': 5.0.1
'@vue/runtime-core': 3.5.21
'@vue/compiler-sfc': 3.5.21
'@vitejs/plugin-vue': 6.0.6
Expand Down
Loading