@pisell/common 0.0.21-bata → 0.0.21

package/es/script/constants/index.js

@@ -8,6 +8,22 @@ var outPathMap = {
     prod: '../data/release/project/pisell_v2',
     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
+};
+export { outPathMap, isSsrMap };

package/es/script/release/index.js

@@ -71,7 +71,7 @@ var getVersionList = /*#__PURE__*/function () {
         case 0:
           env = _ref.env, project = _ref.project;
           _context.next = 3;
-          return getServerConfig(project.fileName);
+          return getServerConfig();
         case 3:
           config = _context.sent;
           host = config[env].host;

package/es/script/release/release.js

@@ -43,7 +43,7 @@ var Release = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return getServerConfig(this.projectName);
+              return getServerConfig();
             case 2:
               serverConfigMap = _context.sent;
               serverConfig = serverConfigMap[this.env]; // 选择release默认用国内cn服务器

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];
   }
 
@@ -66,7 +68,7 @@ var UploadCode = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return getServerConfig(this.projectName);
+              return getServerConfig();
             case 2:
               serverConfigMap = _context.sent;
               if (serverConfigMap) {
@@ -342,7 +344,8 @@ var UploadCode = /*#__PURE__*/function () {
                 path: this.outPath,
                 fileName: "".concat(this.currentVersion),
                 fullFileName: "".concat(this.currentVersion, ".zip"),
-                changelog: this.changelog
+                changelog: this.changelog,
+                isSSR: this.isSSR
               });
             case 2:
               return _context7.abrupt("return", _context7.sent);

package/es/script/utils/index.js

@@ -62,42 +62,27 @@ var getGitCurrentBranch = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * monorepo项目名称
- * @type {string[]}
- */
-var monorepoProjectNameArr = ['admin'];
-
 /**
  * @Title: 获取本地lm_config.json配置信息
- * @Describe:·
+ * @Describe:
  * @Author: Zsj
  */
 var getServerConfig = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(project) {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          if (!monorepoProjectNameArr.includes(project)) {
-            _context3.next = 4;
-            break;
-          }
-          _context3.next = 3;
-          return fs.readJson('../../lm_config.json');
-        case 3:
-          return _context3.abrupt("return", _context3.sent);
-        case 4:
-          _context3.next = 6;
+          _context3.next = 2;
           return fs.readJson('../lm_config.json');
-        case 6:
+        case 2:
           return _context3.abrupt("return", _context3.sent);
-        case 7:
+        case 3:
         case "end":
           return _context3.stop();
       }
     }, _callee3);
   }));
-  return function getServerConfig(_x) {
+  return function getServerConfig() {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -170,7 +155,8 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
   var path = _ref5.path,
     fileName = _ref5.fileName,
     fullFileName = _ref5.fullFileName,
-    changelog = _ref5.changelog;
+    changelog = _ref5.changelog,
+    isSSR = _ref5.isSSR;
   if (!conn) return Promise.reject('未连接服务器');
   // 文件全名
   return new Promise(function (resolve, reject) {
@@ -180,7 +166,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             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             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ") // 打开到path
       // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
       // 删除1.0.0.zip
       // 写入changelog到changelog.md
@@ -329,7 +315,7 @@ var sendWebhook = /*#__PURE__*/function () {
       }
     }, _callee5);
   }));
-  return function sendWebhook(_x2) {
+  return function sendWebhook(_x) {
     return _ref9.apply(this, arguments);
   };
 }();

package/lib/script/constants/index.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/script/constants/index.js
 var constants_exports = {};
 __export(constants_exports, {
+  isSsrMap: () => isSsrMap,
   outPathMap: () => outPathMap
 });
 module.exports = __toCommonJS(constants_exports);
@@ -32,9 +33,26 @@ var outPathMap = {
     prod: "../data/release/project/pisell_v2",
     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"
   }
 };
+var isSsrMap = {
+  my_pisel_shop: false,
+  admin: false,
+  my_pisel_pc_v2: true,
+  my_pisel_h5_v2: true
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  isSsrMap,
   outPathMap
 });

package/lib/script/release/index.js

@@ -79,7 +79,7 @@ var inquirerResult = (versionList) => {
 };
 var ignoreName = ["master", ".git", "pre-master"];
 var getVersionList = async ({ env, project }) => {
-  const config = await (0, import_utils.getServerConfig)(project.fileName);
+  const config = await (0, import_utils.getServerConfig)();
   let host = config[env].host;
   if (env === "release") {
     host = config.cn[env].host;

package/lib/script/release/release.js

@@ -39,7 +39,7 @@ var Release = class {
    * @Author: Zsj
    */
   async setConfig() {
-    const serverConfigMap = await (0, import_utils.getServerConfig)(this.projectName);
+    const serverConfigMap = await (0, import_utils.getServerConfig)();
     let serverConfig = serverConfigMap[this.env];
     if (this.env === "release") {
       serverConfig = serverConfigMap.cn[this.env];

package/lib/script/uploadCode/uploadCode.js

@@ -49,6 +49,7 @@ var UploadCode = class {
     this.projectAbsolutePath = "";
     this.conn = null;
     this.serverConfig = null;
+    this.isSSR = import_constants.isSsrMap[this.projectName];
     this.outPath = import_constants.outPathMap[this.projectName][this.env];
   }
   /**
@@ -66,7 +67,7 @@ var UploadCode = class {
    * @Author: Zsj
    */
   async check() {
-    const serverConfigMap = await (0, import_utils.getServerConfig)(this.projectName);
+    const serverConfigMap = await (0, import_utils.getServerConfig)();
     if (!serverConfigMap) {
       console.log("未找到发布脚本!");
       return false;
@@ -183,7 +184,8 @@ var UploadCode = class {
       path: this.outPath,
       fileName: `${this.currentVersion}`,
       fullFileName: `${this.currentVersion}.zip`,
-      changelog: this.changelog
+      changelog: this.changelog,
+      isSSR: this.isSSR
     });
   }
   /**

package/lib/script/utils/index.js

@@ -54,11 +54,7 @@ var getGitCurrentBranch = async () => {
   const v = await $`git symbolic-ref --short HEAD`;
   return v.stdout;
 };
-var monorepoProjectNameArr = ["admin"];
-var getServerConfig = async (project) => {
-  if (monorepoProjectNameArr.includes(project)) {
-    return await fs.readJson("../../lm_config.json");
-  }
+var getServerConfig = async () => {
   return await fs.readJson("../lm_config.json");
 };
 var connectServer = (config2) => {
@@ -116,7 +112,7 @@ var serverUpload = (conn, { localPath, remotePath }) => {
     });
   });
 };
-var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) => {
+var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, isSSR }) => {
   if (!conn)
     return Promise.reject("未连接服务器");
   return new Promise((resolve, reject) => {
@@ -133,6 +129,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) =>
              rm -rf ${fullFileName}
              echo "${changelog}" > ./${fileName}/changelog.md
              sh deleteOldVersion.sh
+             ${isSSR ? "pm2 restart server.js" : ""}
              exit
             `
         // 打开到path

package/package.json

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