@pisell/common 1.0.58 → 1.0.60

package/src/script/aws/index.js

@@ -1,138 +1,138 @@
-import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
-import fs from 'fs';
-import mime from 'mime-types';
-import path from 'path';
-import { getServerConfig } from '../utils/index.js';
-const filterFiles = ['index.html', 'umi.server.js', 'umi.server.d.ts'];
-const __dirname = process.cwd();
-let s3Client = null;
-let bucketName = '';
-
-/*******
- * @title: 初始化
- * @description:
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2023-11-24 14:05
- */
-const init = async (directory) => {
-  try {
-    // 读取本地config
-    const serverConfig = await getServerConfig(directory);
-
-    // aws配置
-    let awsConfig = serverConfig.aws;
-
-    if (awsConfig) {
-      bucketName = awsConfig.bucketName;
-
-      // 创建实例
-      s3Client = new S3Client({
-        region: awsConfig.region,
-        credentials: {
-          accessKeyId: awsConfig.accessKeyId,
-          secretAccessKey: awsConfig.secretAccessKey,
-        },
-      });
-      console.log('aws 初始化成功');
-
-      return serverConfig.aws;
-    } else {
-      console.log('未获取到aws权限');
-
-      return false;
-    }
-  } catch (err) {
-    console.log(err);
-
-    return false;
-  }
-};
-
-// 上传文件到S3指定目录
-const uploadFile = async (directory, fileKey, filePath) => {
-  const fileStream = fs.createReadStream(filePath);
-  // 根据文件扩展名获取MIME类型
-  const contentType = mime.lookup(filePath);
-  const uploadParams = {
-    Bucket: bucketName,
-    Key: `${directory}/${fileKey}`, // 指定目录路径
-    Body: fileStream,
-    ContentType: contentType,
-    ContentDisposition: 'inline',
-    ACL: 'public-read', // 设置ACL权限为公共读取
-  };
-
-  const command = new PutObjectCommand(uploadParams);
-
-  try {
-    const response = await s3Client.send(command);
-    console.log(`上传成功: ${fileKey}`);
-    return { fileName: fileKey, location: response.Location };
-  } catch (err) {
-    console.error(`上传失败: ${fileKey}`, err);
-    throw new Error(`上传失败: ${fileKey}, ${err.message}`);
-  }
-};
-
-/*******
- * @title: 递归上传文件夹内容
- * @description:
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2023-11-24 14:06
- */
-export const uploadFolderContents = async (
-  directory,
-  folderPath = path.resolve(__dirname, 'dist')
-) => {
-  const files = fs.readdirSync(folderPath);
-
-  // promise all 储存
-  const uploadPromises = [];
-  for (const file of files) {
-    const filePath = path.join(folderPath, file);
-    const fileStats = fs.statSync(filePath);
-
-    // 文件上传, 文件夹递归循环
-    if (fileStats.isFile()) {
-      const fileKey = path.relative(folderPath, filePath);
-      // 过滤不需要上传的文件
-      if (!filterFiles.includes(fileKey)) {
-        const uploadPromise = uploadFile(directory, fileKey, filePath);
-        uploadPromises.push(uploadPromise);
-      }
-      // 文件夹
-    } else if (fileStats.isDirectory()) {
-      const subDirectory = path.join(directory, file);
-      const subFolderPromise = uploadFolderContents(subDirectory, filePath);
-      uploadPromises.push(subFolderPromise);
-    }
-  }
-
-  return Promise.all(uploadPromises)
-    .then((res) => {
-      console.log('全部上传完成', res.length);
-      return res;
-    })
-    .catch((err) => {
-      throw new Error(`上传cdn失败: ${err.message}`);
-    });
-};
-
-/*******
- * @title: 上传资源到oss
- * @description:
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2023-11-24 14:04
- */
-export const uploadStaticToOSS = async (
-  directory,
-  folderPath = path.resolve(__dirname, 'dist')
-) => {
-  // 初始化aws
-  await init(directory);
-
-  return uploadFolderContents(directory, folderPath);
-};
+import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import fs from 'fs';
+import mime from 'mime-types';
+import path from 'path';
+import { getServerConfig } from '../utils/index.js';
+const filterFiles = ['index.html', 'umi.server.js', 'umi.server.d.ts'];
+const __dirname = process.cwd();
+let s3Client = null;
+let bucketName = '';
+
+/*******
+ * @title: 初始化
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:05
+ */
+const init = async (directory) => {
+  try {
+    // 读取本地config
+    const serverConfig = await getServerConfig(directory);
+
+    // aws配置
+    let awsConfig = serverConfig.aws;
+
+    if (awsConfig) {
+      bucketName = awsConfig.bucketName;
+
+      // 创建实例
+      s3Client = new S3Client({
+        region: awsConfig.region,
+        credentials: {
+          accessKeyId: awsConfig.accessKeyId,
+          secretAccessKey: awsConfig.secretAccessKey,
+        },
+      });
+      console.log('aws 初始化成功');
+
+      return serverConfig.aws;
+    } else {
+      console.log('未获取到aws权限');
+
+      return false;
+    }
+  } catch (err) {
+    console.log(err);
+
+    return false;
+  }
+};
+
+// 上传文件到S3指定目录
+const uploadFile = async (directory, fileKey, filePath) => {
+  const fileStream = fs.createReadStream(filePath);
+  // 根据文件扩展名获取MIME类型
+  const contentType = mime.lookup(filePath);
+  const uploadParams = {
+    Bucket: bucketName,
+    Key: `${directory}/${fileKey}`, // 指定目录路径
+    Body: fileStream,
+    ContentType: contentType,
+    ContentDisposition: 'inline',
+    ACL: 'public-read', // 设置ACL权限为公共读取
+  };
+
+  const command = new PutObjectCommand(uploadParams);
+
+  try {
+    const response = await s3Client.send(command);
+    console.log(`上传成功: ${fileKey}`);
+    return { fileName: fileKey, location: response.Location };
+  } catch (err) {
+    console.error(`上传失败: ${fileKey}`, err);
+    throw new Error(`上传失败: ${fileKey}, ${err.message}`);
+  }
+};
+
+/*******
+ * @title: 递归上传文件夹内容
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:06
+ */
+export const uploadFolderContents = async (
+  directory,
+  folderPath = path.resolve(__dirname, 'dist')
+) => {
+  const files = fs.readdirSync(folderPath);
+
+  // promise all 储存
+  const uploadPromises = [];
+  for (const file of files) {
+    const filePath = path.join(folderPath, file);
+    const fileStats = fs.statSync(filePath);
+
+    // 文件上传, 文件夹递归循环
+    if (fileStats.isFile()) {
+      const fileKey = path.relative(folderPath, filePath);
+      // 过滤不需要上传的文件
+      if (!filterFiles.includes(fileKey)) {
+        const uploadPromise = uploadFile(directory, fileKey, filePath);
+        uploadPromises.push(uploadPromise);
+      }
+      // 文件夹
+    } else if (fileStats.isDirectory()) {
+      const subDirectory = path.join(directory, file);
+      const subFolderPromise = uploadFolderContents(subDirectory, filePath);
+      uploadPromises.push(subFolderPromise);
+    }
+  }
+
+  return Promise.all(uploadPromises)
+    .then((res) => {
+      console.log('全部上传完成', res.length);
+      return res;
+    })
+    .catch((err) => {
+      throw new Error(`上传cdn失败: ${err.message}`);
+    });
+};
+
+/*******
+ * @title: 上传资源到oss
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:04
+ */
+export const uploadStaticToOSS = async (
+  directory,
+  folderPath = path.resolve(__dirname, 'dist')
+) => {
+  // 初始化aws
+  await init(directory);
+
+  return uploadFolderContents(directory, folderPath);
+};

package/src/script/constants/index.js

@@ -1,86 +1,86 @@
-const outPathMap = {
-  my_pisel_shop: {
-    prod: '../data/release/project/my_pisel_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',
-  },
-  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',
-  },
-  xzero: {
-    prod: '../data/release/project/xzero',
-    release: '../data/release/project/xzero',
-    pre: '../data/release/project/xzero',
-  },
-  saas_admin: {
-    prod: '../data/release/project/saas_admin',
-    release: '../data/release/project/saas_admin',
-    pre: '../data/release/project/saas_admin',
-  },
-  saas_shop: {
-    prod: '../data/release/project/saas_shop',
-    release: '../data/release/project/saas_shop',
-    pre: '../data/release/project/saas_shop',
-  },
-  saas_kds: {
-    prod: '../data/release/project/saas_kds',
-    release: '../data/release/project/saas_kds',
-    pre: '../data/release/project/saas_kds',
-  },
-  saas_ads: {
-    prod: '../data/release/project/saas_ads',
-    release: '../data/release/project/saas_ads',
-    pre: '../data/release/project/saas_ads',
-  },
-  saas_home: {
-    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',
-  },
-  saas_shop_pos: {
-    prod: '../data/release/project/saas_shop_pos',
-    release: '../data/release/project/saas_shop_pos',
-    pre: '../data/release/project/saas_shop_pos',
-  },
-};
-
-const isSsrMap = {
-  my_pisel_shop: false,
-  admin: false,
-  my_pisel_pc_v2: true,
-  my_pisel_h5_v2: true,
-  xzero: false,
-  docs: false,
-  saas_admin: false,
-  saas_shop: false,
-  saas_kds: false,
-  saas_ads: false,
-  saas_shop_pos: false,
-};
-
-const checkPackages = [
-  '@pisell/date-picker',
-  '@pisell/lowcode-renderer',
-  '@pisell/common',
-  '@pisell/utils',
-  '@pisell/materials',
-];
-
-export { outPathMap, isSsrMap, checkPackages };
+const outPathMap = {
+  my_pisel_shop: {
+    prod: '../data/release/project/my_pisel_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',
+  },
+  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',
+  },
+  xzero: {
+    prod: '../data/release/project/xzero',
+    release: '../data/release/project/xzero',
+    pre: '../data/release/project/xzero',
+  },
+  saas_admin: {
+    prod: '../data/release/project/saas_admin',
+    release: '../data/release/project/saas_admin',
+    pre: '../data/release/project/saas_admin',
+  },
+  saas_shop: {
+    prod: '../data/release/project/saas_shop',
+    release: '../data/release/project/saas_shop',
+    pre: '../data/release/project/saas_shop',
+  },
+  saas_kds: {
+    prod: '../data/release/project/saas_kds',
+    release: '../data/release/project/saas_kds',
+    pre: '../data/release/project/saas_kds',
+  },
+  saas_ads: {
+    prod: '../data/release/project/saas_ads',
+    release: '../data/release/project/saas_ads',
+    pre: '../data/release/project/saas_ads',
+  },
+  saas_home: {
+    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',
+  },
+  saas_shop_pos: {
+    prod: '../data/release/project/saas_shop_pos',
+    release: '../data/release/project/saas_shop_pos',
+    pre: '../data/release/project/saas_shop_pos',
+  },
+};
+
+const isSsrMap = {
+  my_pisel_shop: false,
+  admin: false,
+  my_pisel_pc_v2: true,
+  my_pisel_h5_v2: true,
+  xzero: false,
+  docs: false,
+  saas_admin: false,
+  saas_shop: false,
+  saas_kds: false,
+  saas_ads: false,
+  saas_shop_pos: false,
+};
+
+const checkPackages = [
+  '@pisell/date-picker',
+  '@pisell/lowcode-renderer',
+  '@pisell/common',
+  '@pisell/utils',
+  '@pisell/materials',
+];
+
+export { outPathMap, isSsrMap, checkPackages };

package/src/script/deploy.js

@@ -1,29 +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;
+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

@@ -1,45 +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);
-  }
-})();
+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

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