mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-11 08:33:53 +00:00
Add injectAs feature
This commit is contained in:
parent
7a6bc85b62
commit
55db6e336f
@ -40,19 +40,6 @@ if (process.browser) {
|
||||
}
|
||||
}
|
||||
|
||||
// Includes external plugins
|
||||
<% plugins.forEach(function (plugin) {
|
||||
if (plugin.ssr) { %>
|
||||
<%= (plugin.injectAs ? 'let ' + plugin.injectAs + ' = ' : '') %>require('<%= plugin.src %>')
|
||||
<%= (plugin.injectAs ? plugin.injectAs + ' = ' + plugin.injectAs + '.default || ' + plugin.injectAs : '') %>
|
||||
<% } else { %>
|
||||
if (process.browser) {
|
||||
<%= (plugin.injectAs ? 'let ' + plugin.injectAs + ' = ' : '') %>require('<%= plugin.src %>')
|
||||
<%= (plugin.injectAs ? plugin.injectAs + ' = ' + plugin.injectAs + '.default || ' + plugin.injectAs : '') %>
|
||||
}
|
||||
<% } %>
|
||||
<% }) %>
|
||||
|
||||
// root instance
|
||||
// here we inject the router and store to all child components,
|
||||
// making them available everywhere as `this.$router` and `this.$store`.
|
||||
@ -100,15 +87,24 @@ let app = {
|
||||
...App
|
||||
}
|
||||
|
||||
// Inject external plugins in app
|
||||
|
||||
// Includes & Inject external plugins
|
||||
<% plugins.forEach(function (plugin) {
|
||||
if (plugin.injectAs && plugin.ssr) { %>
|
||||
app.<%= plugin.injectAs %> = <%= plugin.injectAs %>
|
||||
<% } else if (plugin.injectAs) { %>
|
||||
if (process.browser) {
|
||||
app.<%= plugin.injectAs %> = <%= plugin.injectAs %>
|
||||
}
|
||||
if (plugin.ssr) { %>
|
||||
<%= (plugin.injectAs ? 'let ' + plugin.injectAs + ' = ' : '') %>require('<%= plugin.src %>')
|
||||
<% if (plugin.injectAs) { %>
|
||||
<%= plugin.injectAs + ' = ' + plugin.injectAs + '.default || ' + plugin.injectAs %>
|
||||
app['<%= plugin.injectAs %>'] = <%= plugin.injectAs %>
|
||||
<% }
|
||||
} else { %>
|
||||
if (process.browser) {
|
||||
<%= (plugin.injectAs ? 'let ' + plugin.injectAs + ' = ' : '') %>require('<%= plugin.src %>')
|
||||
<% if (plugin.injectAs) { %>
|
||||
<%= plugin.injectAs + ' = ' + plugin.injectAs + '.default || ' + plugin.injectAs %>
|
||||
app['<%= plugin.injectAs %>'] = <%= plugin.injectAs %>
|
||||
<% } %>
|
||||
<% }) %>
|
||||
}
|
||||
<% }
|
||||
}) %>
|
||||
|
||||
export { app, router<%= (store ? ', store' : '') %>, NuxtError }
|
||||
|
@ -220,14 +220,10 @@ export default context => {
|
||||
.then(() => _app)
|
||||
})
|
||||
.catch(function (error) {
|
||||
if (!componentsLoaded && error instanceof Error) {
|
||||
if (error instanceof Error || error.constructor.toString().indexOf('Error()') !== -1) {
|
||||
return Promise.reject(error)
|
||||
}
|
||||
if (error && (error instanceof Error || error.constructor.toString().indexOf('Error()') !== -1)) {
|
||||
let statusCode = error.statusCode || error.status || (error.response && error.response.status) || 500
|
||||
error = { statusCode, message: error.message }
|
||||
}
|
||||
else if (typeof error === 'string') {
|
||||
if (typeof error === 'string') {
|
||||
error = { statusCode: 500, message: error }
|
||||
}
|
||||
context.nuxt.error = context.error(error)
|
||||
|
@ -1,4 +1,5 @@
|
||||
'use strict'
|
||||
import { app } from './index'
|
||||
|
||||
export function getMatchedComponents (route) {
|
||||
return [].concat.apply([], route.matched.map(function (m) {
|
||||
@ -55,6 +56,16 @@ export function getContext (context) {
|
||||
}
|
||||
if (context.req) ctx.req = context.req
|
||||
if (context.res) ctx.res = context.res
|
||||
// Inject external plugins in context
|
||||
<% plugins.forEach(function (plugin) {
|
||||
if (plugin.injectAs && plugin.ssr) { %>
|
||||
ctx['<%= plugin.injectAs %>'] = app['<%= plugin.injectAs %>']
|
||||
<% } else if (plugin.injectAs) { %>
|
||||
if (process.browser) {
|
||||
ctx['<%= plugin.injectAs %>'] = app['<%= plugin.injectAs %>']
|
||||
}
|
||||
<% } %>
|
||||
<% }) %>
|
||||
return ctx
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user