diff --git a/lib/module.js b/lib/module.js index f4c1bec..5bcf9e3 100755 --- 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 index c6bc558..06c1a35 100644 --- 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!