@pisell/common 1.0.3 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @pisell/common
 
+## 1.0.4
+
+### Patch Changes
+
+- Updated dependencies [1bd9790]
+  - @pisell/utils@1.0.5
+
 ## 1.0.3
 
 ### Patch Changes

package/es/index.d.ts

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

package/es/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA,wBAAkB"}

package/es/script/constants/index.js

@@ -5,7 +5,7 @@ var outPathMap = {
     pre: '../data/release/project/my_pisel_shop'
   },
   admin: {
-    prod: '../data/release/project/pisell_v2',
+    prod: '../../data/project/pisell2',
     release: '../data/release/project/pisell_v2',
     pre: '../data/release/project/pisell_v2'
   }

package/es/script/uploadCode/uploadCode.js

@@ -9,8 +9,8 @@ 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 archiver from 'archiver';
-import path from 'path';
+import archiver from "archiver";
+import path from "path";
 import { outPathMap } from "../constants/index.js";
 import { connectServer as _connectServer, getGitCurrentBranch, getServerConfig, isWorkingTreeClean, serverUnpack as _serverUnpack, serverUpload as _serverUpload } from "../utils/index.js";
 
@@ -33,8 +33,8 @@ var UploadCode = /*#__PURE__*/function () {
     this.version = version;
     this.changelog = changelog;
     this.is_release = is_release;
-    this.currentVersion = '';
-    this.projectAbsolutePath = '';
+    this.currentVersion = "";
+    this.projectAbsolutePath = "";
     this.conn = null;
     this.serverConfig = null;
     this.outPath = outPathMap[this.projectName][this.env];
@@ -73,7 +73,7 @@ var UploadCode = /*#__PURE__*/function () {
                 _context.next = 6;
                 break;
               }
-              console.log('未找到发布脚本!');
+              console.log("未找到发布脚本!");
               return _context.abrupt("return", false);
             case 6:
               cd(this.projectRelativePath);
@@ -91,33 +91,38 @@ var UploadCode = /*#__PURE__*/function () {
                 _context.next = 13;
                 break;
               }
-              console.log('工作区不干净, 请先提交代码');
+              console.log("工作区不干净, 请先提交代码");
               return _context.abrupt("return", false);
             case 13:
-              serverConfig = this.setConfig(serverConfigMap[this.env]);
-              if (this.env === 'prod') {
-                serverConfig.privateKey = fs.readFileSync(path.join(process.env.HOME, '.ssh', 'id_rsa'));
+              serverConfig = this.setConfig(serverConfigMap[this.env]); // 选择release默认用国内cn服务器
+              if (this.env === "release") {
+                serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
+              }
+              if (this.env === "prod") {
+                serverConfig.privateKey = fs.readFileSync(path.join(process.env.HOME, ".ssh", "id_rsa"));
               }
 
-              // 选择release默认用国内cn服务器
-              if (this.env === 'release') {
-                serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
+              // pisell2.0正式环境使用亚马逊服务器
+              if (this.env === "prod" && this.projectName === "admin") {
+                serverConfig = serverConfigMap.aws[this.env];
+                serverConfig.privateKey = fs.readFileSync("../../../pisell2.0.pem");
               }
+              this.setConfig(serverConfig);
               if (serverConfig) {
-                _context.next = 19;
+                _context.next = 21;
                 break;
               }
-              console.log('您当前没有权限!');
+              console.log("您当前没有权限!");
               return _context.abrupt("return", false);
-            case 19:
+            case 21:
               _context.t0 = console;
-              _context.next = 22;
+              _context.next = 24;
               return getGitCurrentBranch();
-            case 22:
+            case 24:
               _context.t1 = _context.sent;
-              _context.t0.log.call(_context.t0, '当前主项目分支', _context.t1);
+              _context.t0.log.call(_context.t0, "当前主项目分支", _context.t1);
               return _context.abrupt("return", true);
-            case 25:
+            case 27:
             case "end":
               return _context.stop();
           }
@@ -141,7 +146,7 @@ var UploadCode = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(this.env === 'prod')) {
+              if (!(this.env === "prod")) {
                 _context2.next = 8;
                 break;
               }
@@ -149,13 +154,13 @@ var UploadCode = /*#__PURE__*/function () {
               return $(_templateObject || (_templateObject = _taggedTemplateLiteral(["npm version ", " -m \"%s ", "\""])), this.version, this.changelog);
             case 3:
               _context2.next = 5;
-              return fs.readJson('./package.json');
+              return fs.readJson("./package.json");
             case 5:
               _yield$fs$readJson = _context2.sent;
               version = _yield$fs$readJson.version;
               this.currentVersion = version;
             case 8:
-              if (!(this.env !== 'prod')) {
+              if (!(this.env !== "prod")) {
                 _context2.next = 20;
                 break;
               }
@@ -166,7 +171,7 @@ var UploadCode = /*#__PURE__*/function () {
               return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git add package.json"])));
             case 13:
               _context2.next = 15;
-              return fs.readJson('./package.json');
+              return fs.readJson("./package.json");
             case 15:
               _yield$fs$readJson2 = _context2.sent;
               _version = _yield$fs$readJson2.version;
@@ -227,22 +232,22 @@ var UploadCode = /*#__PURE__*/function () {
               return _context4.abrupt("return", new Promise(function (resolve, reject) {
                 var __dirname = process.cwd();
                 var zipFile = path.resolve(__dirname, "".concat(_this.currentVersion, ".zip"));
-                var originFilePath = path.resolve(__dirname, 'dist');
+                var originFilePath = path.resolve(__dirname, "dist");
                 var output = fs.createWriteStream(zipFile);
-                var archive = archiver('zip', {
+                var archive = archiver("zip", {
                   zlib: {
                     level: 9
                   } // 设置压缩级别
                 });
 
-                archive.on('error', function (err) {
+                archive.on("error", function (err) {
                   reject(err);
                 });
-                output.on('close', function () {
+                output.on("close", function () {
                   resolve(true);
                 });
                 archive.pipe(output);
-                archive.directory(originFilePath, '/dist'); //将srcPath路径对应的内容添加到zip包中/dist路径
+                archive.directory(originFilePath, "/dist"); //将srcPath路径对应的内容添加到zip包中/dist路径
 
                 archive.finalize();
               }));
@@ -273,7 +278,7 @@ var UploadCode = /*#__PURE__*/function () {
                 _context5.next = 3;
                 break;
               }
-              console.log('未找到发布配置!');
+              console.log("未找到发布配置!");
               return _context5.abrupt("return", null);
             case 3:
               _context5.next = 5;

package/lib/index.d.ts

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

package/lib/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA,wBAAkB"}

package/lib/script/constants/index.js

@@ -29,7 +29,7 @@ var outPathMap = {
     pre: "../data/release/project/my_pisel_shop"
   },
   admin: {
-    prod: "../data/release/project/pisell_v2",
+    prod: "../../data/project/pisell2",
     release: "../data/release/project/pisell_v2",
     pre: "../data/release/project/pisell_v2"
   }

package/lib/script/uploadCode/uploadCode.js

@@ -78,14 +78,19 @@ var UploadCode = class {
       return false;
     }
     let serverConfig = this.setConfig(serverConfigMap[this.env]);
+    if (this.env === "release") {
+      serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
+    }
     if (this.env === "prod") {
       serverConfig.privateKey = fs.readFileSync(
         import_path.default.join(process.env.HOME, ".ssh", "id_rsa")
       );
     }
-    if (this.env === "release") {
-      serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
+    if (this.env === "prod" && this.projectName === "admin") {
+      serverConfig = serverConfigMap.aws[this.env];
+      serverConfig.privateKey = fs.readFileSync("../../../pisell2.0.pem");
     }
+    this.setConfig(serverConfig);
     if (!serverConfig) {
       console.log("您当前没有权限!");
       return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "sideEffects": [
     "*.less"
   ],
@@ -17,7 +17,7 @@
     "archiver": "^5.3.1",
     "dotenv": "^16.0.3",
     "ssh2": "^1.13.0",
-    "@pisell/utils": "1.0.3"
+    "@pisell/utils": "1.0.5"
   },
   "devDependencies": {
     "father": "^4.1.6"

package/src/script/constants/index.js

@@ -5,7 +5,7 @@ const outPathMap = {
     pre: '../data/release/project/my_pisel_shop',
   },
   admin: {
-    prod: '../data/release/project/pisell_v2',
+    prod: '../../data/project/pisell2',
     release: '../data/release/project/pisell_v2',
     pre: '../data/release/project/pisell_v2',
   },

package/src/script/uploadCode/uploadCode.js

@@ -1,6 +1,6 @@
-import archiver from 'archiver';
-import path from 'path';
-import { outPathMap } from '../constants/index.js';
+import archiver from "archiver";
+import path from "path";
+import { outPathMap } from "../constants/index.js";
 import {
   connectServer,
   getGitCurrentBranch,
@@ -8,7 +8,7 @@ import {
   isWorkingTreeClean,
   serverUnpack,
   serverUpload,
-} from '../utils/index.js';
+} from "../utils/index.js";
 
 /**
  * @Title: 上传代码至服务器类
@@ -25,8 +25,8 @@ class UploadCode {
     this.changelog = changelog;
     this.is_release = is_release;
 
-    this.currentVersion = '';
-    this.projectAbsolutePath = '';
+    this.currentVersion = "";
+    this.projectAbsolutePath = "";
     this.conn = null;
     this.serverConfig = null;
 
@@ -52,7 +52,7 @@ class UploadCode {
     const serverConfigMap = await getServerConfig(this.projectName);
 
     if (!serverConfigMap) {
-      console.log('未找到发布脚本!');
+      console.log("未找到发布脚本!");
       return false;
     }
 
@@ -66,29 +66,37 @@ class UploadCode {
     this.projectAbsolutePath = process.cwd();
 
     if (!(await isWorkingTreeClean())) {
-      console.log('工作区不干净, 请先提交代码');
+      console.log("工作区不干净, 请先提交代码");
       return false;
     }
 
     let serverConfig = this.setConfig(serverConfigMap[this.env]);
 
-    if (this.env === 'prod') {
+    // 选择release默认用国内cn服务器
+    if (this.env === "release") {
+      serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
+    }
+
+    if (this.env === "prod") {
       serverConfig.privateKey = fs.readFileSync(
-        path.join(process.env.HOME, '.ssh', 'id_rsa'),
+        path.join(process.env.HOME, ".ssh", "id_rsa")
       );
     }
 
-    // 选择release默认用国内cn服务器
-    if (this.env === 'release') {
-      serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
+    // pisell2.0正式环境使用亚马逊服务器
+    if (this.env === "prod" && this.projectName === "admin") {
+      serverConfig = serverConfigMap.aws[this.env];
+      serverConfig.privateKey = fs.readFileSync("../../../pisell2.0.pem");
     }
 
+    this.setConfig(serverConfig);
+
     if (!serverConfig) {
-      console.log('您当前没有权限!');
+      console.log("您当前没有权限!");
       return false;
     }
 
-    console.log('当前主项目分支', await getGitCurrentBranch());
+    console.log("当前主项目分支", await getGitCurrentBranch());
 
     return true;
   }
@@ -99,15 +107,15 @@ class UploadCode {
    * @Author: Zsj
    */
   async updateVersion() {
-    if (this.env === 'prod') {
+    if (this.env === "prod") {
       await $`npm version ${this.version} -m "%s ${this.changelog}"`;
-      let { version } = await fs.readJson('./package.json');
+      let { version } = await fs.readJson("./package.json");
       this.currentVersion = version;
     }
-    if (this.env !== 'prod') {
+    if (this.env !== "prod") {
       await $`npm version ${this.version} --no-git-tag-version`;
       await $`git add package.json`;
-      let { version } = await fs.readJson('./package.json');
+      let { version } = await fs.readJson("./package.json");
       this.currentVersion = version;
       await $`git commit -m "chore: ${this.currentVersion} ${this.changelog}"`;
     }
@@ -132,22 +140,22 @@ class UploadCode {
     return new Promise((resolve, reject) => {
       const __dirname = process.cwd();
       const zipFile = path.resolve(__dirname, `${this.currentVersion}.zip`);
-      const originFilePath = path.resolve(__dirname, 'dist');
+      const originFilePath = path.resolve(__dirname, "dist");
       const output = fs.createWriteStream(zipFile);
-      const archive = archiver('zip', {
+      const archive = archiver("zip", {
         zlib: { level: 9 }, // 设置压缩级别
       });
-      archive.on('error', function (err) {
+      archive.on("error", function (err) {
         reject(err);
       });
 
-      output.on('close', function () {
+      output.on("close", function () {
         resolve(true);
       });
 
       archive.pipe(output);
 
-      archive.directory(originFilePath, '/dist'); //将srcPath路径对应的内容添加到zip包中/dist路径
+      archive.directory(originFilePath, "/dist"); //将srcPath路径对应的内容添加到zip包中/dist路径
 
       archive.finalize();
     });
@@ -160,7 +168,7 @@ class UploadCode {
    */
   async connectServer() {
     if (!this.serverConfig) {
-      console.log('未找到发布配置!');
+      console.log("未找到发布配置!");
       return null;
     }
     this.conn = await connectServer(this.serverConfig);
@@ -175,7 +183,7 @@ class UploadCode {
   async serverUpload() {
     const localPath = path.resolve(
       this.projectAbsolutePath,
-      `${this.currentVersion}.zip`,
+      `${this.currentVersion}.zip`
     );
     const remotePath = `${this.outPath}/${this.currentVersion}.zip`;
     return await serverUpload(this.conn, { localPath, remotePath });