Skip to content

Commit

Permalink
Merge branch 'nuxt:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
HigherOrderLogic authored Sep 14, 2023
2 parents 04f6b0d + 701e38f commit 94d2576
Show file tree
Hide file tree
Showing 5 changed files with 146 additions and 157 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
},
"devDependencies": {
"@nuxt/eslint-config": "^0.2.0",
"@nuxt/kit": "npm:@nuxt/kit-edge@3.7.2-28242195.9892d5cd",
"@nuxt/schema": "npm:@nuxt/schema-edge@3.7.2-28242195.9892d5cd",
"@nuxt/kit": "npm:@nuxt/kit-edge@3.7.2-28242618.3e1ad3e2",
"@nuxt/schema": "npm:@nuxt/schema-edge@3.7.2-28242618.3e1ad3e2",
"@types/clear": "^0.1.2",
"@types/flat": "^5.0.2",
"@types/http-proxy": "^1.17.11",
Expand All @@ -63,12 +63,12 @@
"http-proxy": "^1.18.1",
"httpxy": "^0.1.5",
"jiti": "^1.20.0",
"listhen": "^1.5.0",
"listhen": "^1.5.1",
"magicast": "^0.2.10",
"mlly": "^1.4.2",
"mri": "^1.2.0",
"nitropack": "^2.6.3",
"nuxt": "^3.7.1",
"nuxt": "^3.7.3",
"nypm": "^0.3.3",
"ofetch": "^1.3.3",
"pathe": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion playground/modules/ws.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export default defineNuxtModule({

nuxt.hook('listen', (server) => {
server.on('upgrade', (req, socket, head) => {
console.log(`[server] WebSocket upgrade for path: ${req.url}`)
if (req.url === '/api/ws') {
console.log(`[server] WebSocket upgrade for path: ${req.url}`)
return wss.handleUpgrade(req, socket, head, (ws) => {
wss.emit('connection', ws, req)
})
Expand Down
20 changes: 0 additions & 20 deletions playground/server/ws.ts

This file was deleted.

Loading

0 comments on commit 94d2576

Please # to comment.