@storm-software/git-tools 2.5.1 → 2.5.3

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 2.5.3 (2024-03-28)
+
+
+### 🩹 Fixes
+
+- **storm-ops:** Resolve issue with workspace dependencies ([041dcc78](https://github.com/storm-software/storm-ops/commit/041dcc78))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 2.5.2 (2024-03-28)
+
+
+### 🩹 Fixes
+
+- **git-tools:** Update to executable git hook scripts ([d1e0cb22](https://github.com/storm-software/storm-ops/commit/d1e0cb22))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 2.5.1 (2024-03-28)
 
 

package/bin/git.ts

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 import {
   loadStormConfig,
   exitWithSuccess,
@@ -37,7 +39,3 @@ void (async () => {
     process.exit(1);
   }
 })();
-
-// .then(() => {
-//   loadStormConfig().then((config) => exitWithSuccess(config));
-// });

package/bin/post-checkout.ts

@@ -7,32 +7,37 @@ import {
   loadStormConfig,
   run,
   writeError,
+  writeFatal,
   writeInfo
 } from "@storm-software/config-tools";
 import { checkPackageVersion } from "../src/utilities";
 
-const handle = async () => {
+void (async () => {
   const config = await loadStormConfig();
-  handleProcess(config);
+  try {
+    handleProcess(config);
 
-  writeInfo(config, "Running post-checkout hook...");
-  checkPackageVersion(process.argv?.slice(1));
+    writeInfo(config, "Running post-checkout hook...");
+    checkPackageVersion(process.argv?.slice(1));
 
-  try {
-    run(config, "git-lfs version");
+    try {
+      run(config, "git-lfs version");
+    } catch (error) {
+      writeError(
+        config,
+        `This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-checkout.\nError: ${
+          (error as Error)?.message
+        }`
+      );
+      exitWithError(config);
+    }
+
+    run(config, "git lfs post-checkout");
+
+    exitWithSuccess(config);
   } catch (error) {
-    writeError(
-      config,
-      `This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-checkout.\nError: ${
-        (error as Error)?.message
-      }`
-    );
+    writeFatal(config, `A fatal error occurred while running the program: ${error.message}`);
     exitWithError(config);
+    process.exit(1);
   }
-
-  run(config, "git lfs post-checkout");
-};
-
-handle().then(() => {
-  loadStormConfig().then((config) => exitWithSuccess(config));
-});
+})();

package/bin/post-commit.ts

@@ -7,32 +7,37 @@ import {
   loadStormConfig,
   run,
   writeError,
+  writeFatal,
   writeInfo
 } from "@storm-software/config-tools";
 import { checkPackageVersion } from "../src/utilities";
 
-const handle = async () => {
+void (async () => {
   const config = await loadStormConfig();
-  handleProcess(config);
+  try {
+    handleProcess(config);
 
-  writeInfo(config, "Running post-commit hook...");
-  checkPackageVersion(process.argv?.slice(1));
+    writeInfo(config, "Running post-commit hook...");
+    checkPackageVersion(process.argv?.slice(1));
 
-  try {
-    run(config, "git-lfs version");
+    try {
+      run(config, "git-lfs version");
+    } catch (error) {
+      writeError(
+        config,
+        `This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-commit.\nError: ${
+          (error as Error)?.message
+        }`
+      );
+      exitWithError(config);
+    }
+
+    run(config, "git lfs post-commit");
+
+    exitWithSuccess(config);
   } catch (error) {
-    writeError(
-      config,
-      `This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-commit.\nError: ${
-        (error as Error)?.message
-      }`
-    );
+    writeFatal(config, `A fatal error occurred while running the program: ${error.message}`);
     exitWithError(config);
+    process.exit(1);
   }
-
-  run(config, "git lfs post-commit");
-};
-
-handle().then(() => {
-  loadStormConfig().then((config) => exitWithSuccess(config));
-});
+})();

package/bin/post-merge.ts

@@ -7,32 +7,37 @@ import {
   loadStormConfig,
   run,
   writeError,
+  writeFatal,
   writeInfo
 } from "@storm-software/config-tools";
 import { checkPackageVersion } from "../src/utilities";
 
-const handle = async () => {
+void (async () => {
   const config = await loadStormConfig();
-  handleProcess(config);
+  try {
+    handleProcess(config);
 
-  writeInfo(config, "Running post-merge hook...");
-  checkPackageVersion(process.argv?.slice(1));
+    writeInfo(config, "Running post-merge hook...");
+    checkPackageVersion(process.argv?.slice(1));
 
-  try {
-    run(config, "git-lfs version");
+    try {
+      run(config, "git-lfs version");
+    } catch (error) {
+      writeError(
+        config,
+        `This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-merge.\nError: ${
+          (error as Error)?.message
+        }`
+      );
+      exitWithError(config);
+    }
+
+    run(config, "git lfs post-merge");
+
+    exitWithSuccess(config);
   } catch (error) {
-    writeError(
-      config,
-      `This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-merge.\nError: ${
-        (error as Error)?.message
-      }`
-    );
+    writeFatal(config, `A fatal error occurred while running the program: ${error.message}`);
     exitWithError(config);
+    process.exit(1);
   }
-
-  run(config, "git lfs post-merge");
-};
-
-handle().then(() => {
-  loadStormConfig().then((config) => exitWithSuccess(config));
-});
+})();

package/bin/pre-commit.ts

@@ -5,24 +5,32 @@ import {
   exitWithSuccess,
   handleProcess,
   loadStormConfig,
-  writeError
+  writeError,
+  writeFatal,
+  writeInfo
 } from "@storm-software/config-tools";
 import {
   checkPackageVersion,
   isPackageVersionChanged
 } from "../src/utilities/check-package-version";
 
-const handle = async () => {
+void (async () => {
   const config = await loadStormConfig();
-  handleProcess(config);
+  try {
+    handleProcess(config);
 
-  checkPackageVersion(process.argv.slice(1));
-  if (isPackageVersionChanged(process.argv?.slice(1))) {
-    writeError(config, "Please regenerate the package lock file before committing...");
+    writeInfo(config, "Running pre-commit hook...");
+
+    checkPackageVersion(process.argv.slice(1));
+    if (isPackageVersionChanged(process.argv?.slice(1))) {
+      writeError(config, "Please regenerate the package lock file before committing...");
+      exitWithError(config);
+    }
+
+    exitWithSuccess(config);
+  } catch (error) {
+    writeFatal(config, `A fatal error occurred while running the program: ${error.message}`);
     exitWithError(config);
+    process.exit(1);
   }
-};
-
-handle().then(() => {
-  loadStormConfig().then((config) => exitWithSuccess(config));
-});
+})();

package/bin/pre-install.ts

@@ -1,25 +1,33 @@
 #!/usr/bin/env node
 
 import {
+  exitWithError,
   exitWithSuccess,
   handleProcess,
   loadStormConfig,
   run,
+  writeFatal,
   writeInfo
 } from "@storm-software/config-tools";
 
-const handle = async () => {
+void (async () => {
   const config = await loadStormConfig();
-  handleProcess(config);
+  try {
+    handleProcess(config);
 
-  if (config.ci) {
-    writeInfo(config, "Skipping pre-install for CI process...");
-    exitWithSuccess(config);
-  }
+    writeInfo(config, "Running pre-install hook...");
+
+    if (config.ci) {
+      writeInfo(config, "Skipping pre-install for CI process...");
+      exitWithSuccess(config);
+    }
 
-  run(config, "npx -y only-allow pnpm");
-};
+    run(config, "npx -y only-allow pnpm");
 
-handle().then(() => {
-  loadStormConfig().then((config) => exitWithSuccess(config));
-});
+    exitWithSuccess(config);
+  } catch (error) {
+    writeFatal(config, `A fatal error occurred while running the program: ${error.message}`);
+    exitWithError(config);
+    process.exit(1);
+  }
+})();

package/bin/pre-push.ts

@@ -6,84 +6,87 @@ import path from "node:path";
 import {
   exitWithError,
   exitWithSuccess,
-  findWorkspaceRootSafe,
   handleProcess,
   loadStormConfig,
   run,
   writeError,
+  writeFatal,
   writeInfo,
   writeSuccess
 } from "@storm-software/config-tools";
 import { checkPackageVersion } from "../src/utilities";
 
-const handle = async () => {
+void (async () => {
   const config = await loadStormConfig();
-  handleProcess(config);
+  try {
+    handleProcess(config);
 
-  writeInfo(config, "Running pre-push hook...");
-  checkPackageVersion(process.argv?.slice(1));
+    writeInfo(config, "Running pre-push hook...");
+    checkPackageVersion(process.argv?.slice(1));
 
-  writeInfo(config, "🔒🔒🔒 Validating lock files 🔒🔒🔒\n");
+    writeInfo(config, "🔒🔒🔒 Validating lock files 🔒🔒🔒\n");
 
-  const workspaceRoot = findWorkspaceRootSafe();
-  const errors = [];
+    const errors = [] as string[];
 
-  if (fs.existsSync(path.join(workspaceRoot, "package-lock.json"))) {
-    errors.push(
-      'Invalid occurrence of "package-lock.json" file. Please remove it and use only "pnpm-lock.yaml"'
-    );
-  }
-  if (fs.existsSync(path.join(workspaceRoot, "yarn.lock"))) {
-    errors.push(
-      'Invalid occurrence of "yarn.lock" file. Please remove it and use only "pnpm-lock.yaml"'
-    );
-  }
-
-  try {
-    const content = await readFile(path.join(workspaceRoot, "pnpm-lock.yaml"), {
-      encoding: "utf8"
-    });
-    if (content.match(/localhost:487/)) {
+    if (fs.existsSync(path.join(config.workspaceRoot ?? "./", "package-lock.json"))) {
       errors.push(
-        'The "pnpm-lock.yaml" has reference to local repository ("localhost:4873"). Please use ensure you disable local registry before running "pnpm i"'
+        'Invalid occurrence of "package-lock.json" file. Please remove it and use only "pnpm-lock.yaml"'
       );
     }
-    if (content.match(/resolution: \{tarball/)) {
+    if (fs.existsSync(path.join(config.workspaceRoot ?? "./", "yarn.lock"))) {
       errors.push(
-        'The "pnpm-lock.yaml" has reference to tarball package. Please use npm registry only'
+        'Invalid occurrence of "yarn.lock" file. Please remove it and use only "pnpm-lock.yaml"'
       );
     }
-  } catch {
-    errors.push('The "pnpm-lock.yaml" does not exist or cannot be read');
-  }
 
-  if (errors.length > 0) {
-    writeError(config, "❌ Lock file validation failed");
-    for (const error of errors) {
-      console.error(error);
+    try {
+      const content = await readFile(path.join(config.workspaceRoot ?? "./", "pnpm-lock.yaml"), {
+        encoding: "utf8"
+      });
+      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');
     }
 
-    exitWithError(config);
-  }
+    if (errors.length > 0) {
+      writeError(config, "❌ Lock file validation failed");
+      for (const error of errors) {
+        console.error(error);
+      }
 
-  writeSuccess(config, "✅ Lock file is valid");
-  run(config, "git lfs pre-push origin");
+      exitWithError(config);
+    }
 
-  try {
-    run(config, "git-lfs version");
+    writeSuccess(config, "✅ Lock file is valid");
+    run(config, "git lfs pre-push origin");
+
+    try {
+      run(config, "git-lfs version");
+    } catch (error) {
+      writeError(
+        config,
+        `This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\nError: ${
+          (error as Error)?.message
+        }`
+      );
+      exitWithError(config);
+    }
+
+    run(config, "git lfs pre-push origin");
+
+    exitWithSuccess(config);
   } catch (error) {
-    writeError(
-      config,
-      `This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\nError: ${
-        (error as Error)?.message
-      }`
-    );
+    writeFatal(config, `A fatal error occurred while running the program: ${error.message}`);
     exitWithError(config);
+    process.exit(1);
   }
-
-  run(config, "git lfs pre-push origin");
-};
-
-handle().then(() => {
-  loadStormConfig().then((config) => exitWithSuccess(config));
-});
+})();

package/bin/prepare.ts

@@ -1,16 +1,30 @@
 #!/usr/bin/env node
 
-import { exitWithSuccess, handleProcess, loadStormConfig, run } from "@storm-software/config-tools";
+import {
+  exitWithError,
+  exitWithSuccess,
+  handleProcess,
+  loadStormConfig,
+  run,
+  writeFatal,
+  writeInfo
+} from "@storm-software/config-tools";
 
-const handle = async () => {
+void (async () => {
   const config = await loadStormConfig();
-  handleProcess(config);
+  try {
+    handleProcess(config);
 
-  if (!config.ci) {
-    run(config, "lefthook install");
-  }
-};
+    writeInfo(config, "Running prepare hook...");
+
+    if (!config.ci) {
+      run(config, "lefthook install");
+    }
 
-handle().then(() => {
-  loadStormConfig().then((config) => exitWithSuccess(config));
-});
+    exitWithSuccess(config);
+  } catch (error) {
+    writeFatal(config, `A fatal error occurred while running the program: ${error.message}`);
+    exitWithError(config);
+    process.exit(1);
+  }
+})();

package/bin/version-warning.ts

@@ -1,15 +1,22 @@
 #!/usr/bin/env node
 
-import { exitWithSuccess, handleProcess, loadStormConfig } from "@storm-software/config-tools";
+import {
+  exitWithError,
+  handleProcess,
+  loadStormConfig,
+  writeFatal
+} from "@storm-software/config-tools";
 import { checkPackageVersion } from "../src/utilities/check-package-version";
 
-const handle = async () => {
+void (async () => {
   const config = await loadStormConfig();
-  handleProcess(config);
+  try {
+    handleProcess(config);
 
-  checkPackageVersion(process.argv.slice(1));
-};
-
-handle().then(() => {
-  loadStormConfig().then((config) => exitWithSuccess(config));
-});
+    checkPackageVersion(process.argv.slice(1));
+  } catch (error) {
+    writeFatal(config, `A fatal error occurred while running the program: ${error.message}`);
+    exitWithError(config);
+    process.exit(1);
+  }
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/git-tools",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "private": false,
   "description": "⚡ A package containing various git tools used in Storm workspaces.",
   "keywords": [
@@ -56,16 +56,10 @@
     "word-wrap": "1.2.5"
   },
   "devDependencies": {
-    "@storm-software/config": "1.7.1",
-    "@storm-software/config-tools": "1.33.1",
     "@types/inquirer": "9.0.6",
     "@types/prettier": "3.0.0"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "peerDependencies": {
-    "@storm-software/config": "workspace:^",
-    "@storm-software/config-tools": "workspace:^"
   }
 }

package/project.json

@@ -7,8 +7,13 @@
     "build": {
       "cache": true,
       "executor": "@nx/esbuild:esbuild",
-      "inputs": ["default", "^production"],
-      "outputs": ["{options.outputPath}"],
+      "inputs": [
+        "default",
+        "^production"
+      ],
+      "outputs": [
+        "{options.outputPath}"
+      ],
       "options": {
         "outputPath": "dist/packages/git-tools",
         "tsConfig": "packages/git-tools/tsconfig.json",
@@ -40,8 +45,12 @@
         "skipTypeCheck": true,
         "thirdParty": true,
         "platform": "node",
-        "format": ["cjs", "esm"],
-        "external": ["nx"],
+        "format": [
+          "esm"
+        ],
+        "external": [
+          "nx"
+        ],
         "esbuildOptions": {
           "legalComments": "inline",
           "banner": {
@@ -98,5 +107,8 @@
       }
     }
   },
-  "tags": ["type:util", "scope:tools"]
-}
+  "tags": [
+    "type:util",
+    "scope:tools"
+  ]
+}

package/tsconfig.script.json

@@ -1,20 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "baseUrl": "../..",
-    "strict": false,
-    "module": "commonjs",
-    "allowJs": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "preserveSymlinks": true,
-    "isolatedModules": true,
-    "types": ["node"]
-  },
-  "include": ["**/*.ts"],
-  "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"],
-  "ts-node": {
-    "require": ["tsconfig-paths/register"]
-  }
-}