@pisell/common 1.0.56 → 1.0.57

package/CHANGELOG.md

@@ -1,440 +1,8 @@
 # @pisell/common
 
-## 1.0.56
+## 1.0.57
 
 ### Patch Changes
 
-- Updated dependencies [05e94afdcd]
-  - @pisell/utils@1.0.55
-
-## 1.0.55
-
-### Patch Changes
-
-- Updated dependencies [dc0f1ef331]
-  - @pisell/utils@1.0.54
-
-## 1.0.54
-
-### Patch Changes
-
-- Updated dependencies [130012734]
-  - @pisell/utils@1.0.53
-
-## 1.0.53
-
-### Patch Changes
-
-- Updated dependencies [3c3397ee1]
-  - @pisell/utils@1.0.52
-
-## 1.0.52
-
-### Patch Changes
-
-- Updated dependencies [7f75442c8]
-  - @pisell/utils@1.0.51
-
-## 3.0.12
-
-### Patch Changes
-
-- cf72095e7: update
-
-## 3.0.9
-
-### Patch Changes
-
-- ab5a8d1df: 新增 saas_home 项目路径并更新相关逻辑
-
-## 3.0.10
-
-### Patch Changes
-
-- Updated dependencies [f15c3be02]
-  - @pisell/utils@1.0.44
-
-## 3.0.9
-
-### Patch Changes
-
-- Updated dependencies [2f57417ac]
-  - @pisell/utils@1.0.43
-
-## 3.0.8
-
-## 1.0.51
-
-### Patch Changes
-
-- Updated dependencies [1dd3694e4]
-  - @pisell/utils@1.0.50
-
-## 1.0.50
-
-### Patch Changes
-
-- Updated dependencies [d4e39d968]
-  - @pisell/utils@1.0.49
-
-## 1.0.49
-
-### Patch Changes
-
-- Updated dependencies [4650ca88a]
-  - @pisell/utils@1.0.48
-
-## 1.0.48
-
-### Patch Changes
-
-- Updated dependencies [3ca04e31c]
-  - @pisell/utils@1.0.47
-
-## 1.0.47
-
-### Patch Changes
-
-- Updated dependencies [301a686d8]
-  - @pisell/utils@1.0.46
-
-## 1.0.46
-
-### Patch Changes
-
-- Updated dependencies [6733b2d5c]
-  - @pisell/utils@1.0.45
-
-## 1.0.45
-
-### Patch Changes
-
-- Updated dependencies [a09f3e360]
-  - @pisell/utils@1.0.44
-
-## 1.0.44
-
-### Patch Changes
-
-- f4db8d9a3: build:增加上传代码前的包版本检查
-
-## 1.0.43
-
-### Patch Changes
-
-- 740ab6b52: s
-
-## 1.0.42
-
-### Patch Changes
-
-- Updated dependencies [6f57a4d88]
-  - @pisell/utils@1.0.43
-
-## 1.0.41
-
-### Patch Changes
-
-- Updated dependencies [0267536f]
-  - @pisell/utils@1.0.42
-
-## 1.0.40
-
-### Patch Changes
-
-- Updated dependencies [f3ed6fa4]
-  - @pisell/utils@1.0.41
-
-## 1.0.39
-
-### Patch Changes
-
-- Updated dependencies [b848ae9a]
-  - @pisell/utils@1.0.40
-
-## 1.0.38
-
-### Patch Changes
-
-- Updated dependencies [8640a624]
-  - @pisell/utils@1.0.39
-
-## 1.0.37
-
-### Patch Changes
-
-- Updated dependencies [27cdd90e]
-  - @pisell/utils@1.0.38
-
-## 1.0.36
-
-### Patch Changes
-
-- Updated dependencies [30136d51]
-  - @pisell/utils@1.0.37
-
-## 1.0.35
-
-### Patch Changes
-
-- Updated dependencies [a694c37e]
-  - @pisell/utils@1.0.36
-
-## 1.0.34
-
-### Patch Changes
-
-- Updated dependencies [11c9a831]
-  - @pisell/utils@1.0.35
-
-## 1.0.33
-
-### Patch Changes
-
-- Updated dependencies [881303a5]
-  - @pisell/utils@1.0.34
-
-## 1.0.32
-
-### Patch Changes
-
-- Updated dependencies [fb6b699f]
-  - @pisell/utils@1.0.33
-
-## 1.0.31
-
-### Patch Changes
-
-- Updated dependencies [bf60f3ca]
-  - @pisell/utils@1.0.32
-
-## 1.0.30
-
-### Patch Changes
-
-- Updated dependencies [f7f80d68]
-  - @pisell/utils@1.0.31
-
-## 1.0.29
-
-### Patch Changes
-
-- Updated dependencies [d41cf764]
-  - @pisell/utils@1.0.30
-
-## 1.0.28
-
-### Patch Changes
-
-- Updated dependencies [f10f984b]
-  - @pisell/utils@1.0.29
-
-## 1.0.27
-
-### Patch Changes
-
-- Updated dependencies [1d22e943]
-  - @pisell/utils@1.0.28
-
-## 1.0.26
-
-### Patch Changes
-
-- Updated dependencies [a45e6cd5]
-  - @pisell/utils@1.0.27
-
-## 1.0.25
-
-### Patch Changes
-
-- Updated dependencies [961d44f7]
-  - @pisell/utils@1.0.26
-
-## 1.0.24
-
-### Patch Changes
-
-- Updated dependencies [10083f21]
-  - @pisell/utils@1.0.25
-
-## 1.0.26
-
-### Patch Changes
-
-- Updated dependencies [8dc07315]
-- Updated dependencies [678cac4f]
-  - @pisell/utils@1.0.29
-
-## 1.0.25
-
-### Patch Changes
-
-- Updated dependencies [532f075e]
-  - @pisell/utils@1.0.28
-
-## 1.0.24
-
-### Patch Changes
-
-- Updated dependencies [77f985d0]
-  - @pisell/utils@1.0.25
-
-## 1.0.23
-
-### Patch Changes
-
-- Updated dependencies [315258e3]
-  - @pisell/utils@1.0.24
-
-## 1.0.22
-
-### Patch Changes
-
-- Updated dependencies [fdc8fae]
-  - @pisell/utils@1.0.23
-
-## 1.0.21
-
-### Patch Changes
-
-- Updated dependencies [bbd6503]
-  - @pisell/utils@1.0.22
-
-## 1.0.20
-
-### Patch Changes
-
-- Updated dependencies [d000328]
-  - @pisell/utils@1.0.21
-
-## 1.0.19
-
-### Patch Changes
-
-- Updated dependencies [b879dad]
-  - @pisell/utils@1.0.20
-
-## 1.0.18
-
-### Patch Changes
-
-- Updated dependencies [67d2110]
-  - @pisell/utils@1.0.19
-
-## 1.0.17
-
-### Patch Changes
-
-- Updated dependencies [770c6cb]
-  - @pisell/utils@1.0.18
-
-## 1.0.16
-
-### Patch Changes
-
-- Updated dependencies [443a959]
-  - @pisell/utils@1.0.17
-
-## 1.0.15
-
-### Patch Changes
-
-- Updated dependencies [32fd732]
-  - @pisell/utils@1.0.16
-
-## 1.0.14
-
-### Patch Changes
-
-- Updated dependencies [0f0601e]
-  - @pisell/utils@1.0.15
-
-## 1.0.13
-
-### Patch Changes
-
-- Updated dependencies [bf50fb5]
-  - @pisell/utils@1.0.14
-
-## 1.0.12
-
-### Patch Changes
-
-- Updated dependencies [b41ebaf]
-  - @pisell/utils@1.0.13
-
-## 1.0.11
-
-### Patch Changes
-
-- Updated dependencies [e1a659c]
-  - @pisell/utils@1.0.12
-
-## 1.0.10
-
-### Patch Changes
-
-- Updated dependencies [64ce1de]
-  - @pisell/utils@1.0.11
-
-## 1.0.9
-
-### Patch Changes
-
-- Updated dependencies [eef8cdb]
-  - @pisell/utils@1.0.10
-
-## 1.0.8
-
-### Patch Changes
-
-- Updated dependencies [ab61ee2]
-  - @pisell/utils@1.0.9
-
-## 1.0.7
-
-### Patch Changes
-
-- Updated dependencies [88d5ebc]
-  - @pisell/utils@1.0.8
-
-## 1.0.6
-
-### Patch Changes
-
-- Updated dependencies [abf14c2]
-  - @pisell/utils@1.0.7
-
-## 1.0.5
-
-### Patch Changes
-
-- Updated dependencies [179b7e0]
-  - @pisell/utils@1.0.6
-
-## 1.0.4
-
-### Patch Changes
-
-- Updated dependencies [1bd9790]
-  - @pisell/utils@1.0.5
-
-## 1.0.3
-
-### Patch Changes
-
-- Updated dependencies
-  - @pisell/utils@1.0.3
-
-## 1.0.2
-
-### Patch Changes
-
-- Updated dependencies
-  - @pisell/utils@1.0.2
-
-## 1.0.1
-
-### Patch Changes
-
-- 测试更新包
+- Updated dependencies [e99e4ea03]
+  - @pisell/utils@1.0.56

package/es/bin/pisell.js

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

package/es/script/constants/index.js

@@ -48,6 +48,11 @@ var outPathMap = {
     prod: '../data/release/project/saas_home',
     release: '../data/release/project/saas_home',
     pre: '../data/release/project/saas_home'
+  },
+  docs: {
+    prod: '../data/release/project/docs',
+    release: '../data/release/project/docs',
+    pre: '../data/release/project/docs'
   }
 };
 var isSsrMap = {
@@ -56,6 +61,7 @@ var isSsrMap = {
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
   xzero: false,
+  docs: false,
   saas_admin: false,
   saas_shop: false,
   saas_kds: false,

package/es/script/uploadCode/index.js

@@ -173,7 +173,7 @@ function _init() {
           if (_fileName === 'admin') {
             _fileName = 'my_pisell_v2';
           }
-          if (['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(_fileName)) {
+          if (['xzero', 'docs', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(_fileName)) {
             _context.next = 42;
             break;
           }

package/es/script/uploadCode/uploadCode.js

@@ -125,7 +125,7 @@ var UploadCode = /*#__PURE__*/function () {
               }
 
               // pisell2.0正式环境使用亚马逊服务器
-              if (this.env === 'prod' && this.projectName === 'admin') {
+              if (this.env === 'prod' && ['admin', 'docs'].includes(this.projectName)) {
                 serverConfig = serverConfigMap.aws.service[this.env];
                 serverConfig.privateKey = fs.readFileSync('../../../pem/pisell-pro.pem');
               }

package/es/script/utils/index.js

@@ -73,7 +73,7 @@ var getGitCurrentBranch = /*#__PURE__*/function () {
  * monorepo项目名称
  * @type {string[]}
  */
-var monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
+var monorepoProjectNameArr = ['admin', 'my_pisell_v2', 'docs'];
 
 /**
  * @Title: 获取本地lm_config.json配置信息

package/lib/bin/pisell.js

@@ -23,4 +23,4 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/bin/pisell.js
-import("../../es/script/index.js");
+import("../script/index.js");

package/lib/script/constants/index.js

@@ -74,6 +74,11 @@ var outPathMap = {
     prod: "../data/release/project/saas_home",
     release: "../data/release/project/saas_home",
     pre: "../data/release/project/saas_home"
+  },
+  docs: {
+    prod: "../data/release/project/docs",
+    release: "../data/release/project/docs",
+    pre: "../data/release/project/docs"
   }
 };
 var isSsrMap = {
@@ -82,6 +87,7 @@ var isSsrMap = {
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
   xzero: false,
+  docs: false,
   saas_admin: false,
   saas_shop: false,
   saas_kds: false,

package/lib/script/uploadCode/index.js

@@ -153,9 +153,15 @@ async function init() {
       if (_fileName === "admin") {
         _fileName = "my_pisell_v2";
       }
-      if (!["xzero", "saas_admin", "saas_shop", "saas_kds", "saas_ads", "saas_home"].includes(
-        _fileName
-      )) {
+      if (![
+        "xzero",
+        "docs",
+        "saas_admin",
+        "saas_shop",
+        "saas_kds",
+        "saas_ads",
+        "saas_home"
+      ].includes(_fileName)) {
         await (0, import_aws.uploadStaticToOSS)(_fileName);
       }
     }

package/lib/script/uploadCode/uploadCode.js

@@ -90,13 +90,18 @@ var UploadCode = class {
     if (this.env === "prod") {
       serverConfig = this.setConfig(serverConfigMap["prod3"]);
     }
-    if (this.env === "prod" && ["xzero", "saas_admin", "saas_shop", "saas_kds", "saas_ads", "saas_home"].includes(
-      this.projectName
-    )) {
+    if (this.env === "prod" && [
+      "xzero",
+      "saas_admin",
+      "saas_shop",
+      "saas_kds",
+      "saas_ads",
+      "saas_home"
+    ].includes(this.projectName)) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }
-    if (this.env === "prod" && this.projectName === "admin") {
+    if (this.env === "prod" && ["admin", "docs"].includes(this.projectName)) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
     }

package/lib/script/utils/index.js

@@ -57,7 +57,7 @@ var getGitCurrentBranch = async () => {
   const v = await $`git symbolic-ref --short HEAD`;
   return v.stdout;
 };
-var monorepoProjectNameArr = ["admin", "my_pisell_v2"];
+var monorepoProjectNameArr = ["admin", "my_pisell_v2", "docs"];
 var getServerConfig = async (project) => {
   console.log(project, "project");
   if (monorepoProjectNameArr.includes(project)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "sideEffects": [
     "*.less"
   ],
@@ -20,7 +20,7 @@
     "archiver": "^5.3.1",
     "dotenv": "^16.0.3",
     "ssh2": "^1.13.0",
-    "@pisell/utils": "1.0.55"
+    "@pisell/utils": "1.0.56"
   },
   "devDependencies": {
     "father": "^4.1.6"
@@ -47,6 +47,7 @@
   },
   "scripts": {
     "build": "father build",
+    "build:tsdown": "tsdown",
     "dev": "father dev",
     "docs:build": "dumi build",
     "doctor": "father doctor",

package/src/bin/pisell.js

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

package/src/script/constants/index.js

@@ -49,6 +49,11 @@ const outPathMap = {
     release: '../data/release/project/saas_home',
     pre: '../data/release/project/saas_home',
   },
+  docs: {
+    prod: '../data/release/project/docs',
+    release: '../data/release/project/docs',
+    pre: '../data/release/project/docs',
+  },
 };
 
 const isSsrMap = {
@@ -57,6 +62,7 @@ const isSsrMap = {
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
   xzero: false,
+  docs: false,
   saas_admin: false,
   saas_shop: false,
   saas_kds: false,

package/src/script/uploadCode/index.js

@@ -147,9 +147,15 @@ async function init() {
         _fileName = 'my_pisell_v2';
       }
       if (
-        !['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(
-          _fileName
-        )
+        ![
+          'xzero',
+          'docs',
+          'saas_admin',
+          'saas_shop',
+          'saas_kds',
+          'saas_ads',
+          'saas_home',
+        ].includes(_fileName)
       ) {
         // 上传oss
         await uploadStaticToOSS(_fileName);

package/src/script/uploadCode/uploadCode.js

@@ -96,16 +96,21 @@ class UploadCode {
 
     if (
       this.env === 'prod' &&
-      ['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(
-        this.projectName
-      )
+      [
+        'xzero',
+        'saas_admin',
+        'saas_shop',
+        'saas_kds',
+        'saas_ads',
+        'saas_home',
+      ].includes(this.projectName)
     ) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
     }
 
     // pisell2.0正式环境使用亚马逊服务器
-    if (this.env === 'prod' && this.projectName === 'admin') {
+    if (this.env === 'prod' && ['admin', 'docs'].includes(this.projectName)) {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync('../../../pem/pisell-pro.pem');
     }

package/src/script/utils/index.js

@@ -28,7 +28,7 @@ const getGitCurrentBranch = async () => {
  * monorepo项目名称
  * @type {string[]}
  */
-const monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
+const monorepoProjectNameArr = ['admin', 'my_pisell_v2', 'docs'];
 
 /**
  * @Title: 获取本地lm_config.json配置信息
@@ -36,11 +36,11 @@ const monorepoProjectNameArr = ['admin', 'my_pisell_v2'];
  * @Author: Zsj
  */
 const getServerConfig = async (project) => {
-  console.log(project,'project')
+  console.log(project, 'project');
   if (monorepoProjectNameArr.includes(project)) {
-    return await JSON.parse(fs.readFileSync('../../../lm_config.json', 'utf8'))
+    return await JSON.parse(fs.readFileSync('../../../lm_config.json', 'utf8'));
   }
-  return await JSON.parse(fs.readFileSync('../lm_config.json', 'utf8'))
+  return await JSON.parse(fs.readFileSync('../lm_config.json', 'utf8'));
 };
 
 /**
@@ -106,7 +106,7 @@ const serverUpload = (conn, { localPath, remotePath }) => {
           }
           console.log('上传成功');
           resolve(conn);
-        },
+        }
       );
     });
   });
@@ -117,7 +117,10 @@ const serverUpload = (conn, { localPath, remotePath }) => {
  * @Describe:
  * @Author: Zsj
  */
-const serverUnpack = (conn, { path, fileName, fullFileName, changelog, env }) => {
+const serverUnpack = (
+  conn,
+  { path, fileName, fullFileName, changelog, env }
+) => {
   if (!conn) return Promise.reject('未连接服务器');
   // 文件全名
   return new Promise((resolve, reject) => {
@@ -139,7 +142,7 @@ const serverUnpack = (conn, { path, fileName, fullFileName, changelog, env }) =>
              sh deleteOldVersion.sh
              exit
              ${env === 'prod' ? 'exit' : ''}
-            `,
+            `
           // 打开到path
           // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
           // 删除1.0.0.zip
@@ -184,7 +187,7 @@ const releaseProject = (conn, { path, fileName, isSSR, env }) => {
              ${isSSR ? 'pm2 restart server.js' : ''}
              exit
             ${env === 'prod' ? 'exit' : ''}
-            `,
+            `
           // 打开到path
           // 复制pre-master到next-master
           // 删除pre-master
@@ -251,7 +254,7 @@ const createFeishuMessageContent = (contentArr) => {
         { tag: 'text', text: `${item.key}: ` },
         { tag: 'text', text: `${item.value}` },
       ];
-    }),
+    })
   );
 };
 
@@ -265,7 +268,7 @@ const getNonExcludedPackages = (excludedPackages) => {
   };
 
   const nonExcludedPackages = Object.keys(dependencies).filter(
-    (packageName) => !excludedPackages.includes(packageName),
+    (packageName) => !excludedPackages.includes(packageName)
   );
   return nonExcludedPackages;
 };

package/tsdown.config.ts

@@ -0,0 +1,93 @@
+import { defineConfig } from 'tsdown';
+import fs from 'fs';
+import path from 'path';
+
+const ENTRY = ['src/**/*.{js,ts,tsx,jsx}', '!src/**/*.d.ts'];
+const JS_RE = /((?<!\.d)\.ts|\.(jsx?|tsx))$/;
+
+// 递归遍历目录获取所有文件
+function listFilesRecursive(dir: string, ignores: string[] = []): string[] {
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
+  const files: string[] = [];
+
+  for (const e of entries) {
+    const abs = path.join(dir, e.name);
+    const base = path.basename(abs);
+    if (ignores.includes(base)) continue;
+
+    if (e.isDirectory()) {
+      files.push(...listFilesRecursive(abs, ignores));
+    } else {
+      files.push(abs);
+    }
+  }
+
+  return files;
+}
+
+// 确保目录存在
+function ensureDir(dir: string) {
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+}
+
+const srcDir = path.resolve(__dirname, 'src');
+
+// Plugin factory to copy non-JS files to output directory
+function createCopyAssetsPlugin(outDir: string) {
+  return {
+    name: 'copy-assets',
+    buildEnd() {
+      const files = listFilesRecursive(srcDir, []);
+      for (const file of files) {
+        // 如果不匹配 JS_RE，则直接复制文件
+        if (!JS_RE.test(file)) {
+          const rel = path.relative(srcDir, file);
+          const dest = path.join(outDir, rel);
+          ensureDir(path.dirname(dest));
+          fs.copyFileSync(file, dest);
+        }
+      }
+    },
+  };
+}
+
+const ASSET_EXTERNAL_RE =
+  /\.(css|less|sass|scss|styl|png|jpg|jpeg|gif|svg|webp|bmp|ico|woff2?|ttf|eot)$/;
+
+export default defineConfig([
+  {
+    entry: ENTRY,
+    format: 'esm',
+    outDir: 'es',
+    target: 'es6',
+    dts: true,
+    clean: true,
+    unbundle: true,
+    external: [ASSET_EXTERNAL_RE],
+    plugins: [createCopyAssetsPlugin(path.resolve(__dirname, 'es'))],
+    skipNodeModulesBundle: true,
+    outExtensions: () => ({
+      js: '.js',
+      dts: '.d.ts',
+    }),
+  },
+  {
+    entry: ENTRY,
+    format: 'cjs',
+    outDir: 'lib',
+    target: 'es6',
+    dts: true,
+    clean: true,
+    unbundle: true,
+    external: [ASSET_EXTERNAL_RE],
+    plugins: [createCopyAssetsPlugin(path.resolve(__dirname, 'lib'))],
+    fixedExtension: false,
+    skipNodeModulesBundle: true,
+    outExtensions: () => ({
+      js: '.js',
+      dts: '.d.ts',
+    }),
+  },
+]);