From 1424249b02adac0d2aae7f29319b396dc9284f93 Mon Sep 17 00:00:00 2001
From: Lukas Taegert-Atkinson <lukas.taegert-atkinson@tngtech.com>
Date: Tue, 14 Dec 2021 15:45:50 +0100
Subject: [PATCH] fix(commonjs): use correct version and add package exports
 (#1038)

---
 packages/commonjs/package.json                            | 8 ++++++--
 packages/commonjs/rollup.config.js                        | 3 +++
 .../test/fixtures/samples/caching/rollupWorker.js         | 2 +-
 packages/commonjs/test/helpers/util.js                    | 2 +-
 packages/commonjs/test/test.js                            | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json
index bb2c7b464..6f3bb2e2a 100644
--- a/packages/commonjs/package.json
+++ b/packages/commonjs/package.json
@@ -13,8 +13,12 @@
   "author": "Rich Harris <richard.a.harris@gmail.com>",
   "homepage": "https://github.com/rollup/plugins/tree/master/packages/commonjs/#readme",
   "bugs": "https://github.com/rollup/plugins/issues",
-  "main": "dist/index.js",
-  "module": "dist/index.es.js",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/es/index.js",
+  "exports": {
+    "require": "./dist/cjs/index.js",
+    "import": "./dist/es/index.js"
+  },
   "engines": {
     "node": ">= 12.0.0"
   },
diff --git a/packages/commonjs/rollup.config.js b/packages/commonjs/rollup.config.js
index 93f8a4c3e..825c4b1be 100644
--- a/packages/commonjs/rollup.config.js
+++ b/packages/commonjs/rollup.config.js
@@ -1,5 +1,7 @@
 import json from '@rollup/plugin-json';
 
+import { emitModulePackageFile } from '../../shared/rollup.config';
+
 import pkg from './package.json';
 
 export default {
@@ -10,6 +12,7 @@ export default {
     {
       file: pkg.module,
       format: 'es',
+      plugins: [emitModulePackageFile()],
       sourcemap: true
     },
     {
diff --git a/packages/commonjs/test/fixtures/samples/caching/rollupWorker.js b/packages/commonjs/test/fixtures/samples/caching/rollupWorker.js
index 2f80d6d4e..eb7e39ea6 100644
--- a/packages/commonjs/test/fixtures/samples/caching/rollupWorker.js
+++ b/packages/commonjs/test/fixtures/samples/caching/rollupWorker.js
@@ -2,7 +2,7 @@ const { workerData, parentPort } = require('worker_threads');
 
 const { rollup } = require('rollup');
 
-const commonjs = require('../../../../dist/index');
+const commonjs = require('../../../..');
 const { getCodeFromBundle } = require('../../../helpers/util');
 
 generateCode(workerData);
diff --git a/packages/commonjs/test/helpers/util.js b/packages/commonjs/test/helpers/util.js
index 5a297d7d7..8e43b3778 100644
--- a/packages/commonjs/test/helpers/util.js
+++ b/packages/commonjs/test/helpers/util.js
@@ -1,6 +1,6 @@
 const path = require('path');
 
-const commonjsPlugin = require('../../dist/index');
+const commonjsPlugin = require('../..');
 
 function commonjs(options) {
   delete require.cache[require.resolve('../..')];
diff --git a/packages/commonjs/test/test.js b/packages/commonjs/test/test.js
index 52d1aafda..4a297a301 100644
--- a/packages/commonjs/test/test.js
+++ b/packages/commonjs/test/test.js
@@ -451,7 +451,7 @@ test('does not warn even if the ES module does not export "default"', async (t)
 test('compiles with cache', async (t) => {
   // specific commonjs require() to ensure same instance is used
   // eslint-disable-next-line global-require
-  const commonjsInstance = require('../dist/index');
+  const commonjsInstance = require('..');
 
   const bundle = await rollup({
     input: 'fixtures/function/index/main.js',