@pisell/common 0.0.56 → 0.0.58

package/es/script/aws/index.js

@@ -14,6 +14,9 @@ var filterFiles = ['index.html', 'umi.server.js', 'umi.server.d.ts'];
 var __dirname = process.cwd();
 var s3Client = null;
 var bucketName = '';
+export var isAWSEnv = function isAWSEnv(env) {
+  return env === 'prod' || env === 'pre';
+};
 
 /*******
  * @title: 初始化

package/es/script/release/release.js

@@ -7,6 +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 { isAWSEnv } from "../aws/index.js";
 import { isSsrMap, outPathMap } from "../constants/index.js";
 import { connectServer as _connectServer, getServerConfig, releaseProject } from "../utils/index.js";
 
@@ -52,7 +53,7 @@ var Release = /*#__PURE__*/function () {
               if (this.env === 'release') {
                 serverConfig = serverConfigMap.cn[this.env];
               }
-              if (this.env === 'prod') {
+              if (isAWSEnv(this.env)) {
                 serverConfig = serverConfigMap.aws.service[this.env];
                 serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
               }

package/es/script/uploadCode/uploadCode.js

@@ -11,6 +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 { isAWSEnv } from "../aws/index.js";
 import { checkPackages, isSsrMap, outPathMap } from "../constants/index.js";
 import { checkPkgVersion, connectServer as _connectServer, getGitCurrentBranch, getServerConfig, isWorkingTreeClean, serverUnpack as _serverUnpack, serverUpload as _serverUpload } from "../utils/index.js";
 
@@ -110,7 +111,7 @@ var UploadCode = /*#__PURE__*/function () {
               return _context.abrupt("return", false);
             case 21:
               serverConfig = this.setConfig(serverConfigMap[this.env]);
-              if (this.env === 'prod') {
+              if (isAWSEnv(this.env)) {
                 serverConfig = serverConfigMap.aws.service[this.env];
                 serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
                 this.setConfig(serverConfig);

package/es/script/utils/index.js

@@ -13,6 +13,7 @@ import * as dotenv from 'dotenv';
 import npmCheck from 'npm-check';
 import path from 'path';
 import ssh2 from 'ssh2';
+import { isAWSEnv } from "../aws/index.js";
 
 /**
  * @Title: 项目工作区是否干净
@@ -172,7 +173,7 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
         reject(err);
         return;
       }
-      stream.end("  ".concat(env === 'prod' ? '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             ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
+      stream.end("  ".concat(isAWSEnv(env) ? '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             ").concat(isAWSEnv(env) ? 'exit' : '', "\n            ") // 打开到path
       // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
       // 删除1.0.0.zip
       // 写入changelog到changelog.md
@@ -204,7 +205,7 @@ var releaseProject = function releaseProject(conn, _ref6) {
         reject(err);
         return;
       }
-      stream.end("  ".concat(env === 'prod' ? '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            ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
+      stream.end("  ".concat(isAWSEnv(env) ? '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            ").concat(isAWSEnv(env) ? 'exit' : '', "\n            ") // 打开到path
       // 复制pre-master到next-master
       // 删除pre-master
       // 复制1.0.0到next-master

package/lib/script/aws/index.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/script/aws/index.js
 var aws_exports = {};
 __export(aws_exports, {
+  isAWSEnv: () => isAWSEnv,
   uploadFolderContents: () => uploadFolderContents,
   uploadStaticToOSS: () => uploadStaticToOSS
 });
@@ -42,6 +43,9 @@ var filterFiles = ["index.html", "umi.server.js", "umi.server.d.ts"];
 var __dirname = process.cwd();
 var s3Client = null;
 var bucketName = "";
+var isAWSEnv = (env) => {
+  return env === "prod" || env === "pre";
+};
 var init = async () => {
   try {
     const serverConfig = await (0, import_utils.getServerConfig)();
@@ -120,6 +124,7 @@ var uploadStaticToOSS = async (directory, folderPath = import_path.default.resol
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  isAWSEnv,
   uploadFolderContents,
   uploadStaticToOSS
 });

package/lib/script/release/release.js

@@ -22,6 +22,7 @@ __export(release_exports, {
   default: () => release_default
 });
 module.exports = __toCommonJS(release_exports);
+var import_aws = require("../aws/index.js");
 var import_constants = require("../constants/index.js");
 var import_utils = require("../utils/index.js");
 var Release = class {
@@ -45,7 +46,7 @@ var Release = class {
     if (this.env === "release") {
       serverConfig = serverConfigMap.cn[this.env];
     }
-    if (this.env === "prod") {
+    if ((0, import_aws.isAWSEnv)(this.env)) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }

package/lib/script/uploadCode/uploadCode.js

@@ -34,6 +34,7 @@ __export(uploadCode_exports, {
 module.exports = __toCommonJS(uploadCode_exports);
 var import_archiver = __toESM(require("archiver"));
 var import_path = __toESM(require("path"));
+var import_aws = require("../aws/index.js");
 var import_constants = require("../constants/index.js");
 var import_utils = require("../utils/index.js");
 var UploadCode = class {
@@ -84,7 +85,7 @@ var UploadCode = class {
       return false;
     }
     let serverConfig = this.setConfig(serverConfigMap[this.env]);
-    if (this.env === "prod") {
+    if ((0, import_aws.isAWSEnv)(this.env)) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
       this.setConfig(serverConfig);

package/lib/script/utils/index.js

@@ -49,6 +49,7 @@ var dotenv = __toESM(require("dotenv"));
 var import_npm_check = __toESM(require("npm-check"));
 var import_path = __toESM(require("path"));
 var import_ssh2 = __toESM(require("ssh2"));
+var import_aws = require("../aws/index.js");
 var isWorkingTreeClean = async () => {
   const v = await $`git status --porcelain`;
   return v.stdout === "";
@@ -126,7 +127,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, env
         return;
       }
       stream.end(
-        `  ${env === "prod" ? "sudo -i" : ""}
+        `  ${(0, import_aws.isAWSEnv)(env) ? "sudo -i" : ""}
              cd /tmp
              mv ${fullFileName} ${path2}
              cd ${path2}
@@ -135,7 +136,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, env
              echo "${changelog}" > ./${fileName}/changelog.md
              sh deleteOldVersion.sh
              exit
-             ${env === "prod" ? "exit" : ""}
+             ${(0, import_aws.isAWSEnv)(env) ? "exit" : ""}
             `
         // 打开到path
         // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
@@ -160,7 +161,7 @@ var releaseProject = (conn, { path: path2, fileName, isSSR, env }) => {
         return;
       }
       stream.end(
-        `  ${env === "prod" ? "sudo -i" : ""}
+        `  ${(0, import_aws.isAWSEnv)(env) ? "sudo -i" : ""}
              cd ${path2}
              cp -R -f pre-master next-master
              rm -rf pre-master
@@ -171,7 +172,7 @@ var releaseProject = (conn, { path: path2, fileName, isSSR, env }) => {
              rm -rf next-master
              ${isSSR ? "pm2 restart server.js" : ""}
              exit
-            ${env === "prod" ? "exit" : ""}
+            ${(0, import_aws.isAWSEnv)(env) ? "exit" : ""}
             `
         // 打开到path
         // 复制pre-master到next-master

package/package.json

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