Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-18 14:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename requirePath to path

Browse Source 
more constency with require.resolve(id, { paths })
This commit is contained in:
Pooya Parsa 2020-12-23 00:07:58 +01:00
parent ed6e8cd307
commit 7b59b21511
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/src/module.js
View File

@ -121,13 +121,13 @@ export default class ModuleContainer {
) )
} }
requireModule (moduleOpts, { requirePath } = {}) { requireModule (moduleOpts, { paths } = {}) {
return this.addModule(moduleOpts, undefined, { requirePath }) return this.addModule(moduleOpts, undefined, { paths })
} }
async addModule (moduleOpts, arg2, arg3) { async addModule (moduleOpts, arg2, arg3) {
// Arg2 was previously used for requireOnce which is ignored now // Arg2 was previously used for requireOnce which is ignored now
const { requirePath } = { ...arg2, ...arg3 } const { paths } = { ...arg2, ...arg3 }
let src let src
let options let options
let handler let handler
@ -156,7 +156,7 @@ export default class ModuleContainer {
// Resolve handler // Resolve handler
if (!handler) { if (!handler) {
try { try {
handler = this.nuxt.resolver.requireModule(src, { requirePath }) handler = this.nuxt.resolver.requireModule(src, { paths })
} catch (error) { } catch (error) {
if (error.code !== 'MODULE_NOT_FOUND') { if (error.code !== 'MODULE_NOT_FOUND') {
throw error throw error

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

@ -25,13 +25,10 @@ export default class Resolver {
this._require = this._createRequire(__filename) this._require = this._createRequire(__filename)
} }
resolveModule (path, { requirePath } = {}) { resolveModule (path, { paths } = {}) {
try { try {
return this._require.resolve(path, { return this._require.resolve(path, {
paths: [ paths: [].concat(paths || [], this.options.modulesDir)
requirePath || __dirname,
...[].concat(this.options.modulesDir)
]
}) })
} catch (error) { } catch (error) {
if (error.code !== 'MODULE_NOT_FOUND') { if (error.code !== 'MODULE_NOT_FOUND') {
@ -52,7 +49,7 @@ export default class Resolver {
return resolve(this.options.srcDir, path) return resolve(this.options.srcDir, path)
} }
resolvePath (path, { alias, isAlias = alias, module, isModule = module, isStyle, requirePath } = {}) { resolvePath (path, { alias, isAlias = alias, module, isModule = module, isStyle, paths } = {}) {
// TODO: Remove in Nuxt 3 // TODO: Remove in Nuxt 3
if (alias) { if (alias) {
consola.warn('Using alias is deprecated and will be removed in Nuxt 3. Use `isAlias` instead.') consola.warn('Using alias is deprecated and will be removed in Nuxt 3. Use `isAlias` instead.')
@ -70,7 +67,7 @@ export default class Resolver {
// Try to resolve it as a regular module // Try to resolve it as a regular module
if (isModule !== false) { if (isModule !== false) {
resolvedPath = this.resolveModule(path, { requirePath }) resolvedPath = this.resolveModule(path, { paths })
} }
// Try to resolve alias // Try to resolve alias
@ -117,7 +114,7 @@ export default class Resolver {
throw new Error(`Cannot resolve "${path}" from "${resolvedPath}"`) throw new Error(`Cannot resolve "${path}" from "${resolvedPath}"`)
} }
requireModule (path, { alias, isAlias = alias, intropDefault, interopDefault = intropDefault, requirePath } = {}) { requireModule (path, { alias, isAlias = alias, intropDefault, interopDefault = intropDefault, paths } = {}) {
let resolvedPath = path let resolvedPath = path
let requiredModule let requiredModule
@ -133,7 +130,7 @@ export default class Resolver {
// Try to resolve path // Try to resolve path
try { try {
resolvedPath = this.resolvePath(path, { isAlias, requirePath }) resolvedPath = this.resolvePath(path, { isAlias, paths })
} catch (e) { } catch (e) {
lastError = e lastError = e
} }
@ -148,8 +145,7 @@ export default class Resolver {
// Try to require // Try to require
try { try {
const _require = requirePath ? this._createRequire(requirePath) : this._require requiredModule = this._require(resolvedPath)
requiredModule = _require(resolvedPath)
} catch (e) { } catch (e) {
lastError = e lastError = e
} }

6
packages/core/test/module.test.js
View File

@ -318,7 +318,7 @@ describe('core: module', () => {
module.requireModule(moduleOpts) module.requireModule(moduleOpts)
expect(module.addModule).toBeCalledTimes(1) expect(module.addModule).toBeCalledTimes(1)
expect(module.addModule).toBeCalledWith(moduleOpts, undefined, { requirePath: undefined }) expect(module.addModule).toBeCalledWith(moduleOpts, undefined, { paths: undefined })
}) })
test('should add string module', async () => { test('should add string module', async () => {
@ -332,7 +332,7 @@ describe('core: module', () => {
const result = await module.addModule('moduleTest') const result = await module.addModule('moduleTest')
expect(requireModule).toBeCalledTimes(1) expect(requireModule).toBeCalledTimes(1)
expect(requireModule).toBeCalledWith('moduleTest', { requirePath: undefined }) expect(requireModule).toBeCalledWith('moduleTest', { paths: undefined })
expect(module.requiredModules).toEqual({ expect(module.requiredModules).toEqual({
moduleTest: { moduleTest: {
handler: expect.any(Function), handler: expect.any(Function),
@ -381,7 +381,7 @@ describe('core: module', () => {
const result = await module.addModule(['moduleTest', { test: true }]) const result = await module.addModule(['moduleTest', { test: true }])
expect(requireModule).toBeCalledTimes(1) expect(requireModule).toBeCalledTimes(1)
expect(requireModule).toBeCalledWith('moduleTest', { requirePath: undefined }) expect(requireModule).toBeCalledWith('moduleTest', { paths: undefined })
expect(module.requiredModules).toEqual({ expect(module.requiredModules).toEqual({
moduleTest: { moduleTest: {
handler: expect.any(Function), handler: expect.any(Function),