Skip to content

Commit

Permalink
Merge pull request #216 from GordonSmith/BUMP_VERSIONS
Browse files Browse the repository at this point in the history
chore: Bump versions (security)
  • Loading branch information
GordonSmith authored Jan 25, 2024
2 parents b8c1730 + d06623f commit 770ccf0
Show file tree
Hide file tree
Showing 8 changed files with 219 additions and 237 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}


- name: Publish
if: github.ref_type == 'tag'
env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This repository contains a collection of useful c++ libraries compiled to WASM f
- ...more to follow...

Built with:
- [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.51
- [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.52

## Homepage and Documents

Expand Down
2 changes: 1 addition & 1 deletion karma.conf.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = function (config) {
config.set({
frameworks: ['mocha', 'chai'],
frameworks: ['mocha'],
files: [
'dist-test/index.umd.js',
{ pattern: 'dist-test/*.js', watched: false, included: false, served: true },
Expand Down
425 changes: 204 additions & 221 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"install-vcpkg:win32": "wsl -e ./scripts/cpp-install-vcpkg.sh",
"install-build-deps": "run-s install-emsdk install-vcpkg",
"uninstall-build-deps": "rimraf ./emsdk ./vcpkg ./src-expat ./src-vcpkg",
"clean-build": "rimraf .nyc_output bin build coverage dist* lib* output-* tmp types *.tsbuildinfo",
"clean-build": "rimraf .nyc_output bin build coverage dist* lib* output-* tmp types *.tsbuildinfo vcpkg/vcpkg",
"clean-docs": "rimraf docs/.vitepress/dist docs/classes docs/interfaces docs/modules docs/.nojekyll docs/README.md",
"clean": "run-p clean-build clean-docs",
"copy-res": "cp ./docs/*.png ./docs/.vitepress/dist",
Expand Down Expand Up @@ -117,8 +117,8 @@
"coverage-report": "nyc report --reporter=lcov",
"tag": "run-s standard-version git-push",
"purge-jsdelivr": "node ./utils/purge-jsdelivr.js",
"update-major": "npx npm-check-updates -u",
"update": "npx npm-check-updates -u -t minor"
"update": "npx npm-check-updates -u -t minor",
"update-major": "npx npm-check-updates -u"
},
"dependencies": {
"yargs": "17.7.2"
Expand All @@ -131,12 +131,12 @@
"@types/chai": "4.3.11",
"@types/emscripten": "1.39.10",
"@types/mocha": "10.0.6",
"@types/node": "20.11.5",
"@types/node": "20.11.6",
"@types/yargs": "17.0.32",
"@typescript-eslint/eslint-plugin": "6.19.0",
"@typescript-eslint/parser": "6.19.0",
"@typescript-eslint/eslint-plugin": "6.19.1",
"@typescript-eslint/parser": "6.19.1",
"assemblyscript": "0.27.23",
"chai": "4.4.1",
"chai": "5.0.0",
"coveralls": "3.1.1",
"eslint": "8.56.0",
"fzstd": "0.1.0",
Expand All @@ -151,15 +151,15 @@
"npm-run-all": "4.1.5",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"rollup": "4.9.5",
"rollup": "4.9.6",
"rollup-plugin-sourcemaps": "0.6.3",
"run-script-os": "1.1.6",
"standard-version": "9.5.0",
"tslib": "2.6.2",
"typedoc": "0.25.7",
"typedoc-plugin-markdown": "3.17.1",
"typescript": "5.3.3",
"vitepress": "1.0.0-rc.39"
"vitepress": "1.0.0-rc.40"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion scripts/cpp-install-emsdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# List of current vertsion can be found in https://github.com/emscripten-core/emsdk/tags ---
# UPDATE README.md
VERSION=3.1.51
VERSION=3.1.52

if [ ! -d "./emsdk" ]
then
Expand Down
2 changes: 1 addition & 1 deletion scripts/cpp-install-vcpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# List of current vertsion can be found in https://github.com/microsoft/vcpkg/releases ---
# UPDATE README.md
VCPKG_BUILD_TOOLS_VERSION=2023.12.12
VCPKG_BUILD_TOOLS_VERSION=2024.01.12

if [ ! -d "./vcpkg" ]
then
Expand Down
4 changes: 2 additions & 2 deletions src-cpp/base91/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ class CBasE91
reset();
}

void *malloc(size_t __size)
static void *malloc(size_t __size)
{
return ::malloc(__size);
}

void free(void *__ptr)
static void free(void *__ptr)
{
::free(__ptr);
}
Expand Down

0 comments on commit 770ccf0

Please sign in to comment.