feat: support baseUrl and browserBaseUrl to handle casing typos

nuxt-community · Feb 1, 2021 · 8904847 · minicatsCB · Feb 4, 2021 · amjmhs
1 parent a1a1894
commit 8904847
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/module.js b/lib/module.js
@@ -56,6 +56,16 @@ function axiosModule (_moduleOptions) {
     patch: {}
   }
 
+  // Support baseUrl alternative
+  if (moduleOptions.baseUrl) {
+    moduleOptions.baseURL = moduleOptions.baseUrl
+    delete moduleOptions.baseUrl
+  }
+  if (moduleOptions.browserBaseUrl) {
+    moduleOptions.browserBaseURL = moduleOptions.browserBaseUrl
+    delete moduleOptions.browserBaseUrl
+  }
+
   // Apply defaults
   const options = defu(moduleOptions, {
     baseURL: `http://${defaultHost}:${defaultPort}${prefix}`,

diff --git a/lib/plugin.js b/lib/plugin.js
@@ -194,8 +194,8 @@ export default (ctx, inject) => {
   const runtimeConfig = ctx.$config && ctx.$config.axios || {}
   // baseURL
   const baseURL = process.browser
-    ? (runtimeConfig.browserBaseURL || runtimeConfig.baseURL || '<%= options.browserBaseURL || '' %>')
-      : (runtimeConfig.baseURL || process.env._AXIOS_BASE_URL_ || '<%= options.baseURL || '' %>')
+    ? (runtimeConfig.browserBaseURL || runtimeConfig.browserBaseUrl || runtimeConfig.baseURL || runtimeConfig.baseUrl || '<%= options.browserBaseURL || '' %>')
+      : (runtimeConfig.baseURL || runtimeConfig.baseUrl || process.env._AXIOS_BASE_URL_ || '<%= options.baseURL || '' %>')
 
   // Create fresh objects for all default header scopes
   // Axios creates only one which is shared across SSR requests!