Skip to content

Commit d019a46

Browse files
committed
lib: replace acorn with amaro
Signed-off-by: avivkeller <me@aviv.sh>
1 parent 39e03b4 commit d019a46

58 files changed

Lines changed: 1005 additions & 18947 deletions

Some content is hidden

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

‎.github/workflows/tools.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ on:
1313
type: choice
1414
options:
1515
- all
16-
- acorn
17-
- acorn-walk
1816
- ada
1917
- amaro
2018
- brotli
@@ -64,22 +62,6 @@ jobs:
6462
fail-fast: false # Prevent other jobs from aborting if one fails
6563
matrix:
6664
include:
67-
- id: acorn
68-
subsystem: deps
69-
label: dependencies
70-
run: |
71-
./tools/dep_updaters/update-acorn.sh > temp-output
72-
cat temp-output
73-
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
74-
rm temp-output
75-
- id: acorn-walk
76-
subsystem: deps
77-
label: dependencies
78-
run: |
79-
./tools/dep_updaters/update-acorn-walk.sh > temp-output
80-
cat temp-output
81-
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
82-
rm temp-output
8365
- id: ada
8466
subsystem: deps
8567
label: dependencies

‎LICENSE‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,6 @@ maintained libraries.
5151

5252
The externally maintained libraries used by Node.js are:
5353

54-
- Acorn, located at deps/acorn, is licensed as follows:
55-
"""
56-
MIT License
57-
58-
Copyright (C) 2012-2022 by various contributors (see AUTHORS)
59-
60-
Permission is hereby granted, free of charge, to any person obtaining a copy
61-
of this software and associated documentation files (the "Software"), to deal
62-
in the Software without restriction, including without limitation the rights
63-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
64-
copies of the Software, and to permit persons to whom the Software is
65-
furnished to do so, subject to the following conditions:
66-
67-
The above copyright notice and this permission notice shall be included in
68-
all copies or substantial portions of the Software.
69-
70-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
71-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
72-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
73-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
74-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
75-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
76-
THE SOFTWARE.
77-
"""
78-
7954
- c-ares, located at deps/cares, is licensed as follows:
8055
"""
8156
MIT License

‎configure.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
# builtins may be removed later if they have been disabled by options
6161
shareable_builtins = {'undici/undici': 'deps/undici/undici.js',
62-
'amaro/dist/index': 'deps/amaro/dist/index.js'
62+
'amaro/dist/internal': 'deps/amaro/dist/internal.js'
6363
}
6464

6565
# create option groups
@@ -1065,7 +1065,9 @@
10651065
action='store_true',
10661066
dest='without_amaro',
10671067
default=None,
1068-
help='do not install the bundled Amaro (TypeScript utils)')
1068+
help='disable the TypeScript support (type stripping) provided by the '
1069+
'bundled Amaro. Its JavaScript parser is always bundled, as the REPL '
1070+
'and other internals depend on it')
10691071

10701072
parser.add_argument('--without-lief',
10711073
action='store_true',
@@ -3010,10 +3012,6 @@ def make_bin_override():
30103012
configure_inspector(output)
30113013
configure_section_file(output)
30123014

3013-
# remove builtins that have been disabled
3014-
if options.without_amaro:
3015-
del shareable_builtins['amaro/dist/index']
3016-
30173015
# configure shareable builtins
30183016
output['variables']['node_builtin_shareable_builtins'] = []
30193017
for builtin, value in shareable_builtins.items():

‎deps/acorn/acorn-walk/CHANGELOG.md‎

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

‎deps/acorn/acorn-walk/LICENSE‎

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

0 commit comments

Comments
 (0)