Merge branch 'main' into basepath

Author: kermanx

packages/client/pages/export.vue

@@ -351,6 +351,10 @@ h2 {
 #export-content {
   --uno: pointer-events-none;
 }
+
+#export-container {
+  --slidev-slide-container-scale: var(--slidev-slide-scale);
+}
 </style>
 
 <style>

packages/slidev/node/utils.ts

@@ -105,6 +105,7 @@ export function getBodyJson(req: Connect.IncomingMessage) {
 }
 
 export function makeAbsoluteImportGlob(
+  mode: string,
   userRoot: string,
   globs: string[],
   options: Partial<GeneralImportGlobOptions> = {},
@@ -114,7 +115,7 @@ export function makeAbsoluteImportGlob(
   const opts: GeneralImportGlobOptions = {
     eager: true,
     exhaustive: true,
-    base: '/',
+    base: mode === 'build' ? userRoot : '/',
     ...options,
   }
   return `import.meta.glob(${JSON.stringify(relativeGlobs)}, ${JSON.stringify(opts)})`

packages/slidev/node/virtual/conditional-styles.ts

@@ -5,11 +5,11 @@ import { makeAbsoluteImportGlob } from '../utils'
 
 export const templateConditionalStyles: VirtualModuleTemplate = {
   id: '/@slidev/conditional-styles',
-  async getContent({ data, userRoot, roots }) {
+  async getContent({ mode, data, userRoot, roots }) {
     const imports: string[] = []
 
     for (const root of roots) {
-      imports.push(makeAbsoluteImportGlob(userRoot, [
+      imports.push(makeAbsoluteImportGlob(mode, userRoot, [
         join(root, 'styles/index.{ts,js,css}'),
         join(root, 'styles.{ts,js,css}'),
         join(root, 'style.{ts,js,css}'),

packages/slidev/node/virtual/global-layers.ts

@@ -4,13 +4,13 @@ import { makeAbsoluteImportGlob } from '../utils'
 
 export const templateGlobalLayers: VirtualModuleTemplate = {
   id: `/@slidev/global-layers`,
-  getContent({ userRoot, roots }) {
+  getContent({ mode, userRoot, roots }) {
     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(userRoot, globs, { import: 'default' })
+        yield makeAbsoluteImportGlob(mode, userRoot, globs, { import: 'default' })
         yield ')[0],\n'
       }
       yield `].filter(Boolean)\n`

packages/slidev/node/virtual/setups.ts

@@ -5,10 +5,10 @@ import { makeAbsoluteImportGlob } from '../utils'
 function createSetupTemplate(name: string): VirtualModuleTemplate {
   return {
     id: `/@slidev/setups/${name}`,
-    getContent({ userRoot, roots }) {
+    getContent({ mode, userRoot, roots }) {
       const globs = roots.map((root) => {
         const glob = join(root, `setup/${name}.{ts,js,mts,mjs}`)
-        return `Object.values(${makeAbsoluteImportGlob(userRoot, [glob], { import: 'default' })})[0]`
+        return `Object.values(${makeAbsoluteImportGlob(mode, userRoot, [glob], { import: 'default' })})[0]`
       })
       return `export default [${globs.join(', ')}].filter(Boolean)`
     },

pnpm-lock.yaml

@@ -92,7 +92,7 @@ catalogs:
     monaco-editor: ^0.55.1
   prod:
     '@antfu/ni': ^30.0.0
-    '@comark/markdown-it': ^0.3.2
+    '@comark/markdown-it': ^0.3.3
     '@hedgedoc/markdown-it-plugins': ^2.1.4
     '@lillallol/outline-pdf': ^4.0.0
     '@shikijs/twoslash': ^4.0.2