From b3e4b55e05bba6edc7a8e44bd6a14b7a5bffba37 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Mon, 28 Jan 2019 15:29:48 +0100
Subject: [PATCH 1/2] worker: export workerData to ESM workers

Fixes: https://github.com/nodejs/node/issues/25765
---
 lib/worker_threads.js                       |  3 ++-
 test/fixtures/worker-data.mjs               |  3 +++
 test/parallel/test-worker-mjs-workerdata.js | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/worker-data.mjs
 create mode 100644 test/parallel/test-worker-mjs-workerdata.js

diff --git a/lib/worker_threads.js b/lib/worker_threads.js
index 828edb6bffce7b..a7577771b08ef9 100644
--- a/lib/worker_threads.js
+++ b/lib/worker_threads.js
@@ -17,5 +17,6 @@ module.exports = {
   MessageChannel,
   threadId,
   Worker,
-  parentPort: null
+  parentPort: null,
+  workerData: null
 };
diff --git a/test/fixtures/worker-data.mjs b/test/fixtures/worker-data.mjs
new file mode 100644
index 00000000000000..1ec884aadb1708
--- /dev/null
+++ b/test/fixtures/worker-data.mjs
@@ -0,0 +1,3 @@
+import { workerData, parentPort } from 'worker_threads';
+
+parentPort.postMessage(workerData);
diff --git a/test/parallel/test-worker-mjs-workerdata.js b/test/parallel/test-worker-mjs-workerdata.js
new file mode 100644
index 00000000000000..c107730ea4bba2
--- /dev/null
+++ b/test/parallel/test-worker-mjs-workerdata.js
@@ -0,0 +1,16 @@
+'use strict';
+const common = require('../common');
+const fixtures = require('../common/fixtures');
+const assert = require('assert');
+const { Worker } = require('worker_threads');
+
+const workerData = 'Hello from main thread';
+
+const worker = new Worker(fixtures.path('worker-data.mjs'), {
+  workerData,
+  execArgv: ['--experimental-modules']
+});
+
+worker.on('message', common.mustCall((message) => {
+  assert.strictEqual(message, workerData);
+}));

From 0604889884d9a66662b1fd5e2dcbb693dad94ae6 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Mon, 28 Jan 2019 15:41:08 +0100
Subject: [PATCH 2/2] fixup! worker: export workerData to ESM workers

---
 lib/worker_threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/worker_threads.js b/lib/worker_threads.js
index a7577771b08ef9..2fe1a872464d19 100644
--- a/lib/worker_threads.js
+++ b/lib/worker_threads.js
@@ -18,5 +18,5 @@ module.exports = {
   threadId,
   Worker,
   parentPort: null,
-  workerData: null
+  workerData: null,
 };