@forsakringskassan/commitlint-config 3.0.0 → 3.0.2

package/dist/install.js

@@ -764,8 +764,8 @@ import path3 from "node:path";
 var nonAllowedPackages = ["husky", "simple-git-hooks", "lint-staged"];
 function invalidInstalledPackages(packageJson) {
   const dependencies = [
-    ...Object.keys(packageJson.dependencies),
-    ...Object.keys(packageJson.devDependencies)
+    ...Object.keys(packageJson.dependencies ?? {}),
+    ...Object.keys(packageJson.devDependencies ?? {})
   ];
   for (const item of nonAllowedPackages) {
     if (dependencies.includes(item)) {
@@ -845,9 +845,8 @@ function configureCommitTemplate() {
   console.info(`git ${args.join(" ")}`);
   spawnSync("git", args);
 }
-if (!import_is_ci.default && process.env.FK_COMMITLINT_SKIP !== "1") {
-  configureCommitTemplate();
-  const originCwd = process.env["INIT_CWD"] || "";
+var originCwd = process.env["INIT_CWD"] || "";
+if (process.env.FK_COMMITLINT_SKIP !== "1") {
   const packageJson = JSON.parse(
     await fsp.readFile(path4.join(originCwd, "package.json"), {
       encoding: "utf-8"
@@ -856,14 +855,28 @@ if (!import_is_ci.default && process.env.FK_COMMITLINT_SKIP !== "1") {
   if (invalidInstalledPackages(packageJson) || existingSimpleGitConfig(packageJson) || await existingHuskyConfig(originCwd, fsp)) {
     process.exit(1);
   }
-  const result = await spawn2(
-    "npm",
-    [
-      "exec",
-      "simple-git-hooks",
-      __require.resolve("@forsakringskassan/commitlint-config/hooks.js")
-    ],
-    { cwd: process.env["INIT_CWD"] }
-  );
-  console.log(result.output);
+  if (!import_is_ci.default) {
+    await spawn2("git", ["config", "--unset", "core.hooksPath"], {
+      cwd: process.env["INIT_CWD"]
+    });
+    const result = await spawn2(
+      "npm",
+      [
+        "exec",
+        "simple-git-hooks",
+        __require.resolve(
+          "@forsakringskassan/commitlint-config/hooks.js"
+        )
+      ],
+      { cwd: process.env["INIT_CWD"] }
+    );
+    if (result.output.toLowerCase().includes("error")) {
+      console.log(result.output);
+      process.exit(1);
+    }
+    console.log(result.output);
+  }
+}
+if (!import_is_ci.default) {
+  configureCommitTemplate();
 }

package/hooks.js

@@ -1,6 +1,6 @@
 import { fileURLToPath } from "node:url";
 
-const lintConfigPath = fileURLToPath.meta.resolve("./lint-staged.js");
+const lintConfigPath = fileURLToPath(import.meta.resolve("./lint-staged.js"));
 
 export default {
     "pre-commit": `npm exec lint-staged -- --config "${lintConfigPath}" "$@"`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forsakringskassan/commitlint-config",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "FK commitlint shareable config",
   "keywords": [
     "commitlint"