aelve/guide
1
1
Fork 0
mirror of https://github.com/aelve/guide.git synced 2024-12-23 21:02:13 +03:00
Code Issues Projects Releases Wiki Activity

Fixed executing asyncData function on server on component resolving

Browse Source
This commit is contained in:
zeot 2018-09-08 16:09:57 +03:00
parent 65848205c9
commit bd33eedf23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
front/build/build-config.js
View File

@ -1,11 +1,14 @@
const path = require('path') const path = require('path')
const moment = require('moment') const moment = require('moment')
const axios = require('axios')
const appName = 'Aelve Guide' const appName = 'Aelve Guide'
const clientPort = 4000 const clientPort = 4000
const ssrPort = 5000 const ssrPort = 5000
const distPath = rootResolve('./dist') const distPath = rootResolve('./dist')
axios.defaults.baseURL = `http://localhost:${ssrPort}`
const env = { const env = {
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV), 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
'process.env.BUILD_TIME': JSON.stringify(moment(new Date()).format('YYYY-MM-DD HH:mm:ss')) 'process.env.BUILD_TIME': JSON.stringify(moment(new Date()).format('YYYY-MM-DD HH:mm:ss'))

5
front/client/entry.server.ts
View File

@ -1,4 +1,5 @@
import 'reflect-metadata' import 'reflect-metadata'
import _get from 'lodash/get'
import { createApp } from './app' import { createApp } from './app'
export default context => { export default context => {
@ -18,7 +19,9 @@ export default context => {
} }
Promise.all(matchedComponents.map((Component) => { Promise.all(matchedComponents.map((Component) => {
const asyncDataFunc = Component['asyncData'] || (Component['options'] || {})['asyncData'] const asyncDataFunc = Component['asyncData']
|| _get(Component, 'options.asyncData')
|| _get(Component, 'options.methods.asyncData')
if (typeof asyncDataFunc === 'function') { if (typeof asyncDataFunc === 'function') {
return asyncDataFunc({ return asyncDataFunc({
store, store,