Skip to content

Commit b0a0ecb

Browse files
committed
- not trying to resolve imports unrelated to this plugin
- version #162
1 parent 23420c4 commit b0a0ecb

7 files changed

+19
-9
lines changed

dist/index.d.ts.map

+1-1
Original file line numberDiff line numberDiff line change

dist/rollup-plugin-typescript2.cjs.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -26756,7 +26756,7 @@ const typescript = (options) => {
2675626756
context.info(`rollup version: ${this.meta.rollupVersion}`);
2675726757
if (!semver_31(tsModule.version, ">=2.4.0", { includePrerelease: true }))
2675826758
throw new Error(`Installed typescript version '${tsModule.version}' is outside of supported range '>=2.4.0'`);
26759-
context.info(`rollup-plugin-typescript2 version: 0.22.2`);
26759+
context.info(`rollup-plugin-typescript2 version: 0.23.0`);
2676026760
context.debug(() => `plugin options:\n${JSON.stringify(pluginOptions, (key, value) => key === "typescript" ? `version ${value.version}` : value, 4)}`);
2676126761
context.debug(() => `rollup config:\n${JSON.stringify(rollupOptions, undefined, 4)}`);
2676226762
context.debug(() => `tsconfig path: ${tsConfigPath}`);
@@ -26783,7 +26783,10 @@ const typescript = (options) => {
2678326783
return "\0" + TSLIB;
2678426784
if (!importer)
2678526785
return;
26786-
importer = importer.split("\\").join("/");
26786+
importer = normalize(importer);
26787+
// avoiding trying to resolve ids for things imported from files unrelated to this plugin
26788+
if (!allImportedFiles.has(importer))
26789+
return;
2678726790
// TODO: use module resolution cache
2678826791
const result = tsModule.nodeModuleNameResolver(importee, importer, parsedConfig.options, tsModule.sys);
2678926792
if (result.resolvedModule && result.resolvedModule.resolvedFileName) {

dist/rollup-plugin-typescript2.cjs.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rollup-plugin-typescript2.es.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -26752,7 +26752,7 @@ const typescript = (options) => {
2675226752
context.info(`rollup version: ${this.meta.rollupVersion}`);
2675326753
if (!semver_31(tsModule.version, ">=2.4.0", { includePrerelease: true }))
2675426754
throw new Error(`Installed typescript version '${tsModule.version}' is outside of supported range '>=2.4.0'`);
26755-
context.info(`rollup-plugin-typescript2 version: 0.22.2`);
26755+
context.info(`rollup-plugin-typescript2 version: 0.23.0`);
2675626756
context.debug(() => `plugin options:\n${JSON.stringify(pluginOptions, (key, value) => key === "typescript" ? `version ${value.version}` : value, 4)}`);
2675726757
context.debug(() => `rollup config:\n${JSON.stringify(rollupOptions, undefined, 4)}`);
2675826758
context.debug(() => `tsconfig path: ${tsConfigPath}`);
@@ -26779,7 +26779,10 @@ const typescript = (options) => {
2677926779
return "\0" + TSLIB;
2678026780
if (!importer)
2678126781
return;
26782-
importer = importer.split("\\").join("/");
26782+
importer = normalize(importer);
26783+
// avoiding trying to resolve ids for things imported from files unrelated to this plugin
26784+
if (!allImportedFiles.has(importer))
26785+
return;
2678326786
// TODO: use module resolution cache
2678426787
const result = tsModule.nodeModuleNameResolver(importee, importer, parsedConfig.options, tsModule.sys);
2678526788
if (result.resolvedModule && result.resolvedModule.resolvedFileName) {

dist/rollup-plugin-typescript2.es.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rollup-plugin-typescript2",
3-
"version": "0.22.2",
3+
"version": "0.23.0",
44
"description": "Seamless integration between Rollup and TypeScript. Now with errors.",
55
"main": "dist/rollup-plugin-typescript2.cjs.js",
66
"module": "dist/rollup-plugin-typescript2.es.js",

src/index.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,11 @@ const typescript: PluginImpl<Partial<IOptions>> = (options) =>
130130
if (!importer)
131131
return;
132132

133-
importer = importer.split("\\").join("/");
133+
importer = normalize(importer);
134+
135+
// avoiding trying to resolve ids for things imported from files unrelated to this plugin
136+
if (!allImportedFiles.has(importer))
137+
return;
134138

135139
// TODO: use module resolution cache
136140
const result = tsModule.nodeModuleNameResolver(importee, importer, parsedConfig.options, tsModule.sys);

0 commit comments

Comments
 (0)