Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nuxt-community/axios-module
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.10.1
Choose a base ref
...
head repository: nuxt-community/axios-module
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.10.2
Choose a head ref
  • 5 commits
  • 6 files changed
  • 5 contributors

Commits on Apr 22, 2020

  1. revert: add brotli test back

    This reverts commit 8be99d1.
    pooya parsa committed Apr 22, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    zhukovgreen zhukovgreen
    Copy the full SHA
    ba71853 View commit details

Commits on Apr 27, 2020

  1. docs: add algolia search (#355)

    Sylvain Pace authored Apr 27, 2020
    Copy the full SHA
    b46693b View commit details
  2. Copy the full SHA
    47788bd View commit details
  3. chore(deps): update dependency axios-retry to ^3.1.8 (#353)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 27, 2020
    Copy the full SHA
    95c6010 View commit details
  4. chore(release): 5.10.2

    pooya parsa committed Apr 27, 2020
    Copy the full SHA
    b0483da View commit details
Showing with 44 additions and 228 deletions.
  1. +7 −0 CHANGELOG.md
  2. +4 −0 docs/.vuepress/config.js
  3. +1 −1 lib/plugin.js
  4. +2 −2 package.json
  5. +12 −0 test/axios.test.js
  6. +18 −225 yarn.lock
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [5.10.2](https://github.com/nuxt-community/axios-module/compare/v5.10.1...v5.10.2) (2020-04-27)


### Bug Fixes

* **plugin:** add missing $ prefix to globalName ([#356](https://github.com/nuxt-community/axios-module/issues/356)) ([47788bd](https://github.com/nuxt-community/axios-module/commit/47788bdd0384807c9d63aa3caa7f2031f44d4c96))

### [5.10.1](https://github.com/nuxt-community/axios-module/compare/v5.10.0...v5.10.1) (2020-04-22)

## [5.10.0](https://github.com/nuxt-community/axios-module/compare/v5.9.7...v5.10.0) (2020-04-21)
4 changes: 4 additions & 0 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,10 @@ module.exports = {
description: 'Axios Module for Nuxt',
head: [['link', { rel: 'stylesheet', href: '/styles.css' }]],
themeConfig: {
algolia: {
apiKey: 'b41badfa89f1ce270dfeaf0fdfbfbaea',
indexName: 'nuxtjs_axios'
},
repo: 'nuxt-community/axios-module',
docsDir: 'docs',
editLinks: true,
2 changes: 1 addition & 1 deletion lib/plugin.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import Axios from 'axios'
import defu from 'defu'
<% if (options.retry) { %>import axiosRetry from 'axios-retry'<% } %>

const globalName = '<%= globalName %>'
const globalName = '$<%= globalName %>'

// Axios.prototype cannot be modified
const axiosExtra = {
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxtjs/axios",
"version": "5.10.1",
"version": "5.10.2",
"description": "Secure and easy axios integration with Nuxt.js",
"license": "MIT",
"contributors": [
@@ -25,7 +25,7 @@
"dependencies": {
"@nuxtjs/proxy": "^1.3.3",
"axios": "^0.19.2",
"axios-retry": "^3.1.6",
"axios-retry": "^3.1.8",
"consola": "^2.11.3",
"defu": "^2.0.2"
},
12 changes: 12 additions & 0 deletions test/axios.test.js
Original file line number Diff line number Diff line change
@@ -82,6 +82,18 @@ const testSuite = () => {
expect(d).not.toBeNull()
expect(b).not.toBe(d)
})

test('ssr no brotli', async () => {
const makeReq = login => axios
.get(url('/ssr' + (login ? '?login' : '')))
.then(r => r.data)
.then(h => /encoding-\$(.*)\$/.exec(h))
.then(m => (m && m[1] ? m[1] : null))

const result = await makeReq()

expect(result).toBe('gzip, deflate')
})
}

describe('module', () => {
Loading