Fix resolve block to prefer custom extensions over defaults

andywer · Jul 19, 2017 · 9a38a52 · 9a38a52
1 parent 2d4cd9c
commit 9a38a52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/core/lib/blockUtils.js b/packages/core/lib/blockUtils.js
@@ -3,6 +3,7 @@ const webpackMerge = require('webpack-merge')
 
 module.exports = {
   merge,
+  mergeWithStrategy,
   addLoader,
   addPlugin
 }
@@ -11,6 +12,10 @@ function merge (configSnippet) {
   return prevConfig => webpackMerge.smart(prevConfig, configSnippet)
 }
 
+function mergeWithStrategy (configSnippet, strategy) {
+  return prevConfig => webpackMerge.smartStrategy(strategy)(prevConfig, configSnippet)
+}
+
 function addLoader (loaderDef) {
   const cleanedLoaderDef = _.omitBy(loaderDef, _.isUndefined)
   return prevConfig => webpackMerge.smart(prevConfig, {

diff --git a/packages/webpack/index.js b/packages/webpack/index.js
@@ -116,9 +116,10 @@ function performance (performanceBudget) {
  * @see https://webpack.js.org/configuration/resolve/
  */
 function resolve (config) {
-  return (context, util) => util.merge({
+  const strategy = { 'resolve.extensions': 'prepend' }
+  return (context, util) => util.mergeWithStrategy({
     resolve: config
-  })
+  }, strategy)
 }
 
 /**