fix(core): Preserve format extensions against Rollup v2 chicanery

evocateur · May 22, 2020 · 14efe1e · 14efe1e
1 parent 28db191
commit 14efe1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/packages/pectin-core/lib/getOutput.js b/packages/pectin-core/lib/getOutput.js
@@ -8,14 +8,11 @@ const dotProp = require('dot-prop');
 module.exports = function getOutput(pkg, cwd) {
     const output = [];
 
-    // generated chunks as of rollup v0.68.0 need chunkFileNames, not entryFileNames
-    const chunkFileNames = dotProp.get(pkg, 'rollup.chunkFileNames', '[name]-[hash].[format].js');
-    const entryFileNames = dotProp.get(pkg, 'rollup.entryFileNames', '[name].[format].js');
-
     output.push({
         format: 'cjs',
         dir: path.dirname(path.resolve(cwd, pkg.main)),
-        chunkFileNames,
+        // generated chunks as of rollup v0.68.0 need chunkFileNames, not entryFileNames
+        chunkFileNames: dotProp.get(pkg, 'rollup.chunkFileNames', '[name]-[hash].cjs.js'),
         // only one entry point, thus no pattern is required
         entryFileNames: path.basename(pkg.main),
     });
@@ -24,8 +21,8 @@ module.exports = function getOutput(pkg, cwd) {
         output.push({
             format: 'esm',
             dir: path.dirname(path.resolve(cwd, pkg.module)),
-            chunkFileNames,
-            entryFileNames,
+            chunkFileNames: dotProp.get(pkg, 'rollup.chunkFileNames', '[name]-[hash].esm.js'),
+            entryFileNames: dotProp.get(pkg, 'rollup.entryFileNames', '[name].esm.js'),
         });
     }
 

diff --git a/packages/rollup-config-pectin/test/rollup-config-pectin.test.js b/packages/rollup-config-pectin/test/rollup-config-pectin.test.js
@@ -36,7 +36,7 @@ Object {
   "input": "<REPO_ROOT>/packages/rollup-config-pectin/src/rollup-config-pectin.js",
   "output": Array [
     Object {
-      "chunkFileNames": "[name]-[hash].[format].js",
+      "chunkFileNames": "[name]-[hash].cjs.js",
       "dir": "<REPO_ROOT>/packages/rollup-config-pectin/lib",
       "entryFileNames": "rollup-config-pectin.js",
       "exports": "auto",