Update dependency rollup to v3 (#58252)

* Update dependency rollup to v3 * build(rollup): update all rollup related deps to latest version * chore(runtime): update peerDeps to match other package semver ranges * chore(yarn): refresh lock file * refactor(packages): migrate to esm for rollup@3 configs * build(packages): remove unused rollup dependencies --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
2025-02-25 18:55:37 -06:00 · 2023-02-22 14:10:07 +01:00
parent 06dfe2156f
commit a97e9a1e17
17 changed files with 127 additions and 214 deletions
--- a/packages/grafana-data/.eslintrc
+++ b/packages/grafana-data/.eslintrc
@@ -1,6 +1,9 @@
 {
  "rules": {
-    "no-restricted-imports": ["error", { "patterns": ["@grafana/runtime", "@grafana/ui", "@grafana/data", "@grafana/e2e/*"] }]
+    "no-restricted-imports": [
+      "error",
+      { "patterns": ["@grafana/runtime", "@grafana/ui", "@grafana/data", "@grafana/e2e/*"] }
+    ]
  },
  "overrides": [
    {
@@ -8,6 +11,17 @@
      "rules": {
        "no-restricted-imports": "off"
      }
+    },
+    // rollup v3 uses esm modules
+    {
+      "files": ["rollup.config.mjs"],
+      "parser": "@babel/eslint-parser",
+      "parserOptions": {
+        "requireConfigFile": false,
+        "babelOptions": {
+          "plugins": ["@babel/plugin-syntax-import-assertions"]
+        }
+      }
    }
  ]
 }
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -28,7 +28,7 @@
    "LICENSE_APACHE2"
  ],
  "scripts": {
-    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
+    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.mjs",
    "clean": "rimraf ./dist ./compiled ./package.tgz",
    "typecheck": "tsc --emitDeclarationOnly false --noEmit",
    "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js",
@@ -59,8 +59,6 @@
  },
  "devDependencies": {
    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@rollup/plugin-commonjs": "23.0.2",
-    "@rollup/plugin-json": "5.0.1",
    "@rollup/plugin-node-resolve": "15.0.1",
    "@testing-library/dom": "8.20.0",
    "@testing-library/jest-dom": "5.16.5",
@@ -84,10 +82,10 @@
    "react-dom": "17.0.2",
    "react-test-renderer": "17.0.2",
    "rimraf": "3.0.2",
-    "rollup": "2.79.1",
+    "rollup": "3.3.0",
    "rollup-plugin-dts": "^5.0.0",
    "rollup-plugin-esbuild": "5.0.0",
-    "rollup-plugin-node-externals": "^5.0.0",
+    "rollup-plugin-node-externals": "^5.0.2",
    "sinon": "14.0.1",
    "typescript": "4.8.4"
  },
--- a/packages/grafana-data/rollup.config.mjs
+++ b/packages/grafana-data/rollup.config.mjs
@@ -4,7 +4,7 @@ import dts from 'rollup-plugin-dts';
 import esbuild from 'rollup-plugin-esbuild';
 import { externals } from 'rollup-plugin-node-externals';

-const pkg = require('./package.json');
+import pkg from './package.json' assert { type: 'json' };

 export default [
  {
@@ -21,8 +21,7 @@ export default [
        sourcemap: true,
        dir: path.dirname(pkg.publishConfig.module),
        preserveModules: true,
-        // @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string)
-        preserveModulesRoot: path.join(process.env.PROJECT_CWD, `packages/grafana-data/src`),
+        preserveModulesRoot: path.join(process.env.PROJECT_CWD, 'packages/grafana-data/src'),
      },
    ],
  },
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -31,23 +31,22 @@
    "LICENSE_APACHE2"
  ],
  "scripts": {
-    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
-    "bundle": "rollup -c rollup.config.ts",
+    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.mjs",
+    "bundle": "rollup -c rollup.config.mjs",
    "clean": "rimraf ./dist ./compiled ./package.tgz",
    "typecheck": "tsc --emitDeclarationOnly false --noEmit",
    "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js",
    "postpack": "mv package.json.bak package.json"
  },
  "devDependencies": {
-    "@rollup/plugin-commonjs": "23.0.2",
    "@rollup/plugin-node-resolve": "15.0.1",
    "@types/node": "18.14.0",
    "esbuild": "0.16.17",
    "rimraf": "3.0.2",
-    "rollup": "2.79.1",
+    "rollup": "3.3.0",
    "rollup-plugin-dts": "^5.0.0",
    "rollup-plugin-esbuild": "5.0.0",
-    "rollup-plugin-node-externals": "^5.0.0"
+    "rollup-plugin-node-externals": "^5.0.2"
  },
  "dependencies": {
    "@grafana/tsconfig": "^1.2.0-rc1",
--- a/packages/grafana-e2e-selectors/rollup.config.mjs
+++ b/packages/grafana-e2e-selectors/rollup.config.mjs
@@ -4,7 +4,7 @@ import dts from 'rollup-plugin-dts';
 import esbuild from 'rollup-plugin-esbuild';
 import { externals } from 'rollup-plugin-node-externals';

-const pkg = require('./package.json');
+import pkg from './package.json' assert { type: 'json' };

 export default [
  {
@@ -21,8 +21,7 @@ export default [
        sourcemap: true,
        dir: path.dirname(pkg.publishConfig.module),
        preserveModules: true,
-        // @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string)
-        preserveModulesRoot: path.join(process.env.PROJECT_CWD, `packages/grafana-schema/src`),
+        preserveModulesRoot: path.join(process.env.PROJECT_CWD, 'packages/grafana-e2e-selectors/src'),
      },
    ],
  },
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -35,8 +35,8 @@
    "LICENSE_APACHE2"
  ],
  "scripts": {
-    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
-    "bundle": "rollup -c rollup.config.ts",
+    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.mjs",
+    "bundle": "rollup -c rollup.config.mjs",
    "clean": "rimraf ./dist ./compiled ./package.tgz",
    "open": "cypress open",
    "start": "cypress run --browser=chrome",
@@ -53,10 +53,10 @@
    "@types/node": "18.14.0",
    "@types/uuid": "8.3.4",
    "esbuild": "0.16.17",
-    "rollup": "2.79.1",
+    "rollup": "3.3.0",
    "rollup-plugin-dts": "^5.0.0",
    "rollup-plugin-esbuild": "5.0.0",
-    "rollup-plugin-node-externals": "^5.0.0",
+    "rollup-plugin-node-externals": "^5.0.2",
    "webpack": "5.74.0"
  },
  "dependencies": {
--- a/packages/grafana-e2e/rollup.config.mjs
+++ b/packages/grafana-e2e/rollup.config.mjs
@@ -4,7 +4,7 @@ import dts from 'rollup-plugin-dts';
 import esbuild from 'rollup-plugin-esbuild';
 import { externals } from 'rollup-plugin-node-externals';

-const pkg = require('./package.json');
+import pkg from './package.json' assert { type: 'json' };

 export default [
  {
--- a/packages/grafana-runtime/.eslintrc
+++ b/packages/grafana-runtime/.eslintrc
@@ -1,5 +1,21 @@
 {
  "rules": {
-    "no-restricted-imports": ["error", { "patterns": ["@grafana/runtime", "@grafana/data/*", "@grafana/ui/*", "@grafana/e2e/*"] }]
-  }
+    "no-restricted-imports": [
+      "error",
+      { "patterns": ["@grafana/runtime", "@grafana/data/*", "@grafana/ui/*", "@grafana/e2e/*"] }
+    ]
+  },
+  "overrides": [
+    // rollup v3 uses esm modules
+    {
+      "files": ["rollup.config.mjs"],
+      "parser": "@babel/eslint-parser",
+      "parserOptions": {
+        "requireConfigFile": false,
+        "babelOptions": {
+          "plugins": ["@babel/plugin-syntax-import-assertions"]
+        }
+      }
+    }
+  ]
 }
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -29,8 +29,8 @@
    "LICENSE_APACHE2"
  ],
  "scripts": {
-    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
-    "bundle": "rollup -c rollup.config.ts",
+    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.mjs",
+    "bundle": "rollup -c rollup.config.mjs",
    "clean": "rimraf ./dist ./compiled ./package.tgz",
    "typecheck": "tsc --emitDeclarationOnly false --noEmit",
    "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js",
@@ -50,7 +50,6 @@
  },
  "devDependencies": {
    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@rollup/plugin-commonjs": "23.0.2",
    "@rollup/plugin-node-resolve": "15.0.1",
    "@testing-library/dom": "8.20.0",
    "@testing-library/react": "12.1.4",
@@ -68,16 +67,14 @@
    "react": "17.0.2",
    "react-dom": "17.0.2",
    "rimraf": "3.0.2",
-    "rollup": "2.79.1",
+    "rollup": "3.3.0",
    "rollup-plugin-dts": "^5.0.0",
    "rollup-plugin-esbuild": "5.0.0",
-    "rollup-plugin-node-externals": "^5.0.0",
-    "rollup-plugin-sourcemaps": "0.6.3",
-    "rollup-plugin-terser": "7.0.2",
+    "rollup-plugin-node-externals": "^5.0.2",
    "typescript": "4.8.4"
  },
  "peerDependencies": {
-    "react": "17.0.2",
-    "react-dom": "17.0.2"
+    "react": "^16.8.0 || ^17.0.0",
+    "react-dom": "^16.8.0 || ^17.0.0"
  }
 }
--- a/packages/grafana-runtime/rollup.config.mjs
+++ b/packages/grafana-runtime/rollup.config.mjs
@@ -4,7 +4,7 @@ import dts from 'rollup-plugin-dts';
 import esbuild from 'rollup-plugin-esbuild';
 import { externals } from 'rollup-plugin-node-externals';

-const pkg = require('./package.json');
+import pkg from './package.json' assert { type: 'json' };

 export default [
  {
@@ -21,8 +21,7 @@ export default [
        sourcemap: true,
        dir: path.dirname(pkg.publishConfig.module),
        preserveModules: true,
-        // @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string)
-        preserveModulesRoot: path.join(process.env.PROJECT_CWD, `packages/grafana-runtime/src`),
+        preserveModulesRoot: path.join(process.env.PROJECT_CWD, 'packages/grafana-runtime/src'),
      },
    ],
  },
--- a/packages/grafana-schema/.eslintrc
+++ b/packages/grafana-schema/.eslintrc
@@ -8,6 +8,17 @@
      "rules": {
        "no-restricted-imports": "off"
      }
+    },
+    // rollup v3 uses esm modules
+    {
+      "files": ["rollup.config.mjs"],
+      "parser": "@babel/eslint-parser",
+      "parserOptions": {
+        "requireConfigFile": false,
+        "babelOptions": {
+          "plugins": ["@babel/plugin-syntax-import-assertions"]
+        }
+      }
    }
  ]
 }
--- a/packages/grafana-schema/package.json
+++ b/packages/grafana-schema/package.json
@@ -28,8 +28,8 @@
    "LICENSE_APACHE2"
  ],
  "scripts": {
-    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
-    "bundle": "rollup -c rollup.config.ts",
+    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.mjs",
+    "bundle": "rollup -c rollup.config.mjs",
    "clean": "rimraf ./dist ./compiled ./package.tgz",
    "typecheck": "tsc --emitDeclarationOnly false --noEmit",
    "prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js",
@@ -37,15 +37,13 @@
  },
  "devDependencies": {
    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@rollup/plugin-commonjs": "23.0.2",
-    "@rollup/plugin-json": "5.0.1",
    "@rollup/plugin-node-resolve": "15.0.1",
    "esbuild": "0.16.17",
    "rimraf": "3.0.2",
-    "rollup": "2.79.1",
+    "rollup": "3.3.0",
    "rollup-plugin-dts": "^5.0.0",
    "rollup-plugin-esbuild": "5.0.0",
-    "rollup-plugin-node-externals": "^5.0.0",
+    "rollup-plugin-node-externals": "^5.0.2",
    "typescript": "4.8.4"
  },
  "dependencies": {
--- a/packages/grafana-e2e-selectors/rollup.config.ts
+++ b/packages/grafana-e2e-selectors/rollup.config.ts
@@ -4,7 +4,7 @@ import dts from 'rollup-plugin-dts';
 import esbuild from 'rollup-plugin-esbuild';
 import { externals } from 'rollup-plugin-node-externals';

-const pkg = require('./package.json');
+import pkg from './package.json' assert { type: 'json' };

 export default [
  {
@@ -21,8 +21,7 @@ export default [
        sourcemap: true,
        dir: path.dirname(pkg.publishConfig.module),
        preserveModules: true,
-        // @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string)
-        preserveModulesRoot: path.join(process.env.PROJECT_CWD, `packages/grafana-e2e-selectors/src`),
+        preserveModulesRoot: path.join(process.env.PROJECT_CWD, 'packages/grafana-schema/src'),
      },
    ],
  },
--- a/packages/grafana-ui/.eslintrc
+++ b/packages/grafana-ui/.eslintrc
@@ -21,6 +21,17 @@
        "no-restricted-imports": "off",
        "react/prop-types": "off"
      }
+    },
+    // rollup v3 uses esm modules
+    {
+      "files": ["rollup.config.mjs"],
+      "parser": "@babel/eslint-parser",
+      "parserOptions": {
+        "requireConfigFile": false,
+        "babelOptions": {
+          "plugins": ["@babel/plugin-syntax-import-assertions"]
+        }
+      }
    }
  ]
 }
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -32,8 +32,8 @@
    "./LICENSE_APACHE2"
  ],
  "scripts": {
-    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
-    "bundle": "rollup -c rollup.config.ts",
+    "build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.mjs",
+    "bundle": "rollup -c rollup.config.mjs",
    "clean": "rimraf ./dist ./compiled ./package.tgz",
    "storybook": "start-storybook -p 9001 -c .storybook",
    "storybook:build": "build-storybook -o ./dist/storybook -c .storybook",
@@ -176,10 +176,10 @@
    "react-dom": "17.0.2",
    "react-test-renderer": "17.0.2",
    "rimraf": "3.0.2",
-    "rollup": "2.79.1",
+    "rollup": "3.3.0",
    "rollup-plugin-dts": "^5.0.0",
    "rollup-plugin-esbuild": "5.0.0",
-    "rollup-plugin-node-externals": "^5.0.0",
+    "rollup-plugin-node-externals": "^5.0.2",
    "rollup-plugin-svg-import": "^1.6.0",
    "sass-loader": "13.2.0",
    "storybook-addon-turbo-build": "1.1.0",
--- a/packages/grafana-ui/rollup.config.mjs
+++ b/packages/grafana-ui/rollup.config.mjs
@@ -5,7 +5,7 @@ import esbuild from 'rollup-plugin-esbuild';
 import { externals } from 'rollup-plugin-node-externals';
 import svg from 'rollup-plugin-svg-import';

-const pkg = require('./package.json');
+import pkg from './package.json' assert { type: 'json' };

 export default [
  {
@@ -22,8 +22,7 @@ export default [
        sourcemap: true,
        dir: path.dirname(pkg.publishConfig.module),
        preserveModules: true,
-        // @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string)
-        preserveModulesRoot: path.join(process.env.PROJECT_CWD, `packages/grafana-ui/src`),
+        preserveModulesRoot: path.join(process.env.PROJECT_CWD, 'packages/grafana-ui/src'),
      },
    ],
  },