Merge pull request #1008 from nodejs/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.github/workflows/tools.yml

@@ -16,6 +16,7 @@ on:
           - acorn
           - acorn-walk
           - ada
+          - amaro
           - brotli
           - c-ares
           - cjs-module-lexer
@@ -82,6 +83,14 @@ jobs:
               cat temp-output
               tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
               rm temp-output
+          - id: amaro
+            subsystem: deps
+            label: dependencies
+            run: |
+              ./tools/dep_updaters/update-amaro.sh > temp-output
+              cat temp-output
+              tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
+              rm temp-output
           - id: brotli
             subsystem: deps
             label: dependencies

CHANGELOG.md

@@ -63,7 +63,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V21.md#21.0.0">21.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V20.md#20.15.1">20.15.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V20.md#20.16.0">20.16.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V20.md#20.15.1">20.15.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V20.md#20.15.0">20.15.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V20.md#20.14.0">20.14.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V20.md#20.13.1">20.13.1</a><br/>

LICENSE

@@ -130,6 +130,31 @@ The externally maintained libraries used by Node.js are:
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   """
 
+- amaro, located at deps/amaro, is licensed as follows:
+  """
+    MIT License
+
+    Copyright (c) Marco Ippolito and Amaro contributors
+
+    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:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    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.
+  """
+
 - ICU, located at deps/icu-small, is licensed as follows:
   """
     UNICODE LICENSE V3

README.md

@@ -166,14 +166,10 @@ For information about the governance of the Node.js project, see
   **Antoine du Hamel** <<[email protected]>> (he/him)
 * [anonrig](https://github.com/anonrig) -
   **Yagiz Nizipli** <<[email protected]>> (he/him)
-* [apapirovski](https://github.com/apapirovski) -
-  **Anatoli Papirovski** <<[email protected]>> (he/him)
 * [benjamingr](https://github.com/benjamingr) -
   **Benjamin Gruenbaum** <<[email protected]>>
 * [BridgeAR](https://github.com/BridgeAR) -
   **Ruben Bridgewater** <<[email protected]>> (he/him)
-* [GeoffreyBooth](https://github.com/GeoffreyBooth) -
-  **Geoffrey Booth** <<[email protected]>> (he/him)
 * [gireeshpunathil](https://github.com/gireeshpunathil) -
   **Gireesh Punathil** <<[email protected]>> (he/him)
 * [jasnell](https://github.com/jasnell) -
@@ -207,6 +203,8 @@ For information about the governance of the Node.js project, see
 
 #### TSC regular members
 
+* [apapirovski](https://github.com/apapirovski) -
+  **Anatoli Papirovski** <<[email protected]>> (he/him)
 * [BethGriggs](https://github.com/BethGriggs) -
   **Beth Griggs** <<[email protected]>> (she/her)
 * [bnoordhuis](https://github.com/bnoordhuis) -
@@ -215,6 +213,8 @@ For information about the governance of the Node.js project, see
   **Colin Ihrig** <<[email protected]>> (he/him)
 * [codebytere](https://github.com/codebytere) -
   **Shelley Vohr** <<[email protected]>> (she/her)
+* [GeoffreyBooth](https://github.com/GeoffreyBooth) -
+  **Geoffrey Booth** <<[email protected]>> (he/him)
 * [Trott](https://github.com/Trott) -
   **Rich Trott** <<[email protected]>> (he/him)
 
@@ -355,6 +355,8 @@ For information about the governance of the Node.js project, see
   **Harshitha K P** <<[email protected]>> (she/her)
 * [himself65](https://github.com/himself65) -
   **Zeyu "Alex" Yang** <<[email protected]>> (he/him)
+* [jakecastelli](https://github.com/jakecastelli) -
+  **Jake Yuesong Li** <<[email protected]>> (he/him)
 * [JakobJingleheimer](https://github.com/JakobJingleheimer) -
   **Jacob Smith** <<[email protected]>> (he/him)
 * [jasnell](https://github.com/jasnell) -

common.gypi

@@ -36,7 +36,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.17',
+    'v8_embedder_string': '-node.18',
 
     ##### V8 defaults for Node.js #####
 
@@ -113,6 +113,7 @@
       ['target_arch in "arm ia32 mips mipsel ppc"', {
         'v8_enable_pointer_compression': 0,
         'v8_enable_31bit_smis_on_64bit_arch': 0,
+        'v8_enable_sandbox': 0
       }],
       ['target_arch in "ppc64 s390x"', {
         'v8_enable_backtrace': 1,

configure.py

@@ -1639,6 +1639,7 @@ def configure_v8(o, configs):
   o['variables']['v8_enable_maglev'] = B(not options.v8_disable_maglev and
                                          o['variables']['target_arch'] in maglev_enabled_architectures)
   o['variables']['v8_enable_pointer_compression'] = 1 if options.enable_pointer_compression else 0
+  o['variables']['v8_enable_sandbox'] = 1 if options.enable_pointer_compression else 0
   o['variables']['v8_enable_31bit_smis_on_64bit_arch'] = 1 if options.enable_pointer_compression else 0
   o['variables']['v8_enable_shared_ro_heap'] = 0 if options.enable_pointer_compression or options.disable_shared_ro_heap else 1
   o['variables']['v8_enable_extensible_ro_snapshot'] = 0

deps/amaro/LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Marco Ippolito and Amaro contributors
+
+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:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+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.

deps/amaro/README.md

@@ -0,0 +1,30 @@
+# Amaro
+
+Amaro is a wrapper around `@swc/wasm-typescript`, a WebAssembly port of the SWC TypeScript parser.
+It's currently used as an internal in Node.js for [Type Stripping](https://github.com/nodejs/loaders/issues/208), but in the future it will be possible to be upgraded separately by users.
+The main goal of this package is to provide a stable API for TypeScript parser, which is unstable and subject to change.
+
+> Amaro means "bitter" in Italian. It's a reference to [Mount Amaro](https://en.wikipedia.org/wiki/Monte_Amaro_(Abruzzo)) on whose slopes this package was conceived.
+
+## How to Install
+
+To install Amaro, run:
+
+```shell
+npm install amaro
+```
+
+## How to Use
+
+By default Amaro exports a `transformSync` function that performs type stripping.
+Stack traces are preserved, by replacing removed types with white spaces.
+
+```javascript
+const amaro = require('amaro');
+const { code } = amaro.transformSync("const foo: string = 'bar';");
+console.log(code); // "const foo         = 'bar';"
+```
+
+## License (MIT)
+
+See [`LICENSE.md`](./LICENSE.md).