Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-30 09:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): join with os native sep in resolver (#7131)

Browse Source
This commit is contained in:
Pooya Parsa 2020-03-27 13:56:40 +01:00 committed by GitHub
parent 51b5bf565b
commit 9ef58fae63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/src/resolver.js
View File

@ -105,8 +105,9 @@ export default class Resolver {
return resolvedPath + '.' + ext return resolvedPath + '.' + ext
} }
if (isDirectory && fs.existsSync(resolvedPath + '/index.' + ext)) { const resolvedPathwithIndex = join(resolvedPath, 'index.' + ext)
return resolvedPath + '/index.' + ext if (isDirectory && fs.existsSync(resolvedPathwithIndex)) {
return resolvedPathwithIndex
} }
} }

8
packages/core/test/resolver.test.js
View File

@ -6,12 +6,14 @@ import { startsWithRootAlias, startsWithSrcAlias } from '@nuxt/utils'
import Resolver from '../src/resolver' import Resolver from '../src/resolver'
jest.mock('path')
jest.mock('esm', () => jest.fn(() => jest.fn())) jest.mock('esm', () => jest.fn(() => jest.fn()))
jest.mock('fs-extra') jest.mock('fs-extra')
jest.mock('@nuxt/utils') jest.mock('@nuxt/utils')
describe('core: resolver', () => { jest.spyOn(path, 'join')
jest.spyOn(path, 'resolve')
describe.posix('core: resolver', () => {
beforeEach(() => { beforeEach(() => {
jest.clearAllMocks() jest.clearAllMocks()
}) })
@ -107,7 +109,7 @@ describe('core: resolver', () => {
startsWithRootAlias.mockReturnValue(false) startsWithRootAlias.mockReturnValue(false)
startsWithSrcAlias.mockReturnValue(false) startsWithSrcAlias.mockReturnValue(false)
const aliasPath = { substr: jest.fn(p => String(p)) } const aliasPath = 'x'
resolver.resolveAlias(aliasPath) resolver.resolveAlias(aliasPath)
expect(path.resolve).toBeCalledTimes(1) expect(path.resolve).toBeCalledTimes(1)