@rollup/plugin-commonjs 20.0.0 → 21.0.2

package/dist/index.js

@@ -161,7 +161,7 @@ export function commonjsRegister (path, loader) {
 }
 
 export function commonjsRegisterOrShort (path, to) {
-	const resolvedPath = commonjsResolveImpl(path, null, true);
+	var resolvedPath = commonjsResolveImpl(path, null, true);
 	if (resolvedPath !== null && DYNAMIC_REQUIRE_CACHE[resolvedPath]) {
 	  DYNAMIC_REQUIRE_CACHE[path] = DYNAMIC_REQUIRE_CACHE[resolvedPath];
 	} else {
@@ -169,24 +169,24 @@ export function commonjsRegisterOrShort (path, to) {
 	}
 }
 
-const DYNAMIC_REQUIRE_LOADERS = Object.create(null);
-const DYNAMIC_REQUIRE_CACHE = Object.create(null);
-const DYNAMIC_REQUIRE_SHORTS = Object.create(null);
-const DEFAULT_PARENT_MODULE = {
+var DYNAMIC_REQUIRE_LOADERS = Object.create(null);
+var DYNAMIC_REQUIRE_CACHE = Object.create(null);
+var DYNAMIC_REQUIRE_SHORTS = Object.create(null);
+var DEFAULT_PARENT_MODULE = {
 	id: '<' + 'rollup>', exports: {}, parent: undefined, filename: null, loaded: false, children: [], paths: []
 };
-const CHECKED_EXTENSIONS = ['', '.js', '.json'];
+var CHECKED_EXTENSIONS = ['', '.js', '.json'];
 
 function normalize (path) {
 	path = path.replace(/\\\\/g, '/');
-	const parts = path.split('/');
-	const slashed = parts[0] === '';
-	for (let i = 1; i < parts.length; i++) {
+	var parts = path.split('/');
+	var slashed = parts[0] === '';
+	for (var i = 1; i < parts.length; i++) {
 		if (parts[i] === '.' || parts[i] === '') {
 			parts.splice(i--, 1);
 		}
 	}
-	for (let i = 1; i < parts.length; i++) {
+	for (var i = 1; i < parts.length; i++) {
 		if (parts[i] !== '..') continue;
 		if (i > 0 && parts[i - 1] !== '..' && parts[i - 1] !== '.') {
 			parts.splice(--i, 2);
@@ -204,9 +204,9 @@ function normalize (path) {
 function join () {
 	if (arguments.length === 0)
 	  return '.';
-	let joined;
-	for (let i = 0; i < arguments.length; ++i) {
-	  let arg = arguments[i];
+	var joined;
+	for (var i = 0; i < arguments.length; ++i) {
+	  var arg = arguments[i];
 	  if (arg.length > 0) {
 		if (joined === undefined)
 		  joined = arg;
@@ -221,9 +221,9 @@ function join () {
 }
 
 function isPossibleNodeModulesPath (modulePath) {
-	let c0 = modulePath[0];
+	var c0 = modulePath[0];
 	if (c0 === '/' || c0 === '\\\\') return false;
-	let c1 = modulePath[1], c2 = modulePath[2];
+	var c1 = modulePath[1], c2 = modulePath[2];
 	if ((c0 === '.' && (!c1 || c1 === '/' || c1 === '\\\\')) ||
 		(c0 === '.' && c1 === '.' && (!c2 || c2 === '/' || c2 === '\\\\'))) return false;
 	if (c1 === ':' && (c2 === '/' || c2 === '\\\\'))
@@ -235,9 +235,9 @@ function dirname (path) {
   if (path.length === 0)
     return '.';
 
-  let i = path.length - 1;
+  var i = path.length - 1;
   while (i > 0) {
-    const c = path.charCodeAt(i);
+    var c = path.charCodeAt(i);
     if ((c === 47 || c === 92) && i !== path.length - 1)
       break;
     i--;
@@ -253,9 +253,9 @@ function dirname (path) {
 }
 
 export function commonjsResolveImpl (path, originalModuleDir, testCache) {
-	const shouldTryNodeModules = isPossibleNodeModulesPath(path);
+	var shouldTryNodeModules = isPossibleNodeModulesPath(path);
 	path = normalize(path);
-	let relPath;
+	var relPath;
 	if (path[0] === '/') {
 		originalModuleDir = '/';
 	}
@@ -272,8 +272,8 @@ export function commonjsResolveImpl (path, originalModuleDir, testCache) {
 			break; // Travelled too far up, avoid infinite loop
 		}
 
-		for (let extensionIndex = 0; extensionIndex < CHECKED_EXTENSIONS.length; extensionIndex++) {
-			const resolvedPath = relPath + CHECKED_EXTENSIONS[extensionIndex];
+		for (var extensionIndex = 0; extensionIndex < CHECKED_EXTENSIONS.length; extensionIndex++) {
+			var resolvedPath = relPath + CHECKED_EXTENSIONS[extensionIndex];
 			if (DYNAMIC_REQUIRE_CACHE[resolvedPath]) {
 				return resolvedPath;
 			}
@@ -285,7 +285,7 @@ export function commonjsResolveImpl (path, originalModuleDir, testCache) {
 			}
 		}
 		if (!shouldTryNodeModules) break;
-		const nextDir = normalize(originalModuleDir + '/..');
+		var nextDir = normalize(originalModuleDir + '/..');
 		if (nextDir === originalModuleDir) break;
 		originalModuleDir = nextDir;
 	}
@@ -293,7 +293,7 @@ export function commonjsResolveImpl (path, originalModuleDir, testCache) {
 }
 
 export function commonjsResolve (path, originalModuleDir) {
-	const resolvedPath = commonjsResolveImpl(path, originalModuleDir);
+	var resolvedPath = commonjsResolveImpl(path, originalModuleDir);
 	if (resolvedPath !== null) {
 		return resolvedPath;
 	}
@@ -301,18 +301,18 @@ export function commonjsResolve (path, originalModuleDir) {
 }
 
 export function commonjsRequire (path, originalModuleDir) {
-	let resolvedPath = commonjsResolveImpl(path, originalModuleDir, true);
+	var resolvedPath = commonjsResolveImpl(path, originalModuleDir, true);
 	if (resolvedPath !== null) {
-    let cachedModule = DYNAMIC_REQUIRE_CACHE[resolvedPath];
+    var cachedModule = DYNAMIC_REQUIRE_CACHE[resolvedPath];
     if (cachedModule) return cachedModule.exports;
-    let shortTo = DYNAMIC_REQUIRE_SHORTS[resolvedPath];
+    var shortTo = DYNAMIC_REQUIRE_SHORTS[resolvedPath];
     if (shortTo) {
       cachedModule = DYNAMIC_REQUIRE_CACHE[shortTo];
       if (cachedModule)
         return cachedModule.exports;
       resolvedPath = commonjsResolveImpl(shortTo, null, true);
     }
-    const loader = DYNAMIC_REQUIRE_LOADERS[resolvedPath];
+    var loader = DYNAMIC_REQUIRE_LOADERS[resolvedPath];
     if (loader) {
       DYNAMIC_REQUIRE_CACHE[resolvedPath] = cachedModule = {
         id: resolvedPath,
@@ -455,7 +455,7 @@ function getDynamicRequirePaths(patterns) {
   for (const pattern of !patterns || Array.isArray(patterns) ? patterns || [] : [patterns]) {
     const isNegated = pattern.startsWith('!');
     const modifySet = Set.prototype[isNegated ? 'delete' : 'add'].bind(dynamicRequireModuleSet);
-    for (const path$1 of glob__default['default'].sync(isNegated ? pattern.substr(1) : pattern)) {
+    for (const path$1 of glob__default["default"].sync(isNegated ? pattern.substr(1) : pattern)) {
       modifySet(normalizePathSlashes(path.resolve(path$1)));
       if (isDirectory(path$1)) {
         modifySet(normalizePathSlashes(path.resolve(path.join(path$1, getPackageEntryPoint(path$1)))));
@@ -595,7 +595,7 @@ function getResolveId(extensions) {
     return undefined;
   }
 
-  return function resolveId(importee, rawImporter) {
+  return function resolveId(importee, rawImporter, resolveOptions) {
     if (isWrappedId(importee, MODULE_SUFFIX) || isWrappedId(importee, EXPORTS_SUFFIX)) {
       return importee;
     }
@@ -638,10 +638,16 @@ function getResolveId(extensions) {
       return null;
     }
 
-    return this.resolve(importee, importer, {
-      skipSelf: true,
-      custom: { 'node-resolve': { isRequire: isProxyModule || isRequiredModule } }
-    }).then((resolved) => {
+    return this.resolve(
+      importee,
+      importer,
+      Object.assign({}, resolveOptions, {
+        skipSelf: true,
+        custom: Object.assign({}, resolveOptions.custom, {
+          'node-resolve': { isRequire: isProxyModule || isRequiredModule }
+        })
+      })
+    ).then((resolved) => {
       if (!resolved) {
         resolved = resolveExtensions(importee, importer);
       }
@@ -1187,7 +1193,7 @@ function transformCommonjs(
   defaultIsModuleExports
 ) {
   const ast = astCache || tryParse(parse, code, id);
-  const magicString = new MagicString__default['default'](code);
+  const magicString = new MagicString__default["default"](code);
   const uses = {
     module: false,
     exports: false,
@@ -1446,7 +1452,7 @@ function transformCommonjs(
           return;
         case 'Identifier': {
           const { name } = node;
-          if (!(isReference__default['default'](node, parent) && !scope.contains(name))) return;
+          if (!(isReference__default["default"](node, parent) && !scope.contains(name))) return;
           switch (name) {
             case 'require':
               if (isNodeRequirePropertyAccess(parent)) {
@@ -1692,7 +1698,7 @@ function commonjs(options = {}) {
   );
   const isDynamicRequireModulesEnabled = dynamicRequireModuleSet.size > 0;
   const commonDir = isDynamicRequireModulesEnabled
-    ? getCommonDir__default['default'](null, Array.from(dynamicRequireModuleSet).concat(process.cwd()))
+    ? getCommonDir__default["default"](null, Array.from(dynamicRequireModuleSet).concat(process.cwd()))
     : null;
 
   const esModulesWithDefaultExport = new Set();
@@ -1712,7 +1718,9 @@ function commonjs(options = {}) {
         ? options.ignoreTryCatch(id)
         : Array.isArray(options.ignoreTryCatch)
         ? options.ignoreTryCatch.includes(id)
-        : options.ignoreTryCatch || false;
+        : typeof options.ignoreTryCatch !== 'undefined'
+        ? options.ignoreTryCatch
+        : true;
 
     return {
       canConvertRequire: mode !== 'remove' && mode !== true,