fix: compatibility issues with pre-commit hook

adobe-rnd · Aug 28, 2024 · 064eb43 · 064eb43
1 parent 986b77f
commit 064eb43
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/.husky/pre-commit.mjs b/.husky/pre-commit.mjs
@@ -2,10 +2,9 @@ import { exec } from "node:child_process";
 
 const run = (cmd) => new Promise((resolve, reject) => exec(
  cmd,
- (error, stdout, stderr) => {
- if (error) reject();
- if (stderr) reject(stderr);
- resolve(stdout);
+ (error, stdout) => {
+ if (error) reject(error);
+ else resolve(stdout);
  }
 ));
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
  "eslint-plugin-json": "3.1.0",
  "eslint-plugin-xwalk": "github:adobe-rnd/eslint-plugin-xwalk#v0.1.0",
  "husky": "9.1.1",
- "merge-json-cli": "1.0.3",
+ "merge-json-cli": "^1.0.4",
  "npm-run-all": "4.1.5",
  "stylelint": "16.6.1",
  "stylelint-config-standard": "36.0.0"