Skip to content

Commit 1e4d8f1

Browse files
LeonMrBonnieLeonMrBonnie
authored
Update NodeJS to v17 (#121)
* server: Update NodeJS to v17.7.0 * server: Move bootstrap code to external JS file * server: Update NodeJS binaries * server: Remove deprecated function * server: Remove custom-loader config option * server: Add config options for fetch, webcrypto and network imports
1 parent 038a331 commit 1e4d8f1

File tree

3,112 files changed

+1150368
-18985
lines changed

Some content is hidden

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

3,112 files changed

+1150368
-18985
lines changed

‎server/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -297,3 +297,5 @@ __pycache__/
297297

298298
.vscode
299299
dist/*
300+
301+
src/bootstrap.js.gen

‎server/CMakeLists.txt

+11-1
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,21 @@ endmacro()
5555
GroupSources(${PROJECT_SOURCE_DIR}/src "Source Files")
5656
GroupSources("../shared" "Shared Files")
5757

58+
function(make_includable input_file output_file)
59+
file(READ ${input_file} content)
60+
set(delim "for_c++_include")
61+
set(content "R\"${delim}(\n${content})${delim}\"")
62+
file(WRITE ${output_file} "${content}")
63+
endfunction(make_includable)
64+
65+
make_includable("src/bootstrap.js" "src/bootstrap.js.gen")
66+
5867
include_directories(
5968
src
6069
deps/nodejs/include
6170
deps/nodejs/deps/v8/include
6271
deps/nodejs/deps/uv/include
72+
deps/nodejs/deps/openssl/openssl/include
6373
../shared
6474
../shared/deps
6575
)
@@ -145,5 +155,5 @@ if (WIN32)
145155
endif (WIN32)
146156

147157
if (UNIX)
148-
target_link_libraries(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/deps/nodejs/lib/libnode.so.83)
158+
target_link_libraries(${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/deps/nodejs/lib/libnode.so.102)
149159
endif (UNIX)

‎server/deps/nodejs/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* WARNING: do not edit!
3+
* Generated by util/mkbuildinf.pl
4+
*
5+
* Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
6+
*
7+
* Licensed under the Apache License 2.0 (the "License"). You may not use
8+
* this file except in compliance with the License. You can obtain a copy
9+
* in the file LICENSE in the source distribution or at
10+
* https://www.openssl.org/source/license.html
11+
*/
12+
13+
#define PLATFORM "platform: BSD-x86"
14+
#define DATE "built on: Tue Dec 14 22:49:16 2021 UTC"
15+
16+
/*
17+
* Generate compiler_flags as an array of individual characters. This is a
18+
* workaround for the situation where CFLAGS gets too long for a C90 string
19+
* literal
20+
*/
21+
static const char compiler_flags[] = {
22+
'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','-','f',
23+
'P','I','C',' ','-','p','t','h','r','e','a','d',' ','-','W','a',
24+
',','-','-','n','o','e','x','e','c','s','t','a','c','k',' ','-',
25+
'W','a','l','l',' ','-','O','3',' ','-','f','o','m','i','t','-',
26+
'f','r','a','m','e','-','p','o','i','n','t','e','r',' ','-','D',
27+
'L','_','E','N','D','I','A','N',' ','-','D','O','P','E','N','S',
28+
'S','L','_','P','I','C',' ','-','D','_','T','H','R','E','A','D',
29+
'_','S','A','F','E',' ','-','D','_','R','E','E','N','T','R','A',
30+
'N','T',' ','-','D','O','P','E','N','S','S','L','_','B','U','I',
31+
'L','D','I','N','G','_','O','P','E','N','S','S','L',' ','-','D',
32+
'N','D','E','B','U','G','\0'
33+
};

‎server/deps/nodejs/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/* WARNING: do not edit! */
2+
/* Generated by Makefile from include/crypto/bn_conf.h.in */
3+
/*
4+
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
5+
*
6+
* Licensed under the OpenSSL license (the "License"). You may not use
7+
* this file except in compliance with the License. You can obtain a copy
8+
* in the file LICENSE in the source distribution or at
9+
* https://www.openssl.org/source/license.html
10+
*/
11+
12+
#ifndef OSSL_CRYPTO_BN_CONF_H
13+
# define OSSL_CRYPTO_BN_CONF_H
14+
15+
/*
16+
* The contents of this file are not used in the UEFI build, as
17+
* both 32-bit and 64-bit builds are supported from a single run
18+
* of the Configure script.
19+
*/
20+
21+
/* Should we define BN_DIV2W here? */
22+
23+
/* Only one for the following should be defined */
24+
#undef SIXTY_FOUR_BIT_LONG
25+
#undef SIXTY_FOUR_BIT
26+
#define THIRTY_TWO_BIT
27+
28+
#endif

‎server/deps/nodejs/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/* WARNING: do not edit! */
2+
/* Generated by Makefile from include/crypto/dso_conf.h.in */
3+
/*
4+
* Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
5+
*
6+
* Licensed under the OpenSSL license (the "License"). You may not use
7+
* this file except in compliance with the License. You can obtain a copy
8+
* in the file LICENSE in the source distribution or at
9+
* https://www.openssl.org/source/license.html
10+
*/
11+
12+
#ifndef OSSL_CRYPTO_DSO_CONF_H
13+
# define OSSL_CRYPTO_DSO_CONF_H
14+
# define DSO_DLFCN
15+
# define HAVE_DLFCN_H
16+
# define DSO_EXTENSION ".so"
17+
#endif

‎server/deps/nodejs/deps/openssl/config/archs/BSD-x86/asm/include/crypto/bn_conf.h

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* WARNING: do not edit! */
2+
/* Generated by Makefile from include/crypto/bn_conf.h.in */
3+
/*
4+
* Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
5+
*
6+
* Licensed under the Apache License 2.0 (the "License"). You may not use
7+
* this file except in compliance with the License. You can obtain a copy
8+
* in the file LICENSE in the source distribution or at
9+
* https://www.openssl.org/source/license.html
10+
*/
11+
12+
#ifndef OSSL_CRYPTO_BN_CONF_H
13+
# define OSSL_CRYPTO_BN_CONF_H
14+
# pragma once
15+
16+
/*
17+
* The contents of this file are not used in the UEFI build, as
18+
* both 32-bit and 64-bit builds are supported from a single run
19+
* of the Configure script.
20+
*/
21+
22+
/* Should we define BN_DIV2W here? */
23+
24+
/* Only one for the following should be defined */
25+
#undef SIXTY_FOUR_BIT_LONG
26+
#undef SIXTY_FOUR_BIT
27+
#define THIRTY_TWO_BIT
28+
29+
#endif

‎server/deps/nodejs/deps/openssl/config/archs/BSD-x86/asm/include/crypto/dso_conf.h

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* WARNING: do not edit! */
2+
/* Generated by Makefile from include/crypto/dso_conf.h.in */
3+
/*
4+
* Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
5+
*
6+
* Licensed under the Apache License 2.0 (the "License"). You may not use
7+
* this file except in compliance with the License. You can obtain a copy
8+
* in the file LICENSE in the source distribution or at
9+
* https://www.openssl.org/source/license.html
10+
*/
11+
12+
#ifndef OSSL_CRYPTO_DSO_CONF_H
13+
# define OSSL_CRYPTO_DSO_CONF_H
14+
# pragma once
15+
16+
# define DSO_DLFCN
17+
# define HAVE_DLFCN_H
18+
# define DSO_EXTENSION ".so"
19+
#endif

0 commit comments

Comments
 (0)