Skip to content

Commit d9314e7

Browse files
committed
fix: hmr
1 parent 656e3ad commit d9314e7

File tree

3 files changed

+10
-17
lines changed

3 files changed

+10
-17
lines changed

packages/client/logic/recording.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ export function useRecording() {
143143
)
144144

145145
recorderSlides.value.startRecording()
146-
console.log('started')
147146
recording.value = true
148147
}
149148

packages/client/state/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useMagicKeys, useActiveElement, useStorage, useUrlSearchParams, useBreakpoints, breakpointsTailwind, useWindowSize, useFullscreen, useToggle, isClient } from '@vueuse/core'
2-
import { computed, ref, watch } from 'vue'
2+
import { computed, ref } from 'vue'
33

44
export const showOverview = ref(false)
55
export const showRecordingDialog = ref(false)
@@ -27,5 +27,3 @@ export const editorWidth = useStorage('slidev-editor-width', isClient ? window.i
2727
export const isPrintMode = computed(() => query.print != null)
2828

2929
export const toggleOverview = useToggle(showOverview)
30-
31-
watch(activeElement, () => console.log(activeElement.value))

packages/slidev/node/plugins/loaders.ts

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,34 +148,31 @@ export function createSlidesLoader(
148148
hmrPages.add(i)
149149
}
150150

151+
pluginOptions.onDataReload?.(newData, data)
152+
Object.assign(data, newData)
153+
151154
const modules = (
152155
await Promise.all(
153156
Array.from(hmrPages)
154157
.map(async(i) => {
155-
const id = `${slidePrefix}${i + 1}.md`
156-
const module = ctx.server.moduleGraph.getModuleById(id)
157-
158+
const file = `${slidePrefix}${i + 1}.md`
158159
return await VuePlugin.handleHotUpdate!({
159160
...ctx,
160-
modules: Array.from(module?.importedModules || []),
161-
file: id,
162-
read: () => (<any>MarkdownPlugin.transform)(newData.slides[i]?.raw, id),
163-
},
164-
)
161+
modules: Array.from(ctx.server.moduleGraph.getModulesByFile(file) || []),
162+
file,
163+
read: () => (<any>MarkdownPlugin.transform)(newData.slides[i]?.raw, file),
164+
})
165165
}),
166166
)
167167
).flatMap(i => i || [])
168-
169168
hmrPages.clear()
170169

171170
const moduleEntries = moduleIds
172171
.filter(isTruthy)
173172
.map(id => ctx.server.moduleGraph.getModuleById(id))
174173
.filter(notNullish)
175174
.concat(modules)
176-
177-
pluginOptions.onDataReload?.(newData, data)
178-
Object.assign(data, newData)
175+
.filter(i => !i.id?.startsWith('/@id/@vite-icons'))
179176

180177
return moduleEntries
181178
},
@@ -235,7 +232,6 @@ export function createSlidesLoader(
235232

236233
const imports = [
237234
`import InjectedLayout from "${toAtFS(layouts[layoutName])}"`,
238-
`import { next, nextSlide, prev, prevSlide } from "${toAtFS(clientRoot)}/logic/nav"`,
239235
]
240236

241237
code = code.replace(/(<script setup.*>)/g, `$1${imports.join('\n')}\n`)

0 commit comments

Comments
 (0)