From b3b72b8ae6e110ac7354f22d5237c0aa0159bcc3 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Sat, 12 Sep 2020 16:45:33 -0700 Subject: [PATCH] Toolkit: clean node_modules/@grafana/data/node_modules in prepare (#27554) --- packages/grafana-toolkit/src/cli/tasks/plugin.build.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts index 0a3ee9da376..0bda6e93ce9 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts +++ b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts @@ -37,6 +37,10 @@ const copyIfNonExistent = (srcPath: string, destPath: string) => export const prepare = useSpinner('Preparing', async () => { await Promise.all([ + // Remove local dependencies for @grafana/data/node_modules + // See: https://github.com/grafana/grafana/issues/26748 + rimraf(resolvePath(__dirname, 'node_modules/@grafana/data/node_modules')), + // Copy only if local tsconfig does not exist. Otherwise this will work, but have odd behavior copyIfNonExistent( resolvePath(__dirname, '../../config/tsconfig.plugin.local.json'),