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

pi0 · web-flow · commit 9ef58fae6328 · 2020-03-27T13:56:40.000+01:00
diff --git a/packages/core/src/resolver.js b/packages/core/src/resolver.js
@@ -105,8 +105,9 @@ export default class Resolver {
         return resolvedPath + '.' + ext
       }
 
-      if (isDirectory && fs.existsSync(resolvedPath + '/index.' + ext)) {
-        return resolvedPath + '/index.' + ext
+      const resolvedPathwithIndex = join(resolvedPath, 'index.' + ext)
+      if (isDirectory && fs.existsSync(resolvedPathwithIndex)) {
+        return resolvedPathwithIndex
       }
     }
 
diff --git a/packages/core/test/resolver.test.js b/packages/core/test/resolver.test.js
@@ -6,12 +6,14 @@ import { startsWithRootAlias, startsWithSrcAlias } from '@nuxt/utils'
 
 import Resolver from '../src/resolver'
 
-jest.mock('path')
 jest.mock('esm', () => jest.fn(() => jest.fn()))
 jest.mock('fs-extra')
 jest.mock('@nuxt/utils')
 
-describe('core: resolver', () => {
+jest.spyOn(path, 'join')
+jest.spyOn(path, 'resolve')
+
+describe.posix('core: resolver', () => {
   beforeEach(() => {
     jest.clearAllMocks()
   })
@@ -107,7 +109,7 @@ describe('core: resolver', () => {
     startsWithRootAlias.mockReturnValue(false)
     startsWithSrcAlias.mockReturnValue(false)
 
-    const aliasPath = { substr: jest.fn(p => String(p)) }
+    const aliasPath = 'x'
     resolver.resolveAlias(aliasPath)
 
     expect(path.resolve).toBeCalledTimes(1)

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,9 @@ export default class Resolver {`
`105`	`105`	`return resolvedPath + '.' + ext`
`106`	`106`	`}`
`107`	`107`
`108`		`- if (isDirectory && fs.existsSync(resolvedPath + '/index.' + ext)) {`
`109`		`- return resolvedPath + '/index.' + ext`
	`108`	`+ const resolvedPathwithIndex = join(resolvedPath, 'index.' + ext)`
	`109`	`+ if (isDirectory && fs.existsSync(resolvedPathwithIndex)) {`
	`110`	`+ return resolvedPathwithIndex`
`110`	`111`	`}`
`111`	`112`	`}`
`112`	`113`