fix: wrong hooks where installed by default (#385)

* fix: wrong hooks where installed by default * fix: resolve d2style config from project over package
dhis2 · Apr 22, 2021 · 3ac82f4 · 3ac82f4
1 parent de4a977
commit 3ac82f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/config/d2-style.config.js b/config/d2-style.config.js
@@ -1,8 +1,7 @@
 module.exports = {
     hooks: {
-        'commit-msg': ['yarn d2-style commit check "$1"'],
-        'pre-commit': ['yarn d2-style check'],
-        'pre-push': ['yarn test'],
+        'commit-msg': ['yarn d2-style check commit "$1"'],
+        'pre-commit': ['yarn d2-style check --staged'],
     },
     tools: {
         eslint: ['react'],

diff --git a/src/utils/config.js b/src/utils/config.js
@@ -3,7 +3,6 @@ const log = require('@dhis2/cli-helpers-engine').reporter
 const findup = require('find-up')
 const { copy, fileExists, deleteFile } = require('./files.js')
 const {
-    PACKAGE_ROOT,
     PROJECT_ROOT,
     CONFIG_DIR,
     TEMPLATE_DIR,
@@ -113,7 +112,7 @@ const templateConfig = (tool, template) =>
 const configured = (tool, template) => fileExists(projectConfig(tool, template))
 
 const resolvedStyleConfig = findup.sync(STYLE_CONFIG_FILES, {
-    cwd: PACKAGE_ROOT,
+    cwd: PROJECT_ROOT,
     type: 'file',
     allowSymlinks: true,
 })