Merge pull request #960 from nodejs/main

Create a new pull request by comparing changes across two branches
javascript-indonesias · Jan 22, 2024 · 18b611a · 18b611a
2 parents a03f24a + f820efe
commit 18b611a
Show file tree

Hide file tree

Showing 77 changed files with 3,469 additions and 849 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -174,6 +174,7 @@
 /.github/workflows/tools.yml @nodejs/security-wg
 /.github/workflows/update-openssl.yml @nodejs/security-wg
 /.github/workflows/update-v8.yml @nodejs/security-wg @nodejs/v8-update
+/deps @nodejs/security-wg
 /tools/dep_updaters/* @nodejs/security-wg
 
 # Web Standards

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,7 +36,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V21.md#21.6.0">21.6.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V21.md#21.6.1">21.6.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V21.md#21.6.0">21.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V21.md#21.5.0">21.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V21.md#21.4.0">21.4.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V21.md#21.3.0">21.3.0</a><br/>

diff --git a/deps/acorn/acorn-walk/dist/walk.d.mts b/deps/acorn/acorn-walk/dist/walk.d.mts
@@ -66,10 +66,10 @@ export function simple<TState>(
 
 /**
  * does a 'simple' walk over a tree, building up an array of ancestor nodes (including the current node) and passing the array to the callbacks as a third parameter.
- * @param node 
- * @param visitors 
- * @param base 
- * @param state 
+ * @param node
+ * @param visitors
+ * @param base
+ * @param state
  */
 export function ancestor<TState>(
     node: acorn.Node,
@@ -79,8 +79,8 @@ export function ancestor<TState>(
   ): void
 
 /**
- * does a 'recursive' walk, where the walker functions are responsible for continuing the walk on the child nodes of their target node. 
- * @param node 
+ * does a 'recursive' walk, where the walker functions are responsible for continuing the walk on the child nodes of their target node.
+ * @param node
  * @param state the start state
  * @param functions contain an object that maps node types to walker functions
  * @param base provides the fallback walker functions for node types that aren't handled in the {@link functions} object. If not given, the default walkers will be used.
@@ -94,10 +94,10 @@ export function recursive<TState>(
 
 /**
  * does a 'full' walk over a tree, calling the {@link callback} with the arguments (node, state, type) for each node
- * @param node 
- * @param callback 
- * @param base 
- * @param state 
+ * @param node
+ * @param callback
+ * @param base
+ * @param state
  */
 export function full<TState>(
   node: acorn.Node,
@@ -108,10 +108,10 @@ export function full<TState>(
 
 /**
  * does a 'full' walk over a tree, building up an array of ancestor nodes (including the current node) and passing the array to the callbacks as a third parameter.
- * @param node 
- * @param callback 
- * @param base 
- * @param state 
+ * @param node
+ * @param callback
+ * @param base
+ * @param state
  */
 export function fullAncestor<TState>(
   node: acorn.Node,
@@ -122,8 +122,8 @@ export function fullAncestor<TState>(
 
 /**
  * builds a new walker object by using the walker functions in {@link functions} and filling in the missing ones by taking defaults from {@link base}.
- * @param functions 
- * @param base 
+ * @param functions
+ * @param base
  */
 export function make<TState>(
   functions: RecursiveVisitors<TState>,
@@ -132,12 +132,12 @@ export function make<TState>(
 
 /**
  * tries to locate a node in a tree at the given start and/or end offsets, which satisfies the predicate test. {@link start} and {@link end} can be either `null` (as wildcard) or a `number`. {@link test} may be a string (indicating a node type) or a function that takes (nodeType, node) arguments and returns a boolean indicating whether this node is interesting. {@link base} and {@link state} are optional, and can be used to specify a custom walker. Nodes are tested from inner to outer, so if two nodes match the boundaries, the inner one will be preferred.
- * @param node 
- * @param start 
- * @param end 
- * @param type 
- * @param base 
- * @param state 
+ * @param node
+ * @param start
+ * @param end
+ * @param type
+ * @param base
+ * @param state
  */
 export function findNodeAt<TState>(
   node: acorn.Node,
@@ -150,11 +150,11 @@ export function findNodeAt<TState>(
 
 /**
  * like {@link findNodeAt}, but will match any node that exists 'around' (spanning) the given position.
- * @param node 
- * @param start 
- * @param type 
- * @param base 
- * @param state 
+ * @param node
+ * @param start
+ * @param type
+ * @param base
+ * @param state
  */
 export function findNodeAround<TState>(
   node: acorn.Node,
@@ -165,8 +165,13 @@ export function findNodeAround<TState>(
 ): Found<TState> | undefined
 
 /**
- * similar to {@link findNodeAround}, but will match all nodes after the given position (testing outer nodes before inner nodes).
+ * Find the outermost matching node after a given position.
  */
 export const findNodeAfter: typeof findNodeAround
 
+/**
+ * Find the outermost matching node before a given position.
+ */
+export const findNodeBefore: typeof findNodeAround
+
 export const base: RecursiveVisitors<any>
diff --git a/deps/acorn/acorn-walk/dist/walk.d.ts b/deps/acorn/acorn-walk/dist/walk.d.ts
@@ -66,10 +66,10 @@ export function simple<TState>(
 
 /**
  * does a 'simple' walk over a tree, building up an array of ancestor nodes (including the current node) and passing the array to the callbacks as a third parameter.
- * @param node 
- * @param visitors 
- * @param base 
- * @param state 
+ * @param node
+ * @param visitors
+ * @param base
+ * @param state
  */
 export function ancestor<TState>(
     node: acorn.Node,
@@ -79,8 +79,8 @@ export function ancestor<TState>(
   ): void
 
 /**
- * does a 'recursive' walk, where the walker functions are responsible for continuing the walk on the child nodes of their target node. 
- * @param node 
+ * does a 'recursive' walk, where the walker functions are responsible for continuing the walk on the child nodes of their target node.
+ * @param node
  * @param state the start state
  * @param functions contain an object that maps node types to walker functions
  * @param base provides the fallback walker functions for node types that aren't handled in the {@link functions} object. If not given, the default walkers will be used.
@@ -94,10 +94,10 @@ export function recursive<TState>(
 
 /**
  * does a 'full' walk over a tree, calling the {@link callback} with the arguments (node, state, type) for each node
- * @param node 
- * @param callback 
- * @param base 
- * @param state 
+ * @param node
+ * @param callback
+ * @param base
+ * @param state
  */
 export function full<TState>(
   node: acorn.Node,
@@ -108,10 +108,10 @@ export function full<TState>(
 
 /**
  * does a 'full' walk over a tree, building up an array of ancestor nodes (including the current node) and passing the array to the callbacks as a third parameter.
- * @param node 
- * @param callback 
- * @param base 
- * @param state 
+ * @param node
+ * @param callback
+ * @param base
+ * @param state
  */
 export function fullAncestor<TState>(
   node: acorn.Node,
@@ -122,8 +122,8 @@ export function fullAncestor<TState>(
 
 /**
  * builds a new walker object by using the walker functions in {@link functions} and filling in the missing ones by taking defaults from {@link base}.
- * @param functions 
- * @param base 
+ * @param functions
+ * @param base
  */
 export function make<TState>(
   functions: RecursiveVisitors<TState>,
@@ -132,12 +132,12 @@ export function make<TState>(
 
 /**
  * tries to locate a node in a tree at the given start and/or end offsets, which satisfies the predicate test. {@link start} and {@link end} can be either `null` (as wildcard) or a `number`. {@link test} may be a string (indicating a node type) or a function that takes (nodeType, node) arguments and returns a boolean indicating whether this node is interesting. {@link base} and {@link state} are optional, and can be used to specify a custom walker. Nodes are tested from inner to outer, so if two nodes match the boundaries, the inner one will be preferred.
- * @param node 
- * @param start 
- * @param end 
- * @param type 
- * @param base 
- * @param state 
+ * @param node
+ * @param start
+ * @param end
+ * @param type
+ * @param base
+ * @param state
  */
 export function findNodeAt<TState>(
   node: acorn.Node,
@@ -150,11 +150,11 @@ export function findNodeAt<TState>(
 
 /**
  * like {@link findNodeAt}, but will match any node that exists 'around' (spanning) the given position.
- * @param node 
- * @param start 
- * @param type 
- * @param base 
- * @param state 
+ * @param node
+ * @param start
+ * @param type
+ * @param base
+ * @param state
  */
 export function findNodeAround<TState>(
   node: acorn.Node,
@@ -165,8 +165,13 @@ export function findNodeAround<TState>(
 ): Found<TState> | undefined
 
 /**
- * similar to {@link findNodeAround}, but will match all nodes after the given position (testing outer nodes before inner nodes).
+ * Find the outermost matching node after a given position.
  */
 export const findNodeAfter: typeof findNodeAround
 
+/**
+ * Find the outermost matching node before a given position.
+ */
+export const findNodeBefore: typeof findNodeAround
+
 export const base: RecursiveVisitors<any>
diff --git a/deps/acorn/acorn-walk/package.json b/deps/acorn/acorn-walk/package.json
@@ -16,7 +16,7 @@
     ],
     "./package.json": "./package.json"
   },
-  "version": "8.3.1",
+  "version": "8.3.2",
   "engines": {
     "node": ">=0.4.0"
   },

diff --git a/deps/base64/base64/CMakeLists.txt b/deps/base64/base64/CMakeLists.txt
@@ -17,7 +17,7 @@ if (POLICY CMP0127)
     cmake_policy(SET CMP0127 NEW)
 endif()
 
-project(base64 LANGUAGES C VERSION 0.5.1)
+project(base64 LANGUAGES C VERSION 0.5.2)
 
 include(GNUInstallDirs)
 include(CMakeDependentOption)

diff --git a/deps/base64/base64/Makefile b/deps/base64/base64/Makefile
@@ -1,4 +1,4 @@
-CFLAGS += -std=c99 -O3 -Wall -Wextra -pedantic
+CFLAGS += -std=c99 -O3 -Wall -Wextra -pedantic -DBASE64_STATIC_DEFINE
 
 # Set OBJCOPY if not defined by environment:
 OBJCOPY ?= objcopy
@@ -56,6 +56,7 @@ ifdef OPENMP
   CFLAGS += -fopenmp
 endif
 
+TARGET := $(shell $(CC) -dumpmachine)
 
 .PHONY: all analyze clean
 
@@ -64,9 +65,17 @@ all: bin/base64 lib/libbase64.o
 bin/base64: bin/base64.o lib/libbase64.o
 	$(CC) $(CFLAGS) -o $@ $^
 
-lib/libbase64.o: $(OBJS)
-	$(LD) -r -o $@ $^
-	$(OBJCOPY) --keep-global-symbols=lib/exports.txt $@
+# Workaround: mangle exported function names on MinGW32.
+lib/exports.build.txt: lib/exports.txt
+ifeq (i686-w64-mingw32, $(TARGET))
+	sed -e 's/^/_/' $< > $@
+else
+	cp -f $< $@
+endif
+
+lib/libbase64.o: lib/exports.build.txt $(OBJS)
+	$(LD) -r -o $@ $(OBJS)
+	$(OBJCOPY) --keep-global-symbols=$< $@
 
 lib/config.h:
 	@echo "#define HAVE_AVX512 $(HAVE_AVX512)"  > $@
@@ -97,4 +106,4 @@ analyze: clean
 	scan-build --use-analyzer=`which clang` --status-bugs make
 
 clean:
-	rm -f bin/base64 bin/base64.o lib/libbase64.o lib/config.h $(OBJS)
+	rm -f bin/base64 bin/base64.o lib/libbase64.o lib/config.h lib/exports.build.txt $(OBJS)