Merge remote-tracking branch 'upstream/dev' into config-pages-dir

This commit is contained in:
Ricardo Gobbo de Souza 2018-02-05 08:45:14 -02:00
commit e9e673b8e1
2 changed files with 2 additions and 2 deletions

View File

@ -4,6 +4,6 @@ module.exports = {
'@nuxtjs/proxy' '@nuxtjs/proxy'
], ],
proxy: [ proxy: [
['/api/dog', { target: 'https://dog.ceo/', pathRewrite: { '^/api/dog': '/api/breeds/image/random' } }] ['/dog', { target: 'https://dog.ceo/', pathRewrite: { '^/dog': '/api/breeds/image/random' } }]
] ]
} }

View File

@ -2,7 +2,7 @@
"name": "nuxt-proxy", "name": "nuxt-proxy",
"version": "1.0.0", "version": "1.0.0",
"dependencies": { "dependencies": {
"@nuxtjs/axios": "^4.4.0", "@nuxtjs/axios": "^5.0.0",
"@nuxtjs/proxy": "^1.1.2", "@nuxtjs/proxy": "^1.1.2",
"nuxt": "latest" "nuxt": "latest"
}, },