Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-11 08:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(vue-app): add <client-only> alias for <no-ssr> (#5941)

Browse Source
This commit is contained in:
bluelovers 2019-07-04 23:47:45 +08:00 committed by Xin Du (Clark)
parent 2f3709ccb6
commit 9524bcae5e
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/vue-app/package.json
View File

@ -16,6 +16,7 @@
"unfetch": "^4.1.0", "unfetch": "^4.1.0",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-meta": "^2.0.4", "vue-meta": "^2.0.4",
"vue-client-only": "^2.0.0",
"vue-no-ssr": "^1.1.1", "vue-no-ssr": "^1.1.1",
"vue-router": "^3.0.7", "vue-router": "^3.0.7",
"vue-template-compiler": "^2.6.10", "vue-template-compiler": "^2.6.10",

1
packages/vue-app/src/index.js
View File

@ -20,7 +20,6 @@ export const template = {
'components/nuxt-link.server.js', 'components/nuxt-link.server.js',
'components/nuxt-link.client.js', 'components/nuxt-link.client.js',
'components/nuxt.js', 'components/nuxt.js',
'components/no-ssr.js',
'views/app.template.html', 'views/app.template.html',
'views/error.html' 'views/error.html'
] ]

9
packages/vue-app/template/components/no-ssr.js
View File

@ -1,9 +0,0 @@
/*<%= isTest ? ' @vue/component' : '' %>
** From https://github.com/egoist/vue-no-ssr
** With the authorization of @egoist
*/
import NoSsr from 'vue-no-ssr'
export default {
...NoSsr,
name: 'NoSsr'
}

18
packages/vue-app/template/index.js
View File

@ -1,7 +1,8 @@
import Vue from 'vue' import Vue from 'vue'
import Meta from 'vue-meta' import Meta from 'vue-meta'
import ClientOnly from 'vue-client-only'
import NoSsr from 'vue-no-ssr'
import { createRouter } from './router.js' import { createRouter } from './router.js'
import NoSsr from './components/no-ssr.js'
import NuxtChild from './components/nuxt-child.js' import NuxtChild from './components/nuxt-child.js'
import NuxtError from '<%= components.ErrorPage ? components.ErrorPage : "./components/nuxt-error.vue" %>' import NuxtError from '<%= components.ErrorPage ? components.ErrorPage : "./components/nuxt-error.vue" %>'
import Nuxt from './components/nuxt.js' import Nuxt from './components/nuxt.js'
@ -15,8 +16,19 @@ import { setContext, getLocation, getRouteData, normalizeError } from './utils'
<% }) %> <% }) %>
<%= isTest ? '/* eslint-enable camelcase */' : '' %> <%= isTest ? '/* eslint-enable camelcase */' : '' %>
// Component: <NoSsr> // Component: <ClientOnly>
Vue.component(NoSsr.name, NoSsr) Vue.component(ClientOnly.name, ClientOnly)
// TODO: Remove in Nuxt 3: <NoSsr>
Vue.component(NoSsr.name, {
...NoSsr,
render(h, ctx) {
if (process.client && !NoSsr._warned) {
NoSsr._warned = true
console.warn(`<no-ssr> had been deprecated and will be removed in Nuxt 3, please use <client-only> instead`)
}
return NoSsr.render(h, ctx)
}
})
// Component: <NuxtChild> // Component: <NuxtChild>
Vue.component(NuxtChild.name, NuxtChild) Vue.component(NuxtChild.name, NuxtChild)

5
yarn.lock
View File

@ -11493,6 +11493,11 @@ vue-class-component@^7.0.1:
resolved "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.1.0.tgz#b33efcb10e17236d684f70b1e96f1946ec793e87" resolved "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.1.0.tgz#b33efcb10e17236d684f70b1e96f1946ec793e87"
integrity sha512-G9152NzUkz0i0xTfhk0Afc8vzdXxDR1pfN4dTwE72cskkgJtdXfrKBkMfGvDuxUh35U500g5Ve4xL8PEGdWeHg== integrity sha512-G9152NzUkz0i0xTfhk0Afc8vzdXxDR1pfN4dTwE72cskkgJtdXfrKBkMfGvDuxUh35U500g5Ve4xL8PEGdWeHg==
vue-client-only@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/vue-client-only/-/vue-client-only-2.0.0.tgz#ddad8d675ee02c761a14229f0e440e219de1da1c"
integrity sha512-arhk1wtWAfLsJyxGMoEYhoBowM87/i6HLSG2LH/03Yog6i2d9JEN1peMP0Ceis+/n9DxdenGYZZTxbPPJyHciA==
vue-eslint-parser@^5.0.0: vue-eslint-parser@^5.0.0:
version "5.0.0" version "5.0.0"
resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1" resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1"