From d69e90a90df3d7367eb9cb0bd10ec5f3ad21033a Mon Sep 17 00:00:00 2001 From: axetroy Date: Tue, 11 Feb 2020 16:37:39 +0800 Subject: [PATCH] fix: Module index is incorrect. close #47 --- typescript-deno-plugin/src/module_resolver.ts | 8 ++++---- typescript-deno-plugin/src/plugin.ts | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/typescript-deno-plugin/src/module_resolver.ts b/typescript-deno-plugin/src/module_resolver.ts index b1f8369..740d06b 100644 --- a/typescript-deno-plugin/src/module_resolver.ts +++ b/typescript-deno-plugin/src/module_resolver.ts @@ -52,9 +52,6 @@ export class ModuleResolver { // resolve `http/server.ts` -> `https://deno.land/std/http/server.ts` moduleName = this.resolveModuleNameFromImportMaps(moduleName); - // cover `https://example.com/mod.ts` -> `$DENO_DIR/deps/https/example.com/mod.ts` - moduleName = this.convertRemoteToLocalCache(moduleName); - // if module is ESM. Then the module name may contain url query and url hash // We need to remove it moduleName = trimQueryAndHashFromPath(moduleName); @@ -66,7 +63,10 @@ export class ModuleResolver { // import "/npm:react@16.12.0/cjs/react.development.dew.js"; // import "/npm:object-assign@4?dew"; // import "/npm:prop-types@15/checkPropTypes?dew"; - moduleName = resolvedModule.filepath = this.resolveFromDenoDir( + moduleName = this.resolveFromDenoDir(moduleName); + + // cover `https://example.com/mod.ts` -> `$DENO_DIR/deps/https/example.com/mod.ts` + moduleName = resolvedModule.filepath = this.convertRemoteToLocalCache( moduleName ); diff --git a/typescript-deno-plugin/src/plugin.ts b/typescript-deno-plugin/src/plugin.ts index 2749cc4..91b59c9 100644 --- a/typescript-deno-plugin/src/plugin.ts +++ b/typescript-deno-plugin/src/plugin.ts @@ -191,8 +191,6 @@ export class DenoPlugin implements ts_module.server.PluginModule { ); } - this.logger.info(`workspace dir ${info.project.getCurrentDirectory()}`); - const resolver = new ModuleResolver( containingFile, this.logger,