Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(loader): ensuring a cross-platform path #3

Merged
merged 1 commit into from
Apr 3, 2024
Merged
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
9 changes: 6 additions & 3 deletions packages/hot_hook/src/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import chokidar from 'chokidar'
import picomatch from 'picomatch'
import { realpath } from 'node:fs/promises'
import { MessagePort } from 'node:worker_threads'
import { fileURLToPath } from 'node:url'
import { resolve as pathResolve, dirname } from 'node:path'
import type { InitializeHook, LoadHook, ResolveHook } from 'node:module'

Expand Down Expand Up @@ -140,14 +141,16 @@ export class HotHookLoader {

const result = await nextResolve(specifier, context)
const resultUrl = new URL(result.url)
const resultPath = resultUrl.pathname
if (resultUrl.protocol !== 'file:') {
return result
}

const resultPath = fileURLToPath(resultUrl)
const parentPath = fileURLToPath(parentUrl)

const reloadable = context.importAttributes.hot === 'true' ? true : false
this.#dependencyTree.addDependency(parentUrl?.pathname, { path: resultPath, reloadable })
this.#dependencyTree.addDependent(resultPath, parentUrl?.pathname)
this.#dependencyTree.addDependency(parentPath, { path: resultPath, reloadable })
this.#dependencyTree.addDependent(resultPath, parentPath)

if (this.#pathIgnoredMatcher.match(resultPath)) {
return result
Expand Down
Loading