worker: add support for .cjs extension

aduh95 · codebytere · commit 822f2ac64093 · 2020-02-17T12:48:15.000-08:00
PR-URL: #31662 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Yuta Hiroto <hello@hiroppy.me> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Denys Otrishko <shishugi@gmail.com>
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -1367,7 +1367,7 @@ E('ERR_WORKER_PATH',
 E('ERR_WORKER_UNSERIALIZABLE_ERROR',
   'Serializing an uncaught exception failed', Error);
 E('ERR_WORKER_UNSUPPORTED_EXTENSION',
-  'The worker script extension must be ".js" or ".mjs". Received "%s"',
+  'The worker script extension must be ".js", ".mjs", or ".cjs". Received "%s"',
   TypeError);
 E('ERR_WORKER_UNSUPPORTED_OPERATION',
   '%s is not supported in workers', TypeError);
diff --git a/lib/internal/worker.js b/lib/internal/worker.js
@@ -104,7 +104,7 @@ class Worker extends EventEmitter {
       filename = path.resolve(filename);
 
       const ext = path.extname(filename);
-      if (ext !== '.js' && ext !== '.mjs') {
+      if (!/^\.[cm]?js$/.test(ext)) {
         throw new ERR_WORKER_UNSUPPORTED_EXTENSION(ext);
       }
     }
diff --git a/test/fixtures/worker-data.cjs b/test/fixtures/worker-data.cjs
@@ -0,0 +1,3 @@
+const { workerData, parentPort } = require('worker_threads');
+
+parentPort.postMessage(workerData);
diff --git a/test/parallel/test-worker-cjs-workerdata.js b/test/parallel/test-worker-cjs-workerdata.js
@@ -0,0 +1,15 @@
+'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.cjs'), {
+  workerData
+});
+
+worker.on('message', common.mustCall((message) => {
+  assert.strictEqual(message, workerData);
+}));

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class Worker extends EventEmitter {`
`104`	`104`	`filename = path.resolve(filename);`
`105`	`105`
`106`	`106`	`const ext = path.extname(filename);`
`107`		`- if (ext !== '.js' && ext !== '.mjs') {`
	`107`	`+ if (!/^\.[cm]?js$/.test(ext)) {`
`108`	`108`	`throw new ERR_WORKER_UNSUPPORTED_EXTENSION(ext);`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const { workerData, parentPort } = require('worker_threads');`
	`2`	`+`
	`3`	`+parentPort.postMessage(workerData);`