Merge remote-tracking branch 'origin/master'

Author: JamesMessinger

README.md

@@ -91,6 +91,8 @@ options:
 
   -h, --help                Show usage information
 
+  --ignore-scripts          Bypass version scripts
+
 files...
   One or more files and/or globs to bump (ex: README.md *.txt docs/**/*).
   Defaults to package.json and package-lock.json.

package-lock.json

@@ -43,6 +43,8 @@ options:
 
   -h, --help                Show usage information
 
+  --ignore-scripts          Bypass version scripts
+
 files...
   One or more files and/or globs to bump (ex: README.md *.txt docs/**/*).
   Defaults to package.json and package-lock.json.

src/cli/help.ts

@@ -31,6 +31,7 @@ export function parseArgs(argv: string[]): ParsedArgs {
         { name: "quiet", alias: "q", type: Boolean },
         { name: "version", alias: "v", type: Boolean },
         { name: "help", alias: "h", type: Boolean },
+        { name: "ignore-scripts", type: Boolean },
         { name: "files", type: String, multiple: true, defaultOption: true },
       ],
       { argv }
@@ -48,6 +49,7 @@ export function parseArgs(argv: string[]): ParsedArgs {
         all: args.all as boolean,
         noVerify: args["no-verify"] as boolean,
         files: args.files as string[],
+        ignoreScripts: args["ignore-scripts"] as boolean,
       }
     };
 

src/cli/parse-args.ts

@@ -55,6 +55,7 @@ export interface NormalizedOptions {
   files: string[];
   cwd: string;
   interface: Interface;
+  ignoreScripts: boolean;
 }
 
 /**
@@ -67,6 +68,7 @@ export async function normalizeOptions(raw: VersionBumpOptions): Promise<Normali
   let all = Boolean(raw.all);
   let noVerify = Boolean(raw.noVerify);
   let cwd = raw.cwd || process.cwd();
+  let ignoreScripts = Boolean(raw.ignoreScripts);
 
   let release: Release;
   if (!raw.release || raw.release === "prompt") {
@@ -131,7 +133,7 @@ export async function normalizeOptions(raw: VersionBumpOptions): Promise<Normali
     throw new Error("Cannot prompt for the version number because input or output has been disabled.");
   }
 
-  return { release, commit, tag, push, files, cwd, interface: ui };
+  return { release, commit, tag, push, files, cwd, interface: ui, ignoreScripts };
 }
 
 /**

src/normalize-options.ts

@@ -8,13 +8,15 @@ import { NpmScript, ProgressEvent } from "./types/version-bump-progress";
  * Runs the specified NPM script in the package.json file.
  */
 export async function runNpmScript(script: NpmScript, operation: Operation): Promise<Operation> {
-  let { cwd } = operation.options;
+  let { cwd, ignoreScripts } = operation.options;
 
-  let { data: manifest } = await readJsonFile("package.json", cwd);
+  if (!ignoreScripts) {
+    let { data: manifest } = await readJsonFile("package.json", cwd);
 
-  if (isManifest(manifest) && hasScript(manifest, script)) {
-    await ezSpawn.async("npm", ["run", script, "--silent"], { stdio: "inherit" });
-    operation.update({ event: ProgressEvent.NpmScript, script });
+    if (isManifest(manifest) && hasScript(manifest, script)) {
+      await ezSpawn.async("npm", ["run", script, "--silent"], { stdio: "inherit" });
+      operation.update({ event: ProgressEvent.NpmScript, script });
+    }
   }
 
   return operation;

src/run-npm-script.ts

@@ -92,6 +92,13 @@ export interface VersionBumpOptions {
    */
   interface?: boolean | InterfaceOptions;
 
+  /**
+   * Indicates whether to ignore version scripts.
+   *
+   * Defaults to `false`.
+   */
+  ignoreScripts?: boolean;
+
   /**
    * A callback that is provides information about the progress of the `versionBump()` function.
    */

src/types/version-bump-options.ts

@@ -136,4 +136,30 @@ describe("npm version hooks", () => {
     expect(bin[6].version).to.equal("2.0.0");
   });
 
+  it("should skip all version scripts when --ignore-scripts is used", () => {
+    files.create("package.json", {
+      version: "1.2.3",
+      scripts: {
+        preversion: "echo preversion",
+        version: "echo version",
+        postversion: "echo postversion",
+      }
+    });
+    files.create("package-lock.json", { version: "1.2.3" });
+
+    let cli = bump("major --ignore-scripts");
+
+    expect(cli).to.have.stderr("");
+    expect(cli).to.have.exitCode(0);
+
+    expect(cli).to.have.stdout(
+      `${check} Updated package.json to 2.0.0\n` +
+      `${check} Updated package-lock.json to 2.0.0\n`
+    );
+
+    // NPM should not have been run at all
+    let npm = mocks.npm();
+    expect(npm.length).to.equal(0);
+  });
+
 });