version-from-git 1.1.3-main.98ff1b7 → 1.2.1-main.202512240318.67492b7

package/dist/version-from-git.d.ts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/version-from-git.js

@@ -0,0 +1,80 @@
+#!/usr/bin/env node
+
+// src/index.ts
+import chalk from "chalk";
+import { program } from "commander";
+import spawn from "cross-spawn";
+import { branch as gitBranch, long as gitLong, short as gitShort } from "git-rev-sync";
+import { join, resolve } from "path";
+import { fileURLToPath } from "url";
+import { onErrorResumeNext } from "on-error-resume-next/async";
+import { readPackage } from "read-pkg";
+import { major, minor, patch } from "semver";
+var { green, magenta, red, yellow } = chalk;
+var { log } = console;
+var ourPackageJSON = await readPackage({ cwd: join(fileURLToPath(import.meta.url), "../../") });
+var DEFAULT_TEMPLATE = "branch.short";
+program.version(ourPackageJSON.version).description(ourPackageJSON.description || "").option("-p, --path <path>", "path to package.json, default to current directory", process.cwd()).option("--template <template>", "pre-release version template", DEFAULT_TEMPLATE).option("-t, --travis", "run in Travis CI: skip when TRAVIS_TAG present").option("-f, --force", 'run "npm version" with --force').option("-m, --message <message>", 'run "npm version" with --message').option("--allow-same-version", 'run "npm version" with --allow-same-version').option("--sign-git-tag", 'run "npm version" with --sign-git-tag').option("--no-commit-hooks", 'run "npm version" with --commit-hooks').option("--no-git-tag-version", 'run "npm version" with --no-git-tag-version').parse(process.argv);
+var options = program.opts();
+log(`Running ${green(`${ourPackageJSON.name}@${ourPackageJSON.version}`)}`);
+var branch;
+var long;
+var short;
+if (options["travis"]) {
+  log(`Travis mode ${magenta("enabled")}`);
+  if (process.env["TRAVIS_TAG"]) {
+    log(yellow("Environment variable TRAVIS_TAG is present, we will not generate a new version, exiting"));
+    process.exit(0);
+  }
+  branch = process.env["TRAVIS_BRANCH"];
+}
+if (options["path"]) {
+  process.chdir(resolve(options["path"]));
+}
+var cwd = process.cwd();
+try {
+  branch = branch || gitBranch(cwd);
+  long = gitLong(cwd);
+  short = gitShort(cwd);
+} catch {
+  log(red("Failed to read from .git directory, is this a Git branch with at least one commit?"));
+  process.exit(-1);
+}
+var packageJSONPath = resolve(".");
+log(`Reading from ${magenta(packageJSONPath)}`);
+var packageJSON = await onErrorResumeNext(
+  () => readPackage({ cwd: packageJSONPath })
+);
+if (!packageJSON) {
+  log(red("Failed to read package.json, is it missing or malformed?"));
+  process.exit(-1);
+}
+var { version } = packageJSON;
+var preRelease = (options["template"] || DEFAULT_TEMPLATE).replace(/\w+/giu, (name) => {
+  switch (name) {
+    case "branch":
+      return branch;
+    case "short":
+      return short;
+    case "long":
+      return long;
+    default:
+      return name;
+  }
+});
+var nextVersion = `${major(version)}.${minor(version)}.${patch(version)}-${preRelease}`;
+log(`Bumping from ${green(version)} to ${green(nextVersion)}`);
+var args = [
+  "version",
+  ...options["allowSameVersion"] ? ["--allow-same-version"] : [],
+  ...options["commitHooks"] ? [] : ["--no-commit-hooks"],
+  ...options["force"] ? ["--force"] : [],
+  ...options["gitTagVersion"] ? [] : ["--no-git-tag-version"],
+  ...options["message"] ? ["--message", options["message"]] : [],
+  ...options["signGitTag"] ? ["--sign-git-tag"] : [],
+  nextVersion
+];
+log(`Running ${magenta(`npm ${args.join(" ")}`)}`);
+var result = spawn.sync("npm", args, { cwd, stdio: "inherit" });
+process.exit(result.status);
+//# sourceMappingURL=version-from-git.js.map

package/dist/version-from-git.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport chalk from 'chalk';\nimport { program } from 'commander';\nimport spawn from 'cross-spawn';\nimport { branch as gitBranch, long as gitLong, short as gitShort } from 'git-rev-sync';\nimport { join, resolve } from 'node:path';\nimport { fileURLToPath } from 'node:url';\nimport { onErrorResumeNext } from 'on-error-resume-next/async';\nimport { readPackage } from 'read-pkg';\nimport { major, minor, patch } from 'semver';\n\nconst { green, magenta, red, yellow } = chalk;\nconst { log } = console;\n\nconst ourPackageJSON = await readPackage({ cwd: join(fileURLToPath(import.meta.url), '../../') });\n\nconst DEFAULT_TEMPLATE = 'branch.short';\n\nprogram\n  .version(ourPackageJSON.version)\n  .description(ourPackageJSON.description || '')\n  .option('-p, --path <path>', 'path to package.json, default to current directory', process.cwd())\n  .option('--template <template>', 'pre-release version template', DEFAULT_TEMPLATE)\n  .option('-t, --travis', 'run in Travis CI: skip when TRAVIS_TAG present')\n  .option('-f, --force', 'run \"npm version\" with --force')\n  .option('-m, --message <message>', 'run \"npm version\" with --message')\n  .option('--allow-same-version', 'run \"npm version\" with --allow-same-version')\n  .option('--sign-git-tag', 'run \"npm version\" with --sign-git-tag')\n  .option('--no-commit-hooks', 'run \"npm version\" with --commit-hooks')\n  .option('--no-git-tag-version', 'run \"npm version\" with --no-git-tag-version')\n  .parse(process.argv);\n\nconst options = program.opts();\n\nlog(`Running ${green(`${ourPackageJSON.name}@${ourPackageJSON.version}`)}`);\n\nlet branch, long, short;\n\nif (options['travis']) {\n  log(`Travis mode ${magenta('enabled')}`);\n\n  if (process.env['TRAVIS_TAG']) {\n    log(yellow('Environment variable TRAVIS_TAG is present, we will not generate a new version, exiting'));\n\n    process.exit(0);\n  }\n\n  branch = process.env['TRAVIS_BRANCH'];\n}\n\nif (options['path']) {\n  process.chdir(resolve(options['path']));\n}\n\nconst cwd = process.cwd();\n\ntry {\n  branch = branch || gitBranch(cwd);\n  long = gitLong(cwd);\n  short = gitShort(cwd);\n} catch {\n  log(red('Failed to read from .git directory, is this a Git branch with at least one commit?'));\n  process.exit(-1);\n}\n\nconst packageJSONPath = resolve('.');\n\nlog(`Reading from ${magenta(packageJSONPath)}`);\n\nconst packageJSON: { version: string } | undefined = await onErrorResumeNext(() =>\n  readPackage({ cwd: packageJSONPath })\n);\n\nif (!packageJSON) {\n  log(red('Failed to read package.json, is it missing or malformed?'));\n  process.exit(-1);\n}\n\nconst { version } = packageJSON;\nconst preRelease = (options['template'] || DEFAULT_TEMPLATE).replace(/\\w+/giu, (name: string) => {\n  switch (name) {\n    case 'branch':\n      return branch;\n    case 'short':\n      return short;\n    case 'long':\n      return long;\n\n    default:\n      return name;\n  }\n});\n\nconst nextVersion = `${major(version)}.${minor(version)}.${patch(version)}-${preRelease}`;\n\nlog(`Bumping from ${green(version)} to ${green(nextVersion)}`);\n\nconst args = [\n  'version',\n  ...(options['allowSameVersion'] ? ['--allow-same-version'] : []),\n  ...(options['commitHooks'] ? [] : ['--no-commit-hooks']),\n  ...(options['force'] ? ['--force'] : []),\n  ...(options['gitTagVersion'] ? [] : ['--no-git-tag-version']),\n  ...(options['message'] ? ['--message', options['message']] : []),\n  ...(options['signGitTag'] ? ['--sign-git-tag'] : []),\n  nextVersion\n];\n\nlog(`Running ${magenta(`npm ${args.join(' ')}`)}`);\n\nconst result = spawn.sync('npm', args, { cwd, stdio: 'inherit' });\n\nprocess.exit(result.status);\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,32 +1,35 @@
 {
   "name": "version-from-git",
-  "version": "1.1.3-main.98ff1b7",
+  "version": "1.2.1-main.202512240318.67492b7",
   "description": "Bump package.json version to pre-release tagged with Git branch and short commit hash, 1.0.0-main.1a2b3c4",
   "files": [
-    "./src/**/*.cjs",
-    "./src/**/*.js",
-    "./src/**/*.mjs"
+    "./*.js",
+    "./dist/"
   ],
-  "main": "./src/index.js",
+  "type": "module",
+  "main": "./dist/version-from-git.js",
+  "typings": "./dist/version-from-git.d.ts",
   "bin": {
-    "version-from-git": "./src/index.js"
+    "version-from-git": "./dist/version-from-git.js"
   },
   "scripts": {
-    "bump": "npm run bump:prod && npm run bump:dev && npm run bump:auditfix",
-    "bump:auditfix": "npm audit fix || exit 0",
-    "bump:dev": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.localPeerDependencies // {}) as $L | (.devDependencies // {}) | to_entries | map(select(.key as $K | $L | has($K) | not)) | map(.key + \"@latest\") | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
-    "bump:prod": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.localPeerDependencies // {}) as $L | (.dependencies // {}) | to_entries | map(select(.key as $K | $L | has($K) | not)) | map(.key + \"@latest\") | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
-    "-precommit": "npm run precommit:eslint && npm run precommit:typescript:production && npm run precommit:typescript:test",
-    "precommit:eslint": "eslint ./src/",
+    "build": "tsup-node",
+    "bump": "npm run bump:prod && npm run bump:dev",
+    "bump:dev": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localPeerDependencies // {}) as $L | (.devDependencies // {}) | to_entries | map(select(.key as $K | $L | has($K) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
+    "bump:prod": "PACKAGES_TO_BUMP=$(cat package.json | jq -r '(.pinDependencies // {}) as $P | (.localPeerDependencies // {}) as $L | (.dependencies // {}) | to_entries | map(select(.key as $K | $L | has($K) | not)) | map(.key + \"@\" + ($P[.key] // [\"latest\"])[0]) | join(\" \")') && [ ! -z \"$PACKAGES_TO_BUMP\" ] && npm install $PACKAGES_TO_BUMP || true",
+    "precommit": "npm run precommit:eslint && npm run precommit:publint && npm run precommit:typescript:production && npm run precommit:typescript:test",
+    "precommit:eslint": "ESLINT_USE_FLAT_CONFIG=false eslint ./src/",
+    "precommit:publint": "publint",
     "precommit:typescript:production": "tsc --noEmit --project ./src/tsconfig.precommit.production.json",
     "precommit:typescript:test": "tsc --noEmit --project ./src/tsconfig.precommit.test.json",
     "prepack": "cp ../../CHANGELOG.md . && cp ../../LICENSE . && cp ../../README.md .",
+    "start": "npm run build -- --onSuccess \"touch ../pages/package.json\" --watch",
     "switch": "cat package.json | jq --arg SWITCH_NAME $SWITCH_NAME -r '(.[\"switch:\" + $SWITCH_NAME] // {}) as $TEMPLATE | .devDependencies += ($TEMPLATE.devDependencies // {}) | .dependencies += ($TEMPLATE.dependencies // {})' | tee ./package.json.tmp && mv ./package.json.tmp ./package.json",
-    "test": "echo \"TODO: Add tests\""
+    "test": "node --test ${CI:---watch} **/*.{spec,test}.{[jt]s,[jt]sx,c[jt]s,m[jt]s}"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/compulim/version-from-git.git"
+    "url": "https://github.com/compulim/version-from-git.git"
   },
   "keywords": [
     "branch",
@@ -44,15 +47,22 @@
   },
   "homepage": "https://github.com/compulim/version-from-git#readme",
   "dependencies": {
-    "chalk": "^2.4.1",
-    "commander": "^2.15.1",
-    "cross-spawn": "^6.0.5",
+    "chalk": "^5.6.2",
+    "commander": "^14.0.2",
+    "cross-spawn": "^7.0.6",
     "git-rev-sync": "^3.0.2",
-    "on-error-resume-next": "^1.0.0",
-    "semver": "^5.5.0",
-    "version-from-git": "^1.1.3-main.98ff1b7"
+    "on-error-resume-next": "^2.0.3",
+    "read-pkg": "^10.0.0",
+    "semver": "^7.7.3",
+    "version-from-git": "^1.2.1-main.202512240318.67492b7"
   },
   "devDependencies": {
-    "@tsconfig/strictest": "^2.0.5"
+    "@tsconfig/recommended": "^1.0.13",
+    "@tsconfig/strictest": "^2.0.8",
+    "@types/cross-spawn": "^6.0.6",
+    "@types/git-rev-sync": "^2.0.2",
+    "@types/semver": "^7.7.1",
+    "publint": "^0.3.16",
+    "tsup": "^8.5.1"
   }
 }

package/src/index.js

@@ -1,108 +0,0 @@
-#!/usr/bin/env node
-
-const { branch: gitBranch, short: gitShort, long: gitLong } = require('git-rev-sync');
-const { join, resolve } = require('path');
-const { major, minor, patch } = require('semver');
-const { green, magenta, red, yellow } = require('chalk');
-const { default: onErrorResumeNext } = require('on-error-resume-next');
-const program = require('commander');
-const spawn = require('cross-spawn');
-
-const { log } = console;
-const ourPackageJSON = require(join(__dirname, '../package.json'));
-
-const DEFAULT_TEMPLATE = 'branch.short';
-
-program
-  .version(ourPackageJSON.version)
-  .description(ourPackageJSON.description)
-  .option('-p, --path <path>', 'path to package.json, default to current directory', process.cwd())
-  .option('--template <template>', 'pre-release version template', DEFAULT_TEMPLATE)
-  .option('-t, --travis', 'run in Travis CI: skip when TRAVIS_TAG present')
-  .option('-f, --force', 'run "npm version" with --force')
-  .option('-m, --message <message>', 'run "npm version" with --message')
-  .option('--allow-same-version', 'run "npm version" with --allow-same-version')
-  .option('--sign-git-tag', 'run "npm version" with --sign-git-tag')
-  .option('--no-commit-hooks', 'run "npm version" with --commit-hooks')
-  .option('--no-git-tag-version', 'run "npm version" with --no-git-tag-version')
-  .parse(process.argv);
-
-function main() {
-  log(`Running ${green(`${ourPackageJSON.name}@${ourPackageJSON.version}`)}`);
-
-  let branch, long, short;
-
-  if (program.travis) {
-    log(`Travis mode ${magenta('enabled')}`);
-
-    if (process.env.TRAVIS_TAG) {
-      return log(yellow('Environment variable TRAVIS_TAG is present, we will not generate a new version, exiting'));
-    }
-
-    branch = process.env.TRAVIS_BRANCH;
-  }
-
-  if (program.path) {
-    process.chdir(resolve(program.path));
-  }
-
-  const cwd = process.cwd();
-
-  try {
-    branch = branch || gitBranch(cwd);
-    long = gitLong(cwd);
-    short = gitShort(cwd);
-  } catch (err) {
-    log(red('Failed to read from .git directory, is this a Git branch with at least one commit?'));
-    process.exit(-1);
-  }
-
-  const packageJSONPath = resolve('package.json');
-
-  log(`Reading from ${magenta(packageJSONPath)}`);
-
-  const packageJSON = onErrorResumeNext(() => require(packageJSONPath));
-
-  if (!packageJSON) {
-    log(red('Failed to read package.json, is it missing or malformed?'));
-    process.exit(-1);
-  }
-
-  const { version } = packageJSON;
-  const preRelease = (program.template || DEFAULT_TEMPLATE).replace(/\w+/giu, name => {
-    switch (name) {
-      case 'branch':
-        return branch;
-      case 'short':
-        return short;
-      case 'long':
-        return long;
-
-      default:
-        return name;
-    }
-  });
-
-  const nextVersion = `${major(version)}.${minor(version)}.${patch(version)}-${preRelease}`;
-
-  log(`Bumping from ${green(version)} to ${green(nextVersion)}`);
-
-  const args = [
-    'version',
-    ...(program.allowSameVersion ? ['--allow-same-version'] : []),
-    ...(program.commitHooks ? [] : ['--no-commit-hooks']),
-    ...(program.force ? ['--force'] : []),
-    ...(program.gitTagVersion ? [] : ['--no-git-tag-version']),
-    ...(program.message ? ['--message', program.message] : []),
-    ...(program.signGitTag ? ['--sign-git-tag'] : []),
-    nextVersion
-  ];
-
-  log(`Running ${magenta(`npm ${args.join(' ')}`)}`);
-
-  const result = spawn.sync('npm', args, { cwd, stdio: 'inherit' });
-
-  process.exit(result.status);
-}
-
-main();