fix: fix HMR in windows port

alephjs · Oct 25, 2020 · 86bb340 · 86bb340
1 parent f2a98b0
commit 86bb340
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/project.ts b/project.ts
@@ -663,7 +663,7 @@ export class Project {
  log.info('Start watching code changes...')
  for await (const event of w) {
  for (const p of event.paths) {
- const path = '/' + util.trimPrefix(util.trimPrefix(p, this.appRoot), '/')
+ const path = util.cleanPath(util.trimPrefix(p, this.appRoot))
  // handle `api` dir remove directly
  const validated = (() => {
  if (!reModuleExt.test(path) && !reStyleModuleExt.test(path) && !reMDExt.test(path)) {
@@ -1429,7 +1429,7 @@ Object.assign(globalThis, {
 
 /** inject HMR and React Fast Referesh helper code */
 export function injectHmr({ id, sourceFilePath, jsContent }: Module): string {
- let hmrImportPath = path.relative(
+ let hmrImportPath = getRelativePath(
  path.dirname(sourceFilePath),
  '/-/deno.land/x/aleph/hmr.js'
  )

diff --git a/server.ts b/server.ts
@@ -48,7 +48,7 @@ export async function start(appDir: string, port: number, isDev = false, reload
  type: 'update',
  moduleId: mod.id,
  hash,
- updateUrl: path.join('/', project.config.baseUrl, '/_aleph/', mod.id.replace(/\.js$/, '') + `.${hash!.slice(0, hashShort)}.js`)
+ updateUrl: util.cleanPath(`${project.config.baseUrl}/_aleph/${mod.id.replace(/\.js$/, '')}.${hash!.slice(0, hashShort)}.js`)
  })))
  }
  }

diff --git a/util.ts b/util.ts
@@ -126,7 +126,7 @@ export default {
  },
  splitPath(path: string): string[] {
  return path
- .split('/')
+ .split(/[\/\\]/g)
  .map(p => p.trim())
  .filter(p => p !== '' && p !== '.')
  .reduce((path, p) => {