create-young-proj 0.12.0 → 0.13.0

package/template-uni-app/src/apis/requests/get.ts

@@ -1,14 +1,14 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 16:50:32
- * @LastEditTime: 2023-07-18 17:08:14
+ * @LastEditTime: 2023-09-19 10:19:44
  * @Description:
  */
-import type { Http } from '../lib'
+import type { YoungHttp, YoungHttpAuthReq, YoungHttpFreeReq } from '@bluesyoung/http'
 
-export function useGet(http: Http) {
-  const FreeReq: Http['freeReq'] = args => http.freeReq({ method: 'GET', ...args })
-  const AuthReq: Http['authReq'] = args => http.authReq({ method: 'GET', ...args })
+export function useGet(http: YoungHttp) {
+  const FreeReq: YoungHttpFreeReq = args => http.freeReq({ method: 'GET', ...args })
+  const AuthReq: YoungHttpAuthReq = args => http.authReq({ method: 'GET', ...args })
 
   return {
     getByUserName: (name: string) =>

package/template-uni-app/src/apis/requests/post.ts

@@ -1,14 +1,14 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 16:59:34
- * @LastEditTime: 2023-07-18 16:59:35
+ * @LastEditTime: 2023-09-19 10:20:17
  * @Description:
  */
-import type { Http } from '../lib'
+import type { YoungHttp, YoungHttpAuthReq, YoungHttpFreeReq } from '@bluesyoung/http'
 
-export function usePost(http: Http) {
-  const FreeReq: Http['freeReq'] = args => http.freeReq({ method: 'POST', ...args })
-  const AuthReq: Http['authReq'] = args => http.authReq({ method: 'POST', ...args })
+export function usePost(http: YoungHttp) {
+  const FreeReq: YoungHttpFreeReq = args => http.freeReq({ method: 'GET', ...args })
+  const AuthReq: YoungHttpAuthReq = args => http.authReq({ method: 'GET', ...args })
 
   return {
     createRepo: async (name: string) => {

package/template-uni-app/vite.config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 11:03:01
- * @LastEditTime: 2023-07-20 14:10:56
+ * @LastEditTime: 2023-09-19 10:18:06
  * @Description:
  */
 import { resolve } from 'node:path'
@@ -15,7 +15,7 @@ import UniManifest from '@uni-helper/vite-plugin-uni-manifest'
 import Unocss from 'unocss/vite'
 import AutoImport from 'unplugin-auto-import/vite'
 import AutoComponents from 'unplugin-vue-components/vite'
-import { multiConf, polyfillFormData } from './custom-plugins'
+import { multiConf } from './custom-plugins'
 
 // https://vitejs.dev/config/
 export default ({ command, mode }: ConfigEnv) => {
@@ -28,7 +28,6 @@ export default ({ command, mode }: ConfigEnv) => {
       },
     },
     plugins: [
-      polyfillFormData(),
       // 仅用于增加语法提示，实际导入依靠 uni-app 的 easycom
       AutoComponents({
         dts: true,

package/template-uni-app/custom-plugins/polyfill.ts

@@ -1,32 +0,0 @@
-/*
- * @Author: zhangyang
- * @Date: 2023-07-18 15:58:06
- * @LastEditTime: 2023-07-19 14:32:28
- * @Description:
- */
-import type { Plugin } from 'vite'
-
-export function polyfillFormData() {
-  return {
-    name: 'vite-plugin-uni-axios',
-    transform(code, id) {
-      if (process.env.UNI_PLATFORM?.includes('mp')) {
-        if (id.includes('/form-data/lib/browser.js')) {
-          return {
-            code: code.replace('window', 'globalThis'),
-          }
-        }
-        if (id.includes('/axios/lib/platform/browser/classes/FormData.js')) {
-          return {
-            code: 'import FormData from \'miniprogram-formdata\';\nexport default FormData;',
-          }
-        }
-        if (id.includes('/axios/lib/platform/browser/classes/Blob.js')) {
-          return {
-            code: 'import Blob from \'miniprogram-blob\';\nexport default Blob;',
-          }
-        }
-      }
-    },
-  } as Plugin
-}

package/template-uni-app/dist/dev/mp-weixin/apis/lib/index.js

@@ -1,90 +0,0 @@
-"use strict";
-const common_vendor = require("../../common/vendor.js");
-const defaultConfig = {
-  baseURL: "/api",
-  method: "post",
-  timeout: 5e3,
-  loading: {
-    start: console.log.bind(null, "🚀 ~ http loading start"),
-    end: console.log.bind(null, "🚀 ~ http loading end")
-  },
-  fail: console.error.bind(null, "🚀 ~ http loading error"),
-  checkFn: (res) => res,
-  headers: {
-    getCommonHeaders: () => ({}),
-    getAuthHeaders: () => ({})
-  }
-};
-const useHttp = (config = {}) => {
-  const finalConfig = common_vendor.defu(config, defaultConfig);
-  const { baseURL, lazyBaseURL, method, timeout, headers, checkFn, loading, fail } = finalConfig;
-  const net = common_vendor.axios.create({
-    method,
-    timeout,
-    headers: headers.getCommonHeaders(),
-    adapter: common_vendor.Bt()
-  });
-  net.interceptors.request.use(
-    (req) => {
-      !req.notLoading && loading.start();
-      if (!req.baseURL) {
-        req.baseURL = (lazyBaseURL == null ? void 0 : lazyBaseURL()) ?? baseURL;
-      }
-      return req;
-    },
-    (error) => {
-      fail(error);
-      return Promise.reject(error);
-    }
-  );
-  net.interceptors.response.use(
-    (response) => {
-      !response.config.notLoading && loading.end();
-      const data = response.data;
-      try {
-        return checkFn(data);
-      } catch (err) {
-        fail(err);
-      }
-    },
-    (error) => {
-      !error.config.notLoading && loading.end();
-      fail(error);
-    }
-  );
-  return {
-    get: void 0,
-    post: void 0,
-    delete: void 0,
-    put: void 0,
-    patch: void 0,
-    head: void 0,
-    purge: void 0,
-    options: void 0,
-    link: void 0,
-    unlink: void 0,
-    __instance__: net,
-    __mixin__(extentions) {
-      for (const method2 in extentions) {
-        if (Object.prototype.hasOwnProperty.call(extentions, method2)) {
-          const originFns = this[method2] || {};
-          const fns = extentions[method2];
-          this[method2] = {
-            ...originFns,
-            ...fns
-          };
-        }
-      }
-      return this;
-    },
-    freeReq: net.request,
-    authReq: (args) => net.request({
-      ...args,
-      headers: {
-        ...headers.getAuthHeaders(),
-        ...args == null ? void 0 : args.headers
-      }
-    })
-  };
-};
-exports.useHttp = useHttp;

package/template-uni-app/src/apis/lib/index.ts

@@ -1,235 +0,0 @@
-/*
- * @Author: zhangyang
- * @Date: 2023-07-18 16:36:39
- * @LastEditTime: 2023-09-06 19:40:19
- * @Description:
- */
-/// <reference types="@uni-helper/axios-adapter/client" />
-import type { AxiosAdapter, AxiosInstance, AxiosRequestConfig, Method } from 'axios'
-import axios from 'axios'
-import { defu } from 'defu'
-import { createUniAppAxiosAdapter } from '@uni-helper/axios-adapter'
-
-type Simplify<T> = {
-  [P in keyof T]: T[P];
-}
-
-type SetRequired<T, K extends keyof T> = Simplify<
-  // 将要设置为可选类型的结构取出并设置为必选
-  Required<Pick<T, K>> &
-  // 取并集
-  // 排除需要设置为可选属性的结构，其余的保持不变
-  Pick<T, Exclude<keyof T, K>>
->
-
-export type AllMethod = Lowercase<Method>
-export type Fn<T = any, R = any> = (...args: T[]) => Promise<R>
-export type Cbks = {
-  [k in AllMethod]?: Record<string, Fn>;
-}
-
-type Handlers<R extends Cbks> = {
-  [P in keyof R]?: R[P];
-}
-
-type Headers = Record<string, string>
-
-type Req = <X = any>(config: AxiosRequestConfig<unknown>) => Promise<X>
-
-interface Prototype {
-  __instance__: AxiosInstance
-  __mixin__<T extends Cbks>(
-    extentions: Handlers<T>,
-  ): SetRequired<Handlers<T>, keyof T> & ThisType<Handlers<T>>
-
-  freeReq: Req
-  authReq: Req
-}
-
-export enum UsefulContentTypes {
-  JSON = 'application/json; charset=UTF-8',
-  URLEncoded = 'application/x-www-form-urlencoded; charset=UTF-8',
-  FormData = 'multipart/form-data; charset=UTF-8',
-}
-
-export interface DefaultMsg {
-  code: number
-  msg: string
-  data: any
-}
-
-export interface DefaultHttpConfig<Msg = DefaultMsg> {
-  /**
-   * 基础地址
-   * @default /api
-   */
-  baseURL: string
-  /**
-   * 动态获取基础地址
-   */
-  lazyBaseURL?: () => string
-  /**
-   * 默认方法
-   * @default post
-   */
-  method: AllMethod
-  /**
-   * 超时时间
-   * @default 5e3 5s
-   */
-  timeout: number
-  /**
-   * 加载函数
-   */
-  loading: {
-    start: () => void
-    end: () => void
-  }
-  /**
-   * 错误处理函数，进行错误处理或继续抛出错误
-   * 接受各种抛出的错误
-   * @default console.error
-   */
-  fail: (err: string | number | Error | Msg) => void
-  /**
-   * 结果校验 + 数据解析，判断此次请求是否正常，正常则返回解包数据，否则抛出异常
-   * 不传则默认使用标准 http 状态码作为判断结果，并原样返回
-   * @default () => any | never
-   */
-  checkFn: (res: Msg) => any | never
-  /**
-   * 请求头
-   */
-  headers: {
-    /**
-     * 生成公共请求头
-     * @default () => {}
-     */
-    getCommonHeaders?: () => Headers
-    /**
-     * 生成鉴权请求头
-     * @default () => {}
-     */
-    getAuthHeaders?: () => Headers
-  }
-  /**
-   * 自定义适配器
-   * 微信小程序等其他非标准环境时传入
-   */
-  adapter?: AxiosAdapter
-}
-
-const defaultConfig: DefaultHttpConfig = {
-  baseURL: '/api',
-  method: 'post',
-  timeout: 5e3,
-  loading: {
-    start: console.log.bind(null, '🚀 ~ http loading start'),
-    end: console.log.bind(null, '🚀 ~ http loading end'),
-  },
-  fail: console.error.bind(null, '🚀 ~ http loading error'),
-  checkFn: res => res,
-  headers: {
-    getCommonHeaders: () => ({}),
-    getAuthHeaders: () => ({}),
-  },
-}
-
-declare module 'axios' {
-  export interface AxiosRequestConfig {
-    /**
-     * 禁用 loading 动画
-     * @default false
-     */
-    notLoading?: boolean
-  }
-}
-
-export function useHttp<Msg extends Record<string, any> = DefaultMsg, Fns extends Cbks = Cbks>(config: Partial<DefaultHttpConfig<Msg>> = {}) {
-  const finalConfig = defu(config, defaultConfig)
-
-  const { baseURL, lazyBaseURL, method, timeout, headers, checkFn, loading, fail } = finalConfig
-
-  const net = axios.create({
-    method,
-    timeout,
-    headers: headers.getCommonHeaders!(),
-    adapter: createUniAppAxiosAdapter(),
-  })
-
-  net.interceptors.request.use(
-    (req) => {
-      !req.notLoading && loading.start()
-      if (!req.baseURL)
-        req.baseURL = lazyBaseURL?.() ?? baseURL
-
-      return req
-    },
-    (error) => {
-      fail(error)
-      return Promise.reject(error)
-    },
-  )
-
-  net.interceptors.response.use(
-    (response) => {
-      !response.config.notLoading && loading.end()
-      const data = response.data
-
-      try {
-        return checkFn(data)
-      }
-      catch (err) {
-        // 应用逻辑异常
-        fail(err as any)
-      }
-    },
-    (error) => {
-      !error.config.notLoading && loading.end()
-      // http 异常
-      fail(error)
-    },
-  )
-
-  return {
-    get: undefined,
-    post: undefined,
-    delete: undefined,
-    put: undefined,
-    patch: undefined,
-    head: undefined,
-    purge: undefined,
-    options: undefined,
-    link: undefined,
-    unlink: undefined,
-    __instance__: net,
-    __mixin__(extentions: any) {
-      for (const method in extentions) {
-        if (Object.prototype.hasOwnProperty.call(extentions, method)) {
-          // @ts-expect-error
-          const originFns = this[method] || {}
-          const fns = extentions[method]
-          // @ts-expect-error
-          this[method] = {
-            ...originFns,
-            ...fns,
-          }
-        }
-      }
-
-      return this
-    },
-
-    freeReq: net.request,
-    authReq: (args: AxiosRequestConfig) =>
-      net.request({
-        ...args,
-        headers: {
-          ...headers.getAuthHeaders!(),
-          ...args?.headers,
-        },
-      }),
-  } as unknown as Handlers<Fns> & Prototype
-}
-
-export type Http = ReturnType<typeof useHttp>