Skip to content
Merged
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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"demo:dev": "pnpm -C demo/starter run dev",
"vscode:dev": "pnpm -C packages/vscode run dev",
"play": "pnpm demo:dev",
"dev": "pnpm -r --filter=./packages/** --parallel run dev",
"dev": "pnpm -r --filter=\"./packages/**\" --parallel run dev",
"lint": "eslint . --cache",
"lint:fix": "nr lint --fix",
"typecheck": "vue-tsc --noEmit",
"docs": "pnpm -C docs run dev",
"docs:build": "pnpm run --filter {./docs}... build && pnpm demo:build",
"docs:build": "pnpm run --filter=\"./docs\"... build && pnpm demo:build",
"release": "bumpp package.json packages/*/package.json docs/package.json --all -x \"zx scripts/update-versions.mjs\"",
"test": "vitest test",
"prepare": "simple-git-hooks"
Expand Down
36 changes: 24 additions & 12 deletions packages/slidev/node/vite/loaders.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ResolvedSlidevOptions, SlideInfo, SlidePatch, SlidevData, SlidevServerOptions } from '@slidev/types'
import type { LoadResult } from 'rollup'
import type { Plugin, ViteDevServer } from 'vite'
import type { ModuleNode, Plugin, ViteDevServer } from 'vite'
import { notNullish, range } from '@antfu/utils'
import * as parser from '@slidev/parser/fs'
import equal from 'fast-deep-equal'
Expand Down Expand Up @@ -232,20 +232,32 @@ export function createSlidesLoader(
if (hmrSlidesIndexes.size > 0)
moduleIds.add(templateTitleRendererMd.id)

const vueModules = Array.from(hmrSlidesIndexes)
.flatMap((idx) => {
const frontmatter = ctx.server.moduleGraph.getModuleById(sourceIds.frontmatter[idx])
const main = ctx.server.moduleGraph.getModuleById(sourceIds.md[idx])
const styles = main ? [...main.clientImportedModules].find(m => m.id?.includes(`&type=style`)) : undefined
return [
frontmatter,
main,
styles,
]
})
for (const idx of hmrSlidesIndexes) {
moduleIds.add(sourceIds.frontmatter[idx])
}

const reloadBeforeOthers: ModuleNode[] = []
const vueModules: ModuleNode[] = []
for (const idx of hmrSlidesIndexes) {
const main = ctx.server.moduleGraph.getModuleById(sourceIds.md[idx])
if (main) {
const styles = [...main.clientImportedModules].filter(m => m.id?.includes(`&type=style`))
if (styles.length) {
// `pluginVue.transform(mainModule)` must be called before `pluginVue.load(styleModule)`
// to refresh the internal descriptor cache of `@vitejs/plugin-vue`
reloadBeforeOthers.push(main)
vueModules.push(...styles)
}
else {
vueModules.push(main)
}
}
}

hmrSlidesIndexes.clear()

await Promise.all(reloadBeforeOthers.map(m => ctx.server.reloadModule(m)))

const moduleEntries = [
...ctx.modules.filter(i => i.id === templateMonacoRunDeps.id || i.id === templateMonacoTypes.id),
...vueModules,
Expand Down
Loading