Skip to content

Commit f3ab97a

Browse files
committed
[GR-35975] Backport to 21.3.1: Upgrading the underlying Node.js to version 14.18.1.
PullRequest: js/2277
2 parents f31c53c + 14318ca commit f3ab97a

File tree

2,214 files changed

+126268
-90744
lines changed

Some content is hidden

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

2,214 files changed

+126268
-90744
lines changed

3rd_party_licenses.txt

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
931931

932932
================================================================================
933933

934-
Node.js 14.17.6
934+
Node.js 14.18.1
935935

936936
Node.js is licensed for use as follows:
937937

@@ -990,30 +990,7 @@ The externally maintained libraries used by Node.js are:
990990
"""
991991
MIT License
992992

993-
Copyright (C) 2012-2018 by various contributors (see AUTHORS)
994-
995-
Permission is hereby granted, free of charge, to any person obtaining a copy
996-
of this software and associated documentation files (the "Software"), to deal
997-
in the Software without restriction, including without limitation the rights
998-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
999-
copies of the Software, and to permit persons to whom the Software is
1000-
furnished to do so, subject to the following conditions:
1001-
1002-
The above copyright notice and this permission notice shall be included in
1003-
all copies or substantial portions of the Software.
1004-
1005-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1006-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1007-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1008-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1009-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1010-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1011-
THE SOFTWARE.
1012-
"""
1013-
1014-
- Acorn plugins, located at deps/acorn-plugins, is licensed as follows:
1015-
"""
1016-
Copyright (C) 2017-2018 by Adrian Heine
993+
Copyright (C) 2012-2020 by various contributors (see AUTHORS)
1017994

1018995
Permission is hereby granted, free of charge, to any person obtaining a copy
1019996
of this software and associated documentation files (the "Software"), to deal
@@ -2209,7 +2186,7 @@ The externally maintained libraries used by Node.js are:
22092186
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22102187
"""
22112188

2212-
- gtest, located at test/cctest/gtest, is licensed as follows:
2189+
- gtest, located at deps/googletest, is licensed as follows:
22132190
"""
22142191
Copyright 2008, Google Inc.
22152192
All rights reserved.

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
This changelog summarizes major changes between GraalVM versions of the GraalVM JavaScript (ECMAScript) language runtime.
44
The main focus is on user-observable behavior of the engine.
55

6+
## Version 21.3.1
7+
* Updated Node.js to version 14.18.1.
8+
69
## Version 21.3.0
710
* Implemented the [Private Fields in `in`](https://tc39.es/proposal-private-fields-in-in) proposal. It is available behind the experimental option `--js.private-fields-in`.
811
* Implemented the [JavaScript BigInt to WebAssembly i64 integration](https://github.com/WebAssembly/JS-BigInt-integration) proposal. It can be disabled using the `--js.wasm-bigint=false` option.

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSRuntime.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,6 +1006,7 @@ public static String objectToConsoleString(DynamicObject obj, String name, int d
10061006
@TruffleBoundary
10071007
public static String objectToConsoleString(DynamicObject obj, String name, int depth, String[] internalKeys, Object[] internalValues, boolean allowSideEffects) {
10081008
assert JSDynamicObject.isJSDynamicObject(obj) && !JSFunction.isJSFunction(obj) && !JSProxy.isJSProxy(obj);
1009+
boolean v8CompatMode = JSObject.getJSContext(obj).isOptionV8CompatibilityMode();
10091010
StringBuilder sb = new StringBuilder();
10101011

10111012
if (name != null) {
@@ -1036,7 +1037,7 @@ public static String objectToConsoleString(DynamicObject obj, String name, int d
10361037
}
10371038
sb.append('(').append(length).append(')');
10381039
return sb.toString();
1039-
} else if (topLevel && length >= 2) {
1040+
} else if (topLevel && length >= 2 && !v8CompatMode) {
10401041
sb.append('(').append(length).append(')');
10411042
}
10421043
}
@@ -1055,7 +1056,7 @@ public static String objectToConsoleString(DynamicObject obj, String name, int d
10551056
continue;
10561057
}
10571058
if (propertyCount > 0) {
1058-
sb.append(", ");
1059+
sb.append(v8CompatMode ? "," : ", ");
10591060
if (propertyCount >= JSConfig.MaxConsolePrintProperties) {
10601061
sb.append("...");
10611062
break;

graal-nodejs/.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test/addons/??_*
44
test/fixtures
55
test/message/esm_display_syntax_error.mjs
66
tools/icu
7-
tools/lint-md.js
7+
tools/lint-md.mjs
88
tools/node-lint-md-cli-rollup/dist
99
benchmark/tmp
1010
doc/**/*.js

graal-nodejs/.eslintrc.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const hacks = [
1818
'eslint-plugin-markdown',
1919
'@babel/eslint-parser',
2020
'@babel/plugin-syntax-class-properties',
21+
'@babel/plugin-syntax-import-assertions',
2122
'@babel/plugin-syntax-top-level-await',
2223
];
2324
Module._findPath = (request, paths, isMain) => {
@@ -41,6 +42,7 @@ module.exports = {
4142
babelOptions: {
4243
plugins: [
4344
Module._findPath('@babel/plugin-syntax-class-properties'),
45+
Module._findPath('@babel/plugin-syntax-import-assertions'),
4446
Module._findPath('@babel/plugin-syntax-top-level-await'),
4547
],
4648
},
@@ -124,7 +126,13 @@ module.exports = {
124126
ignorePattern: '.*',
125127
},
126128
}],
127-
'comma-dangle': ['error', 'only-multiline'],
129+
'comma-dangle': ['error', {
130+
arrays: 'always-multiline',
131+
exports: 'only-multiline',
132+
functions: 'only-multiline',
133+
imports: 'only-multiline',
134+
objects: 'only-multiline',
135+
}],
128136
'comma-spacing': 'error',
129137
'comma-style': 'error',
130138
'computed-property-spacing': 'error',
@@ -155,6 +163,7 @@ module.exports = {
155163
code: 80,
156164
ignorePattern: '^// Flags:',
157165
ignoreRegExpLiterals: true,
166+
ignoreTemplateLiterals: true,
158167
ignoreUrls: true,
159168
tabWidth: 2,
160169
}],

graal-nodejs/.github/CODEOWNERS

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
/doc/guides/contributing/pull-requests.md @nodejs/tsc
2323
/doc/guides/collaborator-guide.md @nodejs/tsc
2424
/doc/guides/offboarding.md @nodejs/tsc
25-
/doc/guides/onboarding-extras.md @nodejs/tsc
2625

2726
# streams
2827

@@ -97,6 +96,12 @@
9796
/doc/guides/adding-new-napi-api.md @nodejs/n-api
9897
/doc/api/n-api.md @nodejs/n-api
9998

99+
# gyp
100+
101+
*.gyp @nodejs/gyp
102+
*.gypi @nodejs/gyp
103+
/tools/gyp/**/* @nodejs/gyp
104+
100105
# WASI
101106
/deps/uvwasi/ @nodejs/wasi
102107
/doc/api/wasi.md @nodejs/wasi
@@ -118,3 +123,8 @@
118123
# V8
119124
/deps/v8/* @nodejs/v8-update
120125
/tools/v8_gypfiles/* @nodejs/v8-update
126+
127+
# Actions
128+
129+
/.github/workflows/* @nodejs/actions
130+
/tools/actions/* @nodejs/actions

graal-nodejs/.github/ISSUE_TEMPLATE/1-bug-report.md

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: "\U0001F41B Bug report"
2+
description: Create a report to help us improve
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
Thank you for reporting an issue.
8+
9+
This issue tracker is for bugs and issues found within Node.js core.
10+
If you require more general support please file an issue on our help repo. https://github.com/nodejs/help
11+
12+
Please fill in as much of the form below as you're able.
13+
- type: input
14+
attributes:
15+
label: Version
16+
description: Output of `node -v`
17+
- type: input
18+
attributes:
19+
label: Platform
20+
description: |
21+
UNIX: output of `uname -a`
22+
Windows: output of `"$([Environment]::OSVersion | ForEach-Object VersionString) $(if ([Environment]::Is64BitOperatingSystem) { "x64" } else { "x86" })"` in PowerShell console
23+
- type: input
24+
attributes:
25+
label: Subsystem
26+
description: If known, please specify affected core module name
27+
- type: textarea
28+
attributes:
29+
label: What steps will reproduce the bug?
30+
description: Enter details about your bug, preferably a simple code snippet that can be run using `node` directly without installing third-party dependencies.
31+
- type: textarea
32+
attributes:
33+
label: How often does it reproduce? Is there a required condition?
34+
- type: textarea
35+
attributes:
36+
label: What is the expected behavior?
37+
description: If possible please provide textual output instead of screenshots.
38+
- type: textarea
39+
attributes:
40+
label: What do you see instead?
41+
description: If possible please provide textual output instead of screenshots.
42+
- type: textarea
43+
attributes:
44+
label: Additional information
45+
description: Tell us anything else you think we should know.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: "authors update"
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
authors_update:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
with:
11+
fetch-depth: '0' # this is required to actually get all the authors
12+
- run: "tools/update-authors.js" # run the AUTHORS tool
13+
- uses: gr2m/create-or-update-pull-request-action@v1 # create a PR or update the Action's existing PR
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
with:
17+
title: "meta: update AUTHORS"
18+
body: "If this PR exists, there's presumably new additions to the AUTHORS file. This is an automatically generated PR by the `authors.yml` GitHub Action, which runs `tools/update-authors.js` and submits a new PR or updates an existing PR.\n\nPlease note that there might be duplicate entries. If there are, please remove them and add the duplicate emails to .mailmap directly to this PR."
19+
branch: "actions/authors-update" # custom branch *just* for this Action.
20+
commit-message: "meta: update AUTHORS"
21+
author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
22+
labels: meta

graal-nodejs/.github/workflows/auto-start-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- cron: "*/5 * * * *"
1111

1212
env:
13-
NODE_VERSION: 14.x
13+
NODE_VERSION: lts/*
1414

1515
jobs:
1616
startCI:

0 commit comments

Comments
 (0)