Commit 8904847 1 parent a1a1894 commit 8904847 Copy full SHA for 8904847
File tree 2 files changed +12
-2
lines changed
2 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -56,6 +56,16 @@ function axiosModule (_moduleOptions) {
56
56
patch : { }
57
57
}
58
58
59
+ // Support baseUrl alternative
60
+ if ( moduleOptions . baseUrl ) {
61
+ moduleOptions . baseURL = moduleOptions . baseUrl
62
+ delete moduleOptions . baseUrl
63
+ }
64
+ if ( moduleOptions . browserBaseUrl ) {
65
+ moduleOptions . browserBaseURL = moduleOptions . browserBaseUrl
66
+ delete moduleOptions . browserBaseUrl
67
+ }
68
+
59
69
// Apply defaults
60
70
const options = defu ( moduleOptions , {
61
71
baseURL : `http://${ defaultHost } :${ defaultPort } ${ prefix } ` ,
Original file line number Diff line number Diff line change @@ -194,8 +194,8 @@ export default (ctx, inject) => {
194
194
const runtimeConfig = ctx . $config && ctx . $config . axios || { }
195
195
// baseURL
196
196
const baseURL = process . browser
197
- ? ( runtimeConfig . browserBaseURL || runtimeConfig . baseURL || '<%= options.browserBaseURL || ' ' %>' )
198
- : ( runtimeConfig . baseURL || process . env . _AXIOS_BASE_URL_ || '<%= options.baseURL || ' ' %>' )
197
+ ? ( runtimeConfig . browserBaseURL || runtimeConfig . browserBaseUrl || runtimeConfig . baseURL || runtimeConfig . baseUrl || '<%= options.browserBaseURL || ' ' %>' )
198
+ : ( runtimeConfig . baseURL || runtimeConfig . baseUrl || process . env . _AXIOS_BASE_URL_ || '<%= options.baseURL || ' ' %>' )
199
199
200
200
// Create fresh objects for all default header scopes
201
201
// Axios creates only one which is shared across SSR requests!
You can’t perform that action at this time.
0 commit comments