Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use ws instead of undici.WebSocket #49100

Merged
merged 3 commits into from
May 2, 2023
Merged

use ws instead of undici.WebSocket #49100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00b1dbc
use ws instead of undici.WebSocket
Kikobeats May 2, 2023
7c219b1
Merge branch 'canary' into ws
Kikobeats May 2, 2023
d2eb40a
Merge branch 'canary' into ws
ijjk May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next/src/server/dev/hot-middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import type { webpack } from 'next/dist/compiled/webpack/webpack'
import type ws from 'ws'
import type ws from 'next/dist/compiled/ws'
import { isMiddlewareFilename } from '../../build/utils'
import type { VersionInfo } from './parse-version-info'

Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/server/dev/on-demand-entry-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type ws from 'ws'
import type ws from 'next/dist/compiled/ws'
import origDebug from 'next/dist/compiled/debug'
import type { webpack } from 'next/dist/compiled/webpack/webpack'
import type { NextConfigComplete } from '../config-shared'
Expand Down
11 changes: 1 addition & 10 deletions packages/next/src/server/node-environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,5 @@ if (typeof (globalThis as any).AsyncLocalStorage !== 'function') {
}

if (typeof (globalThis as any).WebSocket !== 'function') {
let WebSocket

// undici's WebSocket handling is only available in Node.js >= 18
// so fallback to using ws for v16
if (Number(process.version.split('.')[0].substring(1)) < 18) {
WebSocket = require('next/dist/compiled/ws').WebSocket
} else {
WebSocket = require('next/dist/compiled/undici').WebSocket
}
;(globalThis as any).WebSocket = WebSocket
;(globalThis as any).WebSocket = require('next/dist/compiled/ws').WebSocket
}
12 changes: 1 addition & 11 deletions packages/next/src/server/web/sandbox/context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,17 +235,7 @@ async function createModuleContext(options: ModuleContextOptions) {
? { strings: true, wasm: true }
: undefined,
extend: (context) => {
let WebSocket

// undici's WebSocket handling is only available in Node.js >= 18
// so fallback to using ws for v16
if (Number(process.version.split('.')[0].substring(1)) < 18) {
WebSocket = require('next/dist/compiled/ws').WebSocket
} else {
WebSocket = require('next/dist/compiled/undici').WebSocket
}

context.WebSocket = WebSocket
context.WebSocket = require('next/dist/compiled/ws').WebSocket
context.process = createProcessPolyfill(options)

Object.defineProperty(context, 'require', {
Expand Down