Skip to content

Commit

Permalink
- fix for #144
Browse files Browse the repository at this point in the history
  • Loading branch information
ezolenko committed Mar 13, 2019
1 parent 84a1588 commit 6572018
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions dist/rollup-plugin-typescript2.cjs.js
Expand Up @@ -26523,23 +26523,23 @@ const typescript = (options) => {
if (importee === TSLIB)
return "\0" + TSLIB;
if (!importer)
return false;
return;
importer = importer.split("\\").join("/");
// TODO: use module resolution cache
const result = tsModule.nodeModuleNameResolver(importee, importer, parsedConfig.options, tsModule.sys);
if (result.resolvedModule && result.resolvedModule.resolvedFileName) {
if (filter(result.resolvedModule.resolvedFileName))
cache().setDependency(result.resolvedModule.resolvedFileName, importer);
if (lodash_6(result.resolvedModule.resolvedFileName, ".d.ts"))
return false;
return;
const resolved = pluginOptions.rollupCommonJSResolveHack
? resolve.sync(result.resolvedModule.resolvedFileName)
: result.resolvedModule.resolvedFileName;
context.debug(() => `${safe_5("resolving")} '${importee}'`);
context.debug(() => ` to '${resolved}'`);
return resolved;
}
return false;
return;
},
load(id) {
if (id === "\0" + TSLIB)
Expand Down
2 changes: 1 addition & 1 deletion dist/rollup-plugin-typescript2.cjs.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/rollup-plugin-typescript2.es.js
Expand Up @@ -26519,23 +26519,23 @@ const typescript = (options) => {
if (importee === TSLIB)
return "\0" + TSLIB;
if (!importer)
return false;
return;
importer = importer.split("\\").join("/");
// TODO: use module resolution cache
const result = tsModule.nodeModuleNameResolver(importee, importer, parsedConfig.options, tsModule.sys);
if (result.resolvedModule && result.resolvedModule.resolvedFileName) {
if (filter(result.resolvedModule.resolvedFileName))
cache().setDependency(result.resolvedModule.resolvedFileName, importer);
if (lodash_6(result.resolvedModule.resolvedFileName, ".d.ts"))
return false;
return;
const resolved = pluginOptions.rollupCommonJSResolveHack
? sync(result.resolvedModule.resolvedFileName)
: result.resolvedModule.resolvedFileName;
context.debug(() => `${safe_5("resolving")} '${importee}'`);
context.debug(() => ` to '${resolved}'`);
return resolved;
}
return false;
return;
},
load(id) {
if (id === "\0" + TSLIB)
Expand Down
2 changes: 1 addition & 1 deletion dist/rollup-plugin-typescript2.es.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/index.ts
Expand Up @@ -115,7 +115,7 @@ const typescript: PluginImpl<Partial<IOptions>> = (options) =>
return "\0" + TSLIB;

if (!importer)
return false;
return;

importer = importer.split("\\").join("/");

Expand All @@ -128,7 +128,7 @@ const typescript: PluginImpl<Partial<IOptions>> = (options) =>
cache().setDependency(result.resolvedModule.resolvedFileName, importer);

if (_.endsWith(result.resolvedModule.resolvedFileName, ".d.ts"))
return false;
return;

const resolved = pluginOptions.rollupCommonJSResolveHack
? resolve.sync(result.resolvedModule.resolvedFileName)
Expand All @@ -140,7 +140,7 @@ const typescript: PluginImpl<Partial<IOptions>> = (options) =>
return resolved;
}

return false;
return;
},

load(id: string)
Expand Down

0 comments on commit 6572018

Please sign in to comment.