@pisell/common 0.0.37 → 0.0.39

package/es/script/aws/index.js

@@ -87,7 +87,7 @@ var uploadFile = /*#__PURE__*/function () {
             Key: "static/".concat(directory, "/").concat(fileKey),
             // 指定目录路径
             Body: fileStream,
-            contentType: contentType,
+            ContentType: contentType,
             ACL: 'public-read' // 设置ACL权限为公共读取
           };
           command = new PutObjectCommand(uploadParams);

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/uploadCode.js

@@ -360,8 +360,7 @@ var UploadCode = /*#__PURE__*/function () {
                 path: this.outPath,
                 fileName: "".concat(this.currentVersion),
                 fullFileName: "".concat(this.currentVersion, ".zip"),
-                changelog: this.changelog,
-                isSSR: this.isSSR
+                changelog: this.changelog
               });
             case 2:
               return _context7.abrupt("return", _context7.sent);

package/es/script/utils/index.js

@@ -161,8 +161,7 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
   var path = _ref5.path,
     fileName = _ref5.fileName,
     fullFileName = _ref5.fullFileName,
-    changelog = _ref5.changelog,
-    isSSR = _ref5.isSSR;
+    changelog = _ref5.changelog;
   if (!conn) return Promise.reject('未连接服务器');
   // 文件全名
   return new Promise(function (resolve, reject) {
@@ -172,7 +171,7 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
         reject(err);
         return;
       }
-      stream.end("\n             cd ".concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && mv ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ") // 打开到path
+      stream.end("\n             cd ".concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && mv ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             exit\n            ") // 打开到path
       // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
       // 删除1.0.0.zip
       // 写入changelog到changelog.md
@@ -194,7 +193,8 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
  */
 var releaseProject = function releaseProject(conn, _ref6) {
   var path = _ref6.path,
-    fileName = _ref6.fileName;
+    fileName = _ref6.fileName,
+    isSSR = _ref6.isSSR;
   return new Promise(function (resolve, reject) {
     conn.shell(function (err, stream) {
       if (err) {
@@ -202,7 +202,7 @@ var releaseProject = function releaseProject(conn, _ref6) {
         reject(err);
         return;
       }
-      stream.end("\n             cd ".concat(path, "\n             cp -R -f pre-master next-master\n             rm -rf pre-master\n             \\cp -R -f ").concat(fileName, "/* next-master\n             cp -R -f ").concat(fileName, " pre-master\n             rm -rf master\n             cp -R next-master master\n             rm -rf next-master\n             exit\n            ") // 打开到path
+      stream.end("\n             cd ".concat(path, "\n             cp -R -f pre-master next-master\n             rm -rf pre-master\n             \\cp -R -f ").concat(fileName, "/* next-master\n             cp -R -f ").concat(fileName, " pre-master\n             rm -rf master\n             cp -R next-master master\n             rm -rf next-master\n             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ") // 打开到path
       // 复制pre-master到next-master
       // 删除pre-master
       // 复制1.0.0到next-master

package/lib/script/aws/index.js

@@ -74,7 +74,7 @@ var uploadFile = async (directory, fileKey, filePath) => {
     Key: `static/${directory}/${fileKey}`,
     // 指定目录路径
     Body: fileStream,
-    contentType,
+    ContentType: contentType,
     ACL: "public-read"
     // 设置ACL权限为公共读取
   };

package/lib/script/release/release.js

@@ -32,6 +32,7 @@ var Release = class {
     this.version = version;
     this.conn = conn;
     this.outPath = import_constants.outPathMap[this.projectName][this.env];
+    this.isSSR = import_constants.isSsrMap[this.projectName];
   }
   /**
    * @Title: 设置连接服务器配置
@@ -72,7 +73,8 @@ var Release = class {
   async release() {
     return await (0, import_utils.releaseProject)(this.conn, {
       path: this.outPath,
-      fileName: `${this.version}`
+      fileName: `${this.version}`,
+      isSSR: this.isSSR
     });
   }
   /**

package/lib/script/uploadCode/uploadCode.js

@@ -187,8 +187,7 @@ var UploadCode = class {
       path: this.outPath,
       fileName: `${this.currentVersion}`,
       fullFileName: `${this.currentVersion}.zip`,
-      changelog: this.changelog,
-      isSSR: this.isSSR
+      changelog: this.changelog
     });
   }
   /**

package/lib/script/utils/index.js

@@ -114,7 +114,7 @@ var serverUpload = (conn, { localPath, remotePath }) => {
     });
   });
 };
-var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, isSSR }) => {
+var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) => {
   if (!conn)
     return Promise.reject("未连接服务器");
   return new Promise((resolve, reject) => {
@@ -131,7 +131,6 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, isSS
              rm -rf ${fullFileName}
              echo "${changelog}" > ./${fileName}/changelog.md
              sh deleteOldVersion.sh
-             ${isSSR ? "pm2 restart server.js" : ""}
              exit
             `
         // 打开到path
@@ -148,7 +147,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, isSS
     });
   });
 };
-var releaseProject = (conn, { path: path2, fileName }) => {
+var releaseProject = (conn, { path: path2, fileName, isSSR }) => {
   return new Promise((resolve, reject) => {
     conn.shell((err, stream) => {
       if (err) {
@@ -166,6 +165,7 @@ var releaseProject = (conn, { path: path2, fileName }) => {
              rm -rf master
              cp -R next-master master
              rm -rf next-master
+             ${isSSR ? "pm2 restart server.js" : ""}
              exit
             `
         // 打开到path

package/package.json

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