Revert "chore: rollup 4 upgrade (#2175)"

This reverts commit 63c331f.
pmndrs · Nov 14, 2024 · 5026740 · 5026740
1 parent 4be5cc7
commit 5026740
Show file tree

Hide file tree

Showing 3 changed files with 233 additions and 327 deletions.
diff --git a/package.json b/package.json
@@ -71,12 +71,9 @@
   },
   "devDependencies": {
     "@babel/core": "^7.26.0",
-    "@babel/plugin-transform-class-properties": "^7.25.9",
-    "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-transform-modules-commonjs": "^7.25.9",
-    "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
-    "@babel/plugin-transform-numeric-separator": "^7.25.9",
-    "@babel/plugin-transform-optional-chaining": "^7.25.9",
     "@babel/plugin-transform-runtime": "^7.25.9",
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-react": "^7.25.9",
@@ -87,10 +84,10 @@
     "@eslint/js": "^9.14.0",
     "@playwright/test": "^1.45.2",
     "@react-three/fiber": "^8.0.8",
-    "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.3.0",
-    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-babel": "^5.3.0",
+    "@rollup/plugin-commonjs": "^19.0.0",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.0.0",
     "@storybook/addon-actions": "^8.4.2",
     "@storybook/addon-controls": "^8.4.2",
     "@storybook/addon-essentials": "^8.4.2",
@@ -120,9 +117,10 @@
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "rimraf": "^6.0.1",
-    "rollup": "^4.25.0",
-    "rollup-plugin-glslify": "^1.3.1",
+    "rollup": "^2.79.2",
+    "rollup-plugin-glslify": "^1.3.0",
     "rollup-plugin-multi-input": "^1.5.0",
+    "rollup-plugin-terser": "^7.0.2",
     "semantic-release": "^24.2.0",
     "serve": "^14.2.4",
     "storybook": "^8.4.2",

diff --git a/rollup.config.mjs → rollup.config.js b/rollup.config.mjs → rollup.config.js
@@ -1,16 +1,16 @@
 import path from 'path'
-import { babel } from '@rollup/plugin-babel'
-import { nodeResolve } from '@rollup/plugin-node-resolve'
+import babel from '@rollup/plugin-babel'
+import resolve from '@rollup/plugin-node-resolve'
 import json from '@rollup/plugin-json'
 import glslify from 'rollup-plugin-glslify'
 import multiInput from 'rollup-plugin-multi-input'
-import terser from '@rollup/plugin-terser'
+import { terser } from 'rollup-plugin-terser'
 
 const root = process.platform === 'win32' ? path.resolve('/') : '/'
 const external = (id) => !id.startsWith('.') && !id.startsWith(root)
 const extensions = ['.js', '.jsx', '.ts', '.tsx', '.json']
 
-const getBabelOptions = ({ useESModules }, targets = '> 1%, not dead, not ie 11, not op_mini all') => ({
+const getBabelOptions = ({ useESModules }) => ({
   babelrc: false,
   extensions,
   exclude: '**/node_modules/**',
@@ -20,24 +20,24 @@ const getBabelOptions = ({ useESModules }, targets = '> 1%, not dead, not ie 11,
       '@babel/preset-env',
       {
         include: [
-          '@babel/plugin-transform-class-properties',
-          '@babel/plugin-transform-optional-chaining',
-          '@babel/plugin-transform-nullish-coalescing-operator',
-          '@babel/plugin-transform-numeric-separator',
-          '@babel/plugin-transform-logical-assignment-operators',
+          '@babel/plugin-proposal-class-properties',
+          '@babel/plugin-proposal-optional-chaining',
+          '@babel/plugin-proposal-nullish-coalescing-operator',
+          '@babel/plugin-proposal-numeric-separator',
+          '@babel/plugin-proposal-logical-assignment-operators',
         ],
         bugfixes: true,
         loose: true,
         modules: false,
-        targets,
+        targets: '> 1%, not dead, not ie 11, not op_mini all',
       },
     ],
     '@babel/preset-react',
     '@babel/preset-typescript',
   ],
   plugins: [
-    '@babel/plugin-transform-nullish-coalescing-operator',
-    ['@babel/plugin-transform-runtime', { regenerator: false, useESModules }],
+    '@babel/plugin-proposal-nullish-coalescing-operator',
+    ['@babel/transform-runtime', { regenerator: false, useESModules }],
   ],
 })
 
@@ -51,19 +51,20 @@ export default [
       json(),
       glslify(),
       babel(getBabelOptions({ useESModules: true }, '>1%, not dead, not ie 11, not op_mini all')),
-      nodeResolve({ extensions }),
+      resolve({ extensions }),
     ],
   },
   {
     input: `./src/index.ts`,
-    output: { dir: `dist`, format: 'esm', preserveModules: true },
+    output: { dir: `dist`, format: 'esm' },
     external,
     plugins: [
       json(),
       glslify(),
       babel(getBabelOptions({ useESModules: true }, '>1%, not dead, not ie 11, not op_mini all')),
-      nodeResolve({ extensions }),
+      resolve({ extensions }),
     ],
+    preserveModules: true,
   },
   {
     input: ['src/**/*.ts', 'src/**/*.tsx', '!src/index.ts'],
@@ -76,20 +77,14 @@ export default [
       json(),
       glslify(),
       babel(getBabelOptions({ useESModules: false })),
-      nodeResolve({ extensions }),
+      resolve({ extensions }),
       terser(),
     ],
   },
   {
     input: `./src/index.ts`,
     output: { file: `dist/index.cjs.js`, format: 'cjs' },
     external,
-    plugins: [
-      json(),
-      glslify(),
-      babel(getBabelOptions({ useESModules: false })),
-      nodeResolve({ extensions }),
-      terser(),
-    ],
+    plugins: [json(), glslify(), babel(getBabelOptions({ useESModules: false })), resolve({ extensions }), terser()],
   },
 ]