@pisell/common 0.0.40 → 0.0.42

package/es/script/aws/index.js

@@ -84,7 +84,7 @@ var uploadFile = /*#__PURE__*/function () {
           contentType = mime.lookup(filePath);
           uploadParams = {
             Bucket: bucketName,
-            Key: "static/".concat(directory, "/").concat(fileKey),
+            Key: "".concat(directory, "/").concat(fileKey),
             // 指定目录路径
             Body: fileStream,
             ContentType: contentType,
@@ -106,10 +106,7 @@ var uploadFile = /*#__PURE__*/function () {
           _context2.prev = 12;
           _context2.t0 = _context2["catch"](4);
           console.error("\u4E0A\u4F20\u5931\u8D25: ".concat(fileKey), _context2.t0);
-          return _context2.abrupt("return", {
-            fileName: fileKey,
-            error: _context2.t0
-          });
+          throw new Error("\u4E0A\u4F20\u5931\u8D25: ".concat(fileKey, ", ").concat(_context2.t0.message));
         case 16:
         case "end":
           return _context2.stop();
@@ -176,6 +173,8 @@ export var uploadFolderContents = /*#__PURE__*/function () {
           return _context3.abrupt("return", Promise.all(uploadPromises).then(function (res) {
             console.log('全部上传完成', res.length);
             return res;
+          }).catch(function (err) {
+            throw new Error("\u4E0A\u4F20cdn\u5931\u8D25: ".concat(err.message));
           }));
         case 6:
         case "end":

package/es/script/uploadCode/index.js

@@ -60,6 +60,17 @@ var inquirerResult = function inquirerResult() {
       value: false,
       name: '只上传'
     }]
+  }, {
+    type: 'list',
+    message: '是否执行build打包',
+    name: 'whether_build',
+    choices: [{
+      value: true,
+      name: '执行打包'
+    }, {
+      value: false,
+      name: '不执行打包，使用项目根目录/dist文件夹'
+    }]
   }, {
     type: 'confirm',
     message: '确认信息无误',
@@ -146,13 +157,22 @@ function _init() {
           result = _context.sent;
           console.log(result, 'result');
           _context.prev = 26;
+          if (!res.whether_build) {
+            _context.next = 34;
+            break;
+          }
           console.log('开始打包');
-          _context.next = 30;
+          _context.next = 31;
           return uploadCode.build();
-        case 30:
+        case 31:
           console.log('✅ 打包完成');
-          if (!(res.env === 'pre' || res.env === 'prod')) {
-            _context.next = 36;
+          _context.next = 35;
+          break;
+        case 34:
+          console.log('使用本地/dist');
+        case 35:
+          if (!(res.env === 'prod')) {
+            _context.next = 40;
             break;
           }
           _fileName = res.project.fileName;
@@ -160,31 +180,31 @@ function _init() {
             _fileName = 'pre_' + _fileName;
           }
           // 上传oss
-          _context.next = 36;
+          _context.next = 40;
           return uploadStaticToOSS(_fileName);
-        case 36:
+        case 40:
           console.log('开始压缩');
-          _context.next = 39;
+          _context.next = 43;
           return uploadCode.compress();
-        case 39:
+        case 43:
           console.log('✅ 压缩完成');
           console.log('开始连接服务器');
-          _context.next = 43;
+          _context.next = 47;
           return uploadCode.connectServer();
-        case 43:
+        case 47:
           conn = _context.sent;
           console.log('✅ 连接服务器完成');
           console.log('开始上传');
-          _context.next = 48;
+          _context.next = 52;
           return uploadCode.serverUpload();
-        case 48:
+        case 52:
           console.log('✅ 上传完成');
           console.log('开始解压');
-          _context.next = 52;
+          _context.next = 56;
           return uploadCode.serverUnpack();
-        case 52:
+        case 56:
           if (!res.is_release) {
-            _context.next = 57;
+            _context.next = 61;
             break;
           }
           releaseInstance = new Release({
@@ -194,32 +214,32 @@ function _init() {
             conn: conn
           });
           console.log('开始发布');
-          _context.next = 57;
-          return releaseInstance.release();
-        case 57:
-          _context.next = 59;
-          return uploadCode.disconnectServer();
-        case 59:
           _context.next = 61;
-          return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
+          return releaseInstance.release();
         case 61:
           _context.next = 63;
-          return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
+          return uploadCode.disconnectServer();
         case 63:
+          _context.next = 65;
+          return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
+        case 65:
+          _context.next = 67;
+          return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
+        case 67:
           console.log('✅ 成功后推送到git');
-          _context.next = 75;
+          _context.next = 79;
           break;
-        case 66:
-          _context.prev = 66;
+        case 70:
+          _context.prev = 70;
           _context.t0 = _context["catch"](26);
           console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 71;
+          _context.next = 75;
           return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 71:
-          _context.next = 73;
+        case 75:
+          _context.next = 77;
           return $(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["git tag -d v", ""])), uploadCode.currentVersion);
-        case 73:
-          _context.next = 75;
+        case 77:
+          _context.next = 79;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -233,18 +253,18 @@ function _init() {
               value: version || ''
             }]
           });
-        case 75:
+        case 79:
           if (!(res.project.fileName === 'my_pisel_shop')) {
-            _context.next = 78;
+            _context.next = 82;
             break;
           }
-          _context.next = 78;
+          _context.next = 82;
           return updateVersion({
             version: version,
             changelog: res.changelog
           }, res.env);
-        case 78:
-          _context.next = 80;
+        case 82:
+          _context.next = 84;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -258,13 +278,13 @@ function _init() {
               value: version || ''
             }]
           });
-        case 80:
+        case 84:
           uploadCode.deleteLocalZip();
-        case 81:
+        case 85:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[26, 66]]);
+    }, _callee, null, [[26, 70]]);
   }));
   return _init.apply(this, arguments);
 }

package/lib/script/aws/index.js

@@ -71,7 +71,7 @@ var uploadFile = async (directory, fileKey, filePath) => {
   const contentType = import_mime_types.default.lookup(filePath);
   const uploadParams = {
     Bucket: bucketName,
-    Key: `static/${directory}/${fileKey}`,
+    Key: `${directory}/${fileKey}`,
     // 指定目录路径
     Body: fileStream,
     ContentType: contentType,
@@ -86,7 +86,7 @@ var uploadFile = async (directory, fileKey, filePath) => {
     return { fileName: fileKey, location: response.Location };
   } catch (err) {
     console.error(`上传失败: ${fileKey}`, err);
-    return { fileName: fileKey, error: err };
+    throw new Error(`上传失败: ${fileKey}, ${err.message}`);
   }
 };
 var uploadFolderContents = async (directory, folderPath = import_path.default.resolve(__dirname, "dist")) => {
@@ -110,6 +110,8 @@ var uploadFolderContents = async (directory, folderPath = import_path.default.re
   return Promise.all(uploadPromises).then((res) => {
     console.log("全部上传完成", res.length);
     return res;
+  }).catch((err) => {
+    throw new Error(`上传cdn失败: ${err.message}`);
   });
 };
 var uploadStaticToOSS = async (directory, folderPath = import_path.default.resolve(__dirname, "dist")) => {

package/lib/script/uploadCode/index.js

@@ -83,6 +83,15 @@ var inquirerResult = () => {
         { value: false, name: "只上传" }
       ]
     },
+    {
+      type: "list",
+      message: "是否执行build打包",
+      name: "whether_build",
+      choices: [
+        { value: true, name: "执行打包" },
+        { value: false, name: "不执行打包，使用项目根目录/dist文件夹" }
+      ]
+    },
     {
       type: "confirm",
       message: "确认信息无误",
@@ -129,10 +138,14 @@ async function init() {
   });
   console.log(result, "result");
   try {
-    console.log("开始打包");
-    await uploadCode.build();
-    console.log("✅ 打包完成");
-    if (res.env === "pre" || res.env === "prod") {
+    if (res.whether_build) {
+      console.log("开始打包");
+      await uploadCode.build();
+      console.log("✅ 打包完成");
+    } else {
+      console.log("使用本地/dist");
+    }
+    if (res.env === "prod") {
       let _fileName = res.project.fileName;
       if (res.env === "pre") {
         _fileName = "pre_" + _fileName;

package/package.json

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