IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Prevent import errors caused by Rollup 4 (#93903)

Browse Source 
fix(packages): prevent import errors by injecting exports.esmodule and check for default prop
This commit is contained in:
Jack Westbrook 2024-09-27 13:18:52 +02:00 committed by GitHub
parent 35f5ef007c
commit 012d62782c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/grafana-data/rollup.config.ts
View File

@ -8,6 +8,11 @@ import { nodeExternals } from 'rollup-plugin-node-externals';
const rq = createRequire(import.meta.url); const rq = createRequire(import.meta.url);
const pkg = rq('./package.json'); const pkg = rq('./package.json');
const legacyOutputDefaults = {
esModule: true,
interop: 'compat',
};
export default [ export default [
{ {
input: 'src/index.ts', input: 'src/index.ts',
@ -24,6 +29,7 @@ export default [
format: 'cjs', format: 'cjs',
sourcemap: true, sourcemap: true,
dir: path.dirname(pkg.publishConfig.main), dir: path.dirname(pkg.publishConfig.main),
...legacyOutputDefaults,
}, },
{ {
format: 'esm', format: 'esm',
@ -32,6 +38,7 @@ export default [
preserveModules: true, preserveModules: true,
// @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string) // @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`),
...legacyOutputDefaults,
}, },
], ],
}, },

7
packages/grafana-e2e-selectors/rollup.config.ts
View File

@ -8,6 +8,11 @@ import { nodeExternals } from 'rollup-plugin-node-externals';
const rq = createRequire(import.meta.url); const rq = createRequire(import.meta.url);
const pkg = rq('./package.json'); const pkg = rq('./package.json');
const legacyOutputDefaults = {
esModule: true,
interop: 'compat',
};
export default [ export default [
{ {
input: 'src/index.ts', input: 'src/index.ts',
@ -24,6 +29,7 @@ export default [
format: 'cjs', format: 'cjs',
sourcemap: true, sourcemap: true,
dir: path.dirname(pkg.publishConfig.main), dir: path.dirname(pkg.publishConfig.main),
...legacyOutputDefaults,
}, },
{ {
format: 'esm', format: 'esm',
@ -32,6 +38,7 @@ export default [
preserveModules: true, preserveModules: true,
// @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string) // @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-e2e-selectors/src`),
...legacyOutputDefaults,
}, },
], ],
}, },

7
packages/grafana-flamegraph/rollup.config.ts
View File

@ -8,6 +8,11 @@ import { nodeExternals } from 'rollup-plugin-node-externals';
const rq = createRequire(import.meta.url); const rq = createRequire(import.meta.url);
const pkg = rq('./package.json'); const pkg = rq('./package.json');
const legacyOutputDefaults = {
esModule: true,
interop: 'compat',
};
export default [ export default [
{ {
input: 'src/index.ts', input: 'src/index.ts',
@ -24,6 +29,7 @@ export default [
format: 'cjs', format: 'cjs',
sourcemap: true, sourcemap: true,
dir: path.dirname(pkg.publishConfig.main), dir: path.dirname(pkg.publishConfig.main),
...legacyOutputDefaults,
}, },
{ {
format: 'esm', format: 'esm',
@ -32,6 +38,7 @@ export default [
preserveModules: true, preserveModules: true,
// @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string) // @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`),
...legacyOutputDefaults,
}, },
], ],
}, },

6
packages/grafana-icons/rollup.config.ts
View File

@ -8,6 +8,11 @@ import { nodeExternals } from 'rollup-plugin-node-externals';
const rq = createRequire(import.meta.url); const rq = createRequire(import.meta.url);
const pkg = rq('./package.json'); const pkg = rq('./package.json');
const legacyOutputDefaults = {
esModule: true,
interop: 'compat',
};
export default [ export default [
{ {
input: 'src/index.ts', input: 'src/index.ts',
@ -25,6 +30,7 @@ export default [
sourcemap: true, sourcemap: true,
dir: path.dirname(pkg.publishConfig.main), dir: path.dirname(pkg.publishConfig.main),
preserveModules: true, preserveModules: true,
...legacyOutputDefaults,
}, },
], ],
}, },

7
packages/grafana-prometheus/rollup.config.ts
View File

@ -9,6 +9,11 @@ import { nodeExternals } from 'rollup-plugin-node-externals';
const rq = createRequire(import.meta.url); const rq = createRequire(import.meta.url);
const pkg = rq('./package.json'); const pkg = rq('./package.json');
const legacyOutputDefaults = {
esModule: true,
interop: 'compat',
};
export default [ export default [
{ {
input: 'src/index.ts', input: 'src/index.ts',
@ -26,6 +31,7 @@ export default [
format: 'cjs', format: 'cjs',
sourcemap: true, sourcemap: true,
dir: path.dirname(pkg.publishConfig.main), dir: path.dirname(pkg.publishConfig.main),
...legacyOutputDefaults,
}, },
{ {
format: 'esm', format: 'esm',
@ -34,6 +40,7 @@ export default [
preserveModules: true, preserveModules: true,
// @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string) // @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string)
preserveModulesRoot: path.join(process.env.PROJECT_CWD, `packages/grafana-prometheus/src`), preserveModulesRoot: path.join(process.env.PROJECT_CWD, `packages/grafana-prometheus/src`),
...legacyOutputDefaults,
}, },
], ],
}, },

7
packages/grafana-runtime/rollup.config.ts
View File

@ -8,6 +8,11 @@ import { nodeExternals } from 'rollup-plugin-node-externals';
const rq = createRequire(import.meta.url); const rq = createRequire(import.meta.url);
const pkg = rq('./package.json'); const pkg = rq('./package.json');
const legacyOutputDefaults = {
esModule: true,
interop: 'compat',
};
export default [ export default [
{ {
input: 'src/index.ts', input: 'src/index.ts',
@ -24,6 +29,7 @@ export default [
format: 'cjs', format: 'cjs',
sourcemap: true, sourcemap: true,
dir: path.dirname(pkg.publishConfig.main), dir: path.dirname(pkg.publishConfig.main),
...legacyOutputDefaults,
}, },
{ {
format: 'esm', format: 'esm',
@ -32,6 +38,7 @@ export default [
preserveModules: true, preserveModules: true,
// @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string) // @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`),
...legacyOutputDefaults,
}, },
], ],
}, },

7
packages/grafana-schema/rollup.config.ts
View File

@ -10,6 +10,11 @@ import { nodeExternals } from 'rollup-plugin-node-externals';
const rq = createRequire(import.meta.url); const rq = createRequire(import.meta.url);
const pkg = rq('./package.json'); const pkg = rq('./package.json');
const legacyOutputDefaults = {
esModule: true,
interop: 'compat',
};
export default [ export default [
{ {
input: 'src/index.ts', input: 'src/index.ts',
@ -26,6 +31,7 @@ export default [
format: 'cjs', format: 'cjs',
sourcemap: true, sourcemap: true,
dir: path.dirname(pkg.publishConfig.main), dir: path.dirname(pkg.publishConfig.main),
...legacyOutputDefaults,
}, },
{ {
format: 'esm', format: 'esm',
@ -34,6 +40,7 @@ export default [
preserveModules: true, preserveModules: true,
// @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string) // @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-schema/src`),
...legacyOutputDefaults,
}, },
], ],
}, },

7
packages/grafana-ui/rollup.config.ts
View File

@ -15,6 +15,11 @@ const iconSrcPaths = icons.map((iconSubPath) => {
return `../../public/img/icons/${iconSubPath}.svg`; return `../../public/img/icons/${iconSubPath}.svg`;
}); });
const legacyOutputDefaults = {
esModule: true,
interop: 'compat',
};
export default [ export default [
{ {
input: 'src/index.ts', input: 'src/index.ts',
@ -36,6 +41,7 @@ export default [
format: 'cjs', format: 'cjs',
sourcemap: true, sourcemap: true,
dir: path.dirname(pkg.publishConfig.main), dir: path.dirname(pkg.publishConfig.main),
...legacyOutputDefaults,
}, },
{ {
format: 'esm', format: 'esm',
@ -44,6 +50,7 @@ export default [
preserveModules: true, preserveModules: true,
// @ts-expect-error (TS cannot assure that `process.env.PROJECT_CWD` is a string) // @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`),
...legacyOutputDefaults,
}, },
], ],
}, },