Merge tag 'v52.15.1' into merge/upstream-52.14.2

ryan-williams · ryan-williams · commit ed3b5ee5da58 · 2026-05-08T12:58:03.000-04:00
diff --git a/docs/package.json b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@slidev/docs",
   "type": "module",
-  "version": "52.15.0",
+  "version": "52.15.1",
   "license": "MIT",
   "funding": "https://github.com/sponsors/antfu",
   "homepage": "https://sli.dev",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "type": "module",
-  "version": "52.15.0",
+  "version": "52.15.1",
   "private": true,
   "packageManager": "pnpm@10.33.2",
   "engines": {
diff --git a/packages/client/internals/DrawingControls.vue b/packages/client/internals/DrawingControls.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { Menu } from 'floating-vue'
+import { Dropdown } from 'floating-vue'
+import { ref } from 'vue'
 import { useDrawings } from '../composables/useDrawings'
 import Draggable from './Draggable.vue'
 import IconButton from './IconButton.vue'
@@ -18,6 +19,23 @@ const {
   brushColors,
 } = useDrawings()
 
+const strokeWidthDropdownShown = ref(false)
+
+function showStrokeWidthDropdown(event: Event) {
+  event.preventDefault()
+  event.stopPropagation()
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      strokeWidthDropdownShown.value = true
+    })
+  })
+}
+
+function showStrokeWidthDropdownForPointer(event: PointerEvent) {
+  if (event.pointerType !== 'mouse')
+    showStrokeWidthDropdown(event)
+}
+
 function undo() {
   drauu.undo()
 }
@@ -71,8 +89,8 @@ function setBrushColor(color: string) {
 
     <VerticalDivider />
 
-    <Menu>
-      <IconButton title="Adjust stroke width" :class="{ shallow: drawingMode === 'eraseLine' }">
+    <Dropdown v-model:shown="strokeWidthDropdownShown" :triggers="[]">
+      <IconButton title="Adjust stroke width" :class="{ shallow: drawingMode === 'eraseLine' }" @click="showStrokeWidthDropdown" @pointerdown="showStrokeWidthDropdownForPointer" @pointerup="showStrokeWidthDropdownForPointer" @touchend="showStrokeWidthDropdown">
         <svg viewBox="0 0 32 32" width="1.2em" height="1.2em">
           <line x1="2" y1="15" x2="22" y2="4" stroke="currentColor" stroke-width="1" stroke-linecap="round" />
           <line x1="2" y1="24" x2="28" y2="10" stroke="currentColor" stroke-width="2" stroke-linecap="round" />
@@ -89,7 +107,7 @@ function setBrushColor(color: string) {
           </div>
         </div>
       </template>
-    </Menu>
+    </Dropdown>
     <IconButton
       v-for="color of brushColors"
       :key="color"
@@ -134,7 +152,7 @@ function setBrushColor(color: string) {
 </template>
 
 <style>
-.v-popper--theme-menu .v-popper__arrow-inner {
+.v-popper--theme-dropdown .v-popper__arrow-inner {
   --uno: border-main;
 }
 </style>
diff --git a/packages/client/logic/recording.ts b/packages/client/logic/recording.ts
@@ -2,8 +2,8 @@ import type RecorderType from 'recordrtc'
 import type { Options as RecorderOptions } from 'recordrtc'
 import type { Ref } from 'vue'
 import { isTruthy } from '@antfu/utils'
+import { fixWebmDuration } from '@fix-webm-duration/fix'
 import { useDevicesList, useEventListener, useLocalStorage } from '@vueuse/core'
-import fixWebmDuration from 'fix-webm-duration'
 import { nextTick, ref, shallowRef, watch } from 'vue'
 import { currentCamera, currentMic } from '../state'
 
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@slidev/client",
   "type": "module",
-  "version": "52.15.0",
+  "version": "52.15.1",
   "description": "Presentation slides for developers",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "@antfu/utils": "catalog:frontend",
+    "@fix-webm-duration/fix": "catalog:frontend",
     "@iconify-json/carbon": "catalog:icons",
     "@iconify-json/ph": "catalog:icons",
     "@iconify-json/svg-spinners": "catalog:icons",
@@ -49,7 +50,6 @@
     "ansis": "catalog:prod",
     "drauu": "catalog:frontend",
     "file-saver": "catalog:frontend",
-    "fix-webm-duration": "catalog:frontend",
     "floating-vue": "catalog:frontend",
     "fuse.js": "catalog:frontend",
     "katex": "catalog:frontend",
diff --git a/packages/create-app/index.mjs b/packages/create-app/index.mjs
@@ -25,7 +25,6 @@ const RE_NON_ALPHANUMERIC = /[^a-z0-9-~]+/g
 
 const renameFiles = {
   _gitignore: '.gitignore',
-  _npmrc: '.npmrc',
 }
 
 async function init() {
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "create-slidev",
   "type": "module",
-  "version": "52.15.0",
+  "version": "52.15.1",
   "description": "Create starter template for Slidev",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
diff --git a/packages/create-app/template/_npmrc b/packages/create-app/template/_npmrc
diff --git a/packages/create-app/template/package.json b/packages/create-app/template/package.json
@@ -8,7 +8,7 @@
     "export": "slidev export"
   },
   "dependencies": {
-    "@slidev/cli": "^52.15.0",
+    "@slidev/cli": "^52.15.1",
     "@slidev/theme-default": "latest",
     "@slidev/theme-seriph": "latest",
     "vue": "^3.5.33"
diff --git a/packages/create-app/template/pnpm-workspace.yaml b/packages/create-app/template/pnpm-workspace.yaml
@@ -0,0 +1 @@
+shamefullyHoist: true
diff --git a/packages/create-theme/package.json b/packages/create-theme/package.json
@@ -1,7 +1,7 @@
 {
   "name": "create-slidev-theme",
   "type": "module",
-  "version": "52.15.0",
+  "version": "52.15.1",
   "description": "Create starter theme template for Slidev",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
diff --git a/packages/create-theme/template/package.json b/packages/create-theme/template/package.json
@@ -14,10 +14,10 @@
     "screenshot": "slidev export example.md --format png"
   },
   "dependencies": {
-    "@slidev/types": "^52.15.0"
+    "@slidev/types": "^52.15.1"
   },
   "devDependencies": {
-    "@slidev/cli": "^52.15.0"
+    "@slidev/cli": "^52.15.1"
   },
   "//": "Learn more: https://sli.dev/guide/write-theme.html",
   "slidev": {
diff --git a/packages/parser/package.json b/packages/parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@slidev/parser",
-  "version": "52.15.0",
+  "version": "52.15.1",
   "description": "Markdown parser for Slidev",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
diff --git a/packages/slidev/node/commands/export.ts b/packages/slidev/node/commands/export.ts
@@ -278,7 +278,7 @@ export async function exportSlides({
     // Wait for frames to load
     {
       const frames = page.frames()
-      await Promise.all(frames.map(frame => frame.waitForLoadState()))
+      await Promise.all(frames.map(frame => frame.waitForLoadState(undefined, { timeout })))
     }
     // Wait for Mermaid graphs to be rendered
     {
diff --git a/packages/slidev/node/utils.ts b/packages/slidev/node/utils.ts
@@ -1,7 +1,7 @@
 import type { ResolvedFontOptions, SourceSlideInfo } from '@slidev/types'
 import type MarkdownExit from 'markdown-exit'
 import type { Connect, GeneralImportGlobOptions } from 'vite'
-import { relative } from 'node:path'
+import { relative, win32 } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { slash } from '@antfu/utils'
 import { createJiti } from 'jiti'
@@ -10,6 +10,7 @@ import YAML from 'yaml'
 const RE_WHITESPACE_ONLY = /^\s*$/
 const RE_QUOTED_STRING = /^(['"])(.*)\1$/
 const RE_WHITESPACE = /\s+/g
+const RE_WINDOWS_DRIVE = /^[A-Z]:\//i
 
 type Token = ReturnType<MarkdownExit['parseInline']>[number]
 
@@ -104,16 +105,38 @@ export function getBodyJson(req: Connect.IncomingMessage) {
   })
 }
 
+function getImportGlobRelativePath(from: string, to: string) {
+  const normalizedFrom = slash(from)
+  const normalizedTo = slash(to)
+  return slash(
+    RE_WINDOWS_DRIVE.test(normalizedFrom) || RE_WINDOWS_DRIVE.test(normalizedTo)
+      ? win32.relative(normalizedFrom, normalizedTo)
+      : relative(normalizedFrom, normalizedTo),
+  )
+}
+
 export function makeAbsoluteImportGlob(
   self: string,
   globs: string[],
   options: Partial<GeneralImportGlobOptions> = {},
+  baseRoot?: string,
 ) {
-  // Vite's import.meta.glob only supports relative paths
-  const relativeGlobs = globs.map(glob => `${slash(relative(self, glob))}`)
+  // Vite's import.meta.glob only supports relative paths. On Windows, though,
+  // resolving drive-letter paths from a virtual /@slidev module can drop the
+  // drive prefix. Use Vite's root-relative form for those paths instead.
+  const root = baseRoot && globs.some(glob => RE_WINDOWS_DRIVE.test(slash(glob)))
+    ? baseRoot
+    : undefined
+  const relativeGlobs = globs.map((glob) => {
+    const relativeGlob = getImportGlobRelativePath(root ?? self, glob)
+    return root && !relativeGlob.startsWith('.') && !RE_WINDOWS_DRIVE.test(relativeGlob)
+      ? `./${relativeGlob}`
+      : relativeGlob
+  })
   const opts: GeneralImportGlobOptions = {
     eager: true,
     exhaustive: true,
+    ...(root ? { base: '/' } : {}),
     ...options,
   }
   return `import.meta.glob(${JSON.stringify(relativeGlobs)}, ${JSON.stringify(opts)})`
diff --git a/packages/slidev/node/virtual/conditional-styles.ts b/packages/slidev/node/virtual/conditional-styles.ts
@@ -7,15 +7,15 @@ const id = '/@slidev/conditional-styles'
 
 export const templateConditionalStyles: VirtualModuleTemplate = {
   id,
-  async getContent({ data, roots }) {
+  async getContent({ data, roots, userRoot }) {
     const imports: string[] = []
 
     for (const root of roots) {
       imports.push(makeAbsoluteImportGlob(id, [
         join(root, 'styles/index.{ts,js,css}'),
         join(root, 'styles.{ts,js,css}'),
         join(root, 'style.{ts,js,css}'),
-      ]))
+      ], {}, userRoot))
     }
 
     if (data.features.katex)
diff --git a/packages/slidev/node/virtual/global-layers.ts b/packages/slidev/node/virtual/global-layers.ts
@@ -6,13 +6,13 @@ const id = `/@slidev/global-layers`
 
 export const templateGlobalLayers: VirtualModuleTemplate = {
   id,
-  getContent({ roots }) {
+  getContent({ roots, userRoot }) {
     function* getComponent(name: string, names: string[]) {
       yield `const ${name}Components = [\n`
       for (const root of roots) {
         const globs = names.map(name => join(root, `${name}.{ts,js,vue}`))
         yield '  Object.values('
-        yield makeAbsoluteImportGlob(id, globs, { import: 'default' })
+        yield makeAbsoluteImportGlob(id, globs, { import: 'default' }, userRoot)
         yield ')[0],\n'
       }
       yield `].filter(Boolean)\n`
diff --git a/packages/slidev/node/virtual/setups.ts b/packages/slidev/node/virtual/setups.ts
@@ -6,10 +6,10 @@ function createSetupTemplate(name: string): VirtualModuleTemplate {
   const id = `/@slidev/setups/${name}`
   return {
     id,
-    getContent({ roots }) {
+    getContent({ roots, userRoot }) {
       const globs = roots.map((root) => {
         const glob = join(root, `setup/${name}.{ts,js,mts,mjs}`)
-        return `Object.values(${makeAbsoluteImportGlob(id, [glob], { import: 'default' })})[0]`
+        return `Object.values(${makeAbsoluteImportGlob(id, [glob], { import: 'default' }, userRoot)})[0]`
       })
       return `export default [${globs.join(', ')}].filter(Boolean)`
     },
diff --git a/packages/slidev/package.json b/packages/slidev/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@slidev/cli",
   "type": "module",
-  "version": "52.15.0",
+  "version": "52.15.1",
   "description": "Presentation slides for developers",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@slidev/types",
-  "version": "52.15.0",
+  "version": "52.15.1",
   "description": "Shared types declarations for Slidev",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
diff --git a/packages/vscode/package.json b/packages/vscode/package.json
@@ -4,7 +4,7 @@
   "displayName": "Slidev",
   "type": "module",
   "preview": true,
-  "version": "52.15.0",
+  "version": "52.15.1",
   "private": true,
   "description": "Slidev support for VS Code",
   "license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/test/utils.test.ts b/test/utils.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@slidev/docs",`
`3`	`3`	`"type": "module",`
`4`		`- "version": "52.15.0",`
	`4`	`+ "version": "52.15.1",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"funding": "https://github.com/sponsors/antfu",`
`7`	`7`	`"homepage": "https://sli.dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "module",`
`3`		`- "version": "52.15.0",`
	`3`	`+ "version": "52.15.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"packageManager": "pnpm@10.33.2",`
`6`	`6`	`"engines": {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ const RE_NON_ALPHANUMERIC = /[^a-z0-9-~]+/g`
`25`	`25`
`26`	`26`	`const renameFiles = {`
`27`	`27`	`_gitignore: '.gitignore',`
`28`		`- _npmrc: '.npmrc',`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`async function init() {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-slidev",`
`3`	`3`	`"type": "module",`
`4`		`- "version": "52.15.0",`
	`4`	`+ "version": "52.15.1",`
`5`	`5`	`"description": "Create starter template for Slidev",`
`6`	`6`	`"author": "Anthony Fu <anthonyfu117@hotmail.com>",`
`7`	`7`	`"license": "MIT",`