Avoid mjs wrapper and specify esm bundle instead

rollup · May 25, 2020 · 41da746 · 41da746
1 parent 9502a8b
commit 41da746
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 21 deletions.
diff --git a/packages/node-resolve/index.mjs b/packages/node-resolve/index.mjs
diff --git a/packages/node-resolve/package.json b/packages/node-resolve/package.json
@@ -10,7 +10,7 @@
   "author": "Rich Harris <richard.a.harris@gmail.com>",
   "homepage": "https://github.com/rollup/plugins/tree/master/packages/node-resolve/#readme",
   "bugs": "https://github.com/rollup/plugins/issues",
-  "main": "./dist/index.js",
+  "main": "./dist/cjs/index.js",
   "engines": {
     "node": ">= 8.0.0"
   },
@@ -76,10 +76,10 @@
     ]
   },
   "exports": {
-    "require": "./dist/index.js",
-    "import": "./index.mjs"
+    "require": "./dist/cjs/index.js",
+    "import": "./dist/es/index.js"
   },
-  "module": "dist/index.es.js",
+  "module": "./dist/es/index.js",
   "type": "commonjs",
   "types": "types/index.d.ts"
 }
diff --git a/packages/node-resolve/rollup.config.js b/packages/node-resolve/rollup.config.js
@@ -3,6 +3,19 @@ import json from '@rollup/plugin-json';
 
 import pkg from './package.json';
 
+function emitModulePackageFile() {
+  return {
+    name: 'emit-module-package-file',
+    generateBundle() {
+      this.emitFile({
+        type: 'asset',
+        fileName: 'package.json',
+        source: `{"type":"module"}`
+      });
+    }
+  };
+}
+
 export default {
   input: 'src/index.js',
   plugins: [
@@ -23,6 +36,6 @@ export default {
   external: Object.keys(pkg.dependencies).concat(['fs', 'path', 'os', 'util']),
   output: [
     { file: pkg.main, format: 'cjs', exports: 'named' },
-    { file: pkg.module, format: 'es' }
+    { file: pkg.module, format: 'es', plugins: [emitModulePackageFile()] }
   ]
 };
diff --git a/packages/pluginutils/package.json b/packages/pluginutils/package.json
@@ -12,7 +12,7 @@
   "bugs": {
     "url": "https://github.com/rollup/plugins/issues"
   },
-  "main": "dist/index.js",
+  "main": "./dist/cjs/index.js",
   "engines": {
     "node": ">= 8.0.0"
   },
@@ -75,12 +75,17 @@
       "!**/types.ts"
     ]
   },
-  "module": "dist/index.es.js",
+  "exports": {
+    "require": "./dist/cjs/index.js",
+    "import": "./dist/es/index.js"
+  },
+  "module": "./dist/es/index.js",
   "nyc": {
     "extension": [
       ".js",
       ".ts"
     ]
   },
+  "type": "commonjs",
   "types": "types/index.d.ts"
 }
diff --git a/packages/pluginutils/rollup.config.js b/packages/pluginutils/rollup.config.js
@@ -4,6 +4,19 @@ import typescript from '@rollup/plugin-typescript';
 
 import pkg from './package.json';
 
+function emitModulePackageFile() {
+  return {
+    name: 'emit-module-package-file',
+    generateBundle() {
+      this.emitFile({
+        type: 'asset',
+        fileName: 'package.json',
+        source: `{"type":"module"}`
+      });
+    }
+  };
+}
+
 export default {
   input: 'src/index.ts',
   plugins: [
@@ -13,14 +26,7 @@ export default {
   ],
   external: Object.keys(pkg.dependencies).concat('path', 'util'),
   output: [
-    {
-      format: 'cjs',
-      file: pkg.main,
-      exports: 'named'
-    },
-    {
-      format: 'es',
-      file: pkg.module
-    }
+    { format: 'cjs', file: pkg.main, exports: 'named' },
+    { file: pkg.module, format: 'es', plugins: [emitModulePackageFile()] }
   ]
 };