Merge branch 'master' into master

axios · Sep 17, 2021 · 0e8a443 · 0e8a443
2 parents a0dbd01 + 7d6bddb
commit 0e8a443
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,6 +19,6 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node }}
+          node-version: ${{ matrix.node-version }}
       - run: npm install
       - run: npm test
diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js
@@ -104,7 +104,7 @@ module.exports = function xhrAdapter(config) {
 
     // Handle timeout
     request.ontimeout = function handleTimeout() {
-      var timeoutErrorMessage = 'timeout of ' + config.timeout + 'ms exceeded';
+      var timeoutErrorMessage = config.timeout ? 'timeout of ' + config.timeout + 'ms exceeded' : 'timeout exceeded';
       if (config.timeoutErrorMessage) {
         timeoutErrorMessage = config.timeoutErrorMessage;
       }

diff --git a/webpack.config.js b/webpack.config.js
@@ -11,7 +11,8 @@ function generateConfig(name) {
       filename: name + '.js',
       sourceMapFilename: name + '.map',
       library: 'axios',
-      libraryTarget: 'umd'
+      libraryTarget: 'umd',
+      globalObject: 'this'
     },
     node: {
       process: false