@pisell/common 1.0.18 → 1.0.20

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @pisell/common
 
+## 1.0.20
+
+### Patch Changes
+
+- Updated dependencies [d000328]
+  - @pisell/utils@1.0.21
+
+## 1.0.19
+
+### Patch Changes
+
+- Updated dependencies [b879dad]
+  - @pisell/utils@1.0.20
+
 ## 1.0.18
 
 ### Patch Changes

package/es/index.d.ts

@@ -1,3 +1,2 @@
 declare const _default: {};
 export default _default;
-//# sourceMappingURL=index.d.ts.map

package/es/script/aws/index.js

@@ -0,0 +1,218 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import fs from 'fs';
+import mime from 'mime-types';
+import path from 'path';
+import { getServerConfig } from "../utils/index.js";
+var filterFiles = ['index.html', 'umi.server.js', 'umi.server.d.ts'];
+var __dirname = process.cwd();
+var s3Client = null;
+var bucketName = '';
+
+/*******
+ * @title: 初始化
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:05
+ */
+var init = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    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');
+        case 3:
+          serverConfig = _context.sent;
+          // aws配置
+          awsConfig = serverConfig.aws;
+          if (!awsConfig) {
+            _context.next = 12;
+            break;
+          }
+          bucketName = awsConfig.bucketName;
+
+          // 创建实例
+          s3Client = new S3Client({
+            region: awsConfig.region,
+            credentials: {
+              accessKeyId: awsConfig.accessKeyId,
+              secretAccessKey: awsConfig.secretAccessKey
+            }
+          });
+          console.log('aws 初始化成功');
+          return _context.abrupt("return", serverConfig.aws);
+        case 12:
+          console.log('未获取到aws权限');
+          return _context.abrupt("return", false);
+        case 14:
+          _context.next = 20;
+          break;
+        case 16:
+          _context.prev = 16;
+          _context.t0 = _context["catch"](0);
+          console.log(_context.t0);
+          return _context.abrupt("return", false);
+        case 20:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 16]]);
+  }));
+  return function init() {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+// 上传文件到S3指定目录
+var uploadFile = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(directory, fileKey, filePath) {
+    var fileStream, contentType, uploadParams, command, response;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          fileStream = fs.createReadStream(filePath); // 根据文件扩展名获取MIME类型
+          contentType = mime.lookup(filePath);
+          uploadParams = {
+            Bucket: bucketName,
+            Key: "".concat(directory, "/").concat(fileKey),
+            // 指定目录路径
+            Body: fileStream,
+            ContentType: contentType,
+            ContentDisposition: 'inline',
+            ACL: 'public-read' // 设置ACL权限为公共读取
+          };
+          command = new PutObjectCommand(uploadParams);
+          _context2.prev = 4;
+          _context2.next = 7;
+          return s3Client.send(command);
+        case 7:
+          response = _context2.sent;
+          console.log("\u4E0A\u4F20\u6210\u529F: ".concat(fileKey));
+          return _context2.abrupt("return", {
+            fileName: fileKey,
+            location: response.Location
+          });
+        case 12:
+          _context2.prev = 12;
+          _context2.t0 = _context2["catch"](4);
+          console.error("\u4E0A\u4F20\u5931\u8D25: ".concat(fileKey), _context2.t0);
+          throw new Error("\u4E0A\u4F20\u5931\u8D25: ".concat(fileKey, ", ").concat(_context2.t0.message));
+        case 16:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[4, 12]]);
+  }));
+  return function uploadFile(_x, _x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+/*******
+ * @title: 递归上传文件夹内容
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:06
+ */
+export var uploadFolderContents = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(directory) {
+    var folderPath,
+      files,
+      uploadPromises,
+      _iterator,
+      _step,
+      file,
+      filePath,
+      fileStats,
+      fileKey,
+      uploadPromise,
+      subDirectory,
+      subFolderPromise,
+      _args3 = arguments;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          folderPath = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : path.resolve(__dirname, 'dist');
+          files = fs.readdirSync(folderPath); // promise all 储存
+          uploadPromises = [];
+          _iterator = _createForOfIteratorHelper(files);
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              file = _step.value;
+              filePath = path.join(folderPath, file);
+              fileStats = fs.statSync(filePath); // 文件上传, 文件夹递归循环
+              if (fileStats.isFile()) {
+                fileKey = path.relative(folderPath, filePath); // 过滤不需要上传的文件
+                if (!filterFiles.includes(fileKey)) {
+                  uploadPromise = uploadFile(directory, fileKey, filePath);
+                  uploadPromises.push(uploadPromise);
+                }
+                // 文件夹
+              } else if (fileStats.isDirectory()) {
+                subDirectory = path.join(directory, file);
+                subFolderPromise = uploadFolderContents(subDirectory, filePath);
+                uploadPromises.push(subFolderPromise);
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          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":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function uploadFolderContents(_x4) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+
+/*******
+ * @title: 上传资源到oss
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:04
+ */
+export var uploadStaticToOSS = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(directory) {
+    var folderPath,
+      _args4 = arguments;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          folderPath = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : path.resolve(__dirname, 'dist');
+          _context4.next = 3;
+          return init();
+        case 3:
+          return _context4.abrupt("return", uploadFolderContents(directory, folderPath));
+        case 4:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return function uploadStaticToOSS(_x5) {
+    return _ref4.apply(this, arguments);
+  };
+}();

package/es/script/constants/index.js

@@ -1,6 +1,6 @@
 var outPathMap = {
   my_pisel_shop: {
-    prod: '../data/release/project/mypisel_shop',
+    prod: '../data/release/project/my_pisel_shop',
     release: '../data/release/project/my_pisel_shop',
     pre: '../data/release/project/my_pisel_shop'
   },
@@ -8,6 +8,23 @@ var outPathMap = {
     prod: '../../data/project/pisell2',
     release: '../data/release/project/pisell_v2',
     pre: '../data/release/project/pisell_v2'
+  },
+  my_pisel_pc_v2: {
+    prod: '../data/release/project/my_pisel_pc_v2',
+    release: '../data/release/project/my_pisel_pc_v2',
+    pre: '../data/release/project/my_pisel_pc_v2'
+  },
+  my_pisel_h5_v2: {
+    prod: '../data/release/project/my_pisel_h5_v2',
+    release: '../data/release/project/my_pisel_h5_v2',
+    pre: '../data/release/project/my_pisel_h5_v2'
   }
 };
-export { outPathMap };
+var isSsrMap = {
+  my_pisel_shop: false,
+  admin: false,
+  my_pisel_pc_v2: true,
+  my_pisel_h5_v2: true
+};
+var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common', '@pisell/utils'];
+export { outPathMap, isSsrMap, checkPackages };

package/es/script/release/release.js

@@ -7,7 +7,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { outPathMap } from "../constants/index.js";
+import { isSsrMap, outPathMap } from "../constants/index.js";
 import { connectServer as _connectServer, getServerConfig, releaseProject } from "../utils/index.js";
 
 /**
@@ -27,6 +27,8 @@ var Release = /*#__PURE__*/function () {
     this.version = version;
     this.conn = conn;
     this.outPath = outPathMap[this.projectName][this.env];
+    // 是否是ssr项目
+    this.isSSR = isSsrMap[this.projectName];
   }
 
   /**
@@ -115,7 +117,8 @@ var Release = /*#__PURE__*/function () {
               _context3.next = 2;
               return releaseProject(this.conn, {
                 path: this.outPath,
-                fileName: "".concat(this.version)
+                fileName: "".concat(this.version),
+                isSSR: this.isSSR
               });
             case 2:
               return _context3.abrupt("return", _context3.sent);

package/es/script/uploadCode/index.js

@@ -7,6 +7,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import inquirer from 'inquirer';
 import 'zx/globals';
+import { uploadStaticToOSS } from "../aws/index.js";
 import Release from "../release/release.js";
 import { getCurrentProjectName, getCurrentUserName, sendWebhook } from "../utils/index.js";
 import UploadCode from "./uploadCode.js";
@@ -59,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: '确认信息无误',
@@ -71,7 +83,7 @@ function init() {
 }
 function _init() {
   _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var res, uploadCode, version, currentUserName, result, conn, releaseInstance;
+    var res, uploadCode, version, currentUserName, result, _fileName, conn, releaseInstance;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -136,33 +148,57 @@ 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('✅ 打包完成');
+          _context.next = 35;
+          break;
+        case 34:
+          console.log('使用本地/dist');
+        case 35:
+          if (!(res.env === 'prod')) {
+            _context.next = 41;
+            break;
+          }
+          _fileName = res.project.fileName;
+          if (res.env === 'pre') {
+            _fileName = 'pre_' + _fileName;
+          }
+          if (_fileName === 'admin') {
+            _fileName = 'my_pisell_v2';
+          }
+          // 上传oss
+          _context.next = 41;
+          return uploadStaticToOSS(_fileName);
+        case 41:
           console.log('开始压缩');
-          _context.next = 34;
+          _context.next = 44;
           return uploadCode.compress();
-        case 34:
+        case 44:
           console.log('✅ 压缩完成');
           console.log('开始连接服务器');
-          _context.next = 38;
+          _context.next = 48;
           return uploadCode.connectServer();
-        case 38:
+        case 48:
           conn = _context.sent;
           console.log('✅ 连接服务器完成');
           console.log('开始上传');
-          _context.next = 43;
+          _context.next = 53;
           return uploadCode.serverUpload();
-        case 43:
+        case 53:
           console.log('✅ 上传完成');
           console.log('开始解压');
-          _context.next = 47;
+          _context.next = 57;
           return uploadCode.serverUnpack();
-        case 47:
+        case 57:
           if (!res.is_release) {
-            _context.next = 52;
+            _context.next = 62;
             break;
           }
           releaseInstance = new Release({
@@ -172,32 +208,32 @@ function _init() {
             conn: conn
           });
           console.log('开始发布');
-          _context.next = 52;
+          _context.next = 62;
           return releaseInstance.release();
-        case 52:
-          _context.next = 54;
+        case 62:
+          _context.next = 64;
           return uploadCode.disconnectServer();
-        case 54:
-          _context.next = 56;
+        case 64:
+          _context.next = 66;
           return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
-        case 56:
-          _context.next = 58;
+        case 66:
+          _context.next = 68;
           return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
-        case 58:
+        case 68:
           console.log('✅ 成功后推送到git');
-          _context.next = 70;
+          _context.next = 80;
           break;
-        case 61:
-          _context.prev = 61;
+        case 71:
+          _context.prev = 71;
           _context.t0 = _context["catch"](26);
           console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 66;
+          _context.next = 76;
           return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 66:
-          _context.next = 68;
+        case 76:
+          _context.next = 78;
           return $(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["git tag -d v", ""])), uploadCode.currentVersion);
-        case 68:
-          _context.next = 70;
+        case 78:
+          _context.next = 80;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -211,8 +247,8 @@ function _init() {
               value: version || ''
             }]
           });
-        case 70:
-          _context.next = 72;
+        case 80:
+          _context.next = 82;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -226,13 +262,13 @@ function _init() {
               value: version || ''
             }]
           });
-        case 72:
+        case 82:
           uploadCode.deleteLocalZip();
-        case 73:
+        case 83:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[26, 61]]);
+    }, _callee, null, [[26, 71]]);
   }));
   return _init.apply(this, arguments);
 }

package/es/script/uploadCode/uploadCode.js

@@ -11,7 +11,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import archiver from "archiver";
 import path from "path";
-import { outPathMap } from "../constants/index.js";
+import { isSsrMap, outPathMap } from "../constants/index.js";
 import { connectServer as _connectServer, getGitCurrentBranch, getServerConfig, isWorkingTreeClean, serverUnpack as _serverUnpack, serverUpload as _serverUpload } from "../utils/index.js";
 
 /**
@@ -37,6 +37,8 @@ var UploadCode = /*#__PURE__*/function () {
     this.projectAbsolutePath = "";
     this.conn = null;
     this.serverConfig = null;
+    // 是否是ssr项目
+    this.isSSR = isSsrMap[this.projectName];
     this.outPath = outPathMap[this.projectName][this.env];
   }
 
@@ -99,7 +101,10 @@ var UploadCode = /*#__PURE__*/function () {
                 serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
               }
               if (this.env === "prod") {
-                serverConfig.privateKey = fs.readFileSync(path.join(process.env.HOME, ".ssh", "id_rsa"));
+                serverConfig = this.setConfig(serverConfigMap['prod3']);
+                // serverConfig.privateKey = fs.readFileSync(
+                //   path.join(process.env.HOME, '.ssh', 'id_rsa'),
+                // );
               }
 
               // pisell2.0正式环境使用亚马逊服务器