feat: fix axios global import

pikax · Nov 1, 2019 · 993973a · 993973a
1 parent 8021456
commit 993973a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/dist/vue-composable.cjs.js b/dist/vue-composable.cjs.js
@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
 var compositionApi = require('@vue/composition-api');
-var _axios = _interopDefault(require('axios'));
+var axios = _interopDefault(require('axios'));
 
 // export function unwrap<T>(o: RefTyped<T>): T {
 //   return isRef(o) ? o.value : o;
@@ -320,11 +320,11 @@ function useFetch(options) {
 }
 
 /* istanbul ignore next  */
-const axios = _axios || (globalThis && globalThis.axios);
+const _axios = axios || (globalThis && globalThis.axios);
 function useAxios(config) {
     /* istanbul ignore next  */
-    process.env.NODE_ENV !== "production" && !axios && console.warn(`[axios] not installed, please install it`);
-    const axiosClient = axios.create(config);
+    process.env.NODE_ENV !== "production" && !_axios && console.warn(`[axios] not installed, please install it`);
+    const axiosClient = _axios.create(config);
     const client = compositionApi.computed(() => axiosClient);
     const use = usePromise(async (request) => {
         return axiosClient.request(request);

diff --git a/dist/vue-composable.es.js b/dist/vue-composable.es.js
@@ -1,5 +1,5 @@
 import { isRef, ref, onMounted, onUnmounted, computed, watch } from '@vue/composition-api';
-import _axios from 'axios';
+import axios from 'axios';
 
 // export function unwrap<T>(o: RefTyped<T>): T {
 //   return isRef(o) ? o.value : o;
@@ -314,11 +314,11 @@ function useFetch(options) {
 }
 
 /* istanbul ignore next  */
-const axios = _axios || (globalThis && globalThis.axios);
+const _axios = axios || (globalThis && globalThis.axios);
 function useAxios(config) {
     /* istanbul ignore next  */
-    process.env.NODE_ENV !== "production" && !axios && console.warn(`[axios] not installed, please install it`);
-    const axiosClient = axios.create(config);
+    process.env.NODE_ENV !== "production" && !_axios && console.warn(`[axios] not installed, please install it`);
+    const axiosClient = _axios.create(config);
     const client = computed(() => axiosClient);
     const use = usePromise(async (request) => {
         return axiosClient.request(request);

diff --git a/dist/vue-composable.umd.js b/dist/vue-composable.umd.js
@@ -1,10 +1,10 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@vue/composition-api'), require('axios')) :
   typeof define === 'function' && define.amd ? define(['exports', '@vue/composition-api', 'axios'], factory) :
-  (global = global || self, factory(global.vueComposable = {}, global.vueCompositionApi, global._axios));
-}(this, (function (exports, compositionApi, _axios) { 'use strict';
+  (global = global || self, factory(global.vueComposable = {}, global.vueCompositionApi, global.axios));
+}(this, (function (exports, compositionApi, axios) { 'use strict';
 
-  _axios = _axios && _axios.hasOwnProperty('default') ? _axios['default'] : _axios;
+  axios = axios && axios.hasOwnProperty('default') ? axios['default'] : axios;
 
   // export function unwrap<T>(o: RefTyped<T>): T {
   //   return isRef(o) ? o.value : o;
@@ -319,11 +319,11 @@
   }
 
   /* istanbul ignore next  */
-  const axios = _axios || (globalThis && globalThis.axios);
+  const _axios = axios || (globalThis && globalThis.axios);
   function useAxios(config) {
       /* istanbul ignore next  */
-       !axios && console.warn(`[axios] not installed, please install it`);
-      const axiosClient = axios.create(config);
+       !_axios && console.warn(`[axios] not installed, please install it`);
+      const axiosClient = _axios.create(config);
       const client = compositionApi.computed(() => axiosClient);
       const use = usePromise(async (request) => {
           return axiosClient.request(request);

diff --git a/dist/vue-composable.umd.prod.js b/dist/vue-composable.umd.prod.js
@@ -1,10 +1,10 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@vue/composition-api'), require('axios')) :
   typeof define === 'function' && define.amd ? define(['exports', '@vue/composition-api', 'axios'], factory) :
-  (global = global || self, factory(global.vueComposable = {}, global.vueCompositionApi, global._axios));
-}(this, (function (exports, compositionApi, _axios) { 'use strict';
+  (global = global || self, factory(global.vueComposable = {}, global.vueCompositionApi, global.axios));
+}(this, (function (exports, compositionApi, axios) { 'use strict';
 
-  _axios = _axios && _axios.hasOwnProperty('default') ? _axios['default'] : _axios;
+  axios = axios && axios.hasOwnProperty('default') ? axios['default'] : axios;
 
   // export function unwrap<T>(o: RefTyped<T>): T {
   //   return isRef(o) ? o.value : o;
@@ -307,9 +307,9 @@
   }
 
   /* istanbul ignore next  */
-  const axios = _axios || (globalThis && globalThis.axios);
+  const _axios = axios || (globalThis && globalThis.axios);
   function useAxios(config) {
-      const axiosClient = axios.create(config);
+      const axiosClient = _axios.create(config);
       const client = compositionApi.computed(() => axiosClient);
       const use = usePromise(async (request) => {
           return axiosClient.request(request);

diff --git a/src/web/axios.ts b/src/web/axios.ts
@@ -1,15 +1,15 @@
 import { ref, computed, watch } from "@vue/composition-api";
-import _axios, { AxiosRequestConfig, AxiosError } from "axios";
+import axios, { AxiosRequestConfig, AxiosError } from "axios";
 import { usePromise } from "../promise/promise";
 
 /* istanbul ignore next  */
-const axios = _axios || (globalThis && (globalThis as any).axios);
+const _axios = axios || (globalThis && (globalThis as any).axios);
 
 export function useAxios<TData = any>(config?: AxiosRequestConfig) {
   /* istanbul ignore next  */
-  __DEV__ && !axios && console.warn(`[axios] not installed, please install it`);
+  __DEV__ && !_axios && console.warn(`[axios] not installed, please install it`);
 
-  const axiosClient = axios.create(config);
+  const axiosClient = _axios.create(config);
   const client = computed(() => axiosClient);
   const use = usePromise(async (request: AxiosRequestConfig) => {
     return axiosClient.request(request);