From aee07949a366fc092aa59b5da399730c006ad861 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 21 Jan 2020 22:10:16 -0800 Subject: [PATCH] Toolkit: copyIfNonExistent order swapped (#21653) --- packages/grafana-toolkit/src/cli/tasks/plugin.build.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts index e5dcaa12d1b..348dd2ea679 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts +++ b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts @@ -40,13 +40,13 @@ export const prepare = useSpinner('Preparing', async () => { await Promise.all([ // Copy only if local tsconfig does not exist. Otherwise this will work, but have odd behavior copyIfNonExistent( - resolvePath(process.cwd(), 'tsconfig.json'), - resolvePath(__dirname, '../../config/tsconfig.plugin.local.json') + resolvePath(__dirname, '../../config/tsconfig.plugin.local.json'), + resolvePath(process.cwd(), 'tsconfig.json') ), // Copy only if local prettierrc does not exist. Otherwise this will work, but have odd behavior copyIfNonExistent( - resolvePath(process.cwd(), '.prettierrc.js'), - resolvePath(__dirname, '../../config/prettier.plugin.rc.js') + resolvePath(__dirname, '../../config/prettier.plugin.rc.js'), + resolvePath(process.cwd(), '.prettierrc.js') ), ]);