Skip to content

Commit 5b6982b

Browse files
committed
Rename implementation-node to prevent conflicts with native node addons
1 parent 4774905 commit 5b6982b

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@
122122
"ts-node/register": false,
123123
"worker_threads": false,
124124
"./dist/master/implementation.js": "./dist/master/implementation.browser.js",
125-
"./dist/master/implementation.node.js": false,
125+
"./dist/master/implementation-node.js": false,
126126
"./dist/worker/implementation.js": "./dist/worker/implementation.browser.js",
127127
"./dist/worker/implementation.tiny-worker.js": false,
128128
"./dist/worker/implementation.worker_threads.js": false,
129129
"./dist-esm/master/implementation.js": "./dist-esm/master/implementation.browser.js",
130-
"./dist-esm/master/implementation.node.js": false,
130+
"./dist-esm/master/implementation-node.js": false,
131131
"./dist-esm/worker/implementation.js": "./dist-esm/worker/implementation.browser.js",
132132
"./dist-esm/worker/implementation.tiny-worker.js": false,
133133
"./dist-esm/worker/implementation.worker_threads.js": false

src/createWorker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ export async function createWorker(workerPath: string & Blob, options: CreateWor
1313
getWorkerImplementation().blob :
1414
getWorkerImplementation().default
1515
} else if (options.backend === "node") {
16-
const { getWorkerImplementation } = await import("./master/implementation.node")
16+
const { getWorkerImplementation } = await import("./master/implementation-node")
1717
WorkerConstructor = options.blob ?
1818
getWorkerImplementation("node").blob :
1919
getWorkerImplementation("node").default
2020
} else if (options.backend === "tiny") {
21-
const { getWorkerImplementation } = await import("./master/implementation.node")
21+
const { getWorkerImplementation } = await import("./master/implementation-node")
2222
WorkerConstructor = options.blob ?
2323
getWorkerImplementation("tiny").blob :
2424
getWorkerImplementation("tiny").default
File renamed without changes.

src/master/implementation.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
// We alias `src/master/implementation` to `src/master/implementation.browser` for web
66
// browsers already in the package.json, so if get here, it's safe to pass-through the
77
// node implementation
8-
8+
import * as NodeImplementation from "./implementation-node"
99
import * as BrowserImplementation from "./implementation.browser"
10-
import * as NodeImplementation from "./implementation.node"
1110

1211
const runningInNode = typeof process !== 'undefined' && process.arch !== 'browser' && 'pid' in process
1312
const implementation = runningInNode ? NodeImplementation : BrowserImplementation

0 commit comments

Comments
 (0)