@bigcommerce/stencil-cli 7.1.2 → 7.2.0

package/bin/stencil-release.js

@@ -7,7 +7,16 @@ const program = require('../lib/commander');
 const { checkNodeVersion } = require('../lib/cliCommon');
 const { printCliResultErrorAndExit } = require('../lib/cliCommon');
 
-program.version(PACKAGE_INFO.version).parse(process.argv);
+program
+    .version(PACKAGE_INFO.version)
+    .option('-b, --branch [name]', 'specify the main branch name')
+    .parse(process.argv);
 
 checkNodeVersion();
-new StencilRelease().run().catch(printCliResultErrorAndExit);
+
+const cliOptions = program.opts();
+const options = {
+    branch: cliOptions.branch || 'master',
+};
+
+new StencilRelease().run(options).catch(printCliResultErrorAndExit);

package/lib/release/release.js

@@ -31,9 +31,9 @@ class StencilRelease {
         this._octokit = octokit;
     }
 
-    async run() {
+    async run(cliOptions) {
         const gitData = await this.getGitData();
-        this.checkGitData(gitData);
+        this.checkGitData(gitData, cliOptions);
 
         const version = await this._themeConfigManager.getVersion();
         this.checkCurrentVersion(version);
@@ -42,7 +42,11 @@ class StencilRelease {
 
         await this.saveGithubToken(answers.githubToken);
 
-        await this.doRelease(answers);
+        const options = {
+            ...answers,
+            ...cliOptions,
+        };
+        await this.doRelease(options);
 
         this._logger.log('done'.green);
 
@@ -86,13 +90,15 @@ class StencilRelease {
      * @param gitData.ahead
      * @returns {boolean}
      */
-    checkGitData(gitData) {
+    checkGitData(gitData, options) {
         if (gitData.remotes.length === 0) {
             throw new Error('No git remote repository found');
         }
 
-        if (gitData.current !== 'master') {
-            throw new Error('Not on master branch, please checkout master branch to proceed');
+        if (gitData.current !== options.branch) {
+            throw new Error(
+                `Not on ${options.branch} branch, please checkout ${options.branch} branch to proceed`,
+            );
         }
 
         if (gitData.dirty) {
@@ -143,7 +149,7 @@ class StencilRelease {
         const bundlePath = await this.bundleTheme();
 
         try {
-            await this.commitAndPush(options.version, options.remote);
+            await this.commitAndPush(options.version, options.remote, options.branch);
 
             if (options.createGithubRelease) {
                 await this.createGithubRelease(
@@ -207,13 +213,13 @@ class StencilRelease {
         return bundle.initBundle();
     }
 
-    async commitAndPush(version, remote) {
+    async commitAndPush(version, remote, branch) {
         await this._git.add(['config.json', 'package.json', 'package-lock.json', 'CHANGELOG.md']);
         const summary = await this._git.commit(`Releasing ${version}`);
 
         this._logger.log(`Pushing Changes to ${remote.name}...`);
 
-        await this._git.push(remote.name, 'master');
+        await this._git.push(remote.name, branch);
 
         return summary.commit;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcommerce/stencil-cli",
-  "version": "7.1.2",
+  "version": "7.2.0",
   "description": "CLI tool to run BigCommerce Stores locally for theme development.",
   "main": "index.js",
   "engines": {