Skip to content

Commit 87eed6d

Browse files
authored
Merge pull request #301 from GordonSmith/BUMP_VERSIONS
chore: Bump versions
2 parents 2c9dd8b + 71cd652 commit 87eed6d

File tree

7 files changed

+1676
-1404
lines changed

7 files changed

+1676
-1404
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ set(EM_LINK_FLAGS
2727
# "-sSTANDALONE_WASM=0"
2828
# "-sBINARYEN_ASYNC_COMPILATION=1"
2929
# "-sDYNAMIC_EXECUTION=0"
30+
"-sWASM_BIGINT=0"
3031
"-sPOLYFILL=0"
3132
# "-sSTRICT=0"
3233
"-sIGNORE_MISSING_MAIN=0"
@@ -45,7 +46,6 @@ set(EM_LINK_FLAGS
4546
if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
4647
set(EM_LINK_FLAGS
4748
${EM_LINK_FLAGS}
48-
"-sUSE_ES6_IMPORT_META=1"
4949
"-gsource-map"
5050
"--source-map-base ./" # Debugging c++ only works in browser with "Experimental DWARF support turned on"
5151
)
@@ -65,7 +65,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebIn
6565
else ()
6666
set(EM_LINK_FLAGS
6767
${EM_LINK_FLAGS}
68-
"-sUSE_ES6_IMPORT_META=0"
6968
)
7069
endif ()
7170

docker/ubuntu-dev.dockerfile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apt-get install -y python3 python3-pip
1515
RUN apt-get install -y ca-certificates curl gnupg
1616
RUN mkdir -p /etc/apt/keyrings
1717
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
18-
ENV NODE_MAJOR=18
18+
ENV NODE_MAJOR=20
1919
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
2020
RUN apt-get update
2121
RUN apt-get install -y nodejs
@@ -32,11 +32,19 @@ COPY ./vcpkg.json ./vcpkg.json
3232
RUN ./scripts/cpp-install-vcpkg.sh
3333

3434
COPY ./package*.json .
35+
COPY ./packages ./packages
36+
COPY ./utils ./utils
3537
RUN npm ci
38+
RUN npm run install-playright-with-deps
3639

37-
COPY ./src-asm ./src-asm
3840
COPY ./src-cpp ./src-cpp
39-
COPY ./src-ts ./src-ts
40-
COPY ./utils ./utils
41+
COPY ./CMake* .
42+
COPY ./vcpkg* .
43+
COPY ./lerna* .
44+
COPY ./vitest* .
45+
46+
ENTRYPOINT ["/bin/bash", "--login", "-c"]
47+
48+
CMD ["/bin/bash"]
4149

42-
CMD ["npm", "run", "test-node"]
50+
# CMD ["npm", "run", "test-node"]

0 commit comments

Comments
 (0)