Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge master into user-dict #12321

Merged
merged 149 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
9093c07
change(web): preps for wordbreaker child projects
jahorton Feb 12, 2024
901861a
feat(web): implements string-encoded prop-array search
jahorton Feb 12, 2024
58c7575
feat(web): full property data-table generation functionality; data is…
jahorton Feb 13, 2024
0b79b86
feat(common/models): initial pass for encoded-string wordbreaker data…
jahorton Feb 13, 2024
47d945f
fix(web): conditional import path
jahorton Feb 16, 2024
346556b
fix(web): conditional import path
jahorton Feb 16, 2024
bbda771
chore(web): Merge branch 'feat/web/wordbreaker-property-data-gen' int…
jahorton Feb 16, 2024
39ae61a
fix(mac): add unit tests to confirm first calls to compliance check
sgschantz Jun 6, 2024
83c0629
fix(mac): rollback runOnlyForDeploymentPostprocessing change
sgschantz Jun 7, 2024
e1f4be9
fix(windows): check IM window will be in a visible location
rc-swag Jul 16, 2024
13fdfe9
fix(windows): review comment suggestions
rc-swag Aug 2, 2024
336db7b
fix(windows): handle IM bigger than app window
rc-swag Aug 2, 2024
cf4f832
chore(web): Merge branch 'master' into feat/web/wordbreaker-property-…
jahorton Aug 6, 2024
cc023dd
chore(common/models): reverts unneeded addition of zlib
jahorton Aug 6, 2024
6994273
chore(web): Merge branch 'fix/web/lm-worker-test' into feat/web/wordb…
jahorton Aug 6, 2024
1e8662a
chore(web): Merge branch 'chore/common/minimum-versions-add-data' int…
jahorton Aug 6, 2024
fd8b260
change(common/models): adds unicode-data downloader
jahorton Aug 6, 2024
77b94bf
feat(common/models): integrates wordbreaking-data processor into word…
jahorton Aug 6, 2024
242eb6c
fix(common): restore, preserve unicode-copyright.txt
jahorton Aug 6, 2024
c7f4631
fix(common/models): fix tsconfig issue from this PR's changes
jahorton Aug 7, 2024
e2dffff
fix(common): fix data-compiler path references
jahorton Aug 7, 2024
217ad29
fix(common/models): actually run the data-compiler
jahorton Aug 7, 2024
c2da9cd
change(common/models): data table compilation as configure, not build
jahorton Aug 7, 2024
1ff33a3
change(common/models): set unicode-data dep for configure step
jahorton Aug 7, 2024
a517c87
chore(web): Merge branch 'master' into feat/web/wordbreaker-property-…
jahorton Aug 7, 2024
23c0308
chore(web): Merge branch 'feat/web/wordbreaker-property-data-gen' int…
jahorton Aug 7, 2024
5045df1
change(common/models): improve encoding format
jahorton Aug 7, 2024
fdecc60
feat(common/models): connect encoded lookup table
jahorton Aug 7, 2024
b145adf
fix(web): fixes value for end of BMP range
jahorton Aug 7, 2024
02f721d
feat(common/models): add property-lookup unit test set
jahorton Aug 7, 2024
6f1d437
feat(web): enable utf8 charset encoding for the build artifacts
jahorton Aug 7, 2024
dda43aa
change(common/models): moves wordbreaker data-gen from src/ to tools/…
jahorton Aug 8, 2024
7016e5b
chore(common/models): removes incomplete early check-in
jahorton Aug 8, 2024
fef5b3a
chore(web): Merge branch 'feat/web/wordbreaker-property-data-gen' int…
jahorton Aug 8, 2024
e5387f0
change(web): Unicode data-fetcher build.sh -> download.sh
jahorton Aug 8, 2024
4159bab
fix(common/models): fix unit-test reference to renamed file
jahorton Aug 9, 2024
2d59ee8
change(ios): defer registration of fonts past initialization
Aug 15, 2024
72da3d8
refactor(ios): optimize font registration
Aug 16, 2024
e28d8a3
change(ios): cleaner set-based fonts-to-find maintenance
Aug 16, 2024
289dda0
change(ios): better early-exit if all font data found
Aug 16, 2024
c712d35
chore(ios): adjustments per review
Aug 19, 2024
97697b6
fix(web): fix documentation-keyboard spacebar-text scaling
jahorton Aug 20, 2024
23e02d2
change(web): better way to re-establish default sizing
jahorton Aug 20, 2024
01ae0c0
chore(web): Revert "change(web): better way to re-establish default s…
jahorton Aug 20, 2024
5c96f8f
fix(mac): remove text from short bundle version string
sgschantz Aug 20, 2024
62461c8
Merge branch 'master' into fix/mac/12197-invalid-version-string
sgschantz Aug 21, 2024
45dee1c
docs(web): extends doc-comment per review comment
jahorton Aug 21, 2024
e8bf8aa
Merge remote-tracking branch 'origin/master' into fix/android/arrows-…
darcywong00 Aug 21, 2024
dc434a7
fix(android): Use increment and decrement arrows on longpress delay
darcywong00 Aug 21, 2024
88df68c
chore(common/models): reorganize wordbreaker build outputs
jahorton Aug 21, 2024
a26389b
test(mac): removed commented code
sgschantz Aug 21, 2024
f074eda
Merge branch 'master' into fix/mac/11674-crash-during-compliance-check
sgschantz Aug 21, 2024
10f46f3
Merge remote-tracking branch 'origin/master' into fix/android/arrows-…
darcywong00 Aug 21, 2024
17f903d
fix(android): Fix navigation arrows in Info Activity for RTL
darcywong00 Aug 21, 2024
79bd383
docs: refresh windows.md
mcdurdin Aug 21, 2024
002970d
Update windows.md
mcdurdin Aug 21, 2024
b87b107
Update windows.md
mcdurdin Aug 21, 2024
b34f095
Merge remote-tracking branch 'origin/master' into fix/android/info-ar…
darcywong00 Aug 22, 2024
7e95bfb
Merge remote-tracking branch 'origin/master' into fix/android/arrows-…
darcywong00 Aug 22, 2024
f0dbcd6
Update windows.md
mcdurdin Aug 22, 2024
012bbb4
fix(android): Add RTL assets for adjusting keyboard height menu
darcywong00 Aug 22, 2024
b721ff6
fix(developer): add call test cases from #11990 to GetXStringImpl_typ…
markcsinclair Aug 22, 2024
7e2f797
fix(developer): move check on store name search to just after search
markcsinclair Aug 22, 2024
75508f4
fix(developer): add ERROR_StoreDoesNotExist test cases to GetXStringI…
markcsinclair Aug 22, 2024
f082ddc
chore(common): adjust build settings for windows clean builds
mcdurdin Aug 22, 2024
75238dc
Update windows.md
mcdurdin Aug 22, 2024
b608e1c
fix(developer): add ERROR_InvalidCall and first valid test case to Ge…
markcsinclair Aug 22, 2024
862f0d9
fix(developer): add test cases for spaces before and after valid stor…
markcsinclair Aug 22, 2024
a09dcff
chore(developer): Merge branch 'master' into fix/developer/12262-ensu…
markcsinclair Aug 22, 2024
5fb3743
auto: increment master version to 18.0.96
keyman-server Aug 22, 2024
d5d4646
Merge pull request #12265 from keymanapp/auto/version-master-18.0.96
keyman-server Aug 22, 2024
48e8567
Merge pull request #12244 from keymanapp/fix/android/info-arrow-order
darcywong00 Aug 22, 2024
fe96d81
Merge pull request #12232 from keymanapp/fix/web/doc-keyboard-spaceba…
jahorton Aug 23, 2024
5c3772f
Merge branch 'master' into change/ios/defer-font-registration
Aug 23, 2024
de6550b
Merge branch 'change/ios/defer-font-registration' into refactor/ios/o…
Aug 23, 2024
044c25a
change(common/models): increase specificity in wordbreaker's .gitignore
jahorton Aug 23, 2024
8737709
chore(web): Merge branch 'master' into feat/web/wordbreaker-property-…
jahorton Aug 23, 2024
347b814
chore(common/models): copies original data-gen's license for attribution
jahorton Aug 23, 2024
ecaef39
docs(common/models): fixes relative path in doc-comment
jahorton Aug 23, 2024
65b3c75
Merge pull request #12242 from keymanapp/fix/android/arrows-longpress…
darcywong00 Aug 23, 2024
d461c48
chore(common): use `npm install` in emsdk update
mcdurdin Aug 23, 2024
47b952f
chore(common): npm install should be in emscripten folder
mcdurdin Aug 23, 2024
046bd25
chore(developer): improve build order of operations so builds work on…
mcdurdin Aug 23, 2024
3690267
Merge pull request #12261 from keymanapp/fix/android/keyboard-height-…
darcywong00 Aug 23, 2024
a273016
Merge pull request #12269 from keymanapp/chore/common/emscripten-npm-…
mcdurdin Aug 23, 2024
3b10dcd
Merge pull request #12248 from keymanapp/docs/windows-install
mcdurdin Aug 23, 2024
74f5865
docs(developer): update build documentation to refer to build.sh
mcdurdin Aug 23, 2024
8457f95
chore(developer): extend timeouts for lm compiler tests to 5 secs
mcdurdin Aug 23, 2024
9a8b6d1
chore(windows): remove remaining unused Makefiles
mcdurdin Aug 23, 2024
91465f2
auto: increment master version to 18.0.97
keyman-server Aug 23, 2024
5380baa
Merge pull request #12275 from keymanapp/auto/version-master-18.0.97
keyman-server Aug 23, 2024
6bfa8a4
refactor(linux): cleanup API of kvk2ldml.py
ermshiperete Aug 23, 2024
64c657e
Merge pull request #12276 from keymanapp/refactor/linux/kvk2ldml
ermshiperete Aug 23, 2024
d028124
fix(developer): find last matching key in LDML key bag when building KVK
mcdurdin Aug 23, 2024
e7d3527
Merge pull request #12264 from keymanapp/chore/common/build-tweaks-ne…
mcdurdin Aug 24, 2024
f506617
fix(developer): make LDML import path consistent for all bundlings of…
mcdurdin Aug 24, 2024
e1bf42e
Merge pull request #12274 from keymanapp/chore/windows/12247-remove-r…
mcdurdin Aug 24, 2024
3072444
Merge branch 'master' into docs/developer/12270-update-build-document…
mcdurdin Aug 24, 2024
e6ecc2d
Merge pull request #12272 from keymanapp/docs/developer/12270-update-…
mcdurdin Aug 24, 2024
96f288a
fix(core): properly support 'other' modifier state with `uint32_t` type
mcdurdin Aug 24, 2024
b0e8b90
auto: increment master version to 18.0.98
keyman-server Aug 24, 2024
b581ea2
Merge pull request #12282 from keymanapp/auto/version-master-18.0.98
keyman-server Aug 24, 2024
ad91f63
chore(web): Merge branch 'master' into feat/web/wordbreaker-property-…
jahorton Aug 26, 2024
be24a7d
chore(common/models): moves data-compiler artifacts to /tools subfolder
jahorton Aug 26, 2024
f7ba4e2
Merge pull request #12190 from keymanapp/change/ios/defer-font-regist…
jahorton Aug 26, 2024
fc2000a
Merge pull request #12210 from keymanapp/refactor/ios/optimize-font-r…
jahorton Aug 26, 2024
f3461b3
chore(windows): fix typo in environment.inc.sh
mcdurdin Aug 26, 2024
dd0173d
Merge branch 'master' into fix/mac/11674-crash-during-compliance-check
sgschantz Aug 26, 2024
633abe3
Merge pull request #11724 from keymanapp/fix/mac/11674-crash-during-c…
sgschantz Aug 26, 2024
2b752bf
Merge branch 'master' into fix/mac/12197-invalid-version-string
sgschantz Aug 26, 2024
5a00aab
Merge pull request #12233 from keymanapp/fix/mac/12197-invalid-versio…
sgschantz Aug 26, 2024
f9b0dc5
Merge pull request #12273 from keymanapp/chore/developer/12271-extend…
mcdurdin Aug 26, 2024
6353f92
chore: Update developer/src/kmc-ldml/src/compiler/visual-keyboard-com…
mcdurdin Aug 26, 2024
89d65ad
Merge pull request #12278 from keymanapp/fix/developer/12056-find-las…
mcdurdin Aug 26, 2024
8c959f7
chore(android): Cleanup stray debug statements in console
darcywong00 Aug 26, 2024
7dabd30
refactor(web): move `gesture-recognizer` → `gesture-processor`
ermshiperete Aug 13, 2024
b1fb812
refactor(web): move `gesture-processor` tests under `web/src/test`
ermshiperete Aug 15, 2024
6276b1e
fix(web): fixes build issue due to unreferenced --ci flag inclusion i…
jahorton Aug 26, 2024
663dbed
fix(web): fix build by calling correct script
ermshiperete Aug 26, 2024
793ef93
Merge pull request #12287 from keymanapp/chore/android/cleanup-stray-…
darcywong00 Aug 26, 2024
fca939b
chore(developer): Merge branch 'master' into fix/developer/12262-ensu…
markcsinclair Aug 26, 2024
e788bf5
fix(web): enable tests to run on Ubuntu 24.04 Noble
ermshiperete Aug 26, 2024
f5ddc4b
Merge pull request #12263 from keymanapp/fix/developer/12262-ensure-c…
markcsinclair Aug 26, 2024
77d9c38
auto: increment master version to 18.0.99
keyman-server Aug 26, 2024
c3535b4
Merge pull request #12289 from keymanapp/auto/version-master-18.0.99
keyman-server Aug 26, 2024
ee68b28
chore(windows): Merge branch 'master' into fix/windows/kmdisplayim-va…
rc-swag Aug 27, 2024
0d194fa
refactor(web): fix tests
ermshiperete Aug 27, 2024
3e89ff8
Merge pull request #10690 from keymanapp/feat/web/wordbreaker-propert…
jahorton Aug 27, 2024
957412a
Merge pull request #10692 from keymanapp/feat/web/wordbreaker-data-op…
jahorton Aug 27, 2024
98a2792
chore(web): Merge branch 'master' into feat/web/utf8-charset-output
jahorton Aug 27, 2024
8c4c485
fix(web): fixes wordbreaker test import path
jahorton Aug 27, 2024
9cf996a
fix(web): fixes wordbreaker test import path
jahorton Aug 27, 2024
7fbd67c
Merge pull request #12297 from keymanapp/fix/common/models/test-fixtu…
jahorton Aug 27, 2024
95bcf99
Merge pull request #12115 from keymanapp/feat/web/utf8-charset-output
jahorton Aug 27, 2024
0daf910
auto: increment master version to 18.0.100
keyman-server Aug 27, 2024
1d346d9
Merge pull request #12299 from keymanapp/auto/version-master-18.0.100
keyman-server Aug 27, 2024
72c894b
Merge pull request #11967 from keymanapp/fix/windows/kmdisplayim-vali…
rc-swag Aug 27, 2024
0b1f85b
chore(android,ios): Update FirstVoices keyboards to 12.15
darcywong00 Aug 27, 2024
0aec723
docs(core): fix a typo in the KMX+ doc
ermshiperete Aug 28, 2024
cf3eef4
chore(web): remove obsolete comment
ermshiperete Aug 28, 2024
00a88fb
auto: increment master version to 18.0.101
keyman-server Aug 28, 2024
ede9f3c
Merge pull request #12306 from keymanapp/auto/version-master-18.0.101
keyman-server Aug 28, 2024
39f0d5b
Merge pull request #12194 from keymanapp/refactor/web/12151_gestures
ermshiperete Aug 29, 2024
4567230
Merge pull request #12302 from keymanapp/docs/core/fixtypo
ermshiperete Aug 29, 2024
0ae160c
Merge pull request #12304 from keymanapp/chore/web/comment
ermshiperete Aug 29, 2024
34f91b1
Merge pull request #12300 from keymanapp/fix/fv/keyboards-12-15
darcywong00 Aug 29, 2024
038b913
Merge pull request #12280 from keymanapp/fix/developer/12279-consiste…
mcdurdin Aug 29, 2024
a468b13
Merge pull request #12281 from keymanapp/fix/core/12057-properly-supp…
mcdurdin Aug 29, 2024
52486e3
Merge pull request #12286 from keymanapp/chore/windows/support-typo
mcdurdin Aug 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
# Keyman Version History

## 18.0.100 alpha 2024-08-28

* fix(windows): check IM window will be in a visible location (#11967)

## 18.0.99 alpha 2024-08-27

* feat(web): import the generator for the pred-text wordbreaker's Unicode-property data-table (#10690)
* feat(web): optimize the wordbreaker data table for filesize and ease of first-load parsing (#10692)
* (#12297)
* (#12115)

## 18.0.98 alpha 2024-08-26

* change(ios): defer registration of fonts past initialization (#12190)
* refactor(ios): optimize font registration (#12210)
* test(mac): add unit tests to validate first calls to compliance check (#11724)
* fix(mac): limit short bundle version string to x.y.z format in info.plist (#12233)
* chore(developer): extend timeouts for lm compiler tests to 5 secs (#12273)
* fix(developer): find last matching key in LDML key bag when building KVK (#12278)
* chore(android): Cleanup stray debug statements in console (#12287)
* fix(developer): ensure call() detects invalid store in kmcmplib compiler (#12263)

## 18.0.97 alpha 2024-08-24

* refactor(linux): cleanup API of kvk2ldml.py (#12276)
* chore(common): adjust build settings for windows clean builds (#12264)
* chore(windows): remove remaining unused Makefiles (#12274)
* docs(developer): update build documentation to refer to build.sh (#12272)

## 18.0.96 alpha 2024-08-23

* fix(android): Fix navigation arrows in Info Activity for RTL (#12244)
* fix(web): fix documentation-keyboard spacebar-text scaling (#12232)
* fix(android): Use increment and decrement arrows on longpress delay menu (#12242)
* fix(android): Add RTL assets for adjusting keyboard height menu (#12261)
* chore(common): use `npm install` in emsdk update (#12269)
* docs: refresh windows.md (#12248)

## 18.0.95 alpha 2024-08-22

* chore(common): allow build agents to automatically select emsdk version, and enable support for 3.1.60+ (#12243)

## 18.0.94 alpha 2024-08-21

* fix(core): look for `emcc` instead of `emcc.py` (#12235)
Expand Down
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.0.95
18.0.101
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:contentDescription="@string/ic_delay_time_down"
android:src="@drawable/ic_light_dialog_textsize_down" />
android:src="@drawable/ic_action_decrement" />

<!-- Seekbar range 0 to 6 corresponds to longpress duration 300 ms to 1500 ms -->
<SeekBar
Expand All @@ -43,7 +43,7 @@
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:contentDescription="@string/ic_delay_time_up"
android:src="@drawable/ic_light_dialog_textsize_up" />
android:src="@drawable/ic_action_increment" />

</LinearLayout>

Expand Down
52 changes: 29 additions & 23 deletions android/KMAPro/kMAPro/src/main/res/layout/activity_info.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/ms_white"
tools:context=".InfoActivity" >
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/ms_white"
tools:context=".InfoActivity" >

<androidx.appcompat.widget.Toolbar
android:id="@+id/titlebar"
Expand All @@ -15,25 +15,31 @@
android:layout_alignParentTop="true"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light">

<!-- Navigation buttons -->
<ImageButton
android:id="@+id/back_button"
style="?android:attr/actionButtonStyle"
app:tint="@color/image_button_color"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:contentDescription="@string/label_back"
android:src="@drawable/ic_action_back" />
android:orientation="horizontal">

<ImageButton
android:id="@+id/forward_button"
style="?android:attr/actionButtonStyle"
app:tint="@color/image_button_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/label_forward"
android:src="@drawable/ic_action_forward" />
<!-- Navigation buttons in a LinearLayout to mirror on RTL -->
<ImageButton
android:id="@+id/back_button"
style="?android:attr/actionButtonStyle"
app:tint="@color/image_button_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:contentDescription="@string/label_back"
android:src="@drawable/ic_action_back" />

<ImageButton
android:id="@+id/forward_button"
style="?android:attr/actionButtonStyle"
app:tint="@color/image_button_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/label_forward"
android:src="@drawable/ic_action_forward" />
</LinearLayout>

<ImageButton
android:id="@+id/close_button"
Expand Down
4 changes: 2 additions & 2 deletions android/KMEA/app/src/main/assets/android-host.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function notifyHost(event, params) {
function setLongpressDelay(delay) {
if (keyman.osk) {
keyman.osk.gestureParams.longpress.waitLength = delay;
console.debug('setLongpressDelay('+delay+')');
console_debug('setLongpressDelay('+delay+')');
} else {
window.console.log('setLongpressDelay error: keyman.osk undefined');
}
Expand Down Expand Up @@ -304,7 +304,7 @@ function updateKMSelectionRange(start, end) {

console_debug('result:\n' + build_context_string(context));
} else {
console.debug('range unchanged');
console_debug('range unchanged');
}
}

Expand Down
3 changes: 2 additions & 1 deletion common/models/wordbreakers/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build/
build/
src/main/default/data.inc.ts
22 changes: 17 additions & 5 deletions common/models/wordbreakers/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"

################################ Main script ################################

# Note: the raw text files used for data.inc.ts are found within
# /resources/standards-data/unicode-character-database.
builder_describe "Builds the predictive-text wordbreaker implementation module" \
"clean" \
"configure" \
Expand All @@ -20,16 +22,26 @@ builder_describe "Builds the predictive-text wordbreaker implementation module"
"--ci"

builder_describe_outputs \
configure /node_modules \
build build/obj/index.js
configure src/main/default/data.inc.ts \
build build/main/obj/index.js

builder_parse "$@"

function do_configure() {
verify_npm_setup

# This is a script used to build the data.inc.ts file needed by the
# default wordbreaker. We rarely update the backing data, but it
# is needed _before_ the `build` action's compilation step.
tsc -b tools/data-compiler/tsconfig.json
node ./build/tools/data-compiler/obj/index.js
}

function do_build() {
tsc -b
tsc -b ./tsconfig.json

# Declaration bundling.
tsc --emitDeclarationOnly --outFile ./build/lib/index.d.ts
tsc -p ./tsconfig.json --emitDeclarationOnly --outFile ./build/main/lib/index.d.ts
}

function do_test() {
Expand All @@ -40,7 +52,7 @@ function do_test() {
fi
}

builder_run_action configure verify_npm_setup
builder_run_action configure do_configure
builder_run_action clean rm -rf build/
builder_run_action build do_build
builder_run_action test do_test
18 changes: 12 additions & 6 deletions common/models/wordbreakers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@
],
"homepage": "https://github.com/keymanapp/keyman",
"license": "MIT",
"main": "build/obj/index.js",
"types": "build/obj/index.d.ts",
"main": "build/main/obj/index.js",
"types": "build/main/obj/index.d.ts",
"exports": {
".": {
"es6-bundling": "./src/index.ts",
"default": "./build/obj/index.js"
"es6-bundling": "./src/main/index.ts",
"default": "./build/main/obj/index.js"
},
"./lib": {
"types": "./build/lib/index.d.ts"
"types": "./build/main/lib/index.d.ts"
},
"./obj/*.js": "./build/obj/*.js"
"./obj/*.js": "./build/main/obj/*.js",
"./test-index": {
"default": "./build/main/obj/test-index.js"
},
"./README.md": {
"default": "./README.md"
}
},
"directories": {
"lib": "lib",
Expand Down
Loading
Loading