@storm-software/git-tools 1.2.18 → 1.2.19

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.2.18](https://github.com/storm-software/storm-ops/compare/git-tools-v1.2.17...git-tools-v1.2.18) (2023-11-10)
+
+
+### Bug Fixes
+
+* **git-tools:** Updated code that checks for git-lfs in hooks ([ec4e632](https://github.com/storm-software/storm-ops/commit/ec4e632fe5db27eba12e7dffbbab7ef96c2ef40e))
+
 ## [1.2.17](https://github.com/storm-software/storm-ops/compare/git-tools-v1.2.16...git-tools-v1.2.17) (2023-11-10)
 
 

package/bin/post-checkout.cjs

@@ -5,8 +5,12 @@ const { execSync } = require("node:child_process");
 try {
   console.log("Running Storm post-checkout hook...");
 
+  const changed = execSync(
+    "git diff-tree -r --name-only --no-commit-id $1 $2",
+    "utf8"
+  );
   execSync(
-    'changedFiles="$(git diff-tree -r --name-only --no-commit-id $1 $2)" && node @storm-software/git-tools/scripts/package-version-warning.cjs $changedFiles'
+    `node @storm-software/git-tools/scripts/package-version-warning.cjs ${changed}`
   );
 
   const result = execSync("git-lfs -v", "utf8");
@@ -17,7 +21,7 @@ try {
     process.exit(1);
   }
 
-  execSync('git lfs post-checkout "$@"');
+  execSync("git lfs post-checkout origin main");
 } catch (e) {
   console.error(e);
   process.exit(1);

package/bin/post-commit.cjs

@@ -13,7 +13,7 @@ try {
     process.exit(1);
   }
 
-  execSync('git lfs post-commit "$@"');
+  execSync("git lfs post-commit origin main");
 } catch (e) {
   console.error(e);
   process.exit(1);

package/bin/post-merge.cjs

@@ -5,8 +5,12 @@ const { execSync } = require("node:child_process");
 try {
   console.log("Running Storm post-merge hook...");
 
+  const changed = execSync(
+    "git diff-tree -r --name-only --no-commit-id $1 $2",
+    "utf8"
+  );
   execSync(
-    'changedFiles="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)" && @storm-software/git-tools/scripts/package-version-warning.cjs $changedFiles'
+    `node @storm-software/git-tools/scripts/package-version-warning.cjs ${changed}`
   );
 
   const result = execSync("git-lfs -v", "utf8");
@@ -17,7 +21,7 @@ try {
     process.exit(1);
   }
 
-  execSync('git lfs post-merge "$@"');
+  execSync("git lfs post-merge origin main");
 } catch (e) {
   console.error(e);
   process.exit(1);

package/bin/pre-push.cjs

@@ -1,11 +1,47 @@
 #!/usr/bin/env node
 
 const { execSync } = require("node:child_process");
+const fs = require("fs");
 
 try {
   console.log("Running Storm pre-push hook...");
 
-  execSync("node @storm-software/git-tools/scripts/check-lock-file.cjs");
+  console.log("🔒🔒🔒 Validating lock files 🔒🔒🔒\n");
+
+  const errors = [];
+  if (fs.existsSync("package-lock.json")) {
+    errors.push(
+      'Invalid occurrence of "package-lock.json" file. Please remove it and use only "pnpm-lock.yaml"'
+    );
+  }
+  if (fs.existsSync("yarn.lock")) {
+    errors.push(
+      'Invalid occurrence of "yarn.lock" file. Please remove it and use only "pnpm-lock.yaml"'
+    );
+  }
+
+  try {
+    const content = fs.readFileSync("pnpm-lock.yaml", "utf-8");
+    if (content.match(/localhost:487/)) {
+      errors.push(
+        'The "pnpm-lock.yaml" has reference to local repository ("localhost:4873"). Please use ensure you disable local registry before running "pnpm i"'
+      );
+    }
+    if (content.match(/resolution: \{tarball/)) {
+      errors.push(
+        'The "pnpm-lock.yaml" has reference to tarball package. Please use npm registry only'
+      );
+    }
+  } catch {
+    errors.push('The "pnpm-lock.yaml" does not exist or cannot be read');
+  }
+
+  if (errors.length > 0) {
+    errors.forEach(e => console.error(e));
+    process.exit(1);
+  }
+
+  console.log("Lock file is valid 👍");
 
   const result = execSync("git-lfs -v", "utf8");
   if (result && Number.isInteger(Number.parseInt(result)) && Number(result)) {
@@ -15,7 +51,7 @@ try {
     process.exit(1);
   }
 
-  execSync('git lfs pre-push "$@"');
+  execSync("git lfs pre-push origin main");
 } catch (e) {
   console.error(e);
   process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/git-tools",
-  "version": "1.2.18",
+  "version": "1.2.19",
   "private": false,
   "description": "⚡ A package containing various git tools used in Storm workspaces.",
   "keywords": [

package/scripts/check-lock-file.cjs

@@ -1,39 +0,0 @@
-const fs = require("fs");
-
-console.log("🔒🔒🔒 Validating lock files 🔒🔒🔒\n");
-
-const errors = [];
-if (fs.existsSync("package-lock.json")) {
-  errors.push(
-    'Invalid occurrence of "package-lock.json" file. Please remove it and use only "pnpm-lock.yaml"'
-  );
-}
-if (fs.existsSync("yarn.lock")) {
-  errors.push(
-    'Invalid occurrence of "yarn.lock" file. Please remove it and use only "pnpm-lock.yaml"'
-  );
-}
-
-try {
-  const content = fs.readFileSync("pnpm-lock.yaml", "utf-8");
-  if (content.match(/localhost:487/)) {
-    errors.push(
-      'The "pnpm-lock.yaml" has reference to local repository ("localhost:4873"). Please use ensure you disable local registry before running "pnpm i"'
-    );
-  }
-  if (content.match(/resolution: \{tarball/)) {
-    errors.push(
-      'The "pnpm-lock.yaml" has reference to tarball package. Please use npm registry only'
-    );
-  }
-} catch {
-  errors.push('The "pnpm-lock.yaml" does not exist or cannot be read');
-}
-
-if (errors.length > 0) {
-  errors.forEach(e => console.log(e));
-  process.exit(1);
-} else {
-  console.log("Lock file is valid 👍");
-  process.exit(0);
-}