- not trying to resolve imports unrelated to this plugin

- version #162
ezolenko · Aug 1, 2019 · b0a0ecb · b0a0ecb
1 parent 23420c4
commit b0a0ecb
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/dist/index.d.ts.map b/dist/index.d.ts.map
diff --git a/dist/rollup-plugin-typescript2.cjs.js b/dist/rollup-plugin-typescript2.cjs.js
@@ -26756,7 +26756,7 @@ const typescript = (options) => {
                     context.info(`rollup version: ${this.meta.rollupVersion}`);
                 if (!semver_31(tsModule.version, ">=2.4.0", { includePrerelease: true }))
                     throw new Error(`Installed typescript version '${tsModule.version}' is outside of supported range '>=2.4.0'`);
-                context.info(`rollup-plugin-typescript2 version: 0.22.2`);
+                context.info(`rollup-plugin-typescript2 version: 0.23.0`);
                 context.debug(() => `plugin options:\n${JSON.stringify(pluginOptions, (key, value) => key === "typescript" ? `version ${value.version}` : value, 4)}`);
                 context.debug(() => `rollup config:\n${JSON.stringify(rollupOptions, undefined, 4)}`);
                 context.debug(() => `tsconfig path: ${tsConfigPath}`);
@@ -26783,7 +26783,10 @@ const typescript = (options) => {
                 return "\0" + TSLIB;
             if (!importer)
                 return;
-            importer = importer.split("\\").join("/");
+            importer = normalize(importer);
+            // avoiding trying to resolve ids for things imported from files unrelated to this plugin
+            if (!allImportedFiles.has(importer))
+                return;
             // TODO: use module resolution cache
             const result = tsModule.nodeModuleNameResolver(importee, importer, parsedConfig.options, tsModule.sys);
             if (result.resolvedModule && result.resolvedModule.resolvedFileName) {

diff --git a/dist/rollup-plugin-typescript2.cjs.js.map b/dist/rollup-plugin-typescript2.cjs.js.map
diff --git a/dist/rollup-plugin-typescript2.es.js b/dist/rollup-plugin-typescript2.es.js
@@ -26752,7 +26752,7 @@ const typescript = (options) => {
                     context.info(`rollup version: ${this.meta.rollupVersion}`);
                 if (!semver_31(tsModule.version, ">=2.4.0", { includePrerelease: true }))
                     throw new Error(`Installed typescript version '${tsModule.version}' is outside of supported range '>=2.4.0'`);
-                context.info(`rollup-plugin-typescript2 version: 0.22.2`);
+                context.info(`rollup-plugin-typescript2 version: 0.23.0`);
                 context.debug(() => `plugin options:\n${JSON.stringify(pluginOptions, (key, value) => key === "typescript" ? `version ${value.version}` : value, 4)}`);
                 context.debug(() => `rollup config:\n${JSON.stringify(rollupOptions, undefined, 4)}`);
                 context.debug(() => `tsconfig path: ${tsConfigPath}`);
@@ -26779,7 +26779,10 @@ const typescript = (options) => {
                 return "\0" + TSLIB;
             if (!importer)
                 return;
-            importer = importer.split("\\").join("/");
+            importer = normalize(importer);
+            // avoiding trying to resolve ids for things imported from files unrelated to this plugin
+            if (!allImportedFiles.has(importer))
+                return;
             // TODO: use module resolution cache
             const result = tsModule.nodeModuleNameResolver(importee, importer, parsedConfig.options, tsModule.sys);
             if (result.resolvedModule && result.resolvedModule.resolvedFileName) {

diff --git a/dist/rollup-plugin-typescript2.es.js.map b/dist/rollup-plugin-typescript2.es.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-typescript2",
-  "version": "0.22.2",
+  "version": "0.23.0",
   "description": "Seamless integration between Rollup and TypeScript. Now with errors.",
   "main": "dist/rollup-plugin-typescript2.cjs.js",
   "module": "dist/rollup-plugin-typescript2.es.js",

diff --git a/src/index.ts b/src/index.ts
@@ -130,7 +130,11 @@ const typescript: PluginImpl<Partial<IOptions>> = (options) =>
 			if (!importer)
 				return;
 
-			importer = importer.split("\\").join("/");
+			importer = normalize(importer);
+
+			// avoiding trying to resolve ids for things imported from files unrelated to this plugin
+			if (!allImportedFiles.has(importer))
+				return;
 
 			// TODO: use module resolution cache
 			const result = tsModule.nodeModuleNameResolver(importee, importer, parsedConfig.options, tsModule.sys);