fix: Module index is incorrect. close #47

axetroy · Feb 11, 2020 · d69e90a · d69e90a
1 parent ed2b7a4
commit d69e90a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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:[email protected]/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
@@ -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,