Revert "Update dependency rollup to v3 (#58252)" (#63790)

This reverts commit a97e9a1e17.
This commit is contained in:
Jack Westbrook
2023-02-27 13:01:24 +01:00
committed by GitHub
parent 5ad074ff2c
commit 9079de068e
17 changed files with 214 additions and 127 deletions

View File

@@ -1,9 +1,6 @@
{
"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": [
{
@@ -11,17 +8,6 @@
"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"]
}
}
}
]
}

View File

@@ -28,7 +28,7 @@
"LICENSE_APACHE2"
],
"scripts": {
"build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.mjs",
"build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
"clean": "rimraf ./dist ./compiled ./package.tgz",
"typecheck": "tsc --emitDeclarationOnly false --noEmit",
"prepack": "cp package.json package.json.bak && node ../../scripts/prepare-packagejson.js",
@@ -59,6 +59,8 @@
},
"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",
@@ -82,10 +84,10 @@
"react-dom": "17.0.2",
"react-test-renderer": "17.0.2",
"rimraf": "3.0.2",
"rollup": "3.3.0",
"rollup": "2.79.1",
"rollup-plugin-dts": "^5.0.0",
"rollup-plugin-esbuild": "5.0.0",
"rollup-plugin-node-externals": "^5.0.2",
"rollup-plugin-node-externals": "^5.0.0",
"sinon": "14.0.1",
"typescript": "4.8.4"
},

View File

@@ -4,7 +4,7 @@ import dts from 'rollup-plugin-dts';
import esbuild from 'rollup-plugin-esbuild';
import { externals } from 'rollup-plugin-node-externals';
import pkg from './package.json' assert { type: 'json' };
const pkg = require('./package.json');
export default [
{
@@ -21,7 +21,8 @@ export default [
sourcemap: true,
dir: path.dirname(pkg.publishConfig.module),
preserveModules: true,
preserveModulesRoot: path.join(process.env.PROJECT_CWD, 'packages/grafana-data/src'),
// @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`),
},
],
},