From 4f1705d3fc39cb7636b72844acec85e2cb349cd7 Mon Sep 17 00:00:00 2001 From: pikax Date: Thu, 7 May 2020 09:21:52 +0100 Subject: [PATCH 1/2] fix: fix resolve path on windows --- src/node/server/serverPluginModuleRewrite.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/server/serverPluginModuleRewrite.ts b/src/node/server/serverPluginModuleRewrite.ts index b64ff4dda902ae..437ac990a14d00 100644 --- a/src/node/server/serverPluginModuleRewrite.ts +++ b/src/node/server/serverPluginModuleRewrite.ts @@ -167,7 +167,7 @@ function rewriteImports( } } else { let pathname = cleanUrl( - slash(path.resolve(path.dirname(importer), id)) + slash(path.join(path.dirname(importer), id)) ) const queryMatch = id.match(queryRE) let query = queryMatch ? queryMatch[0] : '' From 398439493fab0d82444085f1a929ab735ff6ad29 Mon Sep 17 00:00:00 2001 From: pikax Date: Thu, 7 May 2020 10:08:48 +0100 Subject: [PATCH 2/2] fix: use path.posix to archive consistent behaviour --- src/node/server/serverPluginModuleRewrite.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/server/serverPluginModuleRewrite.ts b/src/node/server/serverPluginModuleRewrite.ts index 437ac990a14d00..55a96e46c00b15 100644 --- a/src/node/server/serverPluginModuleRewrite.ts +++ b/src/node/server/serverPluginModuleRewrite.ts @@ -167,7 +167,7 @@ function rewriteImports( } } else { let pathname = cleanUrl( - slash(path.join(path.dirname(importer), id)) + slash(path.posix.resolve(path.dirname(importer), id)) ) const queryMatch = id.match(queryRE) let query = queryMatch ? queryMatch[0] : ''