@pisell/common 0.0.44 → 0.0.46

package/es/script/release/release.js

@@ -52,11 +52,13 @@ var Release = /*#__PURE__*/function () {
               if (this.env === 'release') {
                 serverConfig = serverConfigMap.cn[this.env];
               }
-              if (this.env === 'prod') {
-                serverConfig.privateKey = fs.readFileSync(path.join(process.env.HOME, '.ssh', 'id_rsa'));
+              if (this.env === 'prod' || this.env === 'pre') {
+                serverConfig = serverConfigMap.aws.service[this.env];
+                serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
               }
+              console.log('serverConfig', serverConfig);
               this.serverConfig = serverConfig;
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }

package/es/script/uploadCode/index.js

@@ -171,7 +171,7 @@ function _init() {
         case 34:
           console.log('使用本地/dist');
         case 35:
-          if (!(res.env === 'prod' && res.project.fileName !== 'my_pisel_shop')) {
+          if (!(res.env === 'prod')) {
             _context.next = 39;
             break;
           }

package/es/script/uploadCode/uploadCode.js

@@ -110,11 +110,9 @@ var UploadCode = /*#__PURE__*/function () {
               return _context.abrupt("return", false);
             case 21:
               serverConfig = this.setConfig(serverConfigMap[this.env]);
-              if (this.env === 'prod') {
-                serverConfig = this.setConfig(serverConfigMap['prod3']);
-                // serverConfig.privateKey = fs.readFileSync(
-                //   path.join(process.env.HOME, '.ssh', 'id_rsa'),
-                // );
+              if (this.env === 'prod' || this.env === 'pre') {
+                serverConfig = serverConfigMap.aws.service[this.env];
+                serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
               }
 
               // 选择release默认用国内cn服务器
@@ -324,7 +322,7 @@ var UploadCode = /*#__PURE__*/function () {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               localPath = path.resolve(this.projectAbsolutePath, "".concat(this.currentVersion, ".zip"));
-              remotePath = "".concat(this.outPath, "/").concat(this.currentVersion, ".zip");
+              remotePath = "/tmp/".concat(this.currentVersion, ".zip");
               _context6.next = 4;
               return _serverUpload(this.conn, {
                 localPath: localPath,

package/es/script/utils/index.js

@@ -171,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             exit\n            ") // 打开到path
+      stream.end("  sudo -i\n             cd /tmp\n             mv ".concat(fullFileName, " ").concat(path, "\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             exit\n            ") // 打开到path
       // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
       // 删除1.0.0.zip
       // 写入changelog到changelog.md
@@ -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             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ") // 打开到path
+      stream.end("  sudo -i\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             exit\n            ") // 打开到path
       // 复制pre-master到next-master
       // 删除pre-master
       // 复制1.0.0到next-master

package/lib/script/release/release.js

@@ -45,11 +45,11 @@ var Release = class {
     if (this.env === "release") {
       serverConfig = serverConfigMap.cn[this.env];
     }
-    if (this.env === "prod") {
-      serverConfig.privateKey = fs.readFileSync(
-        path.join(process.env.HOME, ".ssh", "id_rsa")
-      );
+    if (this.env === "prod" || this.env === "pre") {
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }
+    console.log("serverConfig", serverConfig);
     this.serverConfig = serverConfig;
   }
   /**

package/lib/script/uploadCode/index.js

@@ -145,7 +145,7 @@ async function init() {
     } else {
       console.log("使用本地/dist");
     }
-    if (res.env === "prod" && res.project.fileName !== "my_pisel_shop") {
+    if (res.env === "prod") {
       let _fileName = res.project.fileName;
       await (0, import_aws.uploadStaticToOSS)(_fileName);
     }

package/lib/script/uploadCode/uploadCode.js

@@ -84,8 +84,9 @@ var UploadCode = class {
       return false;
     }
     let serverConfig = this.setConfig(serverConfigMap[this.env]);
-    if (this.env === "prod") {
-      serverConfig = this.setConfig(serverConfigMap["prod3"]);
+    if (this.env === "prod" || this.env === "pre") {
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }
     if (this.env === "release") {
       serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
@@ -174,7 +175,7 @@ var UploadCode = class {
       this.projectAbsolutePath,
       `${this.currentVersion}.zip`
     );
-    const remotePath = `${this.outPath}/${this.currentVersion}.zip`;
+    const remotePath = `/tmp/${this.currentVersion}.zip`;
     return await (0, import_utils.serverUpload)(this.conn, { localPath, remotePath });
   }
   /**

package/lib/script/utils/index.js

@@ -126,13 +126,16 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) =>
         return;
       }
       stream.end(
-        `
+        `  sudo -i
+             cd /tmp
+             mv ${fullFileName} ${path2}
              cd ${path2}
              unzip ${fullFileName} -d ${fileName} && mv ${fileName}/dist/* ${fileName}/ && rmdir ${fileName}/dist
              rm -rf ${fullFileName}
              echo "${changelog}" > ./${fileName}/changelog.md
              sh deleteOldVersion.sh
              exit
+             exit
             `
         // 打开到path
         // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
@@ -157,7 +160,7 @@ var releaseProject = (conn, { path: path2, fileName, isSSR }) => {
         return;
       }
       stream.end(
-        `
+        `  sudo -i
              cd ${path2}
              cp -R -f pre-master next-master
              rm -rf pre-master
@@ -168,6 +171,7 @@ var releaseProject = (conn, { path: path2, fileName, isSSR }) => {
              rm -rf next-master
              ${isSSR ? "pm2 restart server.js" : ""}
              exit
+             exit
             `
         // 打开到path
         // 复制pre-master到next-master

package/package.json

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