version-from-git 1.1.1-0 → 1.1.2-main.320b9e4

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 William Wong
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,6 +1,6 @@
 # version-from-git
 
-[![npm version](https://badge.fury.io/js/version-from-git.svg)](https://badge.fury.io/js/version-from-git) [![Build Status](https://travis-ci.org/compulim/version-from-git.svg?branch=master)](https://travis-ci.org/compulim/version-from-git)
+[![npm version](https://badge.fury.io/js/version-from-git.svg)](https://badge.fury.io/js/version-from-git)
 
 # Background
 
@@ -12,17 +12,18 @@ And use Travis CI to automatically publish the pre-release version to NPM, tagge
 
 # How to use
 
-Run `npx version-from-git`, it will run `npm version 1.0.0-master.1a2b3c4`.
+Run `npx version-from-git`, it will run `npm version 1.0.0-main.1a2b3c4`.
 
 ```
   Usage: version-from-git [options]
 
-  Bump package.json version to pre-release tagged with Git branch and short commit hash, 1.0.0-master.1a2b3c4
+  Bump package.json version to pre-release tagged with Git branch and short commit hash, 1.0.0-main.1a2b3c4
 
   Options:
 
     -V, --version            output the version number
     -p, --path <path>        path to package.json, default to current directory (default: C:\Users\Compulim\Source\Repos\version-from-git)
+    --template <template>    pre-release version template (default: branch.short)
     -t, --travis             run in Travis CI: skip when TRAVIS_TAG present
     -f, --force              run "npm version" with --force
     -m, --message <message>  run "npm version" with --message
@@ -41,15 +42,15 @@ Run `npx version-from-git -t`, it will detect whether `TRAVIS_TAG` environment v
 
 ## Customizing pre-release version pattern
 
-You can customize the version pattern when tagging for pre-release versions.
+You can customize the version pattern when tagging for pre-release versions by running with argument `--template branch.short`.
 
 | Pattern name | Description                                                      | Sample                                     |
-|--------------|------------------------------------------------------------------|--------------------------------------------|
-| `branch`     | Branch name<br />In Travis, will use `process.env.TRAVIS_BRANCH` | `master`                                   |
+| ------------ | ---------------------------------------------------------------- | ------------------------------------------ |
+| `branch`     | Branch name<br />In Travis, will use `process.env.TRAVIS_BRANCH` | `main`                                     |
 | `long`       | Git commit in long form                                          | `3807f9004867438c57a3e26f2073c33c458d4ef9` |
 | `short`      | Git commit in short form                                         | `3807f90`                                  |
 
-Default pattern is `branch.short`, which would produce `master.1a2b3c4`.
+Default pattern is `branch.short`, which would produce `main.1a2b3c4`.
 
 # Contributions
 

package/package.json

@@ -1,26 +1,33 @@
 {
   "name": "version-from-git",
-  "version": "1.1.1-0",
-  "description": "Bump package.json version to pre-release tagged with Git branch and short commit hash, 1.0.0-master.1a2b3c4",
-  "main": "src/index.js",
+  "version": "1.1.2-main.320b9e4",
+  "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"
+  ],
+  "main": "./src/index.js",
   "bin": {
     "version-from-git": "./src/index.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/",
+    "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 .",
+    "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\""
   },
-  "author": "William Wong <compulim@hotmail.com> (http://compulim.info/)",
-  "files": [
-    "src/**/*"
-  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/compulim/version-from-git.git"
   },
-  "bugs": {
-    "url": "https://github.com/compulim/version-from-git/issues"
-  },
-  "homepage": "https://github.com/compulim/version-from-git#readme",
   "keywords": [
     "branch",
     "bump",
@@ -30,13 +37,22 @@
     "travis",
     "version"
   ],
+  "author": "William Wong (https://github.com/compulim)",
   "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/compulim/version-from-git/issues"
+  },
+  "homepage": "https://github.com/compulim/version-from-git#readme",
   "dependencies": {
     "chalk": "^2.4.1",
     "commander": "^2.15.1",
     "cross-spawn": "^6.0.5",
-    "git-rev-sync": "^1.12.0",
+    "git-rev-sync": "^3.0.2",
     "on-error-resume-next": "^1.0.0",
-    "semver": "^5.5.0"
+    "semver": "^5.5.0",
+    "version-from-git": "^1.1.2-main.320b9e4"
+  },
+  "devDependencies": {
+    "@tsconfig/strictest": "^2.0.5"
   }
 }

package/src/index.js

@@ -28,12 +28,12 @@ program
   .parse(process.argv);
 
 function main() {
-  log(`Running ${ green(`${ ourPackageJSON.name }@${ ourPackageJSON.version }`) }`);
+  log(`Running ${green(`${ourPackageJSON.name}@${ourPackageJSON.version}`)}`);
 
   let branch, long, short;
 
   if (program.travis) {
-    log(`Travis mode ${ magenta('enabled') }`);
+    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'));
@@ -59,7 +59,7 @@ function main() {
 
   const packageJSONPath = resolve('package.json');
 
-  log(`Reading from ${ magenta(packageJSONPath) }`);
+  log(`Reading from ${magenta(packageJSONPath)}`);
 
   const packageJSON = onErrorResumeNext(() => require(packageJSONPath));
 
@@ -71,34 +71,38 @@ function main() {
   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;
+      case 'branch':
+        return branch;
+      case 'short':
+        return short;
+      case 'long':
+        return long;
+
+      default:
+        return name;
     }
   });
 
-  const nextVersion = `${ major(version) }.${ minor(version) }.${ patch(version) }-${ preRelease }`;
+  const nextVersion = `${major(version)}.${minor(version)}.${patch(version)}-${preRelease}`;
 
-  log(`Bumping from ${ green(version) } to ${ green(nextVersion) }`);
+  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'] : [],
+    ...(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(' ') }`) }`);
+  log(`Running ${magenta(`npm ${args.join(' ')}`)}`);
 
-  // const result = spawn.sync('npm', args, { cwd, stdio: 'inherit' });
+  const result = spawn.sync('npm', args, { cwd, stdio: 'inherit' });
 
-  // process.exit(result);
+  process.exit(result.status);
 }
 
 main();

package/CHANGELOG.md

@@ -1,15 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## [1.1.0] - 2019-08-12
-### Added
-- Fix [#2](https://github.com/compulim/version-from-git/issues/2). Supports customizing pre-release thru `--template`, in [PR #3](https://github.com/compulim/version-from-git/pulls/3)
-
-## [1.0.0] - 2018-05-18
-### Added
-- Initial commit