@pisell/common 0.0.43 → 0.0.44

package/es/script/uploadCode/index.js

@@ -171,40 +171,36 @@ function _init() {
         case 34:
           console.log('使用本地/dist');
         case 35:
-          if (!(res.env === 'prod')) {
-            _context.next = 40;
+          if (!(res.env === 'prod' && res.project.fileName !== 'my_pisel_shop')) {
+            _context.next = 39;
             break;
           }
-          _fileName = res.project.fileName;
-          if (res.env === 'pre') {
-            _fileName = 'pre_' + _fileName;
-          }
-          // 上传oss
-          _context.next = 40;
+          _fileName = res.project.fileName; // 上传oss
+          _context.next = 39;
           return uploadStaticToOSS(_fileName);
-        case 40:
+        case 39:
           console.log('开始压缩');
-          _context.next = 43;
+          _context.next = 42;
           return uploadCode.compress();
-        case 43:
+        case 42:
           console.log('✅ 压缩完成');
           console.log('开始连接服务器');
-          _context.next = 47;
+          _context.next = 46;
           return uploadCode.connectServer();
-        case 47:
+        case 46:
           conn = _context.sent;
           console.log('✅ 连接服务器完成');
           console.log('开始上传');
-          _context.next = 52;
+          _context.next = 51;
           return uploadCode.serverUpload();
-        case 52:
+        case 51:
           console.log('✅ 上传完成');
           console.log('开始解压');
-          _context.next = 56;
+          _context.next = 55;
           return uploadCode.serverUnpack();
-        case 56:
+        case 55:
           if (!res.is_release) {
-            _context.next = 61;
+            _context.next = 60;
             break;
           }
           releaseInstance = new Release({
@@ -214,32 +210,32 @@ function _init() {
             conn: conn
           });
           console.log('开始发布');
-          _context.next = 61;
+          _context.next = 60;
           return releaseInstance.release();
-        case 61:
-          _context.next = 63;
+        case 60:
+          _context.next = 62;
           return uploadCode.disconnectServer();
-        case 63:
-          _context.next = 65;
+        case 62:
+          _context.next = 64;
           return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
-        case 65:
-          _context.next = 67;
+        case 64:
+          _context.next = 66;
           return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
-        case 67:
+        case 66:
           console.log('✅ 成功后推送到git');
 
           // 只有在shop端发布
           if (!(res.project.fileName === 'my_pisel_shop')) {
-            _context.next = 71;
+            _context.next = 70;
             break;
           }
-          _context.next = 71;
+          _context.next = 70;
           return updateVersion({
             version: version,
             changelog: res.changelog
           }, res.env);
-        case 71:
-          _context.next = 73;
+        case 70:
+          _context.next = 72;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -253,20 +249,20 @@ function _init() {
               value: version || ''
             }]
           });
-        case 73:
-          _context.next = 84;
+        case 72:
+          _context.next = 83;
           break;
-        case 75:
-          _context.prev = 75;
+        case 74:
+          _context.prev = 74;
           _context.t0 = _context["catch"](26);
           console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 80;
+          _context.next = 79;
           return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 80:
-          _context.next = 82;
+        case 79:
+          _context.next = 81;
           return deleteGitTag("v".concat(uploadCode.currentVersion));
-        case 82:
-          _context.next = 84;
+        case 81:
+          _context.next = 83;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -283,13 +279,13 @@ function _init() {
               value: "".concat(_context.t0) || ''
             }]
           });
-        case 84:
+        case 83:
           uploadCode.deleteLocalZip();
-        case 85:
+        case 84:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[26, 75]]);
+    }, _callee, null, [[26, 74]]);
   }));
   return _init.apply(this, arguments);
 }

package/lib/script/uploadCode/index.js

@@ -145,11 +145,8 @@ async function init() {
     } else {
       console.log("使用本地/dist");
     }
-    if (res.env === "prod") {
+    if (res.env === "prod" && res.project.fileName !== "my_pisel_shop") {
       let _fileName = res.project.fileName;
-      if (res.env === "pre") {
-        _fileName = "pre_" + _fileName;
-      }
       await (0, import_aws.uploadStaticToOSS)(_fileName);
     }
     console.log("开始压缩");

package/package.json

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