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

@grafana/toolkit: lint fix option now writes changes to disk (#22278)

Browse Source
This commit is contained in:
Steven Vachon 2020-02-18 15:55:42 -05:00 committed by GitHub
parent e08b39d4f0
commit c35dc9a0f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/grafana-toolkit/src/cli/tasks/plugin.build.ts
View File

@ -10,7 +10,7 @@ import { constants as fsConstants, promises as fs } from 'fs';
import { CLIEngine } from 'eslint';
import { bundlePlugin as bundleFn, PluginBundleOptions } from './plugin/bundle';
const { copyFile } = fs;
const { access, copyFile } = fs;
const { COPYFILE_EXCL } = fsConstants;
const rimraf = promisify(rimrafCallback);
@ -62,10 +62,10 @@ const getTypescriptSources = () => globby(resolvePath(process.cwd(), 'src/**/*.+
// @ts-ignore
const getStylesSources = () => globby(resolvePath(process.cwd(), 'src/**/*.+(scss|css)'));
export const lintPlugin = useSpinner<Fixable>('Linting', async ({ fix }) => {
export const lintPlugin = useSpinner<Fixable>('Linting', async ({ fix } = {}) => {
try {
// Show a warning if the tslint file exists
await fs.access(resolvePath(process.cwd(), 'tslint.json'));
await access(resolvePath(process.cwd(), 'tslint.json'));
console.log('\n');
console.log('--------------------------------------------------------------');
console.log('NOTE: @grafana/toolkit has migrated to use eslint');
@ -91,7 +91,13 @@ export const lintPlugin = useSpinner<Fixable>('Linting', async ({ fix }) => {
fix,
});
const { errorCount, results, warningCount } = cli.executeOnFiles(await getTypescriptSources());
const report = cli.executeOnFiles(await getTypescriptSources());
if (fix) {
CLIEngine.outputFixes(report);
}
const { errorCount, results, warningCount } = report;
if (errorCount > 0 || warningCount > 0) {
const formatter = cli.getFormatter();