fix: merge

Author: Akryum

packages/demo/src/router.js

@@ -10,7 +10,7 @@ import ChatDemo from './components/ChatDemo.vue'
 import GridDemo from './components/GridDemo.vue'
 
 const router = createRouter({
- history: createWebHistory(process.env.BASE_URL),
+ history: createWebHistory(import.meta.env.BASE_URL),
  routes: [
  { path: '/', name: 'home', component: Home },
  { path: '/recycle', name: 'recycle', component: Recycle },

packages/vue-virtual-scroller/src/components/DynamicScroller.vue

@@ -27,7 +27,7 @@
  <template #after>
  <slot name="after" />
  </template>
- <template slot="empty">
+ <template #empty>
  <slot name="empty" />
  </template>
  </RecycleScroller>

packages/vue-virtual-scroller/src/components/RecycleScroller.vue

@@ -13,7 +13,6 @@
  v-if="$slots.before"
  ref="before"
  class="vue-recycle-scroller__slot"
- ref="before"
  >
  <slot
  name="before"
@@ -64,7 +63,6 @@
  v-if="$slots.after"
  ref="after"
  class="vue-recycle-scroller__slot"
- ref="after"
  >
  <slot
  name="after"
@@ -181,6 +179,8 @@ export default {
  'visible',
  'hidden',
  'update',
+ 'scroll-start',
+ 'scroll-end',
  ],
 
  data () {
@@ -700,7 +700,7 @@ export default {
  let scrollDistance
 
  if (this.pageMode) {
- const viewportEl = ScrollParent(this.$el)
+ const viewportEl = getScrollParent(this.$el)
  // HTML doesn't overflow like other elements
  const scrollTop = viewportEl.tagName === 'HTML' ? 0 : viewportEl[direction.scroll]
  const bounds = viewportEl.getBoundingClientRect()