mazey 3.3.5 → 3.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mazey",
-  "version": "3.3.5",
+  "version": "3.3.7",
   "description": "Mazey's library for front-end.",
   "main": "lib/index.cjs.js",
   "module": "lib/index.esm.js",
@@ -15,8 +15,8 @@
     "test": "jest",
     "docs": "typedoc",
     "lint-and-fix": "eslint ./src/index.ts --ext 'ts,tsx' --fix",
-    "preview": "npm run build && npm run test && npm run docs",
-    "release": "npm run preview && npm publish && node ./scripts/release.js"
+    "preview": "npm run docs && npm run build && npm run test",
+    "release": "npm run preview && cross-env SCRIPTS_NPM_PACKAGE_VERSION=$npm_package_version node ./scripts/release.js"
   },
   "repository": {
     "type": "git",
@@ -69,6 +69,7 @@
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
     "clean-webpack-plugin": "^1.0.1",
+    "cross-env": "^7.0.3",
     "date-fns": "^2.29.3",
     "eslint": "^6.8.0",
     "eslint-config-standard": "^14.1.0",
@@ -87,6 +88,7 @@
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-cleaner": "^1.0.0",
     "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-copy": "^3.4.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.27.2",
     "ts-loader": "^8.0.2",

package/scripts/dev.js

@@ -1,19 +1,22 @@
 /* eslint-disable no-undef */
 /* eslint-disable @typescript-eslint/no-var-requires */
-const execa = require('execa');
+// const execa = require('execa');
+const { getGitCurrentBranch } = require('./github-helper');
 
 (async () => {
   // const { stdout: pushMsg = '' } = await execa('git', ['push'], { stdio: 'pipe' })
   //   .catch(error => {
   //     console.log('error:', error.message);
   //   });
-  try {
-    await execa('git', ['push'], { stdio: 'pipe' });
-  } catch (error) {
-    console.log('error:', error.message);
-    const { stdout: currentBranch } = await execa('git', ['branch', '--show-current'], { stdio: 'pipe' });
-    console.log('currentBranch:', currentBranch); // currentBranch: fix/rollup_dependences_mon_oct_31st_2022
-    await execa('git', ['push', '--set-upstream', 'origin', currentBranch]);
-  }
+  // try {
+  //   await execa('git', ['push'], { stdio: 'pipe' });
+  // } catch (error) {
+  //   console.log('error:', error.message);
+  //   const { stdout: currentBranch } = await execa('git', ['branch', '--show-current'], { stdio: 'pipe' });
+  //   console.log('currentBranch:', currentBranch); // currentBranch: fix/rollup_dependences_mon_oct_31st_2022
+  //   await execa('git', ['push', '--set-upstream', 'origin', currentBranch]);
+  // }
   // console.log('pushMsg:', pushMsg);
+  const cb = await getGitCurrentBranch('fix returns value');
+  console.log('bbb', cb);
 })();

package/scripts/github-helper.js

@@ -14,9 +14,23 @@ const execa = require('execa');
  * ```
  */
 async function release (ver) {
+  if (!ver) {
+    ver = process.env.SCRIPTS_NPM_PACKAGE_VERSION;
+  }
+  if (!ver) {
+    console.error('Fail to get the current version.');
+    return;
+  }
   const releaseVersion = `v${ver}`;
   const { stdout: releaseStdout } = await execa('echo', [`Start release ${releaseVersion}...`]);
   console.log(releaseStdout);
+  // commit
+  await getCommit('stage');
+  // marge
+  await gitMergeMaster2Release();
+  // build
+  await execa('npm', ['run', 'preview']);
+  await execa('npm', ['publish']);
   // git branch --show-current
   // console.log('git push --set-upstream origin <branch>');
   // Commit Stdout
@@ -38,7 +52,7 @@ async function release (ver) {
 }
 
 /**
- * Git Push
+ * Push code.
  */
 async function gitPush () {
   try {
@@ -49,9 +63,55 @@ async function gitPush () {
     console.log('currentBranch:', currentBranch); // currentBranch: fix/rollup_dependences_mon_oct_31st_2022
     await execa('git', ['push', '--set-upstream', 'origin', currentBranch]);
   }
+  return true;
+}
+
+/**
+ * Merge master to current branch.
+ */
+async function gitMergeMaster2Release () {
+  const currentBranch = await getGitCurrentBranch();
+  await execa('git', ['checkout', 'master']);
+  await execa('git', ['pull']);
+  await execa('git', ['checkout', currentBranch]);
+  await execa('git', ['merge', 'master']);
+  return true;
+}
+
+/**
+ * Get git current branch.
+ */
+async function getGitCurrentBranch () {
+  let currentBranch = '';
+  try {
+    ({ stdout: currentBranch } = await execa('git', ['branch', '--show-current'], { stdio: 'pipe' }));
+  } catch (error) {
+    // console.log('error:', error.message);
+    ({ stdout: currentBranch } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { stdio: 'pipe' }));
+  }
+  console.log('currentBranch:', currentBranch);
+  return currentBranch;
+}
+
+/**
+ * Commit current code.
+ */
+async function getCommit (releaseVersion = 0) {
+  const { stdout: diffStdout } = await execa('git', ['diff'], { stdio: 'pipe' });
+  if (diffStdout) {
+    console.log('Committing changes...');
+    await execa('git', ['add', '-A']);
+    await execa('git', ['commit', '-m', `release: ${releaseVersion}`]);
+  } else {
+    console.log('No changes to commit.');
+  }
+  return true;
 }
 
 module.exports = {
   release,
   gitPush,
+  gitMergeMaster2Release,
+  getGitCurrentBranch,
+  getCommit,
 };

package/scripts/release.js

@@ -2,6 +2,8 @@
 /* eslint-disable no-undef */
 // release
 const { release } = require('./github-helper');
-const pkgVersion = process.env.VERSION || require('../package.json').version;
+const pkgVersion = process.env.SCRIPTS_NPM_PACKAGE_VERSION || process.env.VERSION || require('../package.json').version;
+
+console.log('release: SCRIPTS_NPM_PACKAGE_VERSION', process.env.SCRIPTS_NPM_PACKAGE_VERSION);
 
 release(pkgVersion);