Merge pull request #10 from JoBinsJP/axios-setup

feat: custom axios setup
JoBinsJP · Mar 5, 2023 · 2e3e043 · 2e3e043
2 parents 3d644ac + fdde50d
commit 2e3e043
Show file tree

Hide file tree

Showing 19 changed files with 3,942 additions and 118 deletions.
diff --git a/packages/.github/contributing.md → .github/contributing.md b/packages/.github/contributing.md → .github/contributing.md
@@ -10,7 +10,7 @@ npm publish --workspace=packages --if-present
 
 ##### Set version
 ```bash
-npm version {version} --workspace=packages --if-present
+npm version minor --workspace=packages --if-present
 ```
 
 ##### Test

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,22 @@
+name: "Run Tests - Current"
+
+on:
+    push:
+        branches: [ main ]
+    pull_request:
+        branches: [ main ]
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                adapter: [ 'core','vue2' ]
+                node-version: [ 14.x ]
+        steps:
+            -   uses: actions/checkout@v3
+            -   name: Testing ${{ matrix.adapter }}
+                uses: actions/setup-node@v3
+                with:
+                    node-version: ${{ matrix.node-version }}
+            -   run: cd packages/${{ matrix.adapter }} && npm install && npm run build && npm run test
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "formjs-core",
-    "version": "0.0.23",
+    "version": "0.0.30",
     "type": "module",
     "contributors": [
         "Bedram Tamang <[email protected]>"
@@ -20,7 +20,7 @@
         }
     },
     "scripts": {
-        "test": "vitest",
+        "test": "vitest run -r tests",
         "build": "npm run clean && tsc --emitDeclarationOnly && vite build",
         "clean": "rm -rf types && rm -rf dist",
         "prepublishOnly": "npm run build"

diff --git a/packages/core/src/http.ts b/packages/core/src/http.ts
@@ -14,27 +14,27 @@ export class Http {
             forceFormData = false,
             onFinish = () => {},
             onSuccess = () => {},
+            onErrors = () => {},
             onError = () => {},
+            instance = Axios,
         }: VisitOptions = {},
     ): void {
-        const defaultBaseURL = Axios.defaults.baseURL
-        const authorizationToken = Axios.defaults.headers.common['Authorization']
-
-        let url = typeof href === "string" ? hrefToUrl(href, defaultBaseURL) : href
-
         if ((hasFiles(data) || forceFormData) && !(data instanceof FormData)) {
             data = objectToFormData(data)
         }
 
-        Axios({
+        const defaultConfig = instance?.defaults
+        let url = typeof href === "string" ? hrefToUrl(href, defaultConfig?.baseURL) : href
+
+        const _url = urlWithoutHash(url).href
+
+        instance(_url, {
+            ...defaultConfig,
             method,
-            baseURL: defaultBaseURL,
-            url: urlWithoutHash(url).href,
             data: method === "get" ? {} : data,
             params: method === "get" ? data : {},
             headers: {
                 Accept: "application/json",
-                Authorization: authorizationToken,
                 "Content-Type": "application/json",
                 "X-Requested-With": "XMLHttpRequest",
                 ...headers,
@@ -49,10 +49,10 @@ export class Http {
                     Object.keys(responseErrors).forEach((name) => {
                         errors[name] = responseErrors[name][0]
                     })
-                    return onError(errors)
+                    return onErrors(errors)
                 }
             }
-            return Promise.reject(error)
+            return onError(error)
         }).then(() => {
             return onFinish()
         }).catch((error) => {