diff --git a/dist/index.js b/dist/index.js index 2dd846e6..13521ef4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2899,20 +2899,16 @@ const wrapRequire = new Proxy(require, { moduleID = path__WEBPACK_IMPORTED_MODULE_0__.resolve(moduleID); return target.apply(thisArg, [moduleID]); } - try { - return target.apply(thisArg, [moduleID]); - } - catch (err) { - const modulePath = target.resolve.apply(thisArg, [ - moduleID, - { - // Webpack does not have an escape hatch for getting the actual - // module, other than `eval`. - paths: eval('module').paths.concat(process.cwd()) - } - ]); - return target.apply(thisArg, [modulePath]); - } + const modulePath = target.resolve.apply(thisArg, [ + moduleID, + { + // Search the current working directory first, then the existing paths. + // Webpack does not have an escape hatch for getting the actual + // module, other than `eval`. + paths: [process.cwd(), ...eval('module').paths] + } + ]); + return target.apply(thisArg, [modulePath]); }, get: (target, prop, receiver) => { Reflect.get(target, prop, receiver); diff --git a/src/wrap-require.ts b/src/wrap-require.ts index d7e45ef3..71f7a490 100644 --- a/src/wrap-require.ts +++ b/src/wrap-require.ts @@ -7,20 +7,17 @@ export const wrapRequire = new Proxy(__non_webpack_require__, { return target.apply(thisArg, [moduleID]) } - try { - return target.apply(thisArg, [moduleID]) - } catch (err) { - const modulePath = target.resolve.apply(thisArg, [ - moduleID, - { - // Webpack does not have an escape hatch for getting the actual - // module, other than `eval`. - paths: eval('module').paths.concat(process.cwd()) - } - ]) + const modulePath = target.resolve.apply(thisArg, [ + moduleID, + { + // Search the current working directory first, then the existing paths. + // Webpack does not have an escape hatch for getting the actual + // module, other than `eval`. + paths: [process.cwd(), ...eval('module').paths] + } + ]) - return target.apply(thisArg, [modulePath]) - } + return target.apply(thisArg, [modulePath]) }, get: (target, prop, receiver) => {