diff --git a/.babelrc b/.babelrc index 56a42652..0c91b815 100644 --- a/.babelrc +++ b/.babelrc @@ -1,6 +1,5 @@ { "plugins": [ - "add-module-exports", "module:@babel/plugin-transform-modules-commonjs", [ "module:fast-async", diff --git a/README.md b/README.md index 25851e23..6ded2f13 100755 --- a/README.md +++ b/README.md @@ -45,9 +45,9 @@ $ npm i axios axios-cookiejar-support # Same as above ## Usage ```js -const axios = require('axios'); -const axiosCookieJarSupport = require('@3846masa/axios-cookiejar-support'); -// const axiosCookieJarSupport = require('axios-cookiejar-support'); +const axios = require('axios').default; +const axiosCookieJarSupport = require('@3846masa/axios-cookiejar-support').default; +// const axiosCookieJarSupport = require('axios-cookiejar-support').default; const tough = require('tough-cookie'); axiosCookieJarSupport(axios); diff --git a/example/send-cookies.js b/example/send-cookies.js index 25aea9d7..4a2faea2 100755 --- a/example/send-cookies.js +++ b/example/send-cookies.js @@ -1,8 +1,8 @@ 'use strict'; -const axios = require('axios'); +const axios = require('axios').default; const tough = require('tough-cookie'); -const axiosCookieJarSupport = require('../'); +const axiosCookieJarSupport = require('../').default; axiosCookieJarSupport(axios); diff --git a/example/set-default.js b/example/set-default.js index 33e460fa..2234e39d 100755 --- a/example/set-default.js +++ b/example/set-default.js @@ -1,8 +1,8 @@ 'use strict'; -const axios = require('axios'); +const axios = require('axios').default; const tough = require('tough-cookie'); -const axiosCookieJarSupport = require('../'); +const axiosCookieJarSupport = require('../').default; axiosCookieJarSupport(axios); diff --git a/example/simple.js b/example/simple.js index 1e9fe400..3dbf3c26 100755 --- a/example/simple.js +++ b/example/simple.js @@ -1,8 +1,8 @@ 'use strict'; -const axios = require('axios'); +const axios = require('axios').default; const tough = require('tough-cookie'); -const axiosCookieJarSupport = require('../'); +const axiosCookieJarSupport = require('../').default; axiosCookieJarSupport(axios); diff --git a/example/simple.mjs b/example/simple.mjs new file mode 100644 index 00000000..b883da1f --- /dev/null +++ b/example/simple.mjs @@ -0,0 +1,20 @@ +import axios from 'axios'; +import tough from 'tough-cookie'; +import axiosCookieJarSupport from '../'; + +axiosCookieJarSupport(axios); + +const cookieJar = new tough.CookieJar(); + +axios + .get('https://google.com', { + jar: cookieJar, + withCredentials: true, + }) + .then(response => { + const config = response.config; + console.log(config.jar.toJSON()); + }) + .catch(err => { + console.error(err.stack || err); + }); diff --git a/example/simple.ts b/example/simple.ts new file mode 100644 index 00000000..7ac3585a --- /dev/null +++ b/example/simple.ts @@ -0,0 +1,20 @@ +import axios from 'axios'; +import tough = require('tough-cookie'); +import axiosCookieJarSupport from '../'; + +axiosCookieJarSupport(axios); + +const cookieJar = new tough.CookieJar(); + +axios + .get('https://google.com', { + jar: cookieJar, + withCredentials: true, + }) + .then(response => { + const config = response.config; + console.log(config.jar.toJSON()); + }) + .catch(err => { + console.error(err.stack || err); + }); diff --git a/package.json b/package.json index 263cb823..52c634ea 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "@babel/core": "^7.0.0-beta.32", "@babel/plugin-transform-modules-commonjs": "^7.0.0-beta.32", "axios": "0.17.1", - "babel-plugin-add-module-exports": "^0.2.1", "cookie": "0.3.1", "decache": "4.3.0", "eslint": "4.12.0", diff --git a/test/test.js b/test/test.js index 639f8325..ea363b26 100755 --- a/test/test.js +++ b/test/test.js @@ -5,12 +5,12 @@ const nock = require('nock'); const tough = require('tough-cookie'); const cookie = require('cookie'); const decache = require('decache'); -const axiosCookieJarSupport = require('../'); +const axiosCookieJarSupport = require('../').default; let axios; beforeEach(() => { decache('axios'); - axios = require('axios'); + axios = require('axios').default; axios.defaults.validateStatus = () => true; }); diff --git a/yarn.lock b/yarn.lock index d9e4ada5..ffa26ec2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -321,10 +321,6 @@ babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-plugin-add-module-exports@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25" - babylon@7.0.0-beta.32: version "7.0.0-beta.32" resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.32.tgz#e9033cb077f64d6895f4125968b37dc0a8c3bc6e"