[Fix] order: fix isExternalModule detect on windows

import-js · Feb 11, 2020 · e720ca8 · e720ca8
1 parent 45f0860
commit e720ca8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/core/importType.js b/src/core/importType.js
@@ -29,10 +29,11 @@ function isExternalPath(path, name, settings) {
 }
 
 function isSubpath(subpath, path) {
-  const normSubpath = subpath.replace(/[/]$/, '')
+  const normSubpath = subpath.replace(/\/$/, '')
   if (normSubpath.length === 0) {
     return false
   }
+  path = path.replace(/\\/g, '/')
   const left = path.indexOf(normSubpath)
   const right = left + normSubpath.length
   return left !== -1 &&

diff --git a/tests/src/core/importType.js b/tests/src/core/importType.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import * as path from 'path'
 
-import importType from 'core/importType'
+import importType, {isExternalModule} from 'core/importType'
 
 import { testContext, testFilePath } from '../utils'
 
@@ -224,4 +224,8 @@ describe('importType(name)', function () {
     })
     expect(importType('@test-scope/some-module', foldersContext)).to.equal('external')
   })
+
+  it('`isExternalModule` should work with windows directory separator', function() {
+    expect(isExternalModule('foo', {}, 'E:\\path\\to\\node_modules\\foo')).to.equal(true)
+  })
 })