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

refactor: consistent behavior for resolveModule

Browse Source 
- always prefer explicit paths config
- avoid implicitly depending on pwd
This commit is contained in:
Pooya Parsa 2020-12-23 00:29:50 +01:00
parent 4295c6ca26
commit d4461a56e4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ export default class Resolver {
resolveModule (path, { paths } = {}) { resolveModule (path, { paths } = {}) {
try { try {
return this._require.resolve(path, { return this._require.resolve(path, {
paths: [].concat(paths || [], this.options.modulesDir) paths: [].concat(paths || [], this.options.modulesDir, global.__NUXT_PATHS__ || [])
}) })
} catch (error) { } catch (error) {
if (error.code !== 'MODULE_NOT_FOUND') { if (error.code !== 'MODULE_NOT_FOUND') {

6
packages/utils/src/cjs.js
View File

@ -68,11 +68,7 @@ export function resolveModule (id, paths) {
paths = [paths] paths = [paths]
} }
return _require.resolve(id, { return _require.resolve(id, {
paths: [ paths: [].concat(paths || [], global.__NUXT_PATHS__ || [])
process.cwd(),
...(paths || []),
...(global.__NUXT_PATHS__ || [])
]
}) })
} }