mazey 3.3.2 → 3.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mazey",
-  "version": "3.3.2",
+  "version": "3.3.5",
   "description": "Mazey's library for front-end.",
   "main": "lib/index.cjs.js",
   "module": "lib/index.esm.js",
@@ -10,11 +10,10 @@
     "lib": "./lib"
   },
   "scripts": {
-    "dev": "webpack-dev-server --config webpack.config.dev.js --open",
-    "build": "npx rollup -c",
+    "dev": "webpack-dev-server --config ./scripts/webpack.config.dev.js --open",
+    "build": "rollup --config ./scripts/rollup.config.js",
     "test": "jest",
-    "[Give Up]docs": "npx typedoc --out docs/ src/",
-    "docs": "npx typedoc",
+    "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"
@@ -59,42 +58,43 @@
   },
   "homepage": "https://github.com/mazeyqian/mazey#readme",
   "devDependencies": {
-    "@babel/core": "7.8.4",
-    "@babel/plugin-proposal-class-properties": "7.10.4",
-    "@babel/plugin-proposal-object-rest-spread": "7.11.0",
-    "@babel/plugin-transform-runtime": "7.11.0",
-    "@babel/preset-env": "7.5.5",
-    "@babel/preset-typescript": "7.10.4",
+    "@babel/core": "^7.8.4",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
+    "@babel/plugin-transform-runtime": "^7.11.0",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-typescript": "^7.10.4",
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
-    "clean-webpack-plugin": "1.0.1",
-    "eslint": "6.8.0",
-    "eslint-config-standard": "14.1.0",
-    "eslint-plugin-import": "2.20.1",
-    "eslint-plugin-node": "11.0.0",
-    "eslint-plugin-promise": "4.2.1",
-    "eslint-plugin-standard": "4.0.1",
+    "clean-webpack-plugin": "^1.0.1",
+    "date-fns": "^2.29.3",
+    "eslint": "^6.8.0",
+    "eslint-config-standard": "^14.1.0",
+    "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
     "execa": "^4.1.0",
-    "html-webpack-plugin": "3.2.0",
-    "husky": "4.3.8",
+    "html-webpack-plugin": "^3.2.0",
+    "husky": "^4.3.8",
     "jest": "^27.5.1",
-    "lint-staged": "10.0.8",
-    "prettier": "1.19.1",
-    "prettier-eslint-cli": "5.0.0",
-    "rollup": "^1.31.1",
+    "lint-staged": "^10.0.8",
+    "prettier": "^1.19.1",
+    "prettier-eslint-cli": "^5.0.0",
+    "rollup": "^2.79.1",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-cleaner": "^1.0.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.27.2",
-    "ts-loader": "8.0.2",
-    "typedoc": "0.18.0",
-    "typescript": "3.9.7",
-    "webpack": "4.30.0",
-    "webpack-cli": "3.3.2",
-    "webpack-dev-server": "3.10.3"
+    "ts-loader": "^8.0.2",
+    "typedoc": "^0.18.0",
+    "typescript": "^3.9.7",
+    "webpack": "^4.30.0",
+    "webpack-cli": "^3.3.2",
+    "webpack-dev-server": "^3.10.3"
   },
   "husky": {
     "hooks": {

package/scripts/build-helper.js

@@ -0,0 +1,17 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable no-undef */
+const path = require('path');
+const _resolve = (_path) => path.resolve(__dirname, _path);
+const format = require('date-fns/format');
+// Generate version: 20210308.072903
+const genVersion = () => {
+  const d = new Date();
+  const version = format(d, 'yyyyMMdd.HHmmss');
+  return version;
+};
+const version = genVersion();
+
+module.exports = {
+  _resolve,
+  version,
+};

package/scripts/dev.js

@@ -0,0 +1,19 @@
+/* eslint-disable no-undef */
+/* eslint-disable @typescript-eslint/no-var-requires */
+const execa = require('execa');
+
+(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]);
+  }
+  // console.log('pushMsg:', pushMsg);
+})();

package/scripts/github-helper.js

@@ -0,0 +1,57 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable no-undef */
+// Github Helper
+const execa = require('execa');
+
+/**
+ * Release code.
+ *
+ * Example: Release code with version by `process.env.VERSION` or `package.json`.
+ * 
+ * ```
+ * const pkgVersion = process.env.VERSION || require('../package.json').version;
+ * release(pkgVersion);
+ * ```
+ */
+async function release (ver) {
+  const releaseVersion = `v${ver}`;
+  const { stdout: releaseStdout } = await execa('echo', [`Start release ${releaseVersion}...`]);
+  console.log(releaseStdout);
+  // git branch --show-current
+  // console.log('git push --set-upstream origin <branch>');
+  // Commit Stdout
+  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.');
+  }
+  // Push
+  console.log('Pushing to GitHub...');
+  await execa('git', ['tag', '-a', `${releaseVersion}`, '-m', `Release ${releaseVersion}`]);
+  await execa('git', ['push', 'origin', `refs/tags/${releaseVersion}`]);
+  await gitPush(); // execa('git', ['push']);
+
+  console.log('All done.');
+}
+
+/**
+ * Git Push
+ */
+async function gitPush () {
+  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]);
+  }
+}
+
+module.exports = {
+  release,
+  gitPush,
+};

package/scripts/release.js

@@ -1,28 +1,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable no-undef */
 // release
-const execa = require('execa');
+const { release } = require('./github-helper');
 const pkgVersion = process.env.VERSION || require('../package.json').version;
 
-// Main
-(async () => {
-  const releaseVersion = `v${pkgVersion}`;
-  const { stdout: releaseStdout } = await execa('echo', [`Start release ${releaseVersion}...`]);
-  console.log(releaseStdout);
-  // Commit Stdout
-  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.');
-  }
-  // Push
-  console.log('Pushing to GitHub...');
-  await execa('git', ['tag', '-a', `${releaseVersion}`, '-m', `Release ${releaseVersion}`]);
-  await execa('git', ['push', 'origin', `refs/tags/${releaseVersion}`]);
-  await execa('git', ['push']);
-
-  console.log('All done.');
-})();
+release(pkgVersion);

package/{webpack.config.dev.js → scripts/webpack.config.dev.js}

@@ -1,19 +1,19 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable no-undef */
-const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
+const { _resolve } = require('./build-helper');
 
 module.exports = {
   entry: {
-    index: './examples/index.ts'
+    index: _resolve('../examples/index.ts'),
   },
   output: {
     filename: '[name].js',
-    path: path.resolve(__dirname, 'dist')
+    path: _resolve('../dist'),
   },
   devServer: {
-    contentBase: './dist'
+    contentBase: _resolve('../dist'),
   },
   module: {
     rules: [
@@ -26,14 +26,14 @@ module.exports = {
   },
   plugins: [
     new HtmlWebpackPlugin({
-      filename: path.resolve(__dirname, 'dist/index.html'),
-      template: path.resolve(__dirname, 'examples/index.html'),
+      filename: _resolve('../dist/index.html'),
+      template: _resolve('../examples/index.html'),
       inject: true,
       chunksSortMode: 'dependency'
     }),
-    new CleanWebpackPlugin(['dist'])
+    new CleanWebpackPlugin([_resolve('../dist')]),
   ],
   resolve: {
     extensions: ['.tsx', '.ts', '.js'],
-  }
+  },
 };

package/src/index.ts

@@ -1510,24 +1510,28 @@ export function genCustomConsole(prefix = ''): Console {
 
 /**
  * Verify the validity of axios response.
+ * 
+ * Reference: [Handling Errors](https://axios-http.com/docs/handling_errors)
  */
 export function zAxiosIsValidRes(res: any, options: {
-  validStatus: number[];
+  validStatusRange: number[];
   validCode: number[];
 } = {
-  validStatus: [200],
+  validStatusRange: [200, 300],
   validCode: [0],
 }): boolean {
-  const { validStatus, validCode } = Object.assign(
+  const { validStatusRange, validCode } = Object.assign(
     {
-      validStatus: [200],
+      validStatusRange: [200, 300],
       validCode: [0],
     },
     options,
   );
+  if (validStatusRange.length !== 2) {
+    console.error('valid validStatusRange is required');
+  }
   let ret = false;
-  if (res && res.status && validStatus.includes(res.status)) {
-    ret = true;
+  if (res && res.status && validStatusRange.length === 2 && res.status >= validStatusRange[0] && res.status < validStatusRange[1]) {
     const resData = res.data;
     if (resData && validCode.includes(resData.code)) {
       ret = true;