@storm-software/git-tools 1.2.18 → 1.2.20

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [1.2.19](https://github.com/storm-software/storm-ops/compare/git-tools-v1.2.18...git-tools-v1.2.19) (2023-11-10)
+
+
+### Bug Fixes
+
+* **git-tools:** Add origin to git lfs command ([4c33508](https://github.com/storm-software/storm-ops/commit/4c335088d426535eb443b01d653696576dc1d237))
+* **git-tools:** Added branch name to git command ([f411035](https://github.com/storm-software/storm-ops/commit/f41103595cfa383256b347c5e93635445a051fda))
+* **git-tools:** Ensure full path is added to remote branch params ([bb2c668](https://github.com/storm-software/storm-ops/commit/bb2c668ccb959b038929a30436163088b4c02a7d))
+* **git-tools:** More updates to variables in hooks ([1096948](https://github.com/storm-software/storm-ops/commit/10969481676eba0b86118dff0e1365adfbf4bd75))
+* **git-tools:** Remove git-lfs variables from the husky ([0f80794](https://github.com/storm-software/storm-ops/commit/0f80794418bb82000e73029df6c7d738d289ca78))
+* **git-tools:** Remove git-lfs variables from the husky hooks ([cad7eff](https://github.com/storm-software/storm-ops/commit/cad7eff3c2ed3a1f0b318d9973b6756b8446eb0a))
+* **git-tools:** Resolved issue calling git-lfs commands on current branch ([f5c4dd8](https://github.com/storm-software/storm-ops/commit/f5c4dd8331f1df05e0661b1aa72dcd1260a972ad))
+* **git-tools:** Update code to use the provided git variables ([f5acee1](https://github.com/storm-software/storm-ops/commit/f5acee1da47f1d0ec730a82a20aaaff9f6e77e54))
+* **git-tools:** Update hook execution scripts ([1d1b426](https://github.com/storm-software/storm-ops/commit/1d1b4265ad99ad9fc97764dd89f5cf2cf5f9a2ca))
+* **git-tools:** Update use of command line variables ([a6c0d18](https://github.com/storm-software/storm-ops/commit/a6c0d1858a19791d92316a4fc2ec520f4bf69d98))
+
+## [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/README.md

@@ -15,7 +15,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.org" target="_blank">stormsoftware.org</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-1.2.15-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
+[![Version](https://img.shields.io/badge/version-1.2.19-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
 [![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with docusaurus](https://img.shields.io/badge/documented_with-docusaurus-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://docusaurus.io/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 <h3 align="center" bold="true">⚠️ <b>Attention</b> ⚠️ - This repository, and the apps, libraries, and tools contained within, is still in it's initial development phase. As a result, bugs and issues are expected with it's usage. When the main development phase completes, a proper release will be performed, the packages will be availible through NPM (and other distributions), and this message will be removed. However, in the meantime, please feel free to report any issues you may come across.</h3><br />

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.20",
   "private": false,
   "description": "⚡ A package containing various git tools used in Storm workspaces.",
   "keywords": [

package/readme/templates/README.header.md

@@ -1,4 +1,4 @@
-<div align="center"><img src="https://pub-761b436209f44a4d886487c917806c08.r2.dev/logo-banner.png" width="100%" altText="Storm Software" /></div>
+<div align="center"><img src="https://pub-761b436209f44a4d886487c917806c08.r2.dev/storm-banner.gif" width="100%" altText="Storm Software" /></div>
 
 <div align="center">
 <a href="https://stormsoftware.org" target="_blank">Website</a>  |  <a href="https://stormsoftware.org/contact" target="_blank">Contact</a>  |  <a href="https://github.com/storm-software/stormstack" target="_blank">Repository</a>  |  <a href="https://stormstack.github.io/stormstack/" target="_blank">Documentation</a>  |  <a href="https://github.com/storm-software/stormstack/issues/new?assignees=&labels=bug&template=bug-report.yml&title=Bug Report%3A+">Report a Bug</a> | <a href="https://github.com/storm-software/stormstack/issues/new?assignees=&labels=enhancement&template=feature-request.yml&title=Feature Request%3A+">Request a Feature</a> | <a href="https://github.com/storm-software/stormstack/issues/new?assignees=&labels=documentation&template=documentation.yml&title=Documentation Request%3A+">Request Documentation</a> | <a href="https://github.com/storm-software/stormstack/discussions">Ask a Question</a>

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);
-}