From bf373282c367715079e1fab93f5f631ed325a97d Mon Sep 17 00:00:00 2001 From: Ben Read Date: Wed, 1 Jul 2020 21:09:49 +0100 Subject: [PATCH 1/3] Callback-based asyncData is deprecated --- examples/with-sockets/pages/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/with-sockets/pages/index.vue b/examples/with-sockets/pages/index.vue index fe944f6c0dd6..5c92191a1867 100644 --- a/examples/with-sockets/pages/index.vue +++ b/examples/with-sockets/pages/index.vue @@ -21,13 +21,13 @@ import socket from '~/plugins/socket.io.js' export default { - asyncData (context, callback) { - socket.emit('last-messages', function (messages) { - callback(null, { - messages, - message: '' - }) - }) + asyncData () { + return new Promise(resolve => + socket.emit('last-messages', (messages) => resolve({ messages })) + ) + }, + data () { + return { message: '' } }, watch: { messages: 'scrollToBottom' From 7a208339e9ecc7ec2619f147243ce2a7f2b78e24 Mon Sep 17 00:00:00 2001 From: Ben Read Date: Wed, 1 Jul 2020 21:54:34 +0100 Subject: [PATCH 2/3] eslint vue/no-template-shadow --- examples/with-sockets/pages/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/with-sockets/pages/index.vue b/examples/with-sockets/pages/index.vue index 5c92191a1867..180e464a4f8b 100644 --- a/examples/with-sockets/pages/index.vue +++ b/examples/with-sockets/pages/index.vue @@ -4,10 +4,10 @@
    • -
    • - - {{ message.date.split('T')[1].slice(0, -2) }} - : {{ message.text }} +
    • + + {{ msg.date.split('T')[1].slice(0, -2) }} + : {{ msg.text }}
    @@ -23,7 +23,7 @@ import socket from '~/plugins/socket.io.js' export default { asyncData () { return new Promise(resolve => - socket.emit('last-messages', (messages) => resolve({ messages })) + socket.emit('last-messages', messages => resolve({ messages })) ) }, data () { From 4fb4923f3e5783dd674bb6484bd1dc4003e49b2d Mon Sep 17 00:00:00 2001 From: Ben Read Date: Wed, 1 Jul 2020 21:56:18 +0100 Subject: [PATCH 3/3] Revert feat: rewrite core to esm --- examples/with-sockets/nuxt.config.js | 2 +- examples/with-sockets/server.js | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/examples/with-sockets/nuxt.config.js b/examples/with-sockets/nuxt.config.js index 538c237f8f27..34e2ec30a1bf 100644 --- a/examples/with-sockets/nuxt.config.js +++ b/examples/with-sockets/nuxt.config.js @@ -1,4 +1,4 @@ -export default { +module.exports = { head: { meta: [ { charset: 'utf-8' }, diff --git a/examples/with-sockets/server.js b/examples/with-sockets/server.js index 648f7427e048..cbfd30136d4e 100644 --- a/examples/with-sockets/server.js +++ b/examples/with-sockets/server.js @@ -1,16 +1,12 @@ -import http from 'http' - -import { Nuxt, Builder } from 'nuxt' -import express from 'express' -import SocketIO from 'socket.io' - const port = process.env.PORT || 3000 const isProd = process.env.NODE_ENV === 'production' -const app = express() +const http = require('http') +const app = require('express')() const server = http.createServer(app) -const io = SocketIO(server) +const io = require('socket.io')(server) +const { Nuxt, Builder } = require('nuxt') // We instantiate Nuxt.js with the options const config = require('./nuxt.config.js') config.dev = !isProd