Skip to content

Commit

Permalink
Merge branch 'master' into feat/common/12347-check-markdown-links
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdurdin authored Oct 9, 2024
2 parents eed9b81 + f92e78d commit 76ebb5b
Show file tree
Hide file tree
Showing 25 changed files with 340 additions and 1,245 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,6 @@ lcov.info
/keyman*.buildinfo
/keyman*.changes
/keyman*.tar.?z

# flag file for build script
.configured
10 changes: 10 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Keyman Version History

## 18.0.123 alpha 2024-10-08

* chore(developer,common): deps: replace xml2js with fast-xml-parser (#12502)
* chore(ios): renew certificate (#12512)

## 18.0.122 alpha 2024-10-07

* feat(mac): both option keys generate right alt if no left alt mapping (#12458)
* chore(common): improve configuration detection for hextobin (#12481)

## 18.0.121 alpha 2024-10-03

* docs(developer): Fix image links in help (#12488)
Expand Down
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.0.122
18.0.124
2 changes: 1 addition & 1 deletion common/tools/hextobin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"

builder_describe "Build hextobin" clean configure build
builder_describe_outputs \
configure /common/tools/hextobin/node_modules/commander \
configure /common/tools/hextobin/.configured \
build /common/tools/hextobin/build/index.js

builder_parse "$@"
Expand Down
3 changes: 3 additions & 0 deletions common/tools/hextobin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
"main": "build/index.js",
"bin": {
"hextobin": "build/hextobin.js"
},
"scripts": {
"postinstall": "echo configured > .configured"
}
}
6 changes: 3 additions & 3 deletions developer/src/common/web/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
"/build/"
],
"dependencies": {
"@sentry/node": "^7.57.0",
"@keymanapp/common-types": "*",
"@sentry/node": "^7.57.0",
"eventemitter3": "^5.0.0",
"fast-xml-parser": "^4.5.0",
"restructure": "^3.0.1",
"semver": "^7.5.4",
"sax": ">=0.6.0",
"semver": "^7.5.4",
"xmlbuilder": "~11.0.0"
},
"devDependencies": {
"@types/git-diff": "^2.0.3",
"@types/node": "^20.4.1",
"@types/semver": "^7.3.12",
"@types/xml2js": "^0.4.5",
"c8": "^7.12.0",
"git-diff": "^2.0.6",
"mocha": "^8.4.0",
Expand Down
19 changes: 0 additions & 19 deletions developer/src/common/web/utils/src/deps/xml2js/LICENSE

This file was deleted.

Loading

0 comments on commit 76ebb5b

Please sign in to comment.