mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-27 16:12:12 +00:00
917adc0618
* feat: add options.target * fix(lint): lint * fix(test): update snapshots * fix(builder): default value for target * fix(test): fix test * fix(test): test fixing * fix: use this.options.target * fix: final test * Update packages/vue-renderer/src/renderer.js Co-Authored-By: Alexander Lichter <manniL@gmx.net> * feat: Add target option and update banner * fix(lint): fix * feat: Add warning when using serverMiddleware in static target * chore(utils): add TARGETS and MODES as constants * hotfix: lint * chore(module): add filename as alias of fileName * feat: introducing nuxt export and router/routes.json * hotfix: Fix the linting lord * chore(core): add comment for filename vs fileName * fix: use targets constant * chore: remove warning * fix: unit testing * wip: refactor and use TARGETS * fix: lint * feat: add target as alias for first arg value * fix: generate only for SPA * chore: explain to use nuxt static X * fix: render SPA fallback on redirect for static target * fix: lint issue * fix: only target is useful for now * wip * wip: nuxt static export is looking good * Update packages/generator/src/generator.js Co-Authored-By: Devon Rueckner <indirectlylit@users.noreply.github.com> * Update packages/cli/src/options/common.js Co-Authored-By: Alexander Lichter <manniL@gmx.net> * feat: add options.target * fix(lint): lint * fix(test): update snapshots * fix(builder): default value for target * fix(test): fix test * fix(test): test fixing * fix: use this.options.target * fix: final test * Update packages/vue-renderer/src/renderer.js Co-Authored-By: Alexander Lichter <manniL@gmx.net> * feat: Add target option and update banner * fix(lint): fix * feat: Add warning when using serverMiddleware in static target * chore(utils): add TARGETS and MODES as constants * hotfix: lint * chore(module): add filename as alias of fileName * feat: introducing nuxt export and router/routes.json * hotfix: Fix the linting lord * chore(core): add comment for filename vs fileName * fix: use targets constant * chore: remove warning * fix: unit testing * wip: refactor and use TARGETS * fix: lint * feat: add target as alias for first arg value * chore: explain to use nuxt static X * fix: render SPA fallback on redirect for static target * fix: lint issue * fix: only target is useful for now * wip * wip: nuxt static export is looking good * Update packages/generator/src/generator.js Co-Authored-By: Devon Rueckner <indirectlylit@users.noreply.github.com> * Update packages/cli/src/options/common.js Co-Authored-By: Alexander Lichter <manniL@gmx.net> * fix: duplicate imports * chore: don't server render if an error happens on static target * test: update unit and add export * lint: fix * lint: fix * fix: e2e test * fix: fallback only for static target * fix: dev test * feat: add generate.crawler * fix: full static is when generate.static is given * chore: improvements * fix: Add isFullStatic in nuxt/config.json * feat: handle fetch for full static * feat: router.prefetchPayloads for full static * chore: use fetch in async-data example * fix: add target only if given * fix: use created to have access to props in fetchOnServer * chore: add console.error in dev for easy debugging * feat: payload smart pre-fetching * fix: remove alias for target * fix: increment payloadFetchIndex is static set to false * chore: lint * chore: add serve command * chore: rename universal to server-side * fix: handle payloadPath on SPA fallback * fix: lint * chore lint again * feat: handle spa fallback * feat: support string for exclude * fix: fallback only if no extension or html * chore: use JSON.stringify() for static target * chore: lint again, dammit * chore: fix tests and remove too early return * fix: early return only for server target * fix: update tests * fix: unit tests * chore: add ssr option * chore: add logic for ssr option * fix: #6682 * chore(dx): add next command to run * fix: lint * fix: tests * chore: keep old behaviour for nuxt build in spa * fix: test again, oh boy * fix: alright this is good now * chore: add comment for spa fallback * chore: move routes.json to dot nuxt dir * chore: simplify check for promise * chore: unique lock id * chore: refactor isFullStatic * fix: dont set default in build context * chore: add test for serve * chore: update tests * hotfix: lint tests * chore(dx): improve message for bundling * feat: js payload extraction with jsonp * fix: keep serialized session script for legacy generate * fix: call to setPagePayload from fetchPayload * use devalue for payload chunks * feat: add initial load state chunk * feat: preload payload and state scripts * fix(vue-app): don't re-render the app if trailing slash on SSG * hotfix: remove console.log * chore(dx): add deploy infos for nuxt export Co-authored-by: Pooya Parsa <pyapar@gmail.com> * chore: handle fetching payload.js for nuxt state * chore(dx): error when using nuxt generate and static * chore: remove static option for clarity * chore: remove serverless target * hotfix: lint * hotfix: unit tests * chore: update legacy js resource * chore: remove query params from url in static target * fix: use globalName and urlJoin * chore: typo * feat: previewMode 👀 * chore: rename to enablePreview * fix: wait next tick to avoid error on spa * chore: try 1 sec * hotfix: test only for linux, wtf azure * refactor: static assets - generalize logic for modules need emit export static assets - allow customization for version, dir and base - serialization logic is only in ssr now * feat: smart state chunk creates * fix(client): ignore payload load error * perf: avoide payload loading for spa initial * perf: avoid loading failed chunks again * chore(cli): add simple compression for nuxt serve * test: update snapshots * fix version snapshot * fix(generator): set staticAssetsBase on context only for full static * fix tests * fix: honor shouldHashCspScriptSrc * chore(dx): add log for client-side fallback creation Co-authored-by: Xin Du (Clark) <clark.duxin@gmail.com> Co-authored-by: Alexander Lichter <manniL@gmx.net> Co-authored-by: Pooya Parsa <pooya@pi0.ir> Co-authored-by: Devon Rueckner <indirectlylit@users.noreply.github.com> Co-authored-by: Pooya Parsa <pyapar@gmail.com>
119 lines
2.8 KiB
JavaScript
119 lines
2.8 KiB
JavaScript
import Vue from 'vue'
|
|
import { hasFetch, normalizeError, addLifecycleHook } from '../utils'
|
|
|
|
const isSsrHydration = (vm) => vm.$vnode && vm.$vnode.elm && vm.$vnode.elm.dataset && vm.$vnode.elm.dataset.fetchKey
|
|
const nuxtState = window.<%= globals.context %>
|
|
|
|
export default {
|
|
beforeCreate () {
|
|
if (!hasFetch(this)) {
|
|
return
|
|
}
|
|
|
|
this._fetchDelay = typeof this.$options.fetchDelay === 'number' ? this.$options.fetchDelay : 200
|
|
|
|
Vue.util.defineReactive(this, '$fetchState', {
|
|
pending: false,
|
|
error: null,
|
|
timestamp: Date.now()
|
|
})
|
|
|
|
this.$fetch = $fetch.bind(this)
|
|
addLifecycleHook(this, 'created', created)
|
|
addLifecycleHook(this, 'beforeMount', beforeMount)
|
|
}
|
|
}
|
|
|
|
function beforeMount() {
|
|
if (!this._hydrated) {
|
|
return this.$fetch()
|
|
}
|
|
}
|
|
|
|
function created() {
|
|
if (!isSsrHydration(this)) {
|
|
<% if (isFullStatic) { %>createdFullStatic.call(this)<% } %>
|
|
return
|
|
}
|
|
|
|
// Hydrate component
|
|
this._hydrated = true
|
|
this._fetchKey = +this.$vnode.elm.dataset.fetchKey
|
|
const data = nuxtState.fetch[this._fetchKey]
|
|
|
|
// If fetch error
|
|
if (data && data._error) {
|
|
this.$fetchState.error = data._error
|
|
return
|
|
}
|
|
|
|
// Merge data
|
|
for (const key in data) {
|
|
Vue.set(this.$data, key, data[key])
|
|
}
|
|
}
|
|
|
|
<% if (isFullStatic) { %>
|
|
function createdFullStatic() {
|
|
// Check if component has been fetched on server
|
|
let fetchedOnServer = this.$options.fetchOnServer !== false
|
|
if (typeof this.$options.fetchOnServer === 'function') {
|
|
fetchedOnServer = this.$options.fetchOnServer.call(this) !== false
|
|
}
|
|
if (!fetchedOnServer || this.$nuxt.isPreview || !this.$nuxt._pagePayload) {
|
|
return
|
|
}
|
|
this._hydrated = true
|
|
this._fetchKey = this.$nuxt._payloadFetchIndex++
|
|
const data = this.$nuxt._pagePayload.fetch[this._fetchKey]
|
|
|
|
// If fetch error
|
|
if (data && data._error) {
|
|
this.$fetchState.error = data._error
|
|
return
|
|
}
|
|
|
|
// Merge data
|
|
for (const key in data) {
|
|
Vue.set(this.$data, key, data[key])
|
|
}
|
|
}
|
|
<% } %>
|
|
|
|
function $fetch() {
|
|
if (!this._fetchPromise) {
|
|
this._fetchPromise = $_fetch.call(this)
|
|
.then(() => { delete this._fetchPromise })
|
|
}
|
|
return this._fetchPromise
|
|
}
|
|
|
|
async function $_fetch() {
|
|
this.<%= globals.nuxt %>.nbFetching++
|
|
this.$fetchState.pending = true
|
|
this.$fetchState.error = null
|
|
this._hydrated = false
|
|
let error = null
|
|
const startTime = Date.now()
|
|
|
|
try {
|
|
await this.$options.fetch.call(this)
|
|
} catch (err) {
|
|
if (process.dev) {
|
|
console.error('Error in fetch():', err)
|
|
}
|
|
error = normalizeError(err)
|
|
}
|
|
|
|
const delayLeft = this._fetchDelay - (Date.now() - startTime)
|
|
if (delayLeft > 0) {
|
|
await new Promise(resolve => setTimeout(resolve, delayLeft))
|
|
}
|
|
|
|
this.$fetchState.error = error
|
|
this.$fetchState.pending = false
|
|
this.$fetchState.timestamp = Date.now()
|
|
|
|
this.$nextTick(() => this.<%= globals.nuxt %>.nbFetching--)
|
|
}
|