@pisell/common 1.0.57 → 1.0.58

package/lib/script/release/release.js

@@ -1,89 +1,86 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+const require_asyncToGenerator = require('../../_virtual/_@oxc-project_runtime@0.108.0/helpers/asyncToGenerator.js');
+const require_script_utils_index = require('../utils/index.js');
+const require_script_constants_index = require('../constants/index.js');
 
-// src/script/release/release.js
-var release_exports = {};
-__export(release_exports, {
-  default: () => release_default
-});
-module.exports = __toCommonJS(release_exports);
-var import_constants = require("../constants/index.js");
-var import_utils = require("../utils/index.js");
+//#region src/script/release/release.js
+/**
+* @Title: 执行发布类
+* @Describe:
+* @Author: Zsj
+*/
 var Release = class {
-  constructor(props) {
-    const { project, env, version, conn } = props;
-    this.projectName = project.fileName;
-    this.env = env;
-    this.version = version;
-    this.conn = conn;
-    this.outPath = import_constants.outPathMap[this.projectName][this.env];
-    this.isSSR = import_constants.isSsrMap[this.projectName];
-  }
-  /**
-   * @Title: 设置连接服务器配置
-   * @Describe:
-   * @Author: Zsj
-   */
-  async setConfig() {
-    const serverConfigMap = await (0, import_utils.getServerConfig)(this.projectName);
-    let serverConfig = serverConfigMap[this.env];
-    if (this.env === "release") {
-      serverConfig = serverConfigMap.cn[this.env];
-    }
-    if (this.env === "prod") {
-      serverConfig = serverConfigMap.aws.service[this.env];
-      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
-    }
-    this.serverConfig = serverConfig;
-  }
-  /**
-   * @Title: 连接服务器
-   * @Describe:
-   * @Author: Zsj
-   */
-  async connectServer() {
-    if (!this.serverConfig) {
-      console.log("未找到发布配置!");
-      return null;
-    }
-    this.conn = await (0, import_utils.connectServer)(this.serverConfig);
-    return this.conn;
-  }
-  /**
-   * @Title: 执行发布操作
-   * @Describe:
-   * @Author: Zsj
-   */
-  async release() {
-    return await (0, import_utils.releaseProject)(this.conn, {
-      path: this.outPath,
-      fileName: `${this.version}`,
-      isSSR: this.isSSR,
-      env: this.env
-    });
-  }
-  /**
-   * @Title: 断开服务连接
-   * @Describe:
-   * @Author: Zsj
-   */
-  async disconnectServer() {
-    return await this.conn.end();
-  }
+	constructor(props) {
+		const { project, env, version, conn } = props;
+		this.projectName = project.fileName;
+		this.env = env;
+		this.version = version;
+		this.conn = conn;
+		this.outPath = require_script_constants_index.outPathMap[this.projectName][this.env];
+		this.isSSR = require_script_constants_index.isSsrMap[this.projectName];
+	}
+	/**
+	* @Title: 设置连接服务器配置
+	* @Describe:
+	* @Author: Zsj
+	*/
+	setConfig() {
+		var _this = this;
+		return require_asyncToGenerator._asyncToGenerator(function* () {
+			const serverConfigMap = yield require_script_utils_index.getServerConfig(_this.projectName);
+			let serverConfig = serverConfigMap[_this.env];
+			if (_this.env === "release") serverConfig = serverConfigMap.cn[_this.env];
+			if (_this.env === "prod") {
+				serverConfig = serverConfigMap.aws.service[_this.env];
+				serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
+			}
+			_this.serverConfig = serverConfig;
+		})();
+	}
+	/**
+	* @Title: 连接服务器
+	* @Describe:
+	* @Author: Zsj
+	*/
+	connectServer() {
+		var _this2 = this;
+		return require_asyncToGenerator._asyncToGenerator(function* () {
+			if (!_this2.serverConfig) {
+				console.log("未找到发布配置!");
+				return null;
+			}
+			_this2.conn = yield require_script_utils_index.connectServer(_this2.serverConfig);
+			return _this2.conn;
+		})();
+	}
+	/**
+	* @Title: 执行发布操作
+	* @Describe:
+	* @Author: Zsj
+	*/
+	release() {
+		var _this3 = this;
+		return require_asyncToGenerator._asyncToGenerator(function* () {
+			return yield require_script_utils_index.releaseProject(_this3.conn, {
+				path: _this3.outPath,
+				fileName: `${_this3.version}`,
+				isSSR: _this3.isSSR,
+				env: _this3.env
+			});
+		})();
+	}
+	/**
+	* @Title: 断开服务连接
+	* @Describe:
+	* @Author: Zsj
+	*/
+	disconnectServer() {
+		var _this4 = this;
+		return require_asyncToGenerator._asyncToGenerator(function* () {
+			return yield _this4.conn.end();
+		})();
+	}
 };
 var release_default = Release;
+
+//#endregion
+module.exports = release_default;

package/lib/script/uploadCode/index.js

@@ -1,234 +1,249 @@
 #!/usr/bin/env zx
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.js');
+const require_asyncToGenerator = require('../../_virtual/_@oxc-project_runtime@0.108.0/helpers/asyncToGenerator.js');
+const require_script_utils_index = require('../utils/index.js');
+const require_script_release_release = require('../release/release.js');
+const require_script_aws_index = require('../aws/index.js');
+const require_script_uploadCode_uploadCode = require('./uploadCode.js');
+let inquirer = require("inquirer");
+inquirer = require_rolldown_runtime.__toESM(inquirer);
+require("zx/globals");
 
-// src/script/uploadCode/index.js
-var uploadCode_exports = {};
-__export(uploadCode_exports, {
-  default: () => uploadCode_default
-});
-module.exports = __toCommonJS(uploadCode_exports);
-var import_inquirer = __toESM(require("inquirer"));
-var import_globals = require("zx/globals");
-var import_aws = require("../aws/index.js");
-var import_release = __toESM(require("../release/release.js"));
-var import_utils = require("../utils/index.js");
-var import_uploadCode = __toESM(require("./uploadCode.js"));
-var inquirerResult = () => {
-  return import_inquirer.default.prompt([
-    // {
-    // 	type: "list",
-    // 	message: "请选择项目",
-    // 	name: "project",
-    // 	choices: [
-    // 		{
-    // 			value: {
-    // 				path: "./",
-    // 				fileName: "my_pisel_shop"
-    // 			},
-    // 			name: "my_pisel_shop"
-    // 		},
-    // 	],
-    // },
-    {
-      type: "list",
-      message: "请选择发布环境",
-      name: "env",
-      choices: ["release", "pre", "prod"]
-    },
-    {
-      type: "rawlist",
-      message: "请选择当前更新版本号",
-      name: "version",
-      default: false,
-      choices: ["patch", "minor", "major"]
-    },
-    {
-      type: "input",
-      message: "请输入更新内容",
-      name: "changelog",
-      default: "update"
-    },
-    {
-      type: "list",
-      message: "上传之后是否执行发布",
-      name: "is_release",
-      choices: [
-        { value: true, name: "上传并发布" },
-        { value: false, name: "只上传" }
-      ]
-    },
-    {
-      type: "list",
-      message: "是否执行build打包",
-      name: "whether_build",
-      choices: [
-        { value: true, name: "执行打包" },
-        { value: false, name: "不执行打包，使用项目根目录/dist文件夹" }
-      ]
-    },
-    {
-      type: "confirm",
-      message: "确认信息无误",
-      name: "is_confirm",
-      default: true
-    }
-  ]);
+//#region src/script/uploadCode/index.js
+/**
+* @Title: 选择器函数
+* @Describe:
+* @Author: Wzw
+*/
+const inquirerResult = () => {
+	return inquirer.default.prompt([
+		{
+			type: "list",
+			message: "请选择发布环境",
+			name: "env",
+			choices: [
+				"release",
+				"pre",
+				"prod"
+			]
+		},
+		{
+			type: "rawlist",
+			message: "请选择当前更新版本号",
+			name: "version",
+			default: false,
+			choices: [
+				"patch",
+				"minor",
+				"major"
+			]
+		},
+		{
+			type: "input",
+			message: "请输入更新内容",
+			name: "changelog",
+			default: "update"
+		},
+		{
+			type: "list",
+			message: "上传之后是否执行发布",
+			name: "is_release",
+			choices: [{
+				value: true,
+				name: "上传并发布"
+			}, {
+				value: false,
+				name: "只上传"
+			}]
+		},
+		{
+			type: "list",
+			message: "是否执行build打包",
+			name: "whether_build",
+			choices: [{
+				value: true,
+				name: "执行打包"
+			}, {
+				value: false,
+				name: "不执行打包，使用项目根目录/dist文件夹"
+			}]
+		},
+		{
+			type: "confirm",
+			message: "确认信息无误",
+			name: "is_confirm",
+			default: true
+		}
+	]);
 };
-async function init() {
-  let res = await inquirerResult();
-  if (!res.is_confirm) {
-    console.log("取消发布");
-    return;
-  }
-  res.project = {
-    path: "./",
-    fileName: (0, import_utils.getCurrentProjectName)()
-  };
-  await $`git fetch --prune-tags`;
-  const uploadCode = new import_uploadCode.default(res);
-  if (!await uploadCode.check()) {
-    return;
-  }
-  console.log("开始更新版本号");
-  const version = await uploadCode.updateVersion();
-  console.log("✅ 版本更新完成");
-  const currentUserName = await (0, import_utils.getCurrentUserName)();
-  const result = await (0, import_utils.sendWebhook)({
-    title: `${res.project.fileName} ${res.env}环境开始${res.is_release ? "上传并发布" : "上传"}`,
-    content: [
-      {
-        key: "发布人",
-        value: currentUserName.replace("\n", "")
-      },
-      {
-        key: "更新内容",
-        value: res.changelog
-      },
-      {
-        key: "版本号",
-        value: version || ""
-      }
-    ]
-  });
-  console.log(result, "result");
-  try {
-    if (res.whether_build) {
-      console.log("开始打包");
-      await uploadCode.build();
-      console.log("✅ 打包完成");
-    } else {
-      console.log("使用本地/dist");
-    }
-    if (res.env === "prod") {
-      let _fileName = res.project.fileName;
-      if (res.env === "pre") {
-        _fileName = "pre_" + _fileName;
-      }
-      if (_fileName === "admin") {
-        _fileName = "my_pisell_v2";
-      }
-      if (![
-        "xzero",
-        "docs",
-        "saas_admin",
-        "saas_shop",
-        "saas_kds",
-        "saas_ads",
-        "saas_home"
-      ].includes(_fileName)) {
-        await (0, import_aws.uploadStaticToOSS)(_fileName);
-      }
-    }
-    console.log("开始压缩");
-    await uploadCode.compress();
-    console.log("✅ 压缩完成");
-    console.log("开始连接服务器");
-    const conn = await uploadCode.connectServer();
-    console.log("✅ 连接服务器完成");
-    console.log("开始上传");
-    await uploadCode.serverUpload();
-    console.log("✅ 上传完成");
-    console.log("开始解压");
-    await uploadCode.serverUnpack();
-    if (res.is_release) {
-      const releaseInstance = new import_release.default({
-        project: res.project,
-        env: res.env,
-        version,
-        conn
-      });
-      console.log("开始发布");
-      await releaseInstance.release();
-    }
-    await uploadCode.disconnectServer();
-    await $`git pull --no-edit`;
-    await $`git push --follow-tags`;
-    console.log("✅ 成功后推送到git");
-  } catch (error) {
-    console.log(error, "执行出错 请排查重试");
-    await $`git reset HEAD~1`;
-    await $`git tag -d v${uploadCode.currentVersion}`;
-    await (0, import_utils.sendWebhook)({
-      title: `${res.project.fileName} ${res.env}环境${res.is_release ? "上传并发布" : "上传"}失败`,
-      content: [
-        {
-          key: "发布人",
-          value: currentUserName.replace("\n", "")
-        },
-        {
-          key: "更新内容",
-          value: res.changelog
-        },
-        {
-          key: "版本号",
-          value: version || ""
-        }
-      ]
-    });
-  }
-  await (0, import_utils.sendWebhook)({
-    title: `${res.project.fileName} ${res.env}环境${res.is_release ? "上传并发布" : "上传"}成功`,
-    content: [
-      {
-        key: "发布人",
-        value: currentUserName.replace("\n", "")
-      },
-      {
-        key: "更新内容",
-        value: res.changelog
-      },
-      {
-        key: "版本号",
-        value: version || ""
-      }
-    ]
-  });
-  uploadCode.deleteLocalZip();
+function init() {
+	return _init.apply(this, arguments);
+}
+function _init() {
+	_init = require_asyncToGenerator._asyncToGenerator(function* () {
+		let res = yield inquirerResult();
+		if (!res.is_confirm) {
+			console.log("取消发布");
+			return;
+		}
+		/** 之前选择项目模式改为获取当前主项目 */
+		res.project = {
+			path: "./",
+			fileName: require_script_utils_index.getCurrentProjectName()
+		};
+		yield $`git fetch --prune-tags`;
+		const uploadCode = new require_script_uploadCode_uploadCode(res);
+		if (!(yield uploadCode.check())) return;
+		console.log("开始更新版本号");
+		const version = yield uploadCode.updateVersion();
+		console.log("✅ 版本更新完成");
+		const currentUserName = yield require_script_utils_index.getCurrentUserName();
+		const result = yield require_script_utils_index.sendWebhook({
+			title: `${res.project.fileName} ${res.env}环境开始${res.is_release ? "上传并发布" : "上传"}`,
+			content: [
+				{
+					key: "发布人",
+					value: currentUserName.replace("\n", "")
+				},
+				{
+					key: "更新内容",
+					value: res.changelog
+				},
+				{
+					key: "版本号",
+					value: version || ""
+				}
+			]
+		});
+		console.log(result, "result");
+		try {
+			if (res.whether_build) {
+				console.log("开始打包");
+				yield uploadCode.build();
+				console.log("✅ 打包完成");
+			} else console.log("使用本地/dist");
+			if (res.env === "prod") {
+				let _fileName = res.project.fileName;
+				if (res.env === "pre") _fileName = "pre_" + _fileName;
+				if (_fileName === "admin") _fileName = "my_pisell_v2";
+				if (![
+					"xzero",
+					"docs",
+					"saas_admin",
+					"saas_shop",
+					"saas_shop_pos",
+					"saas_kds",
+					"saas_ads",
+					"saas_home"
+				].includes(_fileName)) yield require_script_aws_index.uploadStaticToOSS(_fileName);
+			}
+			console.log("开始压缩");
+			yield uploadCode.compress();
+			console.log("✅ 压缩完成");
+			console.log("开始连接服务器");
+			const conn = yield uploadCode.connectServer();
+			console.log("✅ 连接服务器完成");
+			console.log("开始上传");
+			yield uploadCode.serverUpload();
+			console.log("✅ 上传完成");
+			console.log("开始解压");
+			yield uploadCode.serverUnpack();
+			if (res.is_release) {
+				const releaseInstance = new require_script_release_release({
+					project: res.project,
+					env: res.env,
+					version,
+					conn
+				});
+				console.log("开始发布");
+				yield releaseInstance.release();
+			}
+			yield uploadCode.disconnectServer();
+			yield $`git pull --no-edit`;
+			yield $`git push --follow-tags`;
+			console.log("✅ 成功后推送到git");
+		} catch (error) {
+			console.log(error, "执行出错 请排查重试");
+			yield $`git reset HEAD~1`;
+			yield $`git tag -d v${uploadCode.currentVersion}`;
+			yield require_script_utils_index.sendWebhook({
+				title: `${res.project.fileName} ${res.env}环境${res.is_release ? "上传并发布" : "上传"}失败`,
+				content: [
+					{
+						key: "发布人",
+						value: currentUserName.replace("\n", "")
+					},
+					{
+						key: "更新内容",
+						value: res.changelog
+					},
+					{
+						key: "版本号",
+						value: version || ""
+					}
+				]
+			});
+		}
+		yield require_script_utils_index.sendWebhook({
+			title: `${res.project.fileName} ${res.env}环境${res.is_release ? "上传并发布" : "上传"}成功`,
+			content: [
+				{
+					key: "发布人",
+					value: currentUserName.replace("\n", "")
+				},
+				{
+					key: "更新内容",
+					value: res.changelog
+				},
+				{
+					key: "版本号",
+					value: version || ""
+				}
+			]
+		});
+		uploadCode.deleteLocalZip();
+	});
+	return _init.apply(this, arguments);
 }
 var uploadCode_default = init;
+/**
+*
+* 上传
+* 1. 选择项目 环境等.
+* 2. 打包
+* 3. 打包完成后生成dist文件压缩包
+* 4. 重命名为当前版本号
+* 5. 上传到服务器,并解压. 上传完成
+*
+*
+*
+* 服务器目录结构:
+*
+* project: 所有前端项目
+*
+*     my_pisel_h5: 某个项目文件夹
+*
+*          master: 当前线上环境指向的代码包
+*
+* 					v1.0.0: 某个版本
+*
+*
+* 部署, 此部分可界面化.
+* 1. 将master备份, 把对应版本的代码合并到master内.
+* 2. 重启当前服务
+*
+*
+* 回滚指定版本
+*
+* 1. 将master内文件清空并将某个版本的包解压到master内
+* 2. 重启服务
+*
+* node端需要提供以下接口
+*
+* 1. 获取每个项目的所有版本包名称.
+* 2. 通过 项目 + 版本包名称 将对应的包更新至maser 实现发布
+* 3. 将操作记录写成日志存储.
+*/
+
+//#endregion
+module.exports = uploadCode_default;