Skip to content

Commit 71cd652

Browse files
committedMar 13, 2025··
chore: Bump versions
Signed-off-by: Gordon Smith <[email protected]>
1 parent 2c9dd8b commit 71cd652

File tree

7 files changed

+1676
-1404
lines changed

7 files changed

+1676
-1404
lines changed
 

‎CMakeLists.txt

+1-2
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

+13-5
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"]

‎package-lock.json

+1,636-1,372
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+23-22
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"install-vcpkg:default": "./scripts/cpp-install-vcpkg.sh",
3030
"install-vcpkg:win32": "wsl -e ./scripts/cpp-install-vcpkg.sh",
3131
"install-playright": "npx playwright install",
32+
"install-playright-with-deps": "npx playwright install --with-deps",
3233
"install-build-deps": "run-s install-emsdk install-vcpkg install-playright",
3334
"uninstall-build-deps": "rimraf ./emsdk ./vcpkg ./src-expat ./src-vcpkg ./wasi-sdk ./wit-bindgen",
3435
"uninstall": "rimraf --glob ./node_modules ./packages/**/node_modules ./package-lock.json",
@@ -53,7 +54,7 @@
5354
"build-docs": "run-s pack-duckdb gen-docs build-docs-vitepress copy-res",
5455
"build-docs-watch": "vitepress dev docs",
5556
"build-docker-image": "docker build --rm --progress plain -f \"./docker/ubuntu-dev.dockerfile\" -t hpcc-js-wasm-build:latest \".\"",
56-
"build-docker-wasm": "npx -y mkdirp dist && docker run --rm -it --mount source=\"/hpcc-js-wasm/dist\",target=/usr/src/app/dist hpcc-js-wasm-build:latest",
57+
"build-docker-wasm": "docker run --rm -it hpcc-js-wasm-build:latest \"npm run build && npm run test\"",
5758
"build-docker": "run-s build-docker-image build-docker-wasm",
5859
"build-ws": "lerna run build",
5960
"build": "run-s build-cpp build-ws",
@@ -75,34 +76,34 @@
7576
"update-major": "npm run update-major-root && lerna run update-major"
7677
},
7778
"devDependencies": {
78-
"@eslint/js": "9.16.0",
79+
"@eslint/js": "9.22.0",
7980
"@hpcc-js/esbuild-plugins": "1.2.0",
80-
"@types/emscripten": "1.39.13",
81-
"@types/node": "22.10.1",
81+
"@types/emscripten": "1.40.0",
82+
"@types/node": "22.13.10",
8283
"@types/yargs": "17.0.33",
83-
"@typescript-eslint/eslint-plugin": "8.18.0",
84-
"@typescript-eslint/parser": "8.18.0",
85-
"@vitest/browser": "2.1.8",
86-
"@vitest/coverage-istanbul": "2.1.8",
87-
"@vitest/coverage-v8": "2.1.8",
88-
"assemblyscript": "0.27.31",
84+
"@typescript-eslint/eslint-plugin": "8.26.1",
85+
"@typescript-eslint/parser": "8.26.1",
86+
"@vitest/browser": "3.0.8",
87+
"@vitest/coverage-istanbul": "3.0.8",
88+
"@vitest/coverage-v8": "3.0.8",
89+
"assemblyscript": "0.27.35",
8990
"chokidar-cli": "3.0.0",
90-
"eslint": "9.16.0",
91-
"globals": "15.13.0",
92-
"happy-dom": "15.11.7",
93-
"lerna": "8.1.9",
91+
"eslint": "9.22.0",
92+
"globals": "16.0.0",
93+
"happy-dom": "17.4.4",
94+
"lerna": "8.2.1",
9495
"npm-run-all": "4.1.5",
95-
"playwright": "1.49.1",
96-
"release-please": "16.15.0",
96+
"playwright": "1.51.0",
97+
"release-please": "17.0.0",
9798
"rimraf": "6.0.1",
9899
"run-script-os": "1.1.6",
99100
"tslib": "2.8.1",
100-
"typedoc": "0.27.4",
101-
"typedoc-plugin-markdown": "4.3.2",
102-
"typescript": "5.7.2",
103-
"typescript-eslint": "8.18.0",
104-
"vitepress": "1.5.0",
105-
"vitest": "2.1.8"
101+
"typedoc": "0.27.9",
102+
"typedoc-plugin-markdown": "4.4.2",
103+
"typescript": "5.8.2",
104+
"typescript-eslint": "8.26.1",
105+
"vitepress": "1.6.3",
106+
"vitest": "3.0.8"
106107
},
107108
"c8": {
108109
"exclude-after-remap": []

‎packages/llama/src-cpp/util.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include <string>
4-
#include <cstdio>
4+
#include <vector>
55

66
class ArgBuffer
77
{

‎scripts/cpp-install-emsdk.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# List of current vertsion can be found in https://github.com/emscripten-core/emsdk/tags ---
44
# UPDATE README.md
5-
VERSION=3.1.73
5+
VERSION=4.0.5
66

77
if [ ! -d "./emsdk" ]
88
then

‎scripts/cpp-install-vcpkg.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# List of current vertsion can be found in https://github.com/microsoft/vcpkg/releases ---
44
# UPDATE README.md
5-
VCPKG_BUILD_TOOLS_VERSION=2024.11.16
5+
VCPKG_BUILD_TOOLS_VERSION=2025.02.14
66

77
if [ ! -d "./vcpkg" ]
88
then

0 commit comments

Comments
 (0)
Please sign in to comment.