From ba0aed9f7eecafa61717aa9e9036a10a579de288 Mon Sep 17 00:00:00 2001
From: Evan Henley <evan.henley@gmail.com>
Date: Sat, 9 Mar 2019 16:03:58 -0600
Subject: [PATCH] [webpack] [fix] match coreLibs after resolveSync in
 webpack-resolver

---
 resolvers/webpack/index.js   | 12 ++++++------
 tests/src/core/importType.js |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/resolvers/webpack/index.js b/resolvers/webpack/index.js
index 146213a0c..0f75a2840 100644
--- a/resolvers/webpack/index.js
+++ b/resolvers/webpack/index.js
@@ -38,10 +38,6 @@ exports.resolve = function (source, file, settings) {
     source = source.slice(0, finalQuestionMark)
   }
 
-  if (source in coreLibs) {
-    return { found: true, path: coreLibs[source] }
-  }
-
   var webpackConfig
 
   var configPath = get(settings, 'config')
@@ -73,7 +69,7 @@ exports.resolve = function (source, file, settings) {
           throw e
         }
       } else {
-        log("No config path found relative to", file, "; using {}")
+        log('No config path found relative to', file, '; using {}')
         webpackConfig = {}
       }
 
@@ -123,6 +119,10 @@ exports.resolve = function (source, file, settings) {
   try {
     return { found: true, path: resolveSync(path.dirname(file), source) }
   } catch (err) {
+    if (source in coreLibs) {
+      return { found: true, path: coreLibs[source] }
+    }
+
     log('Error during module resolution:', err)
     return { found: false }
   }
@@ -136,7 +136,7 @@ function getResolveSync(configPath, webpackConfig) {
   if (!cached) {
     cached = {
       key: cacheKey,
-      value: createResolveSync(configPath, webpackConfig)
+      value: createResolveSync(configPath, webpackConfig),
     }
     // put in front and pop last item
     if (_cache.unshift(cached) > MAX_CACHE) {
diff --git a/tests/src/core/importType.js b/tests/src/core/importType.js
index 603d9afe3..f60063991 100644
--- a/tests/src/core/importType.js
+++ b/tests/src/core/importType.js
@@ -70,8 +70,7 @@ describe('importType(name)', function () {
     const pathContext = testContext({ 'import/resolver': { webpack: { config: webpackConfig } } })
     expect(importType('constants/index', pathContext)).to.equal('internal')
     expect(importType('constants/', pathContext)).to.equal('internal')
-    // the following assertion fails because the webpack resolver runs an resolve.isCore('constants') without first checking paths config
-    // expect(importType('constants', pathContext)).to.equal('internal')
+    expect(importType('constants', pathContext)).to.equal('internal')
   })
 
   it("should return 'parent' for internal modules that go through the parent", function() {