Skip to content

Commit

Permalink
[Fix] order: fix isExternalModule detection on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
fisker authored and ljharb committed Feb 11, 2020
1 parent 8905007 commit 1b3c8bb
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
This change log adheres to standards from [Keep a CHANGELOG](http://keepachangelog.com).

## [Unreleased]
### Fixed
- [`order`]: fix `isExternalModule` detect on windows ([#1651], thanks [@fisker])

## [2.20.1] - 2020-02-01
### Fixed
Expand Down Expand Up @@ -652,6 +654,7 @@ for info on changes for earlier releases.

[`memo-parser`]: ./memo-parser/README.md

[#1651]: https://github.com/benmosher/eslint-plugin-import/pull/1651
[#1635]: https://github.com/benmosher/eslint-plugin-import/issues/1635
[#1625]: https://github.com/benmosher/eslint-plugin-import/pull/1625
[#1620]: https://github.com/benmosher/eslint-plugin-import/pull/1620
Expand Down Expand Up @@ -1105,3 +1108,4 @@ for info on changes for earlier releases.
[@kentcdodds]: https://github.com/kentcdodds
[@IvanGoncharov]: https://github.com/IvanGoncharov
[@wschurman]: https://github.com/wschurman
[@fisker]: https://github.com/fisker
9 changes: 5 additions & 4 deletions src/core/importType.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@ function isExternalPath(path, name, settings) {
}

function isSubpath(subpath, path) {
const normSubpath = subpath.replace(/[/]$/, '')
const normPath = path.replace(/\\/g, '/')
const normSubpath = subpath.replace(/\\/g, '/').replace(/\/$/, '')
if (normSubpath.length === 0) {
return false
}
const left = path.indexOf(normSubpath)
const left = normPath.indexOf(normSubpath)
const right = left + normSubpath.length
return left !== -1 &&
(left === 0 || normSubpath[0] !== '/' && path[left - 1] === '/') &&
(right >= path.length || path[right] === '/')
(left === 0 || normSubpath[0] !== '/' && normPath[left - 1] === '/') &&
(right >= normPath.length || normPath[right] === '/')
}

const externalModuleRegExp = /^\w/
Expand Down
9 changes: 8 additions & 1 deletion tests/src/core/importType.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down Expand Up @@ -224,4 +224,11 @@ describe('importType(name)', function () {
})
expect(importType('@test-scope/some-module', foldersContext)).to.equal('external')
})

it('`isExternalModule` works with windows directory separator', function() {
expect(isExternalModule('foo', {}, 'E:\\path\\to\\node_modules\\foo')).to.equal(true)
expect(isExternalModule('foo', {
'import/external-module-folders': ['E:\\path\\to\\node_modules'],
}, 'E:\\path\\to\\node_modules\\foo')).to.equal(true)
})
})

0 comments on commit 1b3c8bb

Please sign in to comment.