worker_threads: add support for .cjs extension#31662

Closed

aduh95 wants to merge 1 commit intonodejs:masterfrom

aduh95:add-cjs-ext-for-workers

Contributor

aduh95 commented Feb 6, 2020

This PR allows worker filenames to use .cjs extension (in addition of .js and .mjs).

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
tests and/or benchmarks are included
commit message follows commit guidelines


          worker_threads: add support for .cjs extension

77125bc

nodejs-github-bot added errors worker labels

addaleax approved these changes

View reviewed changes

Collaborator

nodejs-github-bot commented Feb 6, 2020 •

edited by addaleax

Loading

CI: https://ci.nodejs.org/job/node-test-pull-request/28953/ (:heavy_check_mark:)

Trott approved these changes

View reviewed changes

jasnell approved these changes

View reviewed changes

cjihrig approved these changes

View reviewed changes

BridgeAR approved these changes

View reviewed changes

BridgeAR added the author ready label

devnexen approved these changes

View reviewed changes

hiroppy approved these changes

View reviewed changes

devsnek approved these changes

View reviewed changes

lundibundi approved these changes

View reviewed changes

lib/internal/worker.js

                     const ext = path.extname(filename);
-                    if (ext !== '.js' && ext !== '.mjs') {
+                    if (!/^\.[cm]?js$/.test(ext)) {

Member

lundibundi Feb 10, 2020

Nit: why not just add another && ext !== '.cjs', that would be both simpler to understand and faster to run. I don't see the benefits of using regexp here.

Member

addaleax commented Feb 13, 2020

Landed in 611a158

addaleax pushed a commit that referenced this pull request


          worker: add support for .cjs extension

611a158

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>

addaleax closed this

addaleax added a commit to addaleax/node that referenced this pull request


          worker: unroll file extension regexp

67fa46a

Refs: nodejs#31662 (comment)

addaleax mentioned this pull request

worker: unroll file extension regexp #31779

Closed

2 tasks

addaleax added a commit that referenced this pull request


          worker: unroll file extension regexp

26e49d8

Refs: #31662 (comment)

PR-URL: #31779
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

codebytere pushed a commit that referenced this pull request


          worker: add support for .cjs extension

822f2ac

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>

codebytere mentioned this pull request

v13.9.0 proposal #31837

Merged

codebytere pushed a commit that referenced this pull request


          worker: unroll file extension regexp

f87ac90

Refs: #31662 (comment)

PR-URL: #31779
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

codebytere pushed a commit that referenced this pull request


          worker: add support for .cjs extension

26d2145

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>

codebytere pushed a commit that referenced this pull request


          worker: unroll file extension regexp

ad55e63

Refs: #31662 (comment)

PR-URL: #31779
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

codebytere pushed a commit that referenced this pull request


          worker: add support for .cjs extension

ff6c8d9

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>

codebytere pushed a commit that referenced this pull request


          worker: unroll file extension regexp

bd2ddc1

Refs: #31662 (comment)

PR-URL: #31779
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

codebytere mentioned this pull request

v12.16.2 proposal #32313

Merged

codebytere pushed a commit that referenced this pull request


          worker: add support for .cjs extension

9f8d315

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>

codebytere pushed a commit that referenced this pull request


          worker: unroll file extension regexp

ea989e1

Refs: #31662 (comment)

PR-URL: #31779
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

aduh95 deleted the add-cjs-ext-for-workers branch

November 14, 2020 11:15

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

jasnell jasnell approved these changes

Trott Trott approved these changes

addaleax addaleax approved these changes

cjihrig cjihrig approved these changes

BridgeAR BridgeAR approved these changes

+4 more reviewers

hiroppy hiroppy approved these changes

devnexen devnexen approved these changes

devsnek devsnek approved these changes

lundibundi lundibundi approved these changes

Labels

author ready errors worker