From 9991aae002c85188b5b19dc91304bbc43673aae7 Mon Sep 17 00:00:00 2001
From: Lars den Bakker <larsdenbakker@gmail.com>
Date: Wed, 22 Apr 2020 13:38:05 +0200
Subject: [PATCH] feat(commonjs): set syntheticNamedExports for commonjs
 modules (#149)

BREAKING CHANGE:

The namedExports option has been removed, now requires rollup >= 2.3.4. Instead of manually defining named exports, rollup now handles this automatically for you.

* feat(commonjs): set syntheticNamedExports for commonjs modules

* feat(commonjs): remove namedExports option

* chore: merge with upstream

* chore(commonjs): restrict rollup version

* chore(commonjs): remove unused fixtures
---
 packages/commonjs/README.md                   |  41 -----
 packages/commonjs/package.json                |   4 +-
 packages/commonjs/src/index.js                |  48 +-----
 packages/commonjs/src/transform.js            |   8 +-
 packages/commonjs/test/fixtures/.eslintrc     |   1 +
 .../test/fixtures/function/__esModule/main.js |   1 -
 .../named-exports-conditional/main.js         |   3 +
 .../function/named-exports-conditional/x.js   |   5 +
 .../function/named-exports-dynamic/_config.js |   5 +
 .../function/named-exports-dynamic/main.js    |   7 +
 .../function/named-exports-dynamic/x.js       |   3 +
 .../named-exports-object-define/main.js       |   3 +
 .../function/named-exports-object-define/x.js |   6 +
 .../named-exports-reexport-default}/export.js |   0
 .../named-exports-reexport-default}/main.js   |   0
 .../reexport.js                               |   0
 .../named-exports-reexport-named/export.js    |   1 +
 .../named-exports-reexport-named/main.js      |   3 +
 .../named-exports-reexport-named/reexport.js  |   3 +
 .../function/named-exports-unexported/main.js |   3 +
 .../function/named-exports-unexported/x.js    |   1 +
 .../fixtures/function/reexports/_config.js    |   9 -
 .../test/fixtures/function/reexports/bar.js   |   1 -
 .../test/fixtures/function/reexports/foo.js   |   1 -
 .../test/fixtures/function/reexports/main.js  |   3 -
 .../main.js                                   |   4 -
 .../main.js                                   |   3 -
 .../other.js                                  |   3 -
 .../main.js                                   |   3 -
 .../samples/custom-named-exports/main.js      |   6 -
 .../secret-named-exporter.js                  |   2 -
 .../fixtures/samples/define-property/foo.js   |   6 -
 .../fixtures/samples/define-property/main.js  |   1 -
 .../commonjs/test/snapshots/function.js.md    | 154 +++++++++++++++---
 .../commonjs/test/snapshots/function.js.snap  | Bin 6808 -> 7178 bytes
 packages/commonjs/test/test.js                | 148 ++---------------
 packages/commonjs/test/types.ts               |   1 -
 pnpm-lock.yaml                                |  66 +++++++-
 38 files changed, 265 insertions(+), 292 deletions(-)
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-conditional/main.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-conditional/x.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-dynamic/_config.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-dynamic/main.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-dynamic/x.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-object-define/main.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-object-define/x.js
 rename packages/commonjs/test/fixtures/{samples/reexport => function/named-exports-reexport-default}/export.js (100%)
 rename packages/commonjs/test/fixtures/{samples/reexport => function/named-exports-reexport-default}/main.js (100%)
 rename packages/commonjs/test/fixtures/{samples/reexport => function/named-exports-reexport-default}/reexport.js (100%)
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-reexport-named/export.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-reexport-named/main.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-reexport-named/reexport.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-unexported/main.js
 create mode 100644 packages/commonjs/test/fixtures/function/named-exports-unexported/x.js
 delete mode 100644 packages/commonjs/test/fixtures/function/reexports/_config.js
 delete mode 100644 packages/commonjs/test/fixtures/function/reexports/bar.js
 delete mode 100644 packages/commonjs/test/fixtures/function/reexports/foo.js
 delete mode 100644 packages/commonjs/test/fixtures/function/reexports/main.js
 delete mode 100644 packages/commonjs/test/fixtures/samples/custom-named-exports-browser-shims/main.js
 delete mode 100644 packages/commonjs/test/fixtures/samples/custom-named-exports-false-positive/main.js
 delete mode 100644 packages/commonjs/test/fixtures/samples/custom-named-exports-false-positive/other.js
 delete mode 100644 packages/commonjs/test/fixtures/samples/custom-named-exports-warn-builtins/main.js
 delete mode 100644 packages/commonjs/test/fixtures/samples/custom-named-exports/main.js
 delete mode 100644 packages/commonjs/test/fixtures/samples/custom-named-exports/secret-named-exporter.js
 delete mode 100644 packages/commonjs/test/fixtures/samples/define-property/foo.js
 delete mode 100644 packages/commonjs/test/fixtures/samples/define-property/main.js

diff --git a/packages/commonjs/README.md b/packages/commonjs/README.md
index 6dfaeeec5..0d6f353a6 100644
--- a/packages/commonjs/README.md
+++ b/packages/commonjs/README.md
@@ -106,47 +106,6 @@ Default: `true`
 
 If false, skips source map generation for CommonJS modules.
 
-### `namedExports`
-
-Type: `Object`<br>
-Default: `null`
-
-Explicitly specify unresolvable named exports.
-
-This plugin will attempt to create named exports, where appropriate, so you can do this...
-
-```js
-// importer.js
-import { named } from './exporter.js';
-
-// exporter.js
-module.exports = { named: 42 }; // or `exports.named = 42;`
-```
-
-...but that's not always possible:
-
-```js
-// importer.js
-import { named } from 'my-lib';
-
-// my-lib.js
-var myLib = exports;
-myLib.named = "you can't see me";
-```
-
-In those cases, you can specify custom named exports:
-
-```js
-commonjs({
-  namedExports: {
-    // left-hand side can be an absolute path, a path
-    // relative to the current directory, or the name
-    // of a module in node_modules
-    'my-lib': ['named']
-  }
-});
-```
-
 ### `ignore`
 
 Type: `Array[...String | (String) => Boolean]`<br>
diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json
index b8c77451e..9f3dc0c8f 100644
--- a/packages/commonjs/package.json
+++ b/packages/commonjs/package.json
@@ -46,7 +46,7 @@
     "require"
   ],
   "peerDependencies": {
-    "rollup": "^1.20.0||^2.0.0"
+    "rollup": "^2.3.4"
   },
   "dependencies": {
     "@rollup/pluginutils": "^3.0.8",
@@ -67,7 +67,7 @@
     "locate-character": "^2.0.5",
     "prettier": "^1.19.1",
     "require-relative": "^0.8.7",
-    "rollup": "^2.0.0",
+    "rollup": "^2.3.4",
     "rollup-plugin-babel": "^4.3.3",
     "shx": "^0.3.2",
     "source-map": "^0.6.1",
diff --git a/packages/commonjs/src/index.js b/packages/commonjs/src/index.js
index 6556cbc02..d4f53ff75 100644
--- a/packages/commonjs/src/index.js
+++ b/packages/commonjs/src/index.js
@@ -1,7 +1,6 @@
-import { realpathSync, existsSync, readFileSync } from 'fs';
-import { extname, resolve, normalize, join } from 'path';
+import { existsSync, readFileSync } from 'fs';
+import { extname, join } from 'path';
 
-import { sync as nodeResolveSync, isCore } from 'resolve';
 import { createFilter } from '@rollup/pluginutils';
 
 import getCommonDir from 'commondir';
@@ -48,40 +47,6 @@ export default function commonjs(options = {}) {
     ? getCommonDir(null, Array.from(dynamicRequireModuleSet).concat(process.cwd()))
     : null;
 
-  const customNamedExports = {};
-  if (options.namedExports) {
-    Object.keys(options.namedExports).forEach((id) => {
-      let resolveId = id;
-      let resolvedId;
-
-      if (isCore(id)) {
-        // resolve will not find npm modules with the same name as
-        // core modules without a trailing slash. Since core modules
-        // must be external, we can assume any core modules defined
-        // here are npm modules by that name.
-        resolveId += '/';
-      }
-
-      try {
-        resolvedId = nodeResolveSync(resolveId, { basedir: process.cwd() });
-      } catch (err) {
-        resolvedId = resolve(id);
-      }
-
-      // Note: customNamedExport's keys must be normalized file paths.
-      // resolve and nodeResolveSync both return normalized file paths
-      // so no additional normalization is necessary.
-      customNamedExports[resolvedId] = options.namedExports[id];
-
-      if (existsSync(resolvedId)) {
-        const realpath = realpathSync(resolvedId);
-        if (realpath !== resolvedId) {
-          customNamedExports[realpath] = options.namedExports[id];
-        }
-      }
-    });
-  }
-
   const esModulesWithoutDefaultExport = new Set();
   const esModulesWithDefaultExport = new Set();
 
@@ -111,8 +76,6 @@ export default function commonjs(options = {}) {
       return null;
     }
 
-    const normalizedId = normalize(id);
-
     const transformed = transformCommonjs(
       this.parse,
       code,
@@ -121,7 +84,6 @@ export default function commonjs(options = {}) {
       isEsModule,
       ignoreGlobal || isEsModule,
       ignoreRequire,
-      customNamedExports[normalizedId],
       sourceMap,
       isDynamicRequireModulesEnabled,
       dynamicRequireModuleSet,
@@ -143,6 +105,12 @@ export default function commonjs(options = {}) {
     name: 'commonjs',
 
     buildStart() {
+      if (options.namedExports != null) {
+        this.warn(
+          'The namedExports option from "@rollup/plugin-commonjs" is deprecated. Named exports are now handled automatically.'
+        );
+      }
+
       const [major, minor] = this.meta.rollupVersion.split('.').map(Number);
       const minVersion = peerDependencies.rollup.slice(2);
       const [minMajor, minMinor] = minVersion.split('.').map(Number);
diff --git a/packages/commonjs/src/transform.js b/packages/commonjs/src/transform.js
index 20e14f1e2..7209e765a 100644
--- a/packages/commonjs/src/transform.js
+++ b/packages/commonjs/src/transform.js
@@ -109,7 +109,6 @@ export function transformCommonjs(
   isEsModule,
   ignoreGlobal,
   ignoreRequire,
-  customNamedExports,
   sourceMap,
   isDynamicRequireModulesEnabled,
   dynamicRequireModuleSet,
@@ -562,8 +561,6 @@ export function transformCommonjs(
     });
   }
 
-  if (customNamedExports) customNamedExports.forEach(addExport);
-
   const defaultExportPropertyAssignments = [];
   let hasDefaultExport = false;
 
@@ -648,12 +645,13 @@ export function transformCommonjs(
     .trim()
     .append(wrapperEnd);
 
-  if (hasDefaultExport || named.length > 0 || shouldWrap || (!isEntry && !isEsModule)) {
+  const injectExportBlock = hasDefaultExport || named.length > 0 || shouldWrap || !isEntry;
+  if (injectExportBlock) {
     magicString.append(exportBlock);
   }
 
   code = magicString.toString();
   const map = sourceMap ? magicString.generateMap() : null;
 
-  return { code, map };
+  return { code, map, syntheticNamedExports: injectExportBlock };
 }
diff --git a/packages/commonjs/test/fixtures/.eslintrc b/packages/commonjs/test/fixtures/.eslintrc
index 8cd798500..a280042d1 100644
--- a/packages/commonjs/test/fixtures/.eslintrc
+++ b/packages/commonjs/test/fixtures/.eslintrc
@@ -6,6 +6,7 @@
     "func-names": "off",
     "no-console": "off",
     "no-undefined": "off",
+    "no-undef": "off",
     "import/prefer-default-export": "off",
     "import/extensions": "off",
     "import/no-unresolved": "off",
diff --git a/packages/commonjs/test/fixtures/function/__esModule/main.js b/packages/commonjs/test/fixtures/function/__esModule/main.js
index be3be5c54..6ef314f3a 100644
--- a/packages/commonjs/test/fixtures/function/__esModule/main.js
+++ b/packages/commonjs/test/fixtures/function/__esModule/main.js
@@ -2,4 +2,3 @@ import * as x from './answer';
 
 t.truthy('answer' in x);
 t.truthy('default' in x);
-t.truthy(!('__esModule' in x));
diff --git a/packages/commonjs/test/fixtures/function/named-exports-conditional/main.js b/packages/commonjs/test/fixtures/function/named-exports-conditional/main.js
new file mode 100644
index 000000000..b469d5837
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-conditional/main.js
@@ -0,0 +1,3 @@
+import { named } from './x.js';
+
+t.is(named, 'foo');
diff --git a/packages/commonjs/test/fixtures/function/named-exports-conditional/x.js b/packages/commonjs/test/fixtures/function/named-exports-conditional/x.js
new file mode 100644
index 000000000..883fb344a
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-conditional/x.js
@@ -0,0 +1,5 @@
+if (typeof someUnknownGlobal !== 'undefined') {
+  module.exports = { named: 'bar' };
+} else {
+  module.exports = { named: 'foo' };
+}
diff --git a/packages/commonjs/test/fixtures/function/named-exports-dynamic/_config.js b/packages/commonjs/test/fixtures/function/named-exports-dynamic/_config.js
new file mode 100644
index 000000000..643cb9d34
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-dynamic/_config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  context: {
+    window: {}
+  }
+};
diff --git a/packages/commonjs/test/fixtures/function/named-exports-dynamic/main.js b/packages/commonjs/test/fixtures/function/named-exports-dynamic/main.js
new file mode 100644
index 000000000..29659b582
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-dynamic/main.js
@@ -0,0 +1,7 @@
+import { named } from './x.js';
+
+t.is(named, undefined);
+
+window.addExport('named', 'foo');
+
+t.is(named, 'foo');
diff --git a/packages/commonjs/test/fixtures/function/named-exports-dynamic/x.js b/packages/commonjs/test/fixtures/function/named-exports-dynamic/x.js
new file mode 100644
index 000000000..0a84c7333
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-dynamic/x.js
@@ -0,0 +1,3 @@
+window.addExport = (key, value) => {
+  module.exports[key] = value;
+};
diff --git a/packages/commonjs/test/fixtures/function/named-exports-object-define/main.js b/packages/commonjs/test/fixtures/function/named-exports-object-define/main.js
new file mode 100644
index 000000000..b469d5837
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-object-define/main.js
@@ -0,0 +1,3 @@
+import { named } from './x.js';
+
+t.is(named, 'foo');
diff --git a/packages/commonjs/test/fixtures/function/named-exports-object-define/x.js b/packages/commonjs/test/fixtures/function/named-exports-object-define/x.js
new file mode 100644
index 000000000..c8dcd764b
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-object-define/x.js
@@ -0,0 +1,6 @@
+Object.defineProperty(module.exports, 'named', {
+  enumerable: true,
+  get: function get() {
+    return 'foo';
+  }
+});
diff --git a/packages/commonjs/test/fixtures/samples/reexport/export.js b/packages/commonjs/test/fixtures/function/named-exports-reexport-default/export.js
similarity index 100%
rename from packages/commonjs/test/fixtures/samples/reexport/export.js
rename to packages/commonjs/test/fixtures/function/named-exports-reexport-default/export.js
diff --git a/packages/commonjs/test/fixtures/samples/reexport/main.js b/packages/commonjs/test/fixtures/function/named-exports-reexport-default/main.js
similarity index 100%
rename from packages/commonjs/test/fixtures/samples/reexport/main.js
rename to packages/commonjs/test/fixtures/function/named-exports-reexport-default/main.js
diff --git a/packages/commonjs/test/fixtures/samples/reexport/reexport.js b/packages/commonjs/test/fixtures/function/named-exports-reexport-default/reexport.js
similarity index 100%
rename from packages/commonjs/test/fixtures/samples/reexport/reexport.js
rename to packages/commonjs/test/fixtures/function/named-exports-reexport-default/reexport.js
diff --git a/packages/commonjs/test/fixtures/function/named-exports-reexport-named/export.js b/packages/commonjs/test/fixtures/function/named-exports-reexport-named/export.js
new file mode 100644
index 000000000..5cb323723
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-reexport-named/export.js
@@ -0,0 +1 @@
+exports.named = 2;
diff --git a/packages/commonjs/test/fixtures/function/named-exports-reexport-named/main.js b/packages/commonjs/test/fixtures/function/named-exports-reexport-named/main.js
new file mode 100644
index 000000000..28abb9a60
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-reexport-named/main.js
@@ -0,0 +1,3 @@
+import { named } from './reexport.js';
+
+t.is(named, 2);
diff --git a/packages/commonjs/test/fixtures/function/named-exports-reexport-named/reexport.js b/packages/commonjs/test/fixtures/function/named-exports-reexport-named/reexport.js
new file mode 100644
index 000000000..ba56c12b5
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-reexport-named/reexport.js
@@ -0,0 +1,3 @@
+const myModule = require('./export.js');
+
+module.exports.named = myModule.named;
diff --git a/packages/commonjs/test/fixtures/function/named-exports-unexported/main.js b/packages/commonjs/test/fixtures/function/named-exports-unexported/main.js
new file mode 100644
index 000000000..8b713b667
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-unexported/main.js
@@ -0,0 +1,3 @@
+import { nonExisting } from './x.js';
+
+t.is(nonExisting, undefined);
diff --git a/packages/commonjs/test/fixtures/function/named-exports-unexported/x.js b/packages/commonjs/test/fixtures/function/named-exports-unexported/x.js
new file mode 100644
index 000000000..5cb323723
--- /dev/null
+++ b/packages/commonjs/test/fixtures/function/named-exports-unexported/x.js
@@ -0,0 +1 @@
+exports.named = 2;
diff --git a/packages/commonjs/test/fixtures/function/reexports/_config.js b/packages/commonjs/test/fixtures/function/reexports/_config.js
deleted file mode 100644
index ae2a6deec..000000000
--- a/packages/commonjs/test/fixtures/function/reexports/_config.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const path = require('path');
-
-module.exports = {
-  pluginOptions: {
-    namedExports: {
-      [path.resolve(__dirname, 'foo.js')]: ['named']
-    }
-  }
-};
diff --git a/packages/commonjs/test/fixtures/function/reexports/bar.js b/packages/commonjs/test/fixtures/function/reexports/bar.js
deleted file mode 100644
index cbf3e94a5..000000000
--- a/packages/commonjs/test/fixtures/function/reexports/bar.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.named = 42;
diff --git a/packages/commonjs/test/fixtures/function/reexports/foo.js b/packages/commonjs/test/fixtures/function/reexports/foo.js
deleted file mode 100644
index 8cb411907..000000000
--- a/packages/commonjs/test/fixtures/function/reexports/foo.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./bar.js');
diff --git a/packages/commonjs/test/fixtures/function/reexports/main.js b/packages/commonjs/test/fixtures/function/reexports/main.js
deleted file mode 100644
index 65d3053db..000000000
--- a/packages/commonjs/test/fixtures/function/reexports/main.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { named } from './foo.js';
-
-t.is(named, 42);
diff --git a/packages/commonjs/test/fixtures/samples/custom-named-exports-browser-shims/main.js b/packages/commonjs/test/fixtures/samples/custom-named-exports-browser-shims/main.js
deleted file mode 100644
index e1783ae5a..000000000
--- a/packages/commonjs/test/fixtures/samples/custom-named-exports-browser-shims/main.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { message, foo } from 'events';
-
-t.is(message, 'this is not builtin');
-t.is(foo, 'this is a hidden export');
diff --git a/packages/commonjs/test/fixtures/samples/custom-named-exports-false-positive/main.js b/packages/commonjs/test/fixtures/samples/custom-named-exports-false-positive/main.js
deleted file mode 100644
index dc5314327..000000000
--- a/packages/commonjs/test/fixtures/samples/custom-named-exports-false-positive/main.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { thing } from './other.js';
-
-t.is(thing, 'yes');
diff --git a/packages/commonjs/test/fixtures/samples/custom-named-exports-false-positive/other.js b/packages/commonjs/test/fixtures/samples/custom-named-exports-false-positive/other.js
deleted file mode 100644
index b559a9cc8..000000000
--- a/packages/commonjs/test/fixtures/samples/custom-named-exports-false-positive/other.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* require (https://github.com/rollup/rollup-plugin-commonjs/issues/36) */
-/* eslint-disable */
-export var thing = 'yes';
diff --git a/packages/commonjs/test/fixtures/samples/custom-named-exports-warn-builtins/main.js b/packages/commonjs/test/fixtures/samples/custom-named-exports-warn-builtins/main.js
deleted file mode 100644
index 6620ad1be..000000000
--- a/packages/commonjs/test/fixtures/samples/custom-named-exports-warn-builtins/main.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { message } from 'events';
-
-t.is(message, 'this is not builtin');
diff --git a/packages/commonjs/test/fixtures/samples/custom-named-exports/main.js b/packages/commonjs/test/fixtures/samples/custom-named-exports/main.js
deleted file mode 100644
index 70db426d5..000000000
--- a/packages/commonjs/test/fixtures/samples/custom-named-exports/main.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { message } from 'external';
-
-import { named } from './secret-named-exporter.js';
-
-t.is(named, 42);
-t.is(message, 'it works');
diff --git a/packages/commonjs/test/fixtures/samples/custom-named-exports/secret-named-exporter.js b/packages/commonjs/test/fixtures/samples/custom-named-exports/secret-named-exporter.js
deleted file mode 100644
index 275a85813..000000000
--- a/packages/commonjs/test/fixtures/samples/custom-named-exports/secret-named-exporter.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const myLib = exports;
-myLib.named = 42;
diff --git a/packages/commonjs/test/fixtures/samples/define-property/foo.js b/packages/commonjs/test/fixtures/samples/define-property/foo.js
deleted file mode 100644
index 84086fe7a..000000000
--- a/packages/commonjs/test/fixtures/samples/define-property/foo.js
+++ /dev/null
@@ -1,6 +0,0 @@
-Object.defineProperty(exports, 'foo', {
-  enumerable: true,
-  get: function get() {
-    return 'bar';
-  }
-});
diff --git a/packages/commonjs/test/fixtures/samples/define-property/main.js b/packages/commonjs/test/fixtures/samples/define-property/main.js
deleted file mode 100644
index de89f2b76..000000000
--- a/packages/commonjs/test/fixtures/samples/define-property/main.js
+++ /dev/null
@@ -1 +0,0 @@
-export { foo } from './foo';
diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md
index e6c6b5bf2..411acaaef 100644
--- a/packages/commonjs/test/snapshots/function.js.md
+++ b/packages/commonjs/test/snapshots/function.js.md
@@ -28,16 +28,14 @@ Generated by [AVA](https://ava.li).
       var answer$1 = unwrapExports(answer);␊
       var answer_1 = answer.answer;␊
       ␊
-      var x = /*#__PURE__*/Object.freeze({␊
-      	__proto__: null,␊
+      var x = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), answer$1, {␊
       	'default': answer$1,␊
       	__moduleExports: answer,␊
       	answer: answer_1␊
-      });␊
+      }));␊
       ␊
       t.truthy('answer' in x);␊
       t.truthy('default' in x);␊
-      t.truthy(!('__esModule' in x));␊
       `,
     }
 
@@ -2693,6 +2691,134 @@ Generated by [AVA](https://ava.li).
       `,
     }
 
+## named-exports-conditional
+
+> Snapshot 1
+
+    {
+      'main.js': `'use strict';␊
+      ␊
+      function createCommonjsModule(fn, module) {␊
+      	return module = { exports: {} }, fn(module, module.exports), module.exports;␊
+      }␊
+      ␊
+      var x = createCommonjsModule(function (module) {␊
+      if (typeof someUnknownGlobal !== 'undefined') {␊
+        module.exports = { named: 'bar' };␊
+      } else {␊
+        module.exports = { named: 'foo' };␊
+      }␊
+      });␊
+      var x_1 = x.named;␊
+      ␊
+      t.is(x_1, 'foo');␊
+      `,
+    }
+
+## named-exports-dynamic
+
+> Snapshot 1
+
+    {
+      'main.js': `'use strict';␊
+      ␊
+      function createCommonjsModule(fn, module) {␊
+      	return module = { exports: {} }, fn(module, module.exports), module.exports;␊
+      }␊
+      ␊
+      var x = createCommonjsModule(function (module) {␊
+      window.addExport = (key, value) => {␊
+        module.exports[key] = value;␊
+      };␊
+      });␊
+      ␊
+      t.is(x.named, undefined);␊
+      ␊
+      window.addExport('named', 'foo');␊
+      ␊
+      t.is(x.named, 'foo');␊
+      `,
+    }
+
+## named-exports-object-define
+
+> Snapshot 1
+
+    {
+      'main.js': `'use strict';␊
+      ␊
+      function createCommonjsModule(fn, module) {␊
+      	return module = { exports: {} }, fn(module, module.exports), module.exports;␊
+      }␊
+      ␊
+      var x = createCommonjsModule(function (module) {␊
+      Object.defineProperty(module.exports, 'named', {␊
+        enumerable: true,␊
+        get: function get() {␊
+          return 'foo';␊
+        }␊
+      });␊
+      });␊
+      ␊
+      t.is(x.named, 'foo');␊
+      `,
+    }
+
+## named-exports-reexport-default
+
+> Snapshot 1
+
+    {
+      'main.js': `'use strict';␊
+      ␊
+      var named = 2;␊
+      ␊
+      var _export = {␊
+      	named: named␊
+      };␊
+      ␊
+      var reexport = _export;␊
+      ␊
+      t.is(reexport.named, 2);␊
+      `,
+    }
+
+## named-exports-reexport-named
+
+> Snapshot 1
+
+    {
+      'main.js': `'use strict';␊
+      ␊
+      var named = 2;␊
+      ␊
+      var _export = {␊
+      	named: named␊
+      };␊
+      ␊
+      var named$1 = _export.named;␊
+      ␊
+      t.is(named$1, 2);␊
+      `,
+    }
+
+## named-exports-unexported
+
+> Snapshot 1
+
+    {
+      'main.js': `'use strict';␊
+      ␊
+      var named = 2;␊
+      ␊
+      var x = {␊
+      	named: named␊
+      };␊
+      ␊
+      t.is(x.nonExisting, undefined);␊
+      `,
+    }
+
 ## ordering
 
 > Snapshot 1
@@ -2778,26 +2904,6 @@ Generated by [AVA](https://ava.li).
       `,
     }
 
-## reexports
-
-> Snapshot 1
-
-    {
-      'main.js': `'use strict';␊
-      ␊
-      var named = 42;␊
-      ␊
-      var bar = {␊
-      	named: named␊
-      };␊
-      ␊
-      var foo = bar;␊
-      var foo_1 = foo.named;␊
-      ␊
-      t.is(foo_1, 42);␊
-      `,
-    }
-
 ## resolve-is-cjs-extension
 
 > Snapshot 1
diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap
index 7d57a0ebda9e9bd972e095d2201e3d0e50db9dca..204228585062c2af2b18a0df7280a58147ca943a 100644
GIT binary patch
delta 7025
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

delta 6664
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

diff --git a/packages/commonjs/test/test.js b/packages/commonjs/test/test.js
index 6dd9b8b8f..0eaea1db5 100644
--- a/packages/commonjs/test/test.js
+++ b/packages/commonjs/test/test.js
@@ -180,39 +180,6 @@ test('handles successive builds', async (t) => {
   t.is(module.exports, 'foobar', code);
 });
 
-test('allows named exports to be added explicitly via config', async (t) => {
-  const bundle = await rollup({
-    input: 'fixtures/samples/custom-named-exports/main.js',
-    plugins: [
-      resolve(),
-      commonjs({
-        namedExports: {
-          'fixtures/samples/custom-named-exports/secret-named-exporter.js': ['named'],
-          external: ['message']
-        }
-      })
-    ]
-  });
-
-  await t.notThrowsAsync(executeBundle(bundle, t));
-});
-
-test('handles warnings without error when resolving named exports', async (t) => {
-  await t.notThrowsAsync(
-    rollup({
-      input: 'fixtures/samples/custom-named-exports-warn-builtins/main.js',
-      plugins: [
-        resolve(),
-        commonjs({
-          namedExports: {
-            events: ['message']
-          }
-        })
-      ]
-    })
-  );
-});
-
 test.serial('handles symlinked node_modules with preserveSymlinks: false', (t) => {
   const cwd = process.cwd();
 
@@ -233,11 +200,7 @@ test.serial('handles symlinked node_modules with preserveSymlinks: false', (t) =
           preserveSymlinks: false,
           preferBuiltins: false
         }),
-        commonjs({
-          namedExports: {
-            events: ['foo']
-          }
-        })
+        commonjs()
       ]
     })
       .then((v) => {
@@ -251,40 +214,6 @@ test.serial('handles symlinked node_modules with preserveSymlinks: false', (t) =
   );
 });
 
-test('handles named exports for built-in shims', async (t) => {
-  const bundle = await rollup({
-    input: 'fixtures/samples/custom-named-exports-browser-shims/main.js',
-    plugins: [
-      resolve({
-        preferBuiltins: false
-      }),
-      commonjs({
-        namedExports: {
-          events: ['foo']
-        }
-      })
-    ]
-  });
-
-  await t.notThrowsAsync(executeBundle(bundle, t));
-});
-
-test('ignores false positives with namedExports (#36)', async (t) => {
-  const bundle = await rollup({
-    input: 'fixtures/samples/custom-named-exports-false-positive/main.js',
-    plugins: [
-      resolve(),
-      commonjs({
-        namedExports: {
-          irrelevant: ['lol']
-        }
-      })
-    ]
-  });
-
-  await t.notThrowsAsync(executeBundle(bundle, t));
-});
-
 test('converts a CommonJS module with custom file extension', async (t) => {
   const bundle = await rollup({
     input: 'fixtures/samples/extension/main.coffee',
@@ -395,30 +324,6 @@ test('does not process the entry file when it has a leading "." (issue #63)', as
   await t.notThrowsAsync(executeBundle(bundle, t));
 });
 
-test('does not reexport named contents', async (t) => {
-  try {
-    await rollup({
-      input: 'fixtures/samples/reexport/main.js',
-      plugins: [commonjs()]
-    });
-  } catch (error) {
-    t.is(
-      error.message,
-      `'named' is not exported by fixtures${path.sep}samples${path.sep}reexport${path.sep}reexport.js, ` +
-        `imported by fixtures${path.sep}samples${path.sep}reexport${path.sep}main.js`
-    );
-  }
-});
-
-test(`exports props defined by 'Object.defineProperty'`, async (t) => {
-  const bundle = await rollup({
-    input: 'fixtures/samples/define-property/main.js',
-    plugins: [commonjs()]
-  });
-  const m = await executeBundle(bundle, t);
-  t.is(m.exports.foo, 'bar');
-});
-
 test('respects other plugins', async (t) => {
   const bundle = await rollup({
     input: 'fixtures/samples/other-transforms/main.js',
@@ -716,40 +621,6 @@ exports.shuffleArray = shuffleArray_1;
   );
 });
 
-test('normalizes paths used in the named export map', async (t) => {
-  // Deliberately denormalizes file paths and ensures named exports
-  // continue to work.
-  function hookedResolve() {
-    const resolvePlugin = resolve();
-    const oldResolve = resolvePlugin.resolveId;
-    resolvePlugin.resolveId = async (...args) => {
-      const result = await oldResolve.apply(resolvePlugin, args);
-      if (result) {
-        result.id = result.id.replace(/\/|\\/, path.sep);
-      }
-
-      return result;
-    };
-
-    return resolvePlugin;
-  }
-
-  const bundle = await rollup({
-    input: 'fixtures/samples/custom-named-exports/main.js',
-    plugins: [
-      hookedResolve(),
-      commonjs({
-        namedExports: {
-          'fixtures/samples/custom-named-exports/secret-named-exporter.js': ['named'],
-          external: ['message']
-        }
-      })
-    ]
-  });
-
-  await t.notThrowsAsync(executeBundle(bundle, t));
-});
-
 test('can spread an object into module.exports', async (t) => {
   const bundle = await rollup({
     input: 'fixtures/samples/module-exports-spread/main.js',
@@ -758,3 +629,20 @@ test('can spread an object into module.exports', async (t) => {
   const code = await getCodeFromBundle(bundle);
   t.snapshot(code);
 });
+
+test('logs a warning when the deprecated namedExports option is used', async (t) => {
+  let message;
+  const bundle = await rollup({
+    onwarn(warning) {
+      message = warning.message;
+    },
+    input: 'fixtures/samples/sourcemap/main.js',
+    plugins: [commonjs({ namedExports: { foo: ['bar'] } })]
+  });
+
+  await getCodeFromBundle(bundle);
+  t.is(
+    message,
+    'The namedExports option from "@rollup/plugin-commonjs" is deprecated. Named exports are now handled automatically.'
+  );
+});
diff --git a/packages/commonjs/test/types.ts b/packages/commonjs/test/types.ts
index a34d1f43a..7a0b16eb8 100644
--- a/packages/commonjs/test/types.ts
+++ b/packages/commonjs/test/types.ts
@@ -13,7 +13,6 @@ const config: import('rollup').RollupOptions = {
       extensions: ['.js', '.coffee'],
       ignoreGlobal: false,
       sourceMap: false,
-      namedExports: { './module.js': ['foo', 'bar'] },
       ignore: ['conditional-runtime-dependency'],
       dynamicRequireTargets: ['node_modules/logform/*.js']
     })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fb2929f02..1fdeb13b7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -107,7 +107,7 @@ importers:
       typescript: ^3.7.4
   packages/commonjs:
     dependencies:
-      '@rollup/pluginutils': 3.0.8_rollup@2.2.0
+      '@rollup/pluginutils': 3.0.8_rollup@2.6.0
       commondir: 1.0.1
       estree-walker: 1.0.1
       glob: 7.1.6
@@ -118,14 +118,14 @@ importers:
       '@babel/core': 7.9.0
       '@babel/preset-env': 7.9.0_@babel+core@7.9.0
       '@babel/register': 7.9.0_@babel+core@7.9.0
-      '@rollup/plugin-json': 4.0.2_rollup@2.2.0
-      '@rollup/plugin-node-resolve': 7.1.1_rollup@2.2.0
+      '@rollup/plugin-json': 4.0.2_rollup@2.6.0
+      '@rollup/plugin-node-resolve': 7.1.1_rollup@2.6.0
       acorn: 7.1.1
       locate-character: 2.0.5
       prettier: 1.19.1
       require-relative: 0.8.7
-      rollup: 2.2.0
-      rollup-plugin-babel: 4.3.3_@babel+core@7.9.0+rollup@2.2.0
+      rollup: 2.6.0
+      rollup-plugin-babel: 4.3.3_@babel+core@7.9.0+rollup@2.6.0
       shx: 0.3.2
       source-map: 0.6.1
       source-map-support: 0.5.16
@@ -147,7 +147,7 @@ importers:
       prettier: ^1.19.1
       require-relative: ^0.8.7
       resolve: ^1.11.0
-      rollup: ^2.0.0
+      rollup: ^2.3.4
       rollup-plugin-babel: ^4.3.3
       shx: ^0.3.2
       source-map: ^0.6.1
@@ -1617,6 +1617,15 @@ packages:
       rollup: ^1.20.0
     resolution:
       integrity: sha512-t4zJMc98BdH42mBuzjhQA7dKh0t4vMJlUka6Fz0c+iO5IVnWaEMiYBy1uBj9ruHZzXBW23IPDGL9oCzBkQ9Udg==
+  /@rollup/plugin-json/4.0.2_rollup@2.6.0:
+    dependencies:
+      '@rollup/pluginutils': 3.0.8_rollup@2.6.0
+      rollup: 2.6.0
+    dev: true
+    peerDependencies:
+      rollup: ^1.20.0
+    resolution:
+      integrity: sha512-t4zJMc98BdH42mBuzjhQA7dKh0t4vMJlUka6Fz0c+iO5IVnWaEMiYBy1uBj9ruHZzXBW23IPDGL9oCzBkQ9Udg==
   /@rollup/plugin-node-resolve/7.1.1:
     dependencies:
       '@rollup/pluginutils': 3.0.8
@@ -1646,6 +1655,21 @@ packages:
       rollup: ^1.20.0
     resolution:
       integrity: sha512-14ddhD7TnemeHE97a4rLOhobfYvUVcaYuqTnL8Ti7Jxi9V9Jr5LY7Gko4HZ5k4h4vqQM0gBQt6tsp9xXW94WPA==
+  /@rollup/plugin-node-resolve/7.1.1_rollup@2.6.0:
+    dependencies:
+      '@rollup/pluginutils': 3.0.8_rollup@2.6.0
+      '@types/resolve': 0.0.8
+      builtin-modules: 3.1.0
+      is-module: 1.0.0
+      resolve: 1.15.1
+      rollup: 2.6.0
+    dev: true
+    engines:
+      node: '>= 8.0.0'
+    peerDependencies:
+      rollup: ^1.20.0
+    resolution:
+      integrity: sha512-14ddhD7TnemeHE97a4rLOhobfYvUVcaYuqTnL8Ti7Jxi9V9Jr5LY7Gko4HZ5k4h4vqQM0gBQt6tsp9xXW94WPA==
   /@rollup/plugin-typescript/3.0.0_b32f28c91b7d5afb3a4e5593fb670831:
     dependencies:
       '@rollup/pluginutils': 3.0.8_rollup@2.2.0
@@ -1724,6 +1748,16 @@ packages:
       rollup: ^1.20.0
     resolution:
       integrity: sha512-rYGeAc4sxcZ+kPG/Tw4/fwJODC3IXHYDH4qusdN/b6aLw5LPUbzpecYbEJh4sVQGPFJxd2dBU4kc1H3oy9/bnw==
+  /@rollup/pluginutils/3.0.8_rollup@2.6.0:
+    dependencies:
+      estree-walker: 1.0.1
+      rollup: 2.6.0
+    engines:
+      node: '>= 8.0.0'
+    peerDependencies:
+      rollup: ^1.20.0
+    resolution:
+      integrity: sha512-rYGeAc4sxcZ+kPG/Tw4/fwJODC3IXHYDH4qusdN/b6aLw5LPUbzpecYbEJh4sVQGPFJxd2dBU4kc1H3oy9/bnw==
   /@samverschueren/stream-to-observable/0.3.0:
     dependencies:
       any-observable: 0.3.0
@@ -6781,6 +6815,18 @@ packages:
       rollup: '>=0.60.0 <2'
     resolution:
       integrity: sha512-tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==
+  /rollup-plugin-babel/4.3.3_@babel+core@7.9.0+rollup@2.6.0:
+    dependencies:
+      '@babel/core': 7.9.0
+      '@babel/helper-module-imports': 7.8.3
+      rollup: 2.6.0
+      rollup-pluginutils: 2.8.2
+    dev: true
+    peerDependencies:
+      '@babel/core': 7 || ^7.0.0-rc.2
+      rollup: '>=0.60.0 <2'
+    resolution:
+      integrity: sha512-tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==
   /rollup-plugin-babel/4.4.0_@babel+core@7.9.0+rollup@2.2.0:
     dependencies:
       '@babel/core': 7.9.0
@@ -6842,6 +6888,14 @@ packages:
       fsevents: 2.1.2
     resolution:
       integrity: sha512-iAu/j9/WJ0i+zT0sAMuQnsEbmOKzdQ4Yxu5rbPs9aUCyqveI1Kw3H4Fi9NWfCOpb8luEySD2lDyFWL9CrLE8iw==
+  /rollup/2.6.0:
+    engines:
+      node: '>=10.0.0'
+    hasBin: true
+    optionalDependencies:
+      fsevents: 2.1.2
+    resolution:
+      integrity: sha512-qbvQ9ZbvbhBdtRBZ/A4g+9z3iJQ1rHAtjinn3FiN+j5tfz8xiNyTE1JEEMcFWqlH7+NHadI9ieeqKdp8HwYLnQ==
   /run-async/2.4.0:
     dependencies:
       is-promise: 2.1.0