From 1cbc478a76e91a011de8aab4a686a6f5686753ac Mon Sep 17 00:00:00 2001 From: vkozulya Date: Thu, 2 Sep 2021 14:51:59 +0300 Subject: [PATCH] fix(webpack):pass all user resolve options to loader(webpack 4, fixes #658) --- packages/webpack4-loader/src/index.ts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/webpack4-loader/src/index.ts b/packages/webpack4-loader/src/index.ts index c55329acf..24d12d7e8 100644 --- a/packages/webpack4-loader/src/index.ts +++ b/packages/webpack4-loader/src/index.ts @@ -44,11 +44,6 @@ export default function webpack4Loader( EvalCache.clearForFile(this.resourcePath); - const resolveOptionsDefaults = { - conditionNames: ['require'], - extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'], - }; - const { sourceMap = undefined, cacheDirectory = '.linaria-cache', @@ -80,12 +75,7 @@ export default function webpack4Loader( // Another option is to read the webpack.config.js, but it won't work for programmatic usage // This API is used by many loaders/plugins, so hope we're safe for a while { - ...resolveOptionsDefaults, - ...((this._compilation?.options.resolve && { - alias: this._compilation.options.resolve.alias, - modules: this._compilation.options.resolve.modules, - }) || - {}), + ...(this._compilation?.options.resolve ?? {}), ...resolveOptions, } );