@pisell/common 1.0.19 → 1.0.21

package/src/script/constants/index.js

@@ -1,6 +1,6 @@
 const outPathMap = {
   my_pisel_shop: {
-    prod: '../data/release/project/mypisel_shop',
+    prod: '../data/release/project/my_pisel_shop',
     release: '../data/release/project/my_pisel_shop',
     pre: '../data/release/project/my_pisel_shop',
   },
@@ -9,6 +9,30 @@ const outPathMap = {
     release: '../data/release/project/pisell_v2',
     pre: '../data/release/project/pisell_v2',
   },
+  my_pisel_pc_v2: {
+    prod: '../data/release/project/my_pisel_pc_v2',
+    release: '../data/release/project/my_pisel_pc_v2',
+    pre: '../data/release/project/my_pisel_pc_v2',
+  },
+  my_pisel_h5_v2: {
+    prod: '../data/release/project/my_pisel_h5_v2',
+    release: '../data/release/project/my_pisel_h5_v2',
+    pre: '../data/release/project/my_pisel_h5_v2',
+  },
 };
 
-export { outPathMap };
+const isSsrMap = {
+  my_pisel_shop: false,
+  admin: false,
+  my_pisel_pc_v2: true,
+  my_pisel_h5_v2: true,
+};
+
+const checkPackages = [
+  '@pisell/date-picker',
+  '@pisell/lowcode-renderer',
+  '@pisell/common',
+  '@pisell/utils',
+];
+
+export { outPathMap,  isSsrMap, checkPackages };

package/src/script/release/release.js

@@ -1,4 +1,4 @@
-import { outPathMap } from '../constants/index.js';
+import { isSsrMap, outPathMap } from '../constants/index.js';
 import {
   connectServer,
   getServerConfig,
@@ -19,6 +19,8 @@ class Release {
 
     this.conn = conn;
     this.outPath = outPathMap[this.projectName][this.env];
+    // 是否是ssr项目
+    this.isSSR = isSsrMap[this.projectName];
   }
 
   /**
@@ -68,6 +70,7 @@ class Release {
     return await releaseProject(this.conn, {
       path: this.outPath,
       fileName: `${this.version}`,
+      isSSR: this.isSSR,
     });
   }
 

package/src/script/uploadCode/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env zx
 import inquirer from 'inquirer';
 import 'zx/globals';
+import { uploadStaticToOSS } from '../aws/index.js';
 import Release from '../release/release.js';
 import {
   getCurrentProjectName,
@@ -58,6 +59,15 @@ const inquirerResult = () => {
         { value: false, name: '只上传' },
       ],
     },
+    {
+      type: 'list',
+      message: '是否执行build打包',
+      name: 'whether_build',
+      choices: [
+        { value: true, name: '执行打包' },
+        { value: false, name: '不执行打包，使用项目根目录/dist文件夹' },
+      ],
+    },
     {
       type: 'confirm',
       message: '确认信息无误',
@@ -119,9 +129,26 @@ async function init() {
   });
   console.log(result, 'result');
   try {
-    console.log('开始打包');
-    await uploadCode.build();
-    console.log('✅ 打包完成');
+    // 选择false时直接使用本地/dist目录 节省二次构建时间
+    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'
+      }
+      // 上传oss
+      await uploadStaticToOSS(_fileName);
+    }
 
     console.log('开始压缩');
     await uploadCode.compress();

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 { isSsrMap, outPathMap } from "../constants/index.js";
 import {
   connectServer,
   getGitCurrentBranch,
@@ -29,6 +29,8 @@ class UploadCode {
     this.projectAbsolutePath = "";
     this.conn = null;
     this.serverConfig = null;
+    // 是否是ssr项目
+    this.isSSR = isSsrMap[this.projectName];
 
     this.outPath = outPathMap[this.projectName][this.env];
   }
@@ -78,9 +80,10 @@ class UploadCode {
     }
 
     if (this.env === "prod") {
-      serverConfig.privateKey = fs.readFileSync(
-        path.join(process.env.HOME, ".ssh", "id_rsa")
-      );
+      serverConfig = this.setConfig(serverConfigMap['prod3']);
+      // serverConfig.privateKey = fs.readFileSync(
+      //   path.join(process.env.HOME, '.ssh', 'id_rsa'),
+      // );
     }
 
     // pisell2.0正式环境使用亚马逊服务器

package/src/script/utils/index.js

@@ -1,4 +1,5 @@
 import * as dotenv from 'dotenv';
+import npmCheck from 'npm-check';
 import path from 'path';
 import ssh2 from 'ssh2';
 
@@ -156,7 +157,7 @@ const serverUnpack = (conn, { path, fileName, fullFileName, changelog }) => {
  * @Describe:
  * @Author: Zsj
  */
-const releaseProject = (conn, { path, fileName }) => {
+const releaseProject = (conn, { path, fileName, isSSR }) => {
   return new Promise((resolve, reject) => {
     conn.shell((err, stream) => {
       if (err) {
@@ -175,6 +176,7 @@ const releaseProject = (conn, { path, fileName }) => {
              rm -rf master
              cp -R next-master master
              rm -rf next-master
+             ${isSSR ? 'pm2 restart server.js' : ''}
              exit
             `,
           // 打开到path
@@ -225,6 +227,10 @@ const getCurrentProjectName = () => {
   return loadJSON(path.join(process.cwd(), './package.json')).name;
 };
 
+const getCurrentProjectPkg = () => {
+  return loadJSON(path.join(process.cwd(), './package.json'));
+};
+
 const loadJSON = (path) => JSON.parse(fs.readFileSync(path));
 
 const getCurrentUserName = async () => {
@@ -243,6 +249,21 @@ const createFeishuMessageContent = (contentArr) => {
   );
 };
 
+// 获取除了此pkg的包
+const getNonExcludedPackages = (excludedPackages) => {
+  const packageData = getCurrentProjectPkg();
+
+  const dependencies = {
+    ...packageData.dependencies,
+    ...packageData.devDependencies,
+  };
+
+  const nonExcludedPackages = Object.keys(dependencies).filter(
+    (packageName) => !excludedPackages.includes(packageName),
+  );
+  return nonExcludedPackages;
+};
+
 const sendWebhook = async ({ title, content }) => {
   const contentStr = createFeishuMessageContent(content);
   if (!dotenv.config()?.parsed?.WEBHOOK) return;
@@ -259,6 +280,29 @@ const sendWebhook = async ({ title, content }) => {
   return await response.json();
 };
 
+const checkPkgVersion = async (checkPackages) => {
+  const currentState = await npmCheck({
+    skipUnused: true,
+    ignore: getNonExcludedPackages(checkPackages),
+  });
+
+  const pkgs = currentState.get('packages');
+
+  const wrongPkg = pkgs.filter((item) => {
+    return checkPackages.includes(item.moduleName) && item.mismatch;
+  });
+  const errorMessage = wrongPkg.reduce((p, c) => {
+    return `${p}
+     ${c.moduleName}本地版本${c.installed}需升级至${c.packageJson}
+     `;
+  }, '');
+  const isWrongVersion = wrongPkg.length;
+  return {
+    success: !isWrongVersion,
+    message: errorMessage,
+  };
+};
+
 export {
   isWorkingTreeClean,
   getServerConfig,
@@ -272,4 +316,5 @@ export {
   loadJSON,
   getCurrentUserName,
   sendWebhook,
+  checkPkgVersion,
 };

package/es/index.d.ts.map

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

package/lib/index.d.ts.map

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