@pisell/common 0.0.21-bata → 1.0.2

package/.fatherrc.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from 'father';
+
+export default defineConfig({
+  // more father config: https://github.com/umijs/father/blob/master/docs/config.md
+  esm: { output: 'es' },
+  cjs: { output: 'lib' },
+});

package/CHANGELOG.md

@@ -0,0 +1,14 @@
+# @pisell/common
+
+## 1.0.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @pisell/utils@1.0.2
+
+## 1.0.1
+
+### Patch Changes
+
+- 测试更新包

package/README.md

@@ -1,40 +1,3 @@
 # @pisell/common
 
-[![NPM version](https://img.shields.io/npm/v/@pisell/common.svg?style=flat)](https://npmjs.org/package/@pisell/common)
-[![NPM downloads](http://img.shields.io/npm/dm/@pisell/common.svg?style=flat)](https://npmjs.org/package/@pisell/common)
-
-pisell
-
-## Usage
-
-TODO
-
-## Options
-
-TODO
-
-## Development
-
-```bash
-# install dependencies
-$ cnpm install
-
-# develop library by docs demo
-$ cnpm start
-
-# build library source code
-$ cnpm run build
-
-# build library source code in watch mode
-$ cnpm run build:watch
-
-# build docs
-$ cnpm run docs:build
-
-# check your project for potential problems
-$ cnpm run doctor
-```
-
-## LICENSE
-
-MIT
+pisell使用的通用组件库

package/es/index.d.ts

@@ -1,4 +1,2 @@
-export * from './business-components';
-export * from './business-hooks';
-export * from './components';
-export * from './hooks';
+declare const _default: {};
+export default _default;

package/es/index.js

@@ -1,4 +1 @@
-export * from "./business-components";
-export * from "./business-hooks";
-export * from "./components";
-export * from "./hooks";
+export default {};

package/es/script/utils/index.js

@@ -83,7 +83,7 @@ var getServerConfig = /*#__PURE__*/function () {
             break;
           }
           _context3.next = 3;
-          return fs.readJson('../../lm_config.json');
+          return fs.readJson('../../../lm_config.json');
         case 3:
           return _context3.abrupt("return", _context3.sent);
         case 4:

package/lib/index.d.ts

@@ -1,4 +1,2 @@
-export * from './business-components';
-export * from './business-hooks';
-export * from './components';
-export * from './hooks';
+declare const _default: {};
+export default _default;

package/lib/index.js

@@ -2,6 +2,10 @@ 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))
@@ -10,13 +14,12 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
 var src_exports = {};
+__export(src_exports, {
+  default: () => src_default
+});
 module.exports = __toCommonJS(src_exports);
-__reExport(src_exports, require("./business-components"), module.exports);
-__reExport(src_exports, require("./business-hooks"), module.exports);
-__reExport(src_exports, require("./components"), module.exports);
-__reExport(src_exports, require("./hooks"), module.exports);
+var src_default = {};

package/lib/script/deploy.js

@@ -57,5 +57,3 @@ var deploy = async () => {
   return actions[res.action]();
 };
 var deploy_default = deploy;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/lib/script/release/index.js

@@ -112,5 +112,3 @@ async function init() {
   }
 }
 var release_default = init;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/lib/script/release/release.js

@@ -85,5 +85,3 @@ var Release = class {
   }
 };
 var release_default = Release;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/lib/script/uploadCode/index.js

@@ -198,5 +198,3 @@ async function init() {
   uploadCode.deleteLocalZip();
 }
 var uploadCode_default = init;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/lib/script/uploadCode/uploadCode.js

@@ -204,5 +204,3 @@ var UploadCode = class {
   }
 };
 var uploadCode_default = UploadCode;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/lib/script/utils/index.js

@@ -57,7 +57,7 @@ var getGitCurrentBranch = async () => {
 var monorepoProjectNameArr = ["admin"];
 var getServerConfig = async (project) => {
   if (monorepoProjectNameArr.includes(project)) {
-    return await fs.readJson("../../lm_config.json");
+    return await fs.readJson("../../../lm_config.json");
   }
   return await fs.readJson("../lm_config.json");
 };

package/package.json

@@ -1,8 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "0.0.21-bata",
-  "description": "A collection of reusable UI components for web development",
-  "license": "MIT",
+  "version": "1.0.2",
   "sideEffects": [
     "*.less"
   ],
@@ -13,32 +11,16 @@
   "bin": {
     "pisell": "es/bin/pisell.js"
   },
-  "files": [
-    "es",
-    "lib",
-    "package.json",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "father build",
-    "build:watch": "father dev",
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "doctor": "father doctor",
-    "lint": "npm run lint:es && npm run lint:css",
-    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "husky install && dumi setup",
-    "prepublishOnly": "father doctor && npm run build",
-    "release": "npm run build && np --no-cleanup --any-branch --yolo --tag",
-    "release:beta": "npm run build && np --no-cleanup --any-branch --yolo --tag=beta",
-    "release:next": "npm run build && np --no-cleanup --any-branch --yolo --tag=next",
-    "start": "npm run dev"
+  "dependencies": {
+    "zx": "^7.2.2",
+    "inquirer": "^9.2.6",
+    "archiver": "^5.3.1",
+    "dotenv": "^16.0.3",
+    "ssh2": "^1.13.0",
+    "@pisell/utils": "1.0.2"
   },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
+  "devDependencies": {
+    "father": "^4.1.6"
   },
   "lint-staged": {
     "*.{md,json}": [
@@ -57,52 +39,19 @@
       "prettier --parser=typescript --write"
     ]
   },
-  "dependencies": {
-    "antd5": "npm:antd@^5.5.0",
-    "archiver": "^5.3.1",
-    "array-move": "^3.0.1",
-    "dotenv": "^16.0.3",
-    "inquirer": "^9.2.6",
-    "react-beautiful-dnd": "^13.1.0",
-    "react-color": "^2.19.3",
-    "ssh2": "^1.13.0",
-    "zx": "^7.2.2"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.8.0",
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/fabric": "^2.0.0",
-    "@umijs/lint": "^4.0.0",
-    "ahooks": "^2.10.0",
-    "classnames": "^2.3.1",
-    "dumi": "^2.0.2",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "np": "^7.7.0",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-packagejson": "^2.2.18",
-    "react": "^17.0.0",
-    "react-dom": "^17.0.0",
-    "stylelint": "^14.9.1",
-    "typescript": "^4.9.5",
-    "umi": "^3.3.9"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": "^4.8.0",
-    "ahooks": "^2.10.0",
-    "classnames": "^2.3.1",
-    "react": ">=17.0",
-    "react-dom": ">=17.0",
-    "umi": "^3.3.9"
-  },
   "publishConfig": {
     "access": "public"
   },
-  "authors": []
-}
+  "scripts": {
+    "build": "father build",
+    "dev": "father dev",
+    "docs:build": "dumi build",
+    "doctor": "father doctor",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
+    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "lowcode:build": "build-scripts build --config ./build.lowcode.js",
+    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
+    "start": "npm run dev"
+  }
+}

package/src/bin/pisell.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import('../../es/script/index.js');

package/src/index.ts

@@ -0,0 +1 @@
+export default {};

package/src/script/constants/index.js

@@ -0,0 +1,14 @@
+const outPathMap = {
+  my_pisel_shop: {
+    prod: '../data/release/project/mypisel_shop',
+    release: '../data/release/project/my_pisel_shop',
+    pre: '../data/release/project/my_pisel_shop',
+  },
+  admin: {
+    prod: '../data/release/project/pisell_v2',
+    release: '../data/release/project/pisell_v2',
+    pre: '../data/release/project/pisell_v2',
+  },
+};
+
+export { outPathMap };

package/src/script/deploy.js

@@ -0,0 +1,29 @@
+import inquirer from 'inquirer';
+import release from './release/index.js';
+import uploadCode from './uploadCode/index.js';
+
+const actions = {
+  uploadCode: uploadCode,
+  release: release,
+};
+
+const inquirerResult = () => {
+  return inquirer.prompt([
+    {
+      type: 'list',
+      message: '请选择功能',
+      name: 'action',
+      choices: [
+        { value: 'uploadCode', name: '上传代码' },
+        { value: 'release', name: '发布代码' },
+      ],
+    },
+  ]);
+};
+
+const deploy = async () => {
+  let res = await inquirerResult();
+  return actions[res.action]();
+};
+
+export default deploy;

package/src/script/index.js

@@ -0,0 +1,45 @@
+import { fileURLToPath } from 'url';
+import deploy from './deploy.js';
+import { loadJSON } from './utils/index.js';
+
+const args = process.argv.slice(2);
+
+const isVersion = (v) => {
+  return ['-v', '--version', '-V'].includes(v);
+};
+
+const isHelp = (v) => {
+  return ['-h', '--help', '-H'].includes(v);
+};
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+(() => {
+  try {
+    const params = args.slice(1);
+    switch (true) {
+      case args[0] === 'deploy':
+        deploy(...params);
+        break;
+      case isVersion(args[0]):
+        console.log(
+          `@pisell/common@${
+            loadJSON(path.join(__dirname, '../../package.json')).version
+          }`,
+        );
+        break;
+      case isHelp(args[0]):
+        console.log('pisell -h  --help  -H [全部命令]');
+
+        console.log('pisell -v  --version  -V [显示版本]');
+
+        console.log('pisell deploy [上传代码|发布代码]');
+        break;
+      default:
+        break;
+    }
+  } catch (e) {
+    console.error(e.stack);
+    process.exit(1);
+  }
+})();

package/src/script/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "script",
+  "type": "module"
+}

package/src/script/release/index.js

@@ -0,0 +1,119 @@
+#!/usr/bin/env zx
+import inquirer from 'inquirer';
+import {
+  getCurrentProjectName,
+  getServerConfig,
+  versionSort,
+} from '../utils/index.js';
+import Release from './release.js';
+
+const selectProject = () => {
+  return inquirer.prompt([
+    // {
+    // 	type: "list",
+    // 	message: "请选择项目",
+    // 	name: "project",
+    // 	choices: [
+    // 		{
+    // 			value: {
+    // 				fileName: "my_pisel_shop",
+    // 				path:"./",
+    // 			},
+    // 			name: "my_pisel_shop"
+    // 		},
+    // 	],
+    // },
+    {
+      type: 'list',
+      message: '请选择发布环境',
+      name: 'env',
+      choices: ['release', 'pre', 'prod'],
+    },
+  ]);
+};
+
+/**
+ * @Title: 选择器函数
+ * @Describe:
+ * @Author: Wzw
+ */
+const inquirerResult = (versionList) => {
+  return inquirer.prompt([
+    {
+      type: 'list',
+      message: '请选择发布版本号',
+      name: 'version',
+      default: versionList,
+      choices: versionList,
+    },
+    {
+      type: 'confirm',
+      message: '确认发布',
+      name: 'is_release',
+      default: true,
+    },
+  ]);
+};
+
+// 版本选择时过滤的文件夹
+const ignoreName = ['master', '.git', 'pre-master'];
+
+/**
+ * @Title: 获取所选项目的版本号列表
+ * @Describe:
+ * @Author: Zsj
+ */
+const getVersionList = async ({ env, project }) => {
+  const config = await getServerConfig(project.fileName);
+
+  let host = config[env].host;
+  if (env === 'release') {
+    host = config.cn[env].host;
+  }
+  let projectName = project.fileName;
+  if (projectName === 'my_pisel_shop' && env === 'prod') {
+    projectName = 'mypisel_shop';
+  }
+  // 域名
+  const versionList = await fetch(
+    `http://${host}:3600/version?projectName=${projectName}`,
+  ).then((res) => res.json());
+
+  return versionSort(versionList.filter((item) => !ignoreName.includes(item)));
+};
+
+async function init() {
+  /** 选择项目 */
+  let projectAndEnv = await selectProject();
+
+  /** 之前选择项目模式改为获取当前主项目 */
+  projectAndEnv.project = {
+    path: './',
+    fileName: getCurrentProjectName(),
+  };
+
+  /** 通过项目和环境查询对应版本号 */
+  const versionList = await getVersionList(projectAndEnv);
+
+  const res = await inquirerResult(versionList);
+
+  const releaseInstance = new Release({ ...res, ...projectAndEnv });
+
+  try {
+    /** 设置连接服务器配置 */
+    await releaseInstance.setConfig();
+
+    /** 连接服务器 */
+    await releaseInstance.connectServer();
+
+    /** 发布 */
+    await releaseInstance.release();
+
+    /** 断开 */
+    await releaseInstance.disconnectServer();
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+export default init;

package/src/script/release/release.js

@@ -0,0 +1,84 @@
+import { outPathMap } from '../constants/index.js';
+import {
+  connectServer,
+  getServerConfig,
+  releaseProject,
+} from '../utils/index.js';
+
+/**
+ * @Title: 执行发布类
+ * @Describe:
+ * @Author: Zsj
+ */
+class Release {
+  constructor(props) {
+    const { project, env, version, conn } = props;
+    this.projectName = project.fileName;
+    this.env = env;
+    this.version = version;
+
+    this.conn = conn;
+    this.outPath = outPathMap[this.projectName][this.env];
+  }
+
+  /**
+   * @Title: 设置连接服务器配置
+   * @Describe:
+   * @Author: Zsj
+   */
+  async setConfig() {
+    const serverConfigMap = await getServerConfig(this.projectName);
+
+    let serverConfig = serverConfigMap[this.env];
+
+    // 选择release默认用国内cn服务器
+    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'),
+      );
+    }
+
+    this.serverConfig = serverConfig;
+  }
+
+  /**
+   * @Title: 连接服务器
+   * @Describe:
+   * @Author: Zsj
+   */
+  async connectServer() {
+    if (!this.serverConfig) {
+      console.log('未找到发布配置!');
+      return null;
+    }
+    this.conn = await connectServer(this.serverConfig);
+    return this.conn;
+  }
+
+  /**
+   * @Title: 执行发布操作
+   * @Describe:
+   * @Author: Zsj
+   */
+  async release() {
+    return await releaseProject(this.conn, {
+      path: this.outPath,
+      fileName: `${this.version}`,
+    });
+  }
+
+  /**
+   * @Title: 断开服务连接
+   * @Describe:
+   * @Author: Zsj
+   */
+  async disconnectServer() {
+    return await this.conn.end();
+  }
+}
+
+export default Release;