Fix CLI option passing (#58)

* Fix CLI option passing

.changeset/92ba93d7/changes.json

@@ -0,0 +1,4 @@
+{
+  "releases": [{ "name": "@changesets/cli", "type": "patch" }],
+  "dependents": []
+}

.changeset/92ba93d7/changes.md

@@ -0,0 +1 @@
+Fix bug where unprovided command line options overrode the config file, leading to incorrect states

TODO.md

@@ -1 +1,3 @@
 # I rolled all of the file updates into a single function! BUT there are no tests for dependents being updated
+
+Check

packages/cli/src/commands/bump/index.js

@@ -25,9 +25,11 @@ import { defaultConfig } from "../../utils/constants";
 
 export default async function version(opts) {
   let userConfig = await resolveConfig(opts.cwd);
+
   userConfig =
     userConfig && userConfig.versionOptions ? userConfig.versionOptions : {};
   const config = { ...defaultConfig.versionOptions, ...userConfig, ...opts };
+
   const cwd = config.cwd || process.cwd();
   const allPackages = await bolt.getWorkspaces({ cwd });
   const changesetBase = await getChangesetBase(cwd);

packages/cli/src/index.js

@@ -22,17 +22,23 @@ const { input, flags } = meow(
   {
     flags: {
       commit: {
-        type: "boolean"
+        type: "boolean",
+        // Command line options need to be undefined, otherwise their
+        // default value overrides the user's provided config in their
+        // config file
+        default: undefined
       },
       updateChangelog: {
         type: "boolean",
-        default: true
+        default: undefined
       },
       skipCI: {
-        type: "boolean"
+        type: "boolean",
+        default: undefined
       },
       public: {
-        type: "boolean"
+        type: "boolean",
+        default: undefined
       },
       sinceMaster: {
         type: "boolean"
@@ -69,21 +75,45 @@ const cwd = process.cwd();
       output
     } = flags;
 
+    // Command line options need to be undefined, otherwise their
+    // default value overrides the user's provided config in their
+    // config file. For this reason, we only assign them to this
+    // object as and when they exist.
+    const config = { cwd };
+
     switch (input[0]) {
       case "init": {
         await init({ cwd });
         return;
       }
       case "add": {
-        await add({ cwd, commit });
+        if (commit !== undefined) {
+          config.commit = commit;
+        }
+        await add(config);
         return;
       }
       case "bump": {
-        await bump({ cwd, updateChangelog, skipCI, commit });
+        // We only assign them to this
+        // object as and when they exist.
+        if (updateChangelog !== undefined) {
+          config.updateChangelog = updateChangelog;
+        }
+        if (skipCI !== undefined) {
+          config.skipCI = skipCI;
+        }
+        if (commit !== undefined) {
+          config.commit = commit;
+        }
+        await bump(config);
         return;
       }
       case "release": {
-        await release({ cwd, public: isPublic });
+        if (isPublic !== undefined) {
+          // This exists as
+          config.public = isPublic;
+        }
+        await release(config);
         return;
       }
       case "status": {