fix(externals): user externals with subpaths

Author: nklayman

__tests__/webpackConfig.spec.js

@@ -183,6 +183,19 @@ describe.each(['production', 'development'])('getExternals in %s', env => {
     hasExternal(externals)
   })
 
+  test('Dep should be found if external includes a child path', async () => {
+    const { externals } = await mockGetExternals(
+      // Prevent it from getting marked as an external by default
+      { main: 'It will not be an external by default', name: 'mockExternal' },
+      // Add it to external list
+      { externals: ['mockExternal/lib'] }
+    )
+    // External is properly added
+    expect(externals).toEqual({
+      'mockExternal/lib': 'require("mockExternal/lib")'
+    })
+  })
+
   test('If dep is listed in user list and prefixed with "!" it should not be an external', async () => {
     const { externals } = await mockGetExternals(
       // Make sure it would have been marked as an external by default

lib/webpackConfig.js

@@ -69,48 +69,58 @@ function getExternals (api, pluginOptions) {
   const userExternals = pluginOptions.externals || []
   const userExternalsWhitelist = []
   userExternals.forEach((d, i) => {
-    if (d.match(/^!.*$/)) {
+    if (d.match(/^!/)) {
       userExternals.splice(i, 1)
       userExternalsWhitelist.push(d.replace(/^!/, ''))
     }
   })
   const { dependencies } = require(api.resolve('./package.json'))
-  const externalsList = Object.keys(dependencies || {}).filter(dep => {
-    // Return true if we want to add a dependency to externals
-    try {
-      let pgkString
-      for (const path of nodeModulesPaths) {
-        // Check if package.json exists
-        if (fs.existsSync(api.resolve(`${path}/${dep}/package.json`))) {
-          // If it does, read it and break
-          pgkString = fs
-            .readFileSync(api.resolve(`${path}/${dep}/package.json`))
-            .toString()
-          break
+  const externalsList = Object.keys(dependencies || {}).reduce(
+    (depList, dep) => {
+      // Return true if we want to add a dependency to externals
+      try {
+        let pgkString
+        for (const path of nodeModulesPaths) {
+          // Check if package.json exists
+          if (fs.existsSync(api.resolve(`${path}/${dep}/package.json`))) {
+            // If it does, read it and break
+            pgkString = fs
+              .readFileSync(api.resolve(`${path}/${dep}/package.json`))
+              .toString()
+            break
+          }
         }
+        if (!pgkString) {
+          throw new Error(`Could not find a package.json for module ${dep}`)
+        }
+        const pkg = JSON.parse(pgkString)
+        const name = userExternals.find(name =>
+          new RegExp(`^${pkg.name}`).test(name)
+        )
+        const fields = ['main', 'module', 'jsnext:main', 'browser']
+        if (
+          // Not whitelisted
+          userExternalsWhitelist.indexOf(dep) === -1 &&
+          // Doesn't have main property
+          (!fields.some(field => field in pkg) ||
+            // Has binary property
+            !!pkg.binary ||
+            // Has gypfile property
+            !!pkg.gypfile ||
+            // Listed in user-defined externals list
+            !!name)
+        ) {
+          // Use user-provided name if it exists, for subpaths
+          depList.push(name || dep)
+        }
+      } catch (e) {
+        console.log(e)
+        depList.push(dep)
       }
-      if (!pgkString) {
-        throw new Error(`Could not find a package.json for module ${dep}`)
-      }
-      const pkg = JSON.parse(pgkString)
-      const fields = ['main', 'module', 'jsnext:main', 'browser']
-      return (
-        // Not whitelisted
-        userExternalsWhitelist.indexOf(dep) === -1 &&
-        // Doesn't have main property
-        (!fields.some(field => field in pkg) ||
-          // Has binary property
-          !!pkg.binary ||
-          // Has gypfile property
-          !!pkg.gypfile ||
-          // Listed in user-defined externals list
-          userExternals.indexOf(pkg.name) > -1)
-      )
-    } catch (e) {
-      console.log(e)
-      return true
-    }
-  })
+      return depList
+    },
+    []
+  )
   let externals = {}
   externalsList.forEach(d => {
     // Set external to be required during runtime