From 1782d68137861fecd1b0b8302b80378f4e163a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 3 Sep 2019 09:38:25 +0200
Subject: [PATCH] Git: Precomit hook slimmed down

---
 package.json                                  |  1 +
 .../grafana-toolkit/bin/grafana-toolkit.js    |  3 ++-
 .../src/cli/tasks/precommit.ts                | 25 +------------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index c6cb237e134..50132ffaab8 100644
--- a/package.json
+++ b/package.json
@@ -152,6 +152,7 @@
     "test": "grunt test",
     "tslint": "tslint -c tslint.json --project tsconfig.json",
     "typecheck": "tsc --noEmit",
+    "typecheckPackages": "yarn workspaces run typecheck",
     "jest": "jest --notify --watch",
     "e2e-tests": "jest --runInBand --config=jest.config.e2e.js",
     "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
diff --git a/packages/grafana-toolkit/bin/grafana-toolkit.js b/packages/grafana-toolkit/bin/grafana-toolkit.js
index 6cab0391954..9e867d9374d 100755
--- a/packages/grafana-toolkit/bin/grafana-toolkit.js
+++ b/packages/grafana-toolkit/bin/grafana-toolkit.js
@@ -7,7 +7,8 @@ var path = require('path') ;
 var tsProjectPath = path.resolve(__dirname, '../tsconfig.json');
 
 require('ts-node').register({
-  project: tsProjectPath
+  project: tsProjectPath,
+  transpileOnly: true
 });
 
 require('../src/cli/index.ts').run(true);
diff --git a/packages/grafana-toolkit/src/cli/tasks/precommit.ts b/packages/grafana-toolkit/src/cli/tasks/precommit.ts
index d97efc56541..dfcc1444dc6 100644
--- a/packages/grafana-toolkit/src/cli/tasks/precommit.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/precommit.ts
@@ -12,15 +12,6 @@ const simpleGit = require('simple-git/promise')(process.cwd());
 interface PrecommitOptions {}
 
 const tasks = {
-  lint: {
-    sass: ['newer:sasslint'],
-    core: ['newer:exec:tslintRoot'],
-    gui: ['newer:exec:tslintPackages'],
-  },
-  typecheck: {
-    core: ['newer:exec:typecheckRoot'],
-    gui: ['newer:exec:typecheckPackages'],
-  },
   test: {
     lint: {
       ts: ['no-only-tests'],
@@ -43,17 +34,12 @@ const precommitRunner: TaskRunner<PrecommitOptions> = async () => {
     file => file.path.match(/^[a-zA-Z0-9\_\-\/]+(\.scss)$/g) || file.path.indexOf('.sass-lint.yml') > -1
   );
 
-  const tsFiles = status.files.filter(file => file.path.match(/^[a-zA-Z0-9\_\-\/]+(\.(ts|tsx))$/g));
   const testFiles = status.files.filter(file => file.path.match(/^[a-zA-Z0-9\_\-\/]+(\.test.(ts|tsx))$/g));
   const goTestFiles = status.files.filter(file => file.path.match(/^[a-zA-Z0-9\_\-\/]+(\_test.go)$/g));
-  const grafanaUiFiles = tsFiles.filter(file => file.path.indexOf('grafana-ui') > -1);
   const affectedNodeVersionFiles = status.files
     .filter(file => nodeVersionFiles.indexOf(file.path) !== -1)
     .map(f => f.path);
 
-  const grafanaUIFilesChangedOnly = tsFiles.length > 0 && tsFiles.length - grafanaUiFiles.length === 0;
-  const coreFilesChangedOnly = tsFiles.length > 0 && grafanaUiFiles.length === 0;
-
   const taskPaths = [];
 
   if (affectedNodeVersionFiles.length > 0) {
@@ -72,16 +58,6 @@ const precommitRunner: TaskRunner<PrecommitOptions> = async () => {
     taskPaths.push('test.lint.go');
   }
 
-  if (tsFiles.length > 0) {
-    if (grafanaUIFilesChangedOnly) {
-      taskPaths.push('lint.gui', 'typecheck.core', 'typecheck.gui');
-    } else if (coreFilesChangedOnly) {
-      taskPaths.push('lint.core', 'typecheck.core');
-    } else {
-      taskPaths.push('lint.core', 'lint.gui', 'typecheck.core', 'typecheck.gui');
-    }
-  }
-
   const gruntTasks = flatten(taskPaths.map(path => get(tasks, path)));
   if (gruntTasks.length > 0) {
     console.log(chalk.yellow(`Precommit checks: ${taskPaths.join(', ')}`));
@@ -93,6 +69,7 @@ const precommitRunner: TaskRunner<PrecommitOptions> = async () => {
     }
     return task;
   }
+
   console.log(chalk.yellow('Skipping precommit checks, not front-end changes detected'));
   return;
 };