Skip to content

Commit 5cfc065

Browse files
anonrigaduh95
authored andcommitted
build,deps: replace cjs-module-lexer with merve
PR-URL: #61456 Reviewed-By: Guy Bedford <guybedford@gmail.com> Reviewed-By: Daniel Lemire <daniel@lemire.me> Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent cd2afa6 commit 5cfc065

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2249
-8653
lines changed

.github/workflows/tools.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
- amaro
2020
- brotli
2121
- c-ares
22-
- cjs-module-lexer
22+
- merve
2323
- corepack
2424
- googletest
2525
- gyp-next
@@ -104,11 +104,11 @@ jobs:
104104
cat temp-output
105105
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
106106
rm temp-output
107-
- id: cjs-module-lexer
107+
- id: merve
108108
subsystem: deps
109109
label: dependencies
110110
run: |
111-
./tools/dep_updaters/update-cjs-module-lexer.sh > temp-output
111+
./tools/dep_updaters/update-merve.sh > temp-output
112112
cat temp-output
113113
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
114114
rm temp-output

LICENSE

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,26 @@ The externally maintained libraries used by Node.js are:
104104
SOFTWARE.
105105
"""
106106

107-
- cjs-module-lexer, located at deps/cjs-module-lexer, is licensed as follows:
107+
- merve, located at deps/merve, is licensed as follows:
108108
"""
109-
MIT License
110-
-----------
111-
112-
Copyright (C) 2018-2020 Guy Bedford
109+
Copyright 2026 Yagiz Nizipli
113110

114-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
111+
Permission is hereby granted, free of charge, to any person obtaining a copy of
112+
this software and associated documentation files (the "Software"), to deal in
113+
the Software without restriction, including without limitation the rights to
114+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
115+
the Software, and to permit persons to whom the Software is furnished to do so,
116+
subject to the following conditions:
115117

116-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
118+
The above copyright notice and this permission notice shall be included in all
119+
copies or substantial portions of the Software.
117120

118-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
121+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
122+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
123+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
124+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
125+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
126+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
119127
"""
120128

121129
- ittapi, located at deps/v8/third_party/ittapi, is licensed as follows:

configure.py

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@
5858
maglev_enabled_architectures = ('x64', 'arm', 'arm64')
5959

6060
# builtins may be removed later if they have been disabled by options
61-
shareable_builtins = {'cjs_module_lexer/lexer': 'deps/cjs-module-lexer/lexer.js',
62-
'cjs_module_lexer/dist/lexer': 'deps/cjs-module-lexer/dist/lexer.js',
63-
'undici/undici': 'deps/undici/undici.js',
61+
shareable_builtins = {'undici/undici': 'deps/undici/undici.js',
6462
'amaro/dist/index': 'deps/amaro/dist/index.js'
6563
}
6664

@@ -550,7 +548,6 @@
550548
dest='shared_simdutf_libpath',
551549
help='a directory to search for the shared simdutf DLL')
552550

553-
554551
shared_optgroup.add_argument('--shared-ada',
555552
action='store_true',
556553
dest='shared_ada',
@@ -573,6 +570,28 @@
573570
dest='shared_ada_libpath',
574571
help='a directory to search for the shared ada DLL')
575572

573+
shared_optgroup.add_argument('--shared-merve',
574+
action='store_true',
575+
dest='shared_merve',
576+
default=None,
577+
help='link to a shared merve DLL instead of static linking')
578+
579+
shared_optgroup.add_argument('--shared-merve-includes',
580+
action='store',
581+
dest='shared_merve_includes',
582+
help='directory containing merve header files')
583+
584+
shared_optgroup.add_argument('--shared-merve-libname',
585+
action='store',
586+
dest='shared_merve_libname',
587+
default='merve',
588+
help='alternative lib name to link to [default: %(default)s]')
589+
590+
shared_optgroup.add_argument('--shared-merve-libpath',
591+
action='store',
592+
dest='shared_merve_libpath',
593+
help='a directory to search for the shared merve DLL')
594+
576595
shared_optgroup.add_argument('--shared-brotli',
577596
action='store_true',
578597
dest='shared_brotli',
@@ -2366,6 +2385,7 @@ def make_bin_override():
23662385
configure_library('cares', output, pkgname='libcares')
23672386
configure_library('gtest', output)
23682387
configure_library('hdr_histogram', output)
2388+
configure_library('merve', output)
23692389
configure_library('nbytes', output)
23702390
configure_library('nghttp2', output, pkgname='libnghttp2')
23712391
configure_library('nghttp3', output, pkgname='libnghttp3')

deps/cjs-module-lexer/LICENSE

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)