Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-19 23:21:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(vue-app): align client fetch key with server (#8809)

Browse Source
This commit is contained in:
Daniel Roe 2021-02-12 11:55:27 +00:00 committed by GitHub
parent 9c24c110b6
commit e277bb284b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/vue-app/template/mixins/fetch.client.js
View File

@ -72,7 +72,7 @@ function createdFullStatic() {
this._fetchKey = this.$options.fetchKey.call(this, getCounter) this._fetchKey = this.$options.fetchKey.call(this, getCounter)
} else { } else {
const key = 'string' === typeof this.$options.fetchKey ? this.$options.fetchKey : defaultKey const key = 'string' === typeof this.$options.fetchKey ? this.$options.fetchKey : defaultKey
this._fetchKey = key + ':' + getCounter(key) this._fetchKey = key ? key + ':' + getCounter(key) : String(getCounter(key))
} }
const data = this.<%= globals.nuxt %>._pagePayload.fetch[this._fetchKey] const data = this.<%= globals.nuxt %>._pagePayload.fetch[this._fetchKey]

2
packages/vue-app/template/mixins/fetch.server.js
View File

@ -54,7 +54,7 @@ export default {
this._fetchKey = this.$options.fetchKey.call(this, getCounter) this._fetchKey = this.$options.fetchKey.call(this, getCounter)
} else { } else {
const key = 'string' === typeof this.$options.fetchKey ? this.$options.fetchKey : defaultKey const key = 'string' === typeof this.$options.fetchKey ? this.$options.fetchKey : defaultKey
this._fetchKey = key + getCounter(key) this._fetchKey = key ? key + ':' + getCounter(key) : String(getCounter(key))
} }
// Added for remove vue undefined warning while ssr // Added for remove vue undefined warning while ssr

12
test/e2e/fetch.browser.test.js
View File

@ -81,7 +81,7 @@ describe('basic browser', () => {
const fetchKeys = await page.evaluate(() => Object.keys(window.__NUXT__.fetch)) const fetchKeys = await page.evaluate(() => Object.keys(window.__NUXT__.fetch))
expect(fetchKeys).toEqual([ expect(fetchKeys).toEqual([
'0', '0',
'DefaultLayout0' 'DefaultLayout:0'
]) ])
expect(await page.$text('div')).toContain('foo-bar-baz') expect(await page.$text('div')).toContain('foo-bar-baz')
expect(await page.$text('div')).toContain('fizz-buzz') expect(await page.$text('div')).toContain('fizz-buzz')
@ -95,7 +95,7 @@ describe('basic browser', () => {
const fetchKeys = await page.evaluate(() => Object.keys(window.__NUXT__.fetch)) const fetchKeys = await page.evaluate(() => Object.keys(window.__NUXT__.fetch))
expect(fetchKeys).toEqual([ expect(fetchKeys).toEqual([
'0', '0',
'DefaultLayout0' 'DefaultLayout:0'
]) ])
expect(await page.$text('div')).toContain('foo-bar-baz') expect(await page.$text('div')).toContain('foo-bar-baz')
expect(await page.$text('div')).toContain('fizz-buzz') expect(await page.$text('div')).toContain('fizz-buzz')
@ -108,7 +108,7 @@ describe('basic browser', () => {
const fetchKeys = await page.evaluate(() => Object.keys(window.__NUXT__.fetch)) const fetchKeys = await page.evaluate(() => Object.keys(window.__NUXT__.fetch))
expect(fetchKeys).toEqual([ expect(fetchKeys).toEqual([
'0', '0',
'DefaultLayout0', 'DefaultLayout:0',
'ie0' 'ie0'
]) ])
expect(await page.$text('button')).toContain('has fetch') expect(await page.$text('button')).toContain('has fetch')
@ -120,10 +120,10 @@ describe('basic browser', () => {
const fetchKeys = await page.evaluate(() => Object.keys(window.__NUXT__.fetch)) const fetchKeys = await page.evaluate(() => Object.keys(window.__NUXT__.fetch))
expect(fetchKeys).toEqual([ expect(fetchKeys).toEqual([
'0', '0',
'DefaultLayout0', 'DefaultLayout:0',
'team0' 'team:0'
]) ])
const team = await page.evaluate(() => window.__NUXT__.fetch.team0.team) const team = await page.evaluate(() => window.__NUXT__.fetch['team:0'].team)
expect(team.includes('Atinux')) expect(team.includes('Atinux'))
expect(await page.$text('div')).toContain('foo-bar-baz') expect(await page.$text('div')).toContain('foo-bar-baz')
expect(await page.$text('div')).toContain('fizz-buzz') expect(await page.$text('div')).toContain('fizz-buzz')