@pisell/common 0.0.58 → 0.0.59

package/es/script/aws/index.js

@@ -14,9 +14,6 @@ var filterFiles = ['index.html', 'umi.server.js', 'umi.server.d.ts'];
 var __dirname = process.cwd();
 var s3Client = null;
 var bucketName = '';
-export var isAWSEnv = function isAWSEnv(env) {
-  return env === 'prod' || env === 'pre';
-};
 
 /*******
  * @title: 初始化

package/es/script/constants/index.js

@@ -33,4 +33,7 @@ var isSsrMap = {
   pisell2_pages: false
 };
 var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common', '@pisell/utils'];
-export { outPathMap, isSsrMap, checkPackages };
+
+// 项目使用的发布分支
+var originBranch = ['master', 'release', 'develop', 'pre', 'master_v2', 'release_v2', 'develop_v2', 'pre_v2'];
+export { outPathMap, isSsrMap, checkPackages, originBranch };

package/es/script/release/release.js

@@ -7,7 +7,6 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { isAWSEnv } from "../aws/index.js";
 import { isSsrMap, outPathMap } from "../constants/index.js";
 import { connectServer as _connectServer, getServerConfig, releaseProject } from "../utils/index.js";
 
@@ -53,7 +52,7 @@ var Release = /*#__PURE__*/function () {
               if (this.env === 'release') {
                 serverConfig = serverConfigMap.cn[this.env];
               }
-              if (isAWSEnv(this.env)) {
+              if (this.env === 'prod') {
                 serverConfig = serverConfigMap.aws.service[this.env];
                 serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
               }
@@ -113,7 +112,7 @@ var Release = /*#__PURE__*/function () {
   }, {
     key: "release",
     value: function () {
-      var _release = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _release = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(grayBranch) {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -122,7 +121,8 @@ var Release = /*#__PURE__*/function () {
                 path: this.outPath,
                 fileName: "".concat(this.version),
                 isSSR: this.isSSR,
-                env: this.env
+                env: this.env,
+                branch: grayBranch
               });
             case 2:
               return _context3.abrupt("return", _context3.sent);
@@ -132,7 +132,7 @@ var Release = /*#__PURE__*/function () {
           }
         }, _callee3, this);
       }));
-      function release() {
+      function release(_x) {
         return _release.apply(this, arguments);
       }
       return release;

package/es/script/uploadCode/index.js

@@ -8,8 +8,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import inquirer from 'inquirer';
 import 'zx/globals';
 import { uploadStaticToOSS } from "../aws/index.js";
+import { originBranch } from "../constants/index.js";
 import Release from "../release/release.js";
-import { deleteGitTag, getCurrentProjectName, getCurrentUserName, sendWebhook } from "../utils/index.js";
+import { deleteGitTag, getCurrentProjectName, getCurrentUserName, getGitCurrentBranch, sendWebhook } from "../utils/index.js";
 import UploadCode from "./uploadCode.js";
 // {\"post\":{\"zh_cn\":{\"title\":\"my_pisell_shop release环境开始上传并发布\",\"content\":[[{\"text\":\"发布人:\",\"style\":[\"bold\"]},{\"text\":\"左胜杰\",\"style\":[\"bold\"]}],[{\"text\":\"版本号:\",\"style\":[\"bold\"]},{\"text\":\"1.0.71\",\"style\":[\"bold\"]}]]}}}
 /**
@@ -100,7 +101,7 @@ function init() {
  */
 function _init() {
   _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var res, uploadCode, version, currentUserName, result, _fileName, ossRes, conn, releaseInstance;
+    var res, uploadCode, version, currentUserName, result, _fileName, ossRes, conn, releaseInstance, branch, grayBranch;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -218,7 +219,7 @@ function _init() {
           return uploadCode.serverUnpack();
         case 60:
           if (!res.is_release) {
-            _context.next = 65;
+            _context.next = 70;
             break;
           }
           releaseInstance = new Release({
@@ -229,31 +230,39 @@ function _init() {
           });
           console.log('开始发布');
           _context.next = 65;
-          return releaseInstance.release();
+          return getGitCurrentBranch();
         case 65:
-          _context.next = 67;
+          branch = _context.sent;
+          grayBranch = 'master';
+          if (!originBranch.includes(branch)) {
+            grayBranch = branch;
+          }
+          _context.next = 70;
+          return releaseInstance.release(grayBranch);
+        case 70:
+          _context.next = 72;
           return uploadCode.disconnectServer();
-        case 67:
-          _context.next = 69;
+        case 72:
+          _context.next = 74;
           return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
-        case 69:
-          _context.next = 71;
+        case 74:
+          _context.next = 76;
           return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
-        case 71:
+        case 76:
           console.log('✅ 成功后推送到git');
 
           // 只有在shop端发布
           if (!(res.project.fileName === 'my_pisel_shop')) {
-            _context.next = 75;
+            _context.next = 80;
             break;
           }
-          _context.next = 75;
+          _context.next = 80;
           return updateVersion({
             version: version,
             changelog: res.changelog
           }, res.env);
-        case 75:
-          _context.next = 77;
+        case 80:
+          _context.next = 82;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -267,20 +276,20 @@ function _init() {
               value: version || ''
             }]
           });
-        case 77:
-          _context.next = 88;
+        case 82:
+          _context.next = 93;
           break;
-        case 79:
-          _context.prev = 79;
+        case 84:
+          _context.prev = 84;
           _context.t0 = _context["catch"](26);
           console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 84;
+          _context.next = 89;
           return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 84:
-          _context.next = 86;
+        case 89:
+          _context.next = 91;
           return deleteGitTag("v".concat(uploadCode.currentVersion));
-        case 86:
-          _context.next = 88;
+        case 91:
+          _context.next = 93;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -297,13 +306,13 @@ function _init() {
               value: "".concat(_context.t0) || ''
             }]
           });
-        case 88:
+        case 93:
           uploadCode.deleteLocalZip();
-        case 89:
+        case 94:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[26, 79]]);
+    }, _callee, null, [[26, 84]]);
   }));
   return _init.apply(this, arguments);
 }

package/es/script/uploadCode/uploadCode.js

@@ -11,7 +11,6 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import archiver from 'archiver';
 import path from 'path';
-import { isAWSEnv } from "../aws/index.js";
 import { checkPackages, isSsrMap, outPathMap } from "../constants/index.js";
 import { checkPkgVersion, connectServer as _connectServer, getGitCurrentBranch, getServerConfig, isWorkingTreeClean, serverUnpack as _serverUnpack, serverUpload as _serverUpload } from "../utils/index.js";
 
@@ -111,7 +110,7 @@ var UploadCode = /*#__PURE__*/function () {
               return _context.abrupt("return", false);
             case 21:
               serverConfig = this.setConfig(serverConfigMap[this.env]);
-              if (isAWSEnv(this.env)) {
+              if (this.env === 'prod') {
                 serverConfig = serverConfigMap.aws.service[this.env];
                 serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
                 this.setConfig(serverConfig);

package/es/script/utils/index.js

@@ -13,7 +13,6 @@ import * as dotenv from 'dotenv';
 import npmCheck from 'npm-check';
 import path from 'path';
 import ssh2 from 'ssh2';
-import { isAWSEnv } from "../aws/index.js";
 
 /**
  * @Title: 项目工作区是否干净
@@ -173,7 +172,7 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
         reject(err);
         return;
       }
-      stream.end("  ".concat(isAWSEnv(env) ? 'sudo -i' : '', "\n             cd /tmp\n             mv ").concat(fullFileName, " ").concat(path, "\n             cd ").concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && mv ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             exit\n             ").concat(isAWSEnv(env) ? 'exit' : '', "\n            ") // 打开到path
+      stream.end("  ".concat(env === 'prod' ? 'sudo -i' : '', "\n             cd /tmp\n             mv ").concat(fullFileName, " ").concat(path, "\n             cd ").concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && mv ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             exit\n             ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
       // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
       // 删除1.0.0.zip
       // 写入changelog到changelog.md
@@ -197,7 +196,9 @@ var releaseProject = function releaseProject(conn, _ref6) {
   var path = _ref6.path,
     fileName = _ref6.fileName,
     isSSR = _ref6.isSSR,
-    env = _ref6.env;
+    env = _ref6.env,
+    _ref6$branch = _ref6.branch,
+    branch = _ref6$branch === void 0 ? 'master' : _ref6$branch;
   return new Promise(function (resolve, reject) {
     conn.shell(function (err, stream) {
       if (err) {
@@ -205,7 +206,7 @@ var releaseProject = function releaseProject(conn, _ref6) {
         reject(err);
         return;
       }
-      stream.end("  ".concat(isAWSEnv(env) ? 'sudo -i' : '', "\n             cd ").concat(path, "\n             cp -R -f pre-master next-master\n             rm -rf pre-master\n             \\cp -R -f ").concat(fileName, "/* next-master\n             cp -R -f ").concat(fileName, " pre-master\n             rm -rf master\n             cp -R next-master master\n             rm -rf next-master\n             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ").concat(isAWSEnv(env) ? 'exit' : '', "\n            ") // 打开到path
+      stream.end("  ".concat(env === 'prod' ? 'sudo -i' : '', "\n             cd ").concat(path, "\n             cp -R -f pre-master next-master\n             rm -rf pre-master\n             \\cp -R -f ").concat(fileName, "/* next-master\n             cp -R -f ").concat(fileName, " pre-master\n             rm -rf ").concat(branch, "\n             cp -R next-master ").concat(branch, "\n             rm -rf next-master\n             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
       // 复制pre-master到next-master
       // 删除pre-master
       // 复制1.0.0到next-master

package/lib/script/aws/index.js

@@ -29,7 +29,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/script/aws/index.js
 var aws_exports = {};
 __export(aws_exports, {
-  isAWSEnv: () => isAWSEnv,
   uploadFolderContents: () => uploadFolderContents,
   uploadStaticToOSS: () => uploadStaticToOSS
 });
@@ -43,9 +42,6 @@ var filterFiles = ["index.html", "umi.server.js", "umi.server.d.ts"];
 var __dirname = process.cwd();
 var s3Client = null;
 var bucketName = "";
-var isAWSEnv = (env) => {
-  return env === "prod" || env === "pre";
-};
 var init = async () => {
   try {
     const serverConfig = await (0, import_utils.getServerConfig)();
@@ -124,7 +120,6 @@ var uploadStaticToOSS = async (directory, folderPath = import_path.default.resol
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  isAWSEnv,
   uploadFolderContents,
   uploadStaticToOSS
 });

package/lib/script/constants/index.js

@@ -21,6 +21,7 @@ var constants_exports = {};
 __export(constants_exports, {
   checkPackages: () => checkPackages,
   isSsrMap: () => isSsrMap,
+  originBranch: () => originBranch,
   outPathMap: () => outPathMap
 });
 module.exports = __toCommonJS(constants_exports);
@@ -64,9 +65,20 @@ var checkPackages = [
   "@pisell/common",
   "@pisell/utils"
 ];
+var originBranch = [
+  "master",
+  "release",
+  "develop",
+  "pre",
+  "master_v2",
+  "release_v2",
+  "develop_v2",
+  "pre_v2"
+];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkPackages,
   isSsrMap,
+  originBranch,
   outPathMap
 });

package/lib/script/release/release.js

@@ -22,7 +22,6 @@ __export(release_exports, {
   default: () => release_default
 });
 module.exports = __toCommonJS(release_exports);
-var import_aws = require("../aws/index.js");
 var import_constants = require("../constants/index.js");
 var import_utils = require("../utils/index.js");
 var Release = class {
@@ -46,7 +45,7 @@ var Release = class {
     if (this.env === "release") {
       serverConfig = serverConfigMap.cn[this.env];
     }
-    if ((0, import_aws.isAWSEnv)(this.env)) {
+    if (this.env === "prod") {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }
@@ -71,12 +70,13 @@ var Release = class {
    * @Describe:
    * @Author: Zsj
    */
-  async release() {
+  async release(grayBranch) {
     return await (0, import_utils.releaseProject)(this.conn, {
       path: this.outPath,
       fileName: `${this.version}`,
       isSSR: this.isSSR,
-      env: this.env
+      env: this.env,
+      branch: grayBranch
     });
   }
   /**

package/lib/script/uploadCode/index.js

@@ -36,6 +36,7 @@ module.exports = __toCommonJS(uploadCode_exports);
 var import_inquirer = __toESM(require("inquirer"));
 var import_globals = require("zx/globals");
 var import_aws = require("../aws/index.js");
+var import_constants = require("../constants/index.js");
 var import_release = __toESM(require("../release/release.js"));
 var import_utils = require("../utils/index.js");
 var import_uploadCode = __toESM(require("./uploadCode.js"));
@@ -182,7 +183,12 @@ async function init() {
         conn
       });
       console.log("开始发布");
-      await releaseInstance.release();
+      const branch = await (0, import_utils.getGitCurrentBranch)();
+      let grayBranch = "master";
+      if (!import_constants.originBranch.includes(branch)) {
+        grayBranch = branch;
+      }
+      await releaseInstance.release(grayBranch);
     }
     await uploadCode.disconnectServer();
     await $`git pull --no-edit`;

package/lib/script/uploadCode/uploadCode.js

@@ -34,7 +34,6 @@ __export(uploadCode_exports, {
 module.exports = __toCommonJS(uploadCode_exports);
 var import_archiver = __toESM(require("archiver"));
 var import_path = __toESM(require("path"));
-var import_aws = require("../aws/index.js");
 var import_constants = require("../constants/index.js");
 var import_utils = require("../utils/index.js");
 var UploadCode = class {
@@ -85,7 +84,7 @@ var UploadCode = class {
       return false;
     }
     let serverConfig = this.setConfig(serverConfigMap[this.env]);
-    if ((0, import_aws.isAWSEnv)(this.env)) {
+    if (this.env === "prod") {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
       this.setConfig(serverConfig);

package/lib/script/utils/index.js

@@ -49,7 +49,6 @@ var dotenv = __toESM(require("dotenv"));
 var import_npm_check = __toESM(require("npm-check"));
 var import_path = __toESM(require("path"));
 var import_ssh2 = __toESM(require("ssh2"));
-var import_aws = require("../aws/index.js");
 var isWorkingTreeClean = async () => {
   const v = await $`git status --porcelain`;
   return v.stdout === "";
@@ -127,7 +126,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, env
         return;
       }
       stream.end(
-        `  ${(0, import_aws.isAWSEnv)(env) ? "sudo -i" : ""}
+        `  ${env === "prod" ? "sudo -i" : ""}
              cd /tmp
              mv ${fullFileName} ${path2}
              cd ${path2}
@@ -136,7 +135,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, env
              echo "${changelog}" > ./${fileName}/changelog.md
              sh deleteOldVersion.sh
              exit
-             ${(0, import_aws.isAWSEnv)(env) ? "exit" : ""}
+             ${env === "prod" ? "exit" : ""}
             `
         // 打开到path
         // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
@@ -152,7 +151,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, env
     });
   });
 };
-var releaseProject = (conn, { path: path2, fileName, isSSR, env }) => {
+var releaseProject = (conn, { path: path2, fileName, isSSR, env, branch = "master" }) => {
   return new Promise((resolve, reject) => {
     conn.shell((err, stream) => {
       if (err) {
@@ -161,18 +160,18 @@ var releaseProject = (conn, { path: path2, fileName, isSSR, env }) => {
         return;
       }
       stream.end(
-        `  ${(0, import_aws.isAWSEnv)(env) ? "sudo -i" : ""}
+        `  ${env === "prod" ? "sudo -i" : ""}
              cd ${path2}
              cp -R -f pre-master next-master
              rm -rf pre-master
              \\cp -R -f ${fileName}/* next-master
              cp -R -f ${fileName} pre-master
-             rm -rf master
-             cp -R next-master master
+             rm -rf ${branch}
+             cp -R next-master ${branch}
              rm -rf next-master
              ${isSSR ? "pm2 restart server.js" : ""}
              exit
-            ${(0, import_aws.isAWSEnv)(env) ? "exit" : ""}
+            ${env === "prod" ? "exit" : ""}
             `
         // 打开到path
         // 复制pre-master到next-master

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "description": "A collection of reusable UI components for web development",
   "license": "MIT",
   "sideEffects": [