Merge pull request #437 from 07akioni/fix-dts-import

Fix import .d.ts as dependency
monounity · Mar 1, 2021 · b7e27ef · b7e27ef
2 parents 0fb19ea + 59c6401
commit b7e27ef
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/examples/angular2/package.json b/examples/angular2/package.json
@@ -30,6 +30,7 @@
     "karma-typescript": "latest",
     "karma-typescript-angular2-transform": "latest",
     "rxjs": "^6.5.4",
+    "csstype": "^3.0.7",
     "typescript": "latest"
   }
 }
diff --git a/examples/angular2/src/app/hello.ts b/examples/angular2/src/app/hello.ts
@@ -1,4 +1,6 @@
 import { Component } from "@angular/core";
+// Testing a type only import
+import { Properties } from 'csstype'
 
 @Component({
     selector: "app-hello",

diff --git a/packages/karma-typescript/src/bundler/bundle-item.ts b/packages/karma-typescript/src/bundler/bundle-item.ts
@@ -15,7 +15,7 @@ export class BundleItem {
     }
 
     public isScript(): boolean {
-        return (this.filename && /\.(js|jsx|mjs|ts|tsx)$/.test(this.filename))
+        return (this.filename && !this.isTypingsFile() && /\.(js|jsx|mjs|ts|tsx)$/.test(this.filename))
             || this.transformedScript;
     }
 

diff --git a/packages/karma-typescript/src/bundler/resolve/resolver.ts b/packages/karma-typescript/src/bundler/resolve/resolver.ts
@@ -195,14 +195,20 @@ export class Resolver {
                 return onFilenameResolved();
             }
 
-            // This is probably a compiler path module (.d.ts)
-            if (bundleItem.isNpmModule() && bundleItem.isTypingsFile() &&
-                bundleItem.filename.indexOf(bundleItem.moduleName) === -1) {
-                const filepath = PathTool.fixWindowsPath(bundleItem.filename);
-                const matches = filepath.match(/\/node_modules\/(.*)\//);
-                if (matches && matches[1]) {
-                    moduleName = matches[1];
-                    this.log.debug("Resolved module name [%s] to [%s]", bundleItem.moduleName, moduleName);
+
+            if (bundleItem.isNpmModule() && bundleItem.isTypingsFile()) {
+                // This is probably a compiler path module (.d.ts)
+                if (bundleItem.filename.indexOf(bundleItem.moduleName) === -1) {
+                  const filepath = PathTool.fixWindowsPath(bundleItem.filename);
+                  const matches = filepath.match(/\/node_modules\/(.*)\//);
+                  if (matches && matches[1]) {
+                      moduleName = matches[1];
+                      this.log.debug("Resolved module name [%s] to [%s]", bundleItem.moduleName, moduleName);
+                  }
+                }
+                // This is probably a type only module import
+                else {
+                  return onFilenameResolved()
                 }
             }