@peng_kai/kit 0.1.16 → 0.1.17

package/admin/scripts/deploy.ts

@@ -0,0 +1,67 @@
+import fs from 'node:fs';
+import process from 'node:process';
+import path from 'node:path';
+import { execa } from 'execa';
+import archiver from 'archiver';
+
+const DIST_DIR = 'dist';
+const DEV_BRANCH = 'develop';
+
+const distPath = path.join(process.cwd(), DIST_DIR);
+const distZipName = `${DIST_DIR}.zip`;
+const distZipPath = `${distPath}.zip`;
+
+const { stdout } = await execa(`git branch --show-current`);
+const currentBranch = stdout;
+
+if (currentBranch !== DEV_BRANCH) {
+  await build();
+  await execa(`git stash push -u -m "部署"`);
+  await execa(`git checkout ${DEV_BRANCH}`);
+  console.log('⏬ 拉取代码成功！');
+  await execa(`git pull`);
+}
+else {
+  console.log('⏬ 拉取代码成功！');
+  await execa(`git pull`);
+  await build();
+}
+
+if (fs.existsSync(distZipPath)) {
+  fs.unlinkSync(distZipPath);
+  console.log('🗑️  删除旧 dist.zip');
+}
+
+await zipDirectory(path.join(process.cwd(), DIST_DIR));
+console.log('✨ 生成新 dist.zip');
+
+await execa(`git add ${distZipName}`);
+await execa(`git commit -m "部署"`);
+await execa(`git push`);
+console.log('✅ 推送代码成功！\n');
+
+if (currentBranch !== DEV_BRANCH) {
+  await execa(`git checkout ${currentBranch}`);
+  await execa(`git stash pop`);
+}
+
+async function build() {
+  process.stdout.write('📦 打包中...');
+  await execa(`pnpm run build@script`);
+  process.stdout.write('\r📦 打包成功！\n');
+}
+
+function zipDirectory(dir: string) {
+  const archive = archiver('zip', { zlib: { level: 5 } });
+  const stream = fs.createWriteStream(`${dir}.zip`);
+
+  return new Promise((resolve, reject) => {
+    archive
+      .directory(dir, DIST_DIR)
+      .on('error', err => reject(err))
+      .pipe(stream);
+
+    stream.on('close', () => resolve(1));
+    archive.finalize();
+  });
+}

package/package.json

@@ -1,53 +1,58 @@
-{
-  "name": "@peng_kai/kit",
-  "type": "module",
-  "version": "0.1.16",
-  "description": "",
-  "author": "",
-  "license": "ISC",
-  "keywords": [],
-  "main": "index.js",
-  "scripts": {
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix"
-  },
-  "peerDependencies": {
-    "@tanstack/vue-query": "4.37.1",
-    "@vueuse/core": "10.7.2",
-    "ant-design-vue": "4.1.1",
-    "axios": "1.6.5",
-    "bignumber.js": "9.1.2",
-    "dayjs": "1.11.10",
-    "lodash-es": "4.17.21",
-    "vue": "3.4.15",
-    "vue-router": "4.2.5"
-  },
-  "dependencies": {
-    "@babel/generator": "^7.23.6",
-    "@babel/parser": "^7.23.6",
-    "@babel/traverse": "^7.23.7",
-    "@babel/types": "^7.23.6",
-    "@tanstack/vue-query": "^4.37.1",
-    "@vueuse/core": "^10.7.2",
-    "a-calc": "^1.3.8",
-    "ant-design-vue": "^4.1.1",
-    "axios": "^1.6.5",
-    "bignumber.js": "^9.1.2",
-    "chokidar": "^3.5.3",
-    "dayjs": "^1.11.10",
-    "fast-glob": "^3.3.2",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "vue": "^3.4.15",
-    "vue-router": "^4.2.5"
-  },
-  "devDependencies": {
-    "@peng_kai/lint": "^0.1.0",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "18",
-    "@types/nprogress": "^0.2.3",
-    "type-fest": "^4.9.0",
-    "typescript": "^5.3.3",
-    "vue-component-type-helpers": "^1.8.27"
-  }
-}
+{
+  "name": "@peng_kai/kit",
+  "type": "module",
+  "version": "0.1.17",
+  "description": "",
+  "author": "",
+  "license": "ISC",
+  "keywords": [],
+  "main": "index.js",
+  "scripts": {
+    "dev:js": "tsx ./admin/scripts/deploy.ts",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
+  },
+  "peerDependencies": {
+    "@tanstack/vue-query": "4.37.1",
+    "@vueuse/core": "10.7.2",
+    "ant-design-vue": "4.1.1",
+    "axios": "1.6.5",
+    "bignumber.js": "9.1.2",
+    "dayjs": "1.11.10",
+    "lodash-es": "4.17.21",
+    "vue": "3.4.15",
+    "vue-router": "4.2.5"
+  },
+  "dependencies": {
+    "@babel/generator": "^7.23.6",
+    "@babel/parser": "^7.23.6",
+    "@babel/traverse": "^7.23.7",
+    "@babel/types": "^7.23.6",
+    "@tanstack/vue-query": "^4.37.1",
+    "@vueuse/core": "^10.7.2",
+    "a-calc": "^1.3.8",
+    "ant-design-vue": "^4.1.1",
+    "archiver": "^6.0.1",
+    "axios": "^1.6.5",
+    "bignumber.js": "^9.1.2",
+    "chokidar": "^3.5.3",
+    "dayjs": "^1.11.10",
+    "execa": "^8.0.1",
+    "fast-glob": "^3.3.2",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "tsx": "^4.7.0",
+    "vue": "^3.4.15",
+    "vue-router": "^4.2.5"
+  },
+  "devDependencies": {
+    "@peng_kai/lint": "^0.1.0",
+    "@types/archiver": "^6.0.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "18",
+    "@types/nprogress": "^0.2.3",
+    "type-fest": "^4.9.0",
+    "typescript": "^5.3.3",
+    "vue-component-type-helpers": "^1.8.27"
+  }
+}

package/request/interceptors/checkCode.ts

@@ -9,13 +9,13 @@ export function checkCode(): Parameters<AxiosInterceptorManager<any>['use']> {
   return [
     (resp) => {
       if (
-        resp.config.checkCode
+        resp?.config?.checkCode
         && !resp.config.ignoreCode?.includes(resp?.data?.code)
         && resp?.data?.code !== ApiCode.NORMAL
       ) {
         throw new axios.AxiosError(
-          resp?.data?.msg ?? 'Unknown Error',
-          resp?.data?.code ?? ApiCode.UNKNOWN,
+          resp.data?.msg ?? 'Unknown Error',
+          resp.data?.code ?? ApiCode.UNKNOWN,
           resp.config,
           resp.request,
           resp,

package/request/interceptors/returnResultType.ts

@@ -7,7 +7,7 @@ import { ApiCode, ApiError, isTimeout } from '../helpers';
 export function returnResultType(): Parameters<AxiosInterceptorManager<any>['use']> {
   return [
     (resp) => {
-      const { resultType } = resp.config;
+      const { resultType } = resp?.config;
 
       if (resultType === 'api')
         return resp.data;
@@ -30,4 +30,4 @@ export function returnResultType(): Parameters<AxiosInterceptorManager<any>['use
       throw new ApiError({ code, msg, data });
     },
   ];
-}
+}