Merge branch 'feature/0.1.0' of https://github.com/callmecalcal/apple…

…t-request into feature/0.1.0
calandnong · Jun 30, 2024 · 30df94d · 30df94d
2 parents 8c48ba2 + 5026b8c
commit 30df94d
Show file tree

Hide file tree

Showing 25 changed files with 437 additions and 20 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -1,6 +1,11 @@
 {
   "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
-  "changelog": "@changesets/cli/changelog",
+  "changelog": [
+    "@changesets/changelog-github", 
+    { 
+      "repo": "calandnong/applet-request" 
+    }
+  ],
   "commit": false,
   "fixed": [],
   "linked": [],

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,21 @@
+name: Release
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+
+      - run: npx changelogithub
+        env:
+          GITHUB_TOKEN: ${{ secrets.TOKEN }}
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
+registry = "https://registry.npmjs.org/"
 engine-strict=true
diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "@applet-request/eslint-config-ts": "workspace:*",
     "@applet-request/meta-data": "workspace:*",
     "@applet-request/shared": "workspace:*",
+    "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.1",
     "@commitlint/cli": "^17.5.1",
     "@commitlint/config-conventional": "^17.4.4",

diff --git a/packages/adapters/CHANGELOG.md b/packages/adapters/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @applet-request/adapters
 
+## 0.1.12
+
+### Patch Changes
+
+- fix: 修复 axios 的 params 重复问题&修复 request 类型问题
+
+## 0.1.11
+
+### Patch Changes
+
+- fix: 修复 axios 配置类型问题
+
+## 0.1.10
+
+### Patch Changes
+
+- fix: 修复 axios 依赖问题
+
+- Updated dependencies []:
+  - @applet-request/shared@0.1.10
+  - @applet-request/core@0.1.10
+
+## 0.1.9
+
+### Patch Changes
+
+- fix: 修复 xhr 的转换 data 问题&增加 axios 的版本
+
+- Updated dependencies []:
+  - @applet-request/core@0.1.9
+  - @applet-request/shared@0.1.9
+
 ## 0.1.8
 
 ### Patch Changes

diff --git a/packages/adapters/axios/index.ts b/packages/adapters/axios/index.ts
@@ -0,0 +1,49 @@
+import { Adapter } from '@applet-request/core';
+import type {
+  RequestContext,
+  MiddlewareNext,
+  RequestConfig,
+} from '@applet-request/core';
+import { BaseException, isHttpSuccess } from '@applet-request/shared';
+import type { AxiosRequestConfig, AxiosResponse } from 'axios';
+import AxiosStatic from 'axios';
+
+/**
+ * 请求单例
+ */
+const request = AxiosStatic.create();
+
+/**
+ * axios的其他请求配置
+ */
+export type AxiosOtherConfig = Omit<AxiosRequestConfig, 'url' | 'params' | 'data'>;
+
+/**
+ * axios的请求配置
+ */
+export type AxiosConfig = RequestConfig<AxiosOtherConfig>;
+
+/**
+ * axios的请求适配器
+ */
+export class AxiosAdapter<Data> extends Adapter<
+AxiosOtherConfig,
+Data,
+AxiosResponse
+> {
+  async request(context: RequestContext<AxiosOtherConfig, Data, AxiosResponse>, next: MiddlewareNext): Promise<unknown> {
+    await next();
+    return request({
+      ...context.request.config,
+      url: context.request.apiURL,
+      data: context.request.data,
+    }).then((res) => {
+      if (isHttpSuccess(res.status)) {
+        context.response.data = res.data;
+        context.response.raw = res;
+        return res;
+      }
+      return Promise.reject(new BaseException('系统繁忙，请重试！', res));
+    });
+  }
+}
diff --git a/packages/adapters/index.ts b/packages/adapters/index.ts
@@ -2,3 +2,4 @@ export * from './uni-request';
 export * from './uni-uploadFile';
 export * from './uni-downloadFile';
 export * from './xhr';
+export * from './axios';
diff --git a/packages/adapters/package.json b/packages/adapters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@applet-request/adapters",
-  "version": "0.1.8",
+  "version": "0.1.12",
   "description": "",
   "files": [
     "dist"
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@applet-request/core": "workspace:*",
-    "@applet-request/shared": "workspace:*"
+    "@applet-request/shared": "workspace:*",
+    "axios": "^1.4.0"
   }
 }
diff --git a/packages/adapters/uni-request/index.ts b/packages/adapters/uni-request/index.ts
@@ -2,19 +2,28 @@ import { Adapter } from '@applet-request/core';
 import type {
   RequestContext,
   MiddlewareNext,
+  RequestConfig,
 } from '@applet-request/core';
 
-export type UniRequestConfig = Omit<UniApp.RequestOptions, 'url' | 'data' | 'fail' | 'success' | 'complete'>;
+/**
+ * uni.request的其他请求配置
+ */
+export type UniRequestOtherConfig = Omit<UniApp.RequestOptions, 'url' | 'data' | 'fail' | 'success' | 'complete'>;
+
+/**
+ * uni.request的请求配置
+ */
+export type UniRequestConfig = RequestConfig<UniRequestOtherConfig>;
 
 /**
  * uni.request的请求适配器
  */
 export class UniRequestAdapter<Data> extends Adapter<
-UniRequestConfig,
+UniRequestOtherConfig,
 Data,
 UniApp.RequestSuccessCallbackResult
 > {
-  async request(context: RequestContext<UniRequestConfig, Data, UniApp.RequestSuccessCallbackResult>, next: MiddlewareNext): Promise<unknown> {
+  async request(context: RequestContext<UniRequestOtherConfig, Data, UniApp.RequestSuccessCallbackResult>, next: MiddlewareNext): Promise<unknown> {
     await next();
     return new Promise((resolve, reject) => {
       uni.request({

diff --git a/packages/adapters/uni-uploadFile/index.ts b/packages/adapters/uni-uploadFile/index.ts
@@ -2,12 +2,12 @@ import { Adapter } from '@applet-request/core';
 import type { RequestContext, MiddlewareNext, RequestConfig } from '@applet-request/core';
 
 /**
- * uni.downloadFile的其他请求配置
+ * uni.uploadFile的其他请求配置
  */
-export type UniUploadFileOtherConfig = Omit<UniApp.UploadFileOption, 'url' | 'fail' | 'success' | 'complete'>;
+export type UniUploadFileOtherConfig = Omit<UniApp.UploadFileOption, 'url' | 'fail' | 'success' | 'complete' | 'formData'>;
 
 /**
- * uni.downloadFile的请求配置
+ * uni.uploadFile的请求配置
  */
 export type UniUploadFileConfig = RequestConfig<UniUploadFileOtherConfig>;
 
@@ -32,6 +32,7 @@ export class UniUploadFileAdaptor<Data> extends Adapter<
       uni.uploadFile({
         ...context.request.config,
         url: context.request.apiURL,
+        formData: context.request.data,
         success(res) {
           context.response.data = res.data as Data;
           context.response.raw = res;

diff --git a/packages/adapters/xhr/index.ts b/packages/adapters/xhr/index.ts
@@ -225,13 +225,16 @@ XHROtherConfig,
       //
       configureRequest();
 
+      // 转换data
+      const finalData = transformRequest(data, header);
+
       // 监听回调
       addEvents();
 
       // 设置自定义请求头
       processHeaders();
 
-      xhr.send(transformRequest(data) as Document | XMLHttpRequestBodyInit | null | undefined);
+      xhr.send(finalData as Document | XMLHttpRequestBodyInit | null | undefined);
     });
   }
 }
diff --git a/packages/api-mock/CHANGELOG.md b/packages/api-mock/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @applet-request/api-mock
 
+## 1.0.11
+
+### Patch Changes
+
+- fix: 修复 axios 依赖问题
+
+## 1.0.10
+
+### Patch Changes
+
+- fix: 修复 xhr 的转换 data 问题&增加 axios 的版本
+
 ## 1.0.9
 
 ### Patch Changes

diff --git a/packages/api-mock/package.json b/packages/api-mock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@applet-request/api-mock",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "",
   "files": [
     "dist"

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @applet-request/core
 
+## 0.1.10
+
+### Patch Changes
+
+- fix: 修复 axios 依赖问题
+
+- Updated dependencies []:
+  - @applet-request/shared@0.1.10
+
+## 0.1.9
+
+### Patch Changes
+
+- fix: 修复 xhr 的转换 data 问题&增加 axios 的版本
+
+- Updated dependencies []:
+  - @applet-request/shared@0.1.9
+
 ## 0.1.8
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@applet-request/core",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "",
   "files": [
     "dist"

diff --git a/packages/core/types/core.ts b/packages/core/types/core.ts
@@ -35,7 +35,7 @@ export interface TransformRequestConfig<Config> extends RequestConfig<Config> {
    */
   baseURL: string;
   /**
-   * 请求方法未拼接的url
+   * 请求方法已拼接的url
    */
   apiURL: string;
 }

diff --git a/packages/eslint-config-ts/CHANGELOG.md b/packages/eslint-config-ts/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @applet-request/eslint-config-ts
 
+## 0.1.10
+
+### Patch Changes
+
+- fix: 修复 axios 依赖问题
+
+## 0.1.9
+
+### Patch Changes
+
+- fix: 修复 xhr 的转换 data 问题&增加 axios 的版本
+
 ## 0.1.8
 
 ### Patch Changes

diff --git a/packages/eslint-config-ts/package.json b/packages/eslint-config-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@applet-request/eslint-config-ts",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "",
   "author": "coder_pig",
   "license": "MIT",

diff --git a/packages/meta-data/CHANGELOG.md b/packages/meta-data/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @applet-request/meta-data
 
+## 0.1.11
+
+### Patch Changes
+
+- fix: 修复 axios 依赖问题
+
+## 0.1.10
+
+### Patch Changes
+
+- fix: 修复 xhr 的转换 data 问题&增加 axios 的版本
+
 ## 0.1.9
 
 ### Patch Changes

diff --git a/packages/meta-data/meta-data.ts b/packages/meta-data/meta-data.ts
@@ -8,6 +8,9 @@ export const PACKAGES: PackageManifest[] = [
     name: 'core',
     displayName: 'Applet Request Core',
     description: 'The core logical library of applet-request',
+    external: [
+      '@applet-request/shared',
+    ],
   },
   {
     name: 'shared',
@@ -22,6 +25,9 @@ export const PACKAGES: PackageManifest[] = [
     name: 'adapters',
     displayName: 'Adapters Collection',
     description: 'The collection of adapters for applet-request',
+    external: [
+      'axios',
+    ],
   },
   {
     name: 'api-mock',

diff --git a/packages/meta-data/package.json b/packages/meta-data/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@applet-request/meta-data",
   "private": true,
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "",
   "scripts": {},
   "keywords": [],

diff --git a/packages/shared/CHANGELOG.md b/packages/shared/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @applet-request/shared
 
+## 0.1.10
+
+### Patch Changes
+
+- fix: 修复 axios 依赖问题
+
+## 0.1.9
+
+### Patch Changes
+
+- fix: 修复 xhr 的转换 data 问题&增加 axios 的版本
+
 ## 0.1.8
 
 ### Patch Changes
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		registry = "https://registry.npmjs.org/"
		engine-strict=true