update

meatjam · meatjam · commit acd89044618b · 2024-02-17T22:35:00.000+08:00
diff --git a/index.ts b/index.ts
@@ -18,6 +18,9 @@ import getCommand from './utils/getCommand'
 import getLanguage from './utils/getLanguage'
 import renderEslint from './utils/renderEslint'
 
+const util = require('util')
+const exec = util.promisify(require('child_process').exec)
+
 function isValidPackageName(projectName) {
   return /^(?:@[a-z0-9-*~][a-z0-9-*._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/.test(projectName)
 }
@@ -566,6 +569,15 @@ async function init() {
   }
   console.log(`  ${bold(green(getCommand(packageManager, 'dev')))}`)
   console.log()
+  const cmds = [
+    'pnpm i'
+    /*'pnpm exec husky init',*/
+    /*'pnpm run prepare'*/
+  ]
+  for (const cmd of cmds) {
+    const { stdout, stderr } = await exec(`cd ${root} && ${cmd}`)
+    console.log(stdout, stderr)
+  }
 }
 
 init().catch((e) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/template/base/index.html b/template/base/index.html
@@ -8,6 +8,7 @@
   </head>
   <body>
     <div id="app"></div>
+    <script src="/config.js"></script>
     <script type="module" src="/src/main.js"></script>
   </body>
 </html>
diff --git a/template/base/package.json b/template/base/package.json
@@ -10,7 +10,8 @@
     "dependencies": {
         "vue": "^3.4.15",
         "lodash": "^4.17.21",
-        "axios": "^1.6.7"
+        "axios": "^1.6.7",
+        "query-string": "^8.2.0"
     },
     "devDependencies": {
         "@vitejs/plugin-vue": "^5.0.3",
diff --git a/template/base/src/api/apiIndex.js b/template/base/src/api/apiIndex.js
@@ -1,13 +1,11 @@
-import Qs from 'querystring';
-import { HttpRequest } from '@/libs/custom_axios';
+import HttpRequest from '@/libs/custom_axios';
 import config from '@/config/configIndex';
-import axios from 'axios';
+const mode = import.meta.env.MODE;
 
-let [backend_api] =
-    process.env.NODE_ENV === 'development' ? [config.baseUrl.backend_dev] : [config.baseUrl.backend_pro];
+let [backend_api] = mode === 'development' ? [config.baseUrl.backend_dev] : [config.baseUrl.backend_pro];
 
 export const axios_backend_api = new HttpRequest(backend_api);
 
 let baseUrl = backend_api;
-if (baseUrl[baseUrl.length - 1] == '/') baseUrl = baseUrl.slice(0, -1);
+if (baseUrl[baseUrl.length - 1] === '/') baseUrl = baseUrl.slice(0, -1);
 export const prefixBackendBaseUrl = baseUrl;
diff --git a/template/base/src/config/configIndex.js b/template/base/src/config/configIndex.js
@@ -1,9 +1,8 @@
+import queryString from 'query-string';
 const BACKEND = import.meta.env.BACKEND;
 
-const Qs = require('querystring');
 const public_config = window['CUSTOM_PUBLIC_CONFIG'];
-const url = window.___location.href + '';
-const paramsObj = Qs.decode(url.slice(url.indexOf('?') + 1));
+const paramsObj = queryString.parse(window.___location.search);
 
 const local_config = {
     baseUrl: {
diff --git a/template/base/src/libs/custom_axios.ts b/template/base/src/libs/custom_axios.ts
@@ -0,0 +1,31 @@
+import axios from 'axios';
+
+class HttpRequest {
+    baseUrl: string;
+    queue: Record<string, any>;
+    constructor(baseUrl = '') {
+        this.baseUrl = baseUrl;
+        this.queue = {};
+    }
+    getInsideConfig() {
+        return {
+            baseURL: this.baseUrl,
+            headers: {
+                //
+            },
+        };
+    }
+    destroy(url: string) {
+        delete this.queue[url];
+        /*if (!Object.keys(this.queue).length) {
+            return;
+        }*/
+    }
+
+    request(options: Record<string, any>) {
+        const instance = axios.create();
+        options = Object.assign(this.getInsideConfig(), options);
+        return instance(options);
+    }
+}
+export default HttpRequest;
diff --git a/template/base/vite.config.js.ejs b/template/base/vite.config.js.ejs
@@ -6,7 +6,7 @@ import { defineConfig, loadEnv } from 'vite'
 <%_ } _%>
 
 // https://vitejs.dev/config/
-export default ({ mode }) => {
+export default ({ mode }: any) => {
   // import.meta.env.VITE_NAME available here with: process.env.VITE_NAME
   const env = loadEnv(mode, process.cwd());
   process.env = {...process.env, ...env};
