@pisell/common 1.0.43 → 3.0.1

package/CHANGELOG.md

@@ -1,143 +1,16 @@
 # @pisell/common
 
-## 1.0.43
+## 3.0.1
 
 ### Patch Changes
 
-- 740ab6b52: s
-
-## 1.0.42
-
-### 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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "1.0.43",
+  "version": "3.0.1",
   "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);
 };