feat!: drop cjs support (#2871)

diegomura · Sep 22, 2024 · 70f29a0 · 70f29a0
1 parent 3895403
commit 70f29a0
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 324 deletions.
diff --git a/.changeset/strong-rockets-fix.md b/.changeset/strong-rockets-fix.md
@@ -0,0 +1,15 @@
+---
+"@react-pdf/primitives": major
+"@react-pdf/stylesheet": major
+"@react-pdf/renderer": major
+"@react-pdf/textkit": major
+"@react-pdf/layout": major
+"@react-pdf/pdfkit": major
+"@react-pdf/png-js": major
+"@react-pdf/render": major
+"@react-pdf/image": major
+"@react-pdf/font": major
+"@react-pdf/fns": major
+---
+
+feat!: drop cjs support
diff --git a/packages/fns/package.json b/packages/fns/package.json
@@ -6,15 +6,7 @@
   "author": "Diego Muracciole <[email protected]>",
   "homepage": "https://github.com/diegomura/react-pdf#readme",
   "type": "module",
-  "main": "./lib/index.cjs",
-  "module": "./lib/index.js",
-  "exports": {
-    ".": {
-      "import": "./lib/index.js",
-      "require": "./lib/index.cjs",
-      "default": "./lib/index.js"
-    }
-  },
+  "main": "./lib/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/diegomura/react-pdf.git",

diff --git a/packages/fns/rollup.config.js b/packages/fns/rollup.config.js
@@ -1,20 +1,9 @@
 import babel from '@rollup/plugin-babel';
 
-const cjs = {
-  exports: 'named',
-  format: 'cjs',
-  interop: 'compat',
-};
-
-const esm = {
-  format: 'es',
-};
-
-const getCJS = (override) => Object.assign({}, cjs, override);
-const getESM = (override) => Object.assign({}, esm, override);
-
 const input = 'src/index.js';
 
+const output = { format: 'es', file: 'lib/index.js' };
+
 const getExternal = () => [/@babel\/runtime/];
 
 const getPlugins = () => [
@@ -27,7 +16,7 @@ const getPlugins = () => [
 
 const config = {
   input,
-  output: [getESM({ file: 'lib/index.js' }), getCJS({ file: 'lib/index.cjs' })],
+  output,
   external: getExternal(),
   plugins: getPlugins(),
 };

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -11,18 +11,9 @@
     "directory": "packages/font"
   },
   "type": "module",
-  "main": "./lib/index.cjs",
-  "module": "./lib/index.js",
+  "main": "./lib/index.js",
   "browser": {
-    "./lib/index.js": "./lib/index.browser.js",
-    "./lib/index.cjs": "./lib/index.browser.cjs"
-  },
-  "exports": {
-    ".": {
-      "import": "./lib/index.js",
-      "require": "./lib/index.cjs",
-      "default": "./lib/index.js"
-    }
+    "./lib/index.js": "./lib/index.browser.js"
   },
   "scripts": {
     "test": "vitest",

diff --git a/packages/font/rollup.config.js b/packages/font/rollup.config.js
@@ -2,19 +2,6 @@ import babel from '@rollup/plugin-babel';
 import replace from '@rollup/plugin-replace';
 import pkg from './package.json' assert { type: 'json' };
 
-const cjs = {
-  exports: 'named',
-  format: 'cjs',
-  interop: 'compat',
-};
-
-const esm = {
-  format: 'es',
-};
-
-const getCJS = (override) => Object.assign({}, cjs, override);
-const getESM = (override) => Object.assign({}, esm, override);
-
 const babelConfig = () => ({
   babelrc: true,
   exclude: 'node_modules/**',
@@ -35,17 +22,14 @@ const getPlugins = ({ browser }) => [
 
 const serverConfig = {
   input: './src/index.js',
-  output: [getESM({ file: 'lib/index.js' }), getCJS({ file: 'lib/index.cjs' })],
+  output: { format: 'es', file: 'lib/index.js' },
   external,
   plugins: getPlugins({ browser: false }),
 };
 
 const browserConfig = {
   input: './src/index.js',
-  output: [
-    getESM({ file: 'lib/index.browser.js' }),
-    getCJS({ file: 'lib/index.browser.cjs' }),
-  ],
+  output: { format: 'es', file: 'lib/index.browser.js' },
   external,
   plugins: getPlugins({ browser: true }),
 };

diff --git a/packages/image/package.json b/packages/image/package.json
@@ -6,19 +6,10 @@
   "author": "Diego Muracciole <[email protected]>",
   "homepage": "https://github.com/diegomura/react-pdf#readme",
   "type": "module",
-  "main": "./lib/index.cjs",
-  "module": "./lib/index.js",
+  "main": "./lib/index.js",
   "browser": {
-    "./lib/index.cjs": "./lib/index.browser.cjs",
     "./lib/index.js": "./lib/index.browser.js"
   },
-  "exports": {
-    ".": {
-      "import": "./lib/index.js",
-      "require": "./lib/index.cjs",
-      "default": "./lib/index.js"
-    }
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/diegomura/react-pdf.git",

diff --git a/packages/image/rollup.config.js b/packages/image/rollup.config.js
@@ -5,19 +5,6 @@ import nodePolyfills from 'rollup-plugin-polyfill-node';
 
 import pkg from './package.json' assert { type: 'json' };
 
-const cjs = {
-  exports: 'named',
-  format: 'cjs',
-  interop: 'compat',
-};
-
-const esm = {
-  format: 'es',
-};
-
-const getCJS = (override) => Object.assign({}, cjs, override);
-const getESM = (override) => Object.assign({}, esm, override);
-
 const input = './src/index.js';
 
 const babelConfig = () => ({
@@ -50,17 +37,14 @@ const getPlugins = ({ browser }) => [
 
 const serverConfig = {
   input,
-  output: [getESM({ file: 'lib/index.js' }), getCJS({ file: 'lib/index.cjs' })],
+  output: { format: 'es', file: 'lib/index.js' },
   external: getExternal({ browser: false }),
   plugins: getPlugins({ browser: false }),
 };
 
 const browserConfig = {
   input,
-  output: [
-    getESM({ file: 'lib/index.browser.js' }),
-    getCJS({ file: 'lib/index.browser.cjs' }),
-  ],
+  output: { format: 'es', file: 'lib/index.browser.js' },
   external: getExternal({ browser: true }),
   plugins: getPlugins({ browser: true }),
 };

diff --git a/packages/layout/package.json b/packages/layout/package.json
@@ -6,15 +6,7 @@
   "author": "Diego Muracciole <[email protected]>",
   "homepage": "https://github.com/diegomura/react-pdf#readme",
   "type": "module",
-  "main": "./lib/index.cjs",
-  "module": "./lib/index.js",
-  "exports": {
-    ".": {
-      "import": "./lib/index.js",
-      "require": "./lib/index.cjs",
-      "default": "./lib/index.js"
-    }
-  },
+  "main": "./lib/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/diegomura/react-pdf.git",

diff --git a/packages/layout/rollup.config.js b/packages/layout/rollup.config.js
@@ -2,21 +2,9 @@ import babel from '@rollup/plugin-babel';
 
 import pkg from './package.json' assert { type: 'json' };
 
-const cjs = {
-  exports: 'named',
-  format: 'cjs',
-  interop: 'compat',
-};
-
-const esm = {
-  format: 'es',
-};
-
-const getCJS = (override) => Object.assign({}, cjs, override);
-const getESM = (override) => Object.assign({}, esm, override);
-
-const configBase = {
+const config = {
   input: 'src/index.js',
+  output: { format: 'es', file: 'lib/index.js' },
   external: Object.keys(pkg.dependencies).concat(
     /@babel\/runtime/,
     /@react-pdf/,
@@ -30,8 +18,4 @@ const configBase = {
   ],
 };
 
-const config = Object.assign({}, configBase, {
-  output: [getESM({ file: 'lib/index.js' }), getCJS({ file: 'lib/index.cjs' })],
-});
-
 export default config;
diff --git a/packages/pdfkit/package.json b/packages/pdfkit/package.json
@@ -4,18 +4,9 @@
   "license": "MIT",
   "description": "A PDF generation library for Node.js",
   "type": "module",
-  "main": "./lib/pdfkit.cjs",
-  "module": "./lib/pdfkit.js",
+  "main": "./lib/pdfkit.js",
   "browser": {
-    "./lib/pdfkit.js": "./lib/pdfkit.browser.js",
-    "./lib/pdfkit.cjs": "./lib/pdfkit.browser.cjs"
-  },
-  "exports": {
-    ".": {
-      "import": "./lib/pdfkit.js",
-      "require": "./lib/pdfkit.cjs",
-      "default": "./lib/pdfkit.js"
-    }
+    "./lib/pdfkit.js": "./lib/pdfkit.browser.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/pdfkit/rollup.config.js b/packages/pdfkit/rollup.config.js
@@ -2,27 +2,13 @@ import babel from '@rollup/plugin-babel';
 import json from '@rollup/plugin-json';
 import replace from '@rollup/plugin-replace';
 import nodeResolve from '@rollup/plugin-node-resolve';
-import terser from '@rollup/plugin-terser';
 import ignore from 'rollup-plugin-ignore';
 import alias from '@rollup/plugin-alias';
 import nodePolyfills from 'rollup-plugin-polyfill-node';
 import commonjs from '@rollup/plugin-commonjs';
 
 import pkg from './package.json' assert { type: 'json' };
 
-const cjs = {
-  exports: 'named',
-  format: 'cjs',
-  interop: 'compat'
-};
-
-const esm = {
-  format: 'es'
-};
-
-const getCJS = (override) => Object.assign({}, cjs, override);
-const getESM = (override) => Object.assign({}, esm, override);
-
 const input = 'src/index.js';
 
 const babelConfig = () => ({
@@ -43,7 +29,7 @@ const getExternal = ({ browser }) => [
   ...(browser ? [] : ['fs'])
 ];
 
-const getPlugins = ({ browser, minify = false }) => [
+const getPlugins = ({ browser }) => [
   json(),
   ...(browser
     ? [
@@ -77,52 +63,23 @@ const getPlugins = ({ browser, minify = false }) => [
     }
   }),
   babel(babelConfig()),
-  ...(minify ? [terser()] : [])
 ];
 
 const serverConfig = {
   input,
-  output: [
-    getESM({ file: 'lib/pdfkit.js' }),
-    getCJS({ file: 'lib/pdfkit.cjs' })
-  ],
+  output: { format: 'es', file: 'lib/pdfkit.js' },
   external: getExternal({ browser: false }),
   plugins: getPlugins({ browser: false })
 };
 
-const serverProdConfig = {
-  input,
-  output: [
-    getESM({ file: 'lib/pdfkit.min.js' }),
-    getCJS({ file: 'lib/pdfkit.min.cjs' })
-  ],
-  external: getExternal({ browser: false }),
-  plugins: getPlugins({ browser: false, minify: true })
-};
-
 const browserConfig = {
   input,
-  output: [
-    getESM({ file: 'lib/pdfkit.browser.js' }),
-    getCJS({ file: 'lib/pdfkit.browser.cjs' })
-  ],
+  output: { format: 'es', file: 'lib/pdfkit.browser.js' },
   external: getExternal({ browser: true }),
   plugins: getPlugins({ browser: true })
 };
 
-const browserProdConfig = Object.assign({}, browserConfig, {
-  input,
-  output: [
-    getESM({ file: 'lib/pdfkit.browser.min.js' }),
-    getCJS({ file: 'lib/pdfkit.browser.min.cjs' })
-  ],
-  external: getExternal({ browser: true }),
-  plugins: getPlugins({ browser: true, minify: true })
-});
-
 export default [
   serverConfig,
-  serverProdConfig,
   browserConfig,
-  browserProdConfig
 ];
diff --git a/packages/png-js/package.json b/packages/png-js/package.json
@@ -4,18 +4,9 @@
   "version": "2.3.1",
   "license": "MIT",
   "type": "module",
-  "main": "./lib/png-js.cjs",
-  "module": "./lib/png-js.js",
+  "main": "./lib/png-js.js",
   "browser": {
-    "./lib/png-js.js": "./lib/png-js.browser.js",
-    "./lib/png-js.cjs": "./lib/png-js.browser.cjs"
-  },
-  "exports": {
-    ".": {
-      "import": "./lib/png-js.js",
-      "require": "./lib/png-js.cjs",
-      "default": "./lib/png-js.js"
-    }
+    "./lib/png-js.js": "./lib/png-js.browser.js"
   },
   "repository": {
     "type": "git",