@pisell/common 0.0.47 → 0.0.49

package/es/script/uploadCode/index.js

@@ -78,6 +78,14 @@ var inquirerResult = function inquirerResult() {
     default: true
   }]);
 };
+var inquirerOss = function inquirerOss() {
+  return inquirer.prompt([{
+    type: 'confirm',
+    message: '确认OSS上传完成, 并且vpn环境正确',
+    name: 'is_upload_completed_OSS',
+    default: true
+  }]);
+};
 function init() {
   return _init.apply(this, arguments);
 }
@@ -92,7 +100,7 @@ function init() {
  */
 function _init() {
   _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var res, uploadCode, version, currentUserName, result, _fileName, conn, releaseInstance;
+    var res, uploadCode, version, currentUserName, result, _fileName, ossRes, conn, releaseInstance;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -171,36 +179,46 @@ function _init() {
         case 34:
           console.log('使用本地/dist');
         case 35:
-          if (!(res.env === 'prod')) {
-            _context.next = 39;
+          if (!(res.env === 'prod' || res.env === 'pre')) {
+            _context.next = 44;
             break;
           }
           _fileName = res.project.fileName; // 上传oss
           _context.next = 39;
           return uploadStaticToOSS(_fileName);
         case 39:
+          _context.next = 41;
+          return inquirerOss();
+        case 41:
+          ossRes = _context.sent;
+          if (ossRes.is_upload_completed_OSS) {
+            _context.next = 44;
+            break;
+          }
+          return _context.abrupt("return");
+        case 44:
           console.log('开始压缩');
-          _context.next = 42;
+          _context.next = 47;
           return uploadCode.compress();
-        case 42:
+        case 47:
           console.log('✅ 压缩完成');
           console.log('开始连接服务器');
-          _context.next = 46;
+          _context.next = 51;
           return uploadCode.connectServer();
-        case 46:
+        case 51:
           conn = _context.sent;
           console.log('✅ 连接服务器完成');
           console.log('开始上传');
-          _context.next = 51;
+          _context.next = 56;
           return uploadCode.serverUpload();
-        case 51:
+        case 56:
           console.log('✅ 上传完成');
           console.log('开始解压');
-          _context.next = 55;
+          _context.next = 60;
           return uploadCode.serverUnpack();
-        case 55:
+        case 60:
           if (!res.is_release) {
-            _context.next = 60;
+            _context.next = 65;
             break;
           }
           releaseInstance = new Release({
@@ -210,32 +228,32 @@ function _init() {
             conn: conn
           });
           console.log('开始发布');
-          _context.next = 60;
+          _context.next = 65;
           return releaseInstance.release();
-        case 60:
-          _context.next = 62;
+        case 65:
+          _context.next = 67;
           return uploadCode.disconnectServer();
-        case 62:
-          _context.next = 64;
+        case 67:
+          _context.next = 69;
           return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
-        case 64:
-          _context.next = 66;
+        case 69:
+          _context.next = 71;
           return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
-        case 66:
+        case 71:
           console.log('✅ 成功后推送到git');
 
           // 只有在shop端发布
           if (!(res.project.fileName === 'my_pisel_shop')) {
-            _context.next = 70;
+            _context.next = 75;
             break;
           }
-          _context.next = 70;
+          _context.next = 75;
           return updateVersion({
             version: version,
             changelog: res.changelog
           }, res.env);
-        case 70:
-          _context.next = 72;
+        case 75:
+          _context.next = 77;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -249,20 +267,20 @@ function _init() {
               value: version || ''
             }]
           });
-        case 72:
-          _context.next = 83;
+        case 77:
+          _context.next = 88;
           break;
-        case 74:
-          _context.prev = 74;
+        case 79:
+          _context.prev = 79;
           _context.t0 = _context["catch"](26);
           console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 79;
+          _context.next = 84;
           return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 79:
-          _context.next = 81;
+        case 84:
+          _context.next = 86;
           return deleteGitTag("v".concat(uploadCode.currentVersion));
-        case 81:
-          _context.next = 83;
+        case 86:
+          _context.next = 88;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -279,13 +297,13 @@ function _init() {
               value: "".concat(_context.t0) || ''
             }]
           });
-        case 83:
+        case 88:
           uploadCode.deleteLocalZip();
-        case 84:
+        case 89:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[26, 74]]);
+    }, _callee, null, [[26, 79]]);
   }));
   return _init.apply(this, arguments);
 }

package/lib/script/uploadCode/index.js

@@ -100,6 +100,16 @@ var inquirerResult = () => {
     }
   ]);
 };
+var inquirerOss = () => {
+  return import_inquirer.default.prompt([
+    {
+      type: "confirm",
+      message: "确认OSS上传完成, 并且vpn环境正确",
+      name: "is_upload_completed_OSS",
+      default: true
+    }
+  ]);
+};
 async function init() {
   let res = await inquirerResult();
   if (!res.is_confirm) {
@@ -145,9 +155,13 @@ async function init() {
     } else {
       console.log("使用本地/dist");
     }
-    if (res.env === "prod") {
+    if (res.env === "prod" || res.env === "pre") {
       let _fileName = res.project.fileName;
       await (0, import_aws.uploadStaticToOSS)(_fileName);
+      const ossRes = await inquirerOss();
+      if (!ossRes.is_upload_completed_OSS) {
+        return;
+      }
     }
     console.log("开始压缩");
     await uploadCode.compress();

package/package.json

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