Support Regexp externals (#654)

* regex

* whitespaces

* flip regex in object form

* fixup async

* fixup unit tests

* fixup tests

* fixup test skip

Co-authored-by: Guy Bedford <guybedford@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

src/index.js

@@ -146,12 +146,30 @@ function ncc (
     }
   });
 
-  const externalMap = new Map();
+  const externalMap = (() => {
+    const regexps = [];
+    const aliasMap = new Map();
+
+    function set(key, value) {
+      if (key instanceof RegExp)
+        regexps.push(key);
+      aliasMap.set(key, value);
+    }
+
+    function get(key) {
+      if (aliasMap.has(key)) return aliasMap.get(key);
+
+      const matchedRegex = regexps.find(regex => regex.test(key));
+      return matchedRegex !== null ? aliasMap.get(matchedRegex) : null;
+    }
+
+    return { get, set };
+  })();
 
   if (Array.isArray(externals))
     externals.forEach(external => externalMap.set(external, external));
   else if (typeof externals === 'object')
-    Object.keys(externals).forEach(external => externalMap.set(external, externals[external]));
+    Object.keys(externals).forEach(external => externalMap.set(external[0] === '/' && external[external.length - 1] === '/' ? new RegExp(external.slice(1, -1)) : external, externals[external]));
 
   let watcher, watchHandler, rebuildHandler;
 
@@ -260,8 +278,9 @@ function ncc (
     },
     // https://github.com/vercel/ncc/pull/29#pullrequestreview-177152175
     node: false,
-    externals: ({ context, request }, callback) => {
-      if (externalMap.has(request)) return callback(null, `commonjs ${externalMap.get(request)}`);
+    externals ({ context, request }, callback) {
+      const external = externalMap.get(request);
+      if (external) return callback(null, `commonjs ${external}`);
       return callback();
     },
     module: {

test/index.test.js

@@ -42,7 +42,8 @@ for (const unitTest of fs.readdirSync(`${__dirname}/unit`)) {
       },
       externals: {
         'piscina': 'piscina',
-        'externaltest': 'externalmapped'
+        'externaltest': 'externalmapped',
+        '/\\w+-regex/': 'regexexternal',
       }
     }, opts)).then(
       async ({ code, assets, map }) => {

test/unit/externals/input.js

@@ -1,3 +1,6 @@
 const external = require('externaltest');
+const regexpExternal = require('external-regex');
 
 console.log(external);
+console.log(regexpExternal);
+

test/unit/externals/output-coverage.js

@@ -7,6 +7,14 @@
 "use strict";
 module.exports = require("externalmapped");
 
+/***/ }),
+
+/***/ 196:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("regexexternal");
+
 /***/ })
 
 /******/ 	});
@@ -49,8 +57,11 @@ var __webpack_exports__ = {};
 // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
 (() => {
 const external = __nccwpck_require__(306);
+const regexpExternal = __nccwpck_require__(196);
 
 console.log(external);
+console.log(regexpExternal);
+
 
 })();
 

test/unit/externals/output.js

@@ -7,6 +7,14 @@
 "use strict";
 module.exports = require("externalmapped");
 
+/***/ }),
+
+/***/ 196:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("regexexternal");
+
 /***/ })
 
 /******/ 	});
@@ -49,8 +57,11 @@ var __webpack_exports__ = {};
 // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
 (() => {
 const external = __nccwpck_require__(306);
+const regexpExternal = __nccwpck_require__(196);
 
 console.log(external);
+console.log(regexpExternal);
+
 
 })();