mazey 3.6.5 → 3.6.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/index.cjs.js +1 -1
  2. package/lib/index.esm.js +1 -1
  3. package/lib/mazey.min.js +1 -1
  4. package/package.json +1 -1
  5. package/scripts/github-helper.js +5 -5
package/lib/index.cjs.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * mazey v3.6.5
2
+ * mazey v3.6.6
3
3
  * (c) 2018-2023 Mazey Chu
4
4
  * Released under the MIT License.
5
5
  */
package/lib/index.esm.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * mazey v3.6.5
2
+ * mazey v3.6.6
3
3
  * (c) 2018-2023 Mazey Chu
4
4
  * Released under the MIT License.
5
5
  */
package/lib/mazey.min.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * mazey v3.6.5
2
+ * mazey v3.6.6
3
3
  * (c) 2018-2023 Mazey Chu
4
4
  * Released under the MIT License.
5
5
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mazey",
3
- "version": "3.6.5",
3
+ "version": "3.6.6",
4
4
  "description": "Mazey's library for front-end.",
5
5
  "main": "lib/index.cjs.js",
6
6
  "module": "lib/index.esm.js",
package/scripts/github-helper.js CHANGED
@@ -30,7 +30,7 @@ const { generateToc } = require('./build-helper');
30
30
  * @param {string} ver Version
31
31
  * @returns {void}
32
32
  */
33
- async function release (ver, { canGenerateToc = false } = {}) {
33
+ async function release (ver, { canGenerateToc = false, defaultBranch = 'master' } = {}) {
34
34
  if (!ver) {
35
35
  ver = process.env.SCRIPTS_NPM_PACKAGE_VERSION;
36
36
  }
@@ -48,7 +48,7 @@ async function release (ver, { canGenerateToc = false } = {}) {
48
48
  // Commit
49
49
  await gitCommit('stage');
50
50
  // Marge
51
- await gitMergeMaster2Release();
51
+ await gitMergeMaster2Release(defaultBranch);
52
52
  // Build
53
53
  await execa('npm', ['run', 'preview']);
54
54
  await execa('npm', ['publish']);
@@ -80,12 +80,12 @@ async function gitPush () {
80
80
  /**
81
81
  * Merge master to current branch.
82
82
  */
83
- async function gitMergeMaster2Release () {
83
+ async function gitMergeMaster2Release (defaultBranch = 'master') {
84
84
  const currentBranch = await getGitCurrentBranch();
85
- await execa('git', ['checkout', 'master']);
85
+ await execa('git', ['checkout', defaultBranch]);
86
86
  await execa('git', ['pull']);
87
87
  await execa('git', ['checkout', currentBranch]);
88
- await execa('git', ['merge', 'master']);
88
+ await execa('git', ['merge', defaultBranch]);
89
89
  return true;
90
90
  }
91
91