Skip to content

Commit ec54193

Browse files
sbc100sbc100
authored
Use globalThis in node detection. NFC (#25434)
Also, make node detection consistent between file_packager output and emscripten output. Followup to #25417
1 parent 88a8d74 commit ec54193

File tree

50 files changed

+190
-190
lines changed

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

+190
-190
lines changed

‎src/parseTools.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ function nodeDetectionCode() {
11321132
// optimize code size.
11331133
return 'true';
11341134
}
1135-
return "typeof process == 'object' && process.versions?.node && process.type != 'renderer'";
1135+
return "globalThis.process?.versions?.node && globalThis.process?.type != 'renderer'";
11361136
}
11371137

11381138
function nodePthreadDetection() {

‎test/codesize/test_codesize_cxx_ctors1.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19678,
3-
"a.out.js.gz": 8157,
2+
"a.out.js": 19676,
3+
"a.out.js.gz": 8151,
44
"a.out.nodebug.wasm": 129509,
55
"a.out.nodebug.wasm.gz": 49243,
6-
"total": 149187,
7-
"total_gz": 57400,
6+
"total": 149185,
7+
"total_gz": 57394,
88
"sent": [
99
"__cxa_throw",
1010
"_abort_js",

‎test/codesize/test_codesize_cxx_ctors2.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19655,
3-
"a.out.js.gz": 8143,
2+
"a.out.js": 19653,
3+
"a.out.js.gz": 8138,
44
"a.out.nodebug.wasm": 128936,
55
"a.out.nodebug.wasm.gz": 48884,
6-
"total": 148591,
7-
"total_gz": 57027,
6+
"total": 148589,
7+
"total_gz": 57022,
88
"sent": [
99
"__cxa_throw",
1010
"_abort_js",

‎test/codesize/test_codesize_cxx_except.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 23333,
3-
"a.out.js.gz": 9135,
2+
"a.out.js": 23331,
3+
"a.out.js.gz": 9129,
44
"a.out.nodebug.wasm": 171271,
55
"a.out.nodebug.wasm.gz": 57338,
6-
"total": 194604,
7-
"total_gz": 66473,
6+
"total": 194602,
7+
"total_gz": 66467,
88
"sent": [
99
"__cxa_begin_catch",
1010
"__cxa_end_catch",

‎test/codesize/test_codesize_cxx_except_wasm.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19563,
3-
"a.out.js.gz": 8103,
2+
"a.out.js": 19561,
3+
"a.out.js.gz": 8098,
44
"a.out.nodebug.wasm": 144630,
55
"a.out.nodebug.wasm.gz": 54894,
6-
"total": 164193,
7-
"total_gz": 62997,
6+
"total": 164191,
7+
"total_gz": 62992,
88
"sent": [
99
"_abort_js",
1010
"_tzset_js",

‎test/codesize/test_codesize_cxx_except_wasm_legacy.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19563,
3-
"a.out.js.gz": 8103,
2+
"a.out.js": 19561,
3+
"a.out.js.gz": 8098,
44
"a.out.nodebug.wasm": 142219,
55
"a.out.nodebug.wasm.gz": 54358,
6-
"total": 161782,
7-
"total_gz": 62461,
6+
"total": 161780,
7+
"total_gz": 62456,
88
"sent": [
99
"_abort_js",
1010
"_tzset_js",

‎test/codesize/test_codesize_cxx_lto.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19011,
3-
"a.out.js.gz": 7836,
2+
"a.out.js": 19009,
3+
"a.out.js.gz": 7829,
44
"a.out.nodebug.wasm": 106463,
55
"a.out.nodebug.wasm.gz": 42596,
6-
"total": 125474,
7-
"total_gz": 50432,
6+
"total": 125472,
7+
"total_gz": 50425,
88
"sent": [
99
"a (emscripten_resize_heap)",
1010
"b (_setitimer_js)",

‎test/codesize/test_codesize_cxx_mangle.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 23383,
3-
"a.out.js.gz": 9155,
2+
"a.out.js": 23381,
3+
"a.out.js.gz": 9149,
44
"a.out.nodebug.wasm": 235312,
55
"a.out.nodebug.wasm.gz": 78933,
6-
"total": 258695,
7-
"total_gz": 88088,
6+
"total": 258693,
7+
"total_gz": 88082,
88
"sent": [
99
"__cxa_begin_catch",
1010
"__cxa_end_catch",

‎test/codesize/test_codesize_cxx_noexcept.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19678,
3-
"a.out.js.gz": 8157,
2+
"a.out.js": 19676,
3+
"a.out.js.gz": 8151,
44
"a.out.nodebug.wasm": 131926,
55
"a.out.nodebug.wasm.gz": 50238,
6-
"total": 151604,
7-
"total_gz": 58395,
6+
"total": 151602,
7+
"total_gz": 58389,
88
"sent": [
99
"__cxa_throw",
1010
"_abort_js",

‎test/codesize/test_codesize_cxx_wasmfs.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 7067,
3-
"a.out.js.gz": 3332,
2+
"a.out.js": 7065,
3+
"a.out.js.gz": 3329,
44
"a.out.nodebug.wasm": 169797,
55
"a.out.nodebug.wasm.gz": 63087,
6-
"total": 176864,
7-
"total_gz": 66419,
6+
"total": 176862,
7+
"total_gz": 66416,
88
"sent": [
99
"__cxa_throw",
1010
"_abort_js",

0 commit comments

Comments
 (0)