@pisell/common 1.0.43 → 3.0.2

package/CHANGELOG.md

@@ -1,143 +1,22 @@
 # @pisell/common
 
-## 1.0.43
+## 3.0.2
 
 ### Patch Changes
 
-- 740ab6b52: s
+- add57fee8: xzero 不上传 oss
 
-## 1.0.42
+## 3.0.1
 
 ### Patch Changes
 
-- Updated dependencies [6f57a4d88]
-  - @pisell/utils@1.0.43
-
-## 1.0.41
-
-### Patch Changes
-
-- Updated dependencies [0267536f]
-  - @pisell/utils@1.0.42
-
-## 1.0.40
-
-### Patch Changes
-
-- Updated dependencies [f3ed6fa4]
-  - @pisell/utils@1.0.41
-
-## 1.0.39
-
-### Patch Changes
-
-- Updated dependencies [b848ae9a]
-  - @pisell/utils@1.0.40
-
-## 1.0.38
-
-### Patch Changes
-
-- Updated dependencies [8640a624]
-  - @pisell/utils@1.0.39
-
-## 1.0.37
-
-### Patch Changes
-
-- Updated dependencies [27cdd90e]
-  - @pisell/utils@1.0.38
-
-## 1.0.36
-
-### Patch Changes
-
-- Updated dependencies [30136d51]
-  - @pisell/utils@1.0.37
-
-## 1.0.35
-
-### Patch Changes
-
-- Updated dependencies [a694c37e]
-  - @pisell/utils@1.0.36
-
-## 1.0.34
-
-### Patch Changes
-
-- Updated dependencies [11c9a831]
-  - @pisell/utils@1.0.35
-
-## 1.0.33
-
-### Patch Changes
-
-- Updated dependencies [881303a5]
-  - @pisell/utils@1.0.34
-
-## 1.0.32
-
-### Patch Changes
-
-- Updated dependencies [fb6b699f]
-  - @pisell/utils@1.0.33
-
-## 1.0.31
-
-### Patch Changes
-
-- Updated dependencies [bf60f3ca]
-  - @pisell/utils@1.0.32
-
-## 1.0.30
-
-### Patch Changes
-
-- Updated dependencies [f7f80d68]
-  - @pisell/utils@1.0.31
-
-## 1.0.29
-
-### Patch Changes
-
-- Updated dependencies [d41cf764]
-  - @pisell/utils@1.0.30
-
-## 1.0.28
-
-### Patch Changes
-
-- Updated dependencies [f10f984b]
-  - @pisell/utils@1.0.29
+- f8847ef9a: s
 
 ## 1.0.27
 
 ### Patch Changes
 
-- Updated dependencies [1d22e943]
-  - @pisell/utils@1.0.28
-
-## 1.0.26
-
-### Patch Changes
-
-- Updated dependencies [a45e6cd5]
-  - @pisell/utils@1.0.27
-
-## 1.0.25
-
-### Patch Changes
-
-- Updated dependencies [961d44f7]
-  - @pisell/utils@1.0.26
-
-## 1.0.24
-
-### Patch Changes
-
-- Updated dependencies [10083f21]
-  - @pisell/utils@1.0.25
+- 7b7637320: s
 
 ## 1.0.26
 

package/es/script/aws/index.js

@@ -23,14 +23,14 @@ var bucketName = '';
  * @Date: 2023-11-24 14:05
  */
 var init = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(directory) {
     var serverConfig, awsConfig;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
           _context.next = 3;
-          return getServerConfig('admin');
+          return getServerConfig(directory);
         case 3:
           serverConfig = _context.sent;
           // aws配置
@@ -68,7 +68,7 @@ var init = /*#__PURE__*/function () {
       }
     }, _callee, null, [[0, 16]]);
   }));
-  return function init() {
+  return function init(_x) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -113,7 +113,7 @@ var uploadFile = /*#__PURE__*/function () {
       }
     }, _callee2, null, [[4, 12]]);
   }));
-  return function uploadFile(_x, _x2, _x3) {
+  return function uploadFile(_x2, _x3, _x4) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -182,7 +182,7 @@ export var uploadFolderContents = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function uploadFolderContents(_x4) {
+  return function uploadFolderContents(_x5) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -203,7 +203,7 @@ export var uploadStaticToOSS = /*#__PURE__*/function () {
         case 0:
           folderPath = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : path.resolve(__dirname, 'dist');
           _context4.next = 3;
-          return init();
+          return init(directory);
         case 3:
           return _context4.abrupt("return", uploadFolderContents(directory, folderPath));
         case 4:
@@ -212,7 +212,7 @@ export var uploadStaticToOSS = /*#__PURE__*/function () {
       }
     }, _callee4);
   }));
-  return function uploadStaticToOSS(_x5) {
+  return function uploadStaticToOSS(_x6) {
     return _ref4.apply(this, arguments);
   };
 }();

package/es/script/uploadCode/index.js

@@ -163,7 +163,7 @@ function _init() {
           console.log('使用本地/dist');
         case 35:
           if (!(res.env === 'prod')) {
-            _context.next = 41;
+            _context.next = 42;
             break;
           }
           _fileName = res.project.fileName;
@@ -173,32 +173,35 @@ function _init() {
           if (_fileName === 'admin') {
             _fileName = 'my_pisell_v2';
           }
-          // 上传oss
-          _context.next = 41;
+          if (!(_fileName !== 'xzero')) {
+            _context.next = 42;
+            break;
+          }
+          _context.next = 42;
           return uploadStaticToOSS(_fileName);
-        case 41:
+        case 42:
           console.log('开始压缩');
-          _context.next = 44;
+          _context.next = 45;
           return uploadCode.compress();
-        case 44:
+        case 45:
           console.log('✅ 压缩完成');
           console.log('开始连接服务器');
-          _context.next = 48;
+          _context.next = 49;
           return uploadCode.connectServer();
-        case 48:
+        case 49:
           conn = _context.sent;
           console.log('✅ 连接服务器完成');
           console.log('开始上传');
-          _context.next = 53;
+          _context.next = 54;
           return uploadCode.serverUpload();
-        case 53:
+        case 54:
           console.log('✅ 上传完成');
           console.log('开始解压');
-          _context.next = 57;
+          _context.next = 58;
           return uploadCode.serverUnpack();
-        case 57:
+        case 58:
           if (!res.is_release) {
-            _context.next = 62;
+            _context.next = 63;
             break;
           }
           releaseInstance = new Release({
@@ -208,32 +211,32 @@ function _init() {
             conn: conn
           });
           console.log('开始发布');
-          _context.next = 62;
+          _context.next = 63;
           return releaseInstance.release();
-        case 62:
-          _context.next = 64;
+        case 63:
+          _context.next = 65;
           return uploadCode.disconnectServer();
-        case 64:
-          _context.next = 66;
+        case 65:
+          _context.next = 67;
           return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
-        case 66:
-          _context.next = 68;
+        case 67:
+          _context.next = 69;
           return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
-        case 68:
+        case 69:
           console.log('✅ 成功后推送到git');
-          _context.next = 80;
+          _context.next = 81;
           break;
-        case 71:
-          _context.prev = 71;
+        case 72:
+          _context.prev = 72;
           _context.t0 = _context["catch"](26);
           console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 76;
+          _context.next = 77;
           return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 76:
-          _context.next = 78;
+        case 77:
+          _context.next = 79;
           return $(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["git tag -d v", ""])), uploadCode.currentVersion);
-        case 78:
-          _context.next = 80;
+        case 79:
+          _context.next = 81;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -247,8 +250,8 @@ function _init() {
               value: version || ''
             }]
           });
-        case 80:
-          _context.next = 82;
+        case 81:
+          _context.next = 83;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -262,13 +265,13 @@ function _init() {
               value: version || ''
             }]
           });
-        case 82:
-          uploadCode.deleteLocalZip();
         case 83:
+          uploadCode.deleteLocalZip();
+        case 84:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[26, 71]]);
+    }, _callee, null, [[26, 72]]);
   }));
   return _init.apply(this, arguments);
 }

package/lib/script/aws/index.js

@@ -42,9 +42,9 @@ var filterFiles = ["index.html", "umi.server.js", "umi.server.d.ts"];
 var __dirname = process.cwd();
 var s3Client = null;
 var bucketName = "";
-var init = async () => {
+var init = async (directory) => {
   try {
-    const serverConfig = await (0, import_utils.getServerConfig)("admin");
+    const serverConfig = await (0, import_utils.getServerConfig)(directory);
     let awsConfig = serverConfig.aws;
     if (awsConfig) {
       bucketName = awsConfig.bucketName;
@@ -115,7 +115,7 @@ var uploadFolderContents = async (directory, folderPath = import_path.default.re
   });
 };
 var uploadStaticToOSS = async (directory, folderPath = import_path.default.resolve(__dirname, "dist")) => {
-  await init();
+  await init(directory);
   return uploadFolderContents(directory, folderPath);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/script/uploadCode/index.js

@@ -153,7 +153,9 @@ async function init() {
       if (_fileName === "admin") {
         _fileName = "my_pisell_v2";
       }
-      await (0, import_aws.uploadStaticToOSS)(_fileName);
+      if (_fileName !== "xzero") {
+        await (0, import_aws.uploadStaticToOSS)(_fileName);
+      }
     }
     console.log("开始压缩");
     await uploadCode.compress();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "1.0.43",
+  "version": "3.0.2",
   "sideEffects": [
     "*.less"
   ],
@@ -20,7 +20,7 @@
     "archiver": "^5.3.1",
     "dotenv": "^16.0.3",
     "ssh2": "^1.13.0",
-    "@pisell/utils": "1.0.43"
+    "@pisell/utils": "1.0.42"
   },
   "devDependencies": {
     "father": "^4.1.6"

package/src/script/aws/index.js

@@ -15,10 +15,10 @@ let bucketName = '';
  * @Author: zhiwei.Wang
  * @Date: 2023-11-24 14:05
  */
-const init = async () => {
+const init = async (directory) => {
   try {
     // 读取本地config
-    const serverConfig = await getServerConfig('admin');
+    const serverConfig = await getServerConfig(directory);
 
     // aws配置
     let awsConfig = serverConfig.aws;
@@ -84,7 +84,7 @@ const uploadFile = async (directory, fileKey, filePath) => {
  */
 export const uploadFolderContents = async (
   directory,
-  folderPath = path.resolve(__dirname, 'dist'),
+  folderPath = path.resolve(__dirname, 'dist')
 ) => {
   const files = fs.readdirSync(folderPath);
 
@@ -129,10 +129,10 @@ export const uploadFolderContents = async (
  */
 export const uploadStaticToOSS = async (
   directory,
-  folderPath = path.resolve(__dirname, 'dist'),
+  folderPath = path.resolve(__dirname, 'dist')
 ) => {
   // 初始化aws
-  await init();
+  await init(directory);
 
   return uploadFolderContents(directory, folderPath);
 };

package/src/script/uploadCode/index.js

@@ -146,8 +146,10 @@ async function init() {
       if (_fileName === 'admin') {
         _fileName = 'my_pisell_v2'
       }
-      // 上传oss
-      await uploadStaticToOSS(_fileName);
+      if (_fileName !== 'xzero') {
+        // 上传oss
+        await uploadStaticToOSS(_fileName);
+      }
     }
 
     console.log('开始压缩');