0.10.0: emscripten 3.1.46; librime 1.9.0

checksum

@@ -1,3 +1,3 @@
 f6a0288a806954b8c0f1d34148aa43e1 public/rime.data
-b5b59a5c5fa068d6c05643328ddf088a public/rime.js
-d33690333f83dda1e42f6efa2e6b2e0c public/rime.wasm
+75aac76d4bb9a379a91af10540690f3e public/rime.js
+2f516320307c1c811bc819b63d429098 public/rime.wasm

librime_patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5262f16..9c5bb5b 100644
+index 3ec4398f..452e1909 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -46,6 +46,9 @@ if (ENABLE_ASAN)
+@@ -45,6 +45,9 @@ if (ENABLE_ASAN)
  set(CMAKE_SHARED_LINKER_FLAGS "${asan_lflags} ${CMAKE_SHARED_LINKER_FLAGS}")
  endif()
 
@@ -13,7 +13,7 @@ index 5262f16..9c5bb5b 100644
  set(Gflags_STATIC ${BUILD_STATIC})
  set(Glog_STATIC ${BUILD_STATIC})
 diff --git a/include/darts.h b/include/darts.h
-index 18bf988..4b9bb5d 100644
+index 18bf988b..4b9bb5d2 100644
 --- a/include/darts.h
 +++ b/include/darts.h
 @@ -16,7 +16,7 @@
@@ -26,7 +26,7 @@ index 18bf988..4b9bb5d 100644
  namespace Darts {
 
 diff --git a/src/rime/config/build_info_plugin.cc b/src/rime/config/build_info_plugin.cc
-index a60b6b5..eb521bb 100644
+index a60b6b56..eb521bb4 100644
 --- a/src/rime/config/build_info_plugin.cc
 +++ b/src/rime/config/build_info_plugin.cc
 @@ -19,6 +19,7 @@ bool BuildInfoPlugin::ReviewLinkOutput(ConfigCompiler* compiler,
@@ -38,7 +38,7 @@ index a60b6b5..eb521bb 100644
  compiler->EnumerateResources([&](an<ConfigResource> resource) {
  if (!resource->loaded) {
 diff --git a/src/rime/deployer.cc b/src/rime/deployer.cc
-index 2b2169c..19ac109 100644
+index 2b2169ca..19ac1097 100644
 --- a/src/rime/deployer.cc
 +++ b/src/rime/deployer.cc
 @@ -5,6 +5,7 @@
@@ -66,7 +66,7 @@ index 2b2169c..19ac109 100644
  }
  LOG(INFO) << success + failure << " tasks ran: " << success << " success, "
 diff --git a/src/rime/schema.cc b/src/rime/schema.cc
-index 3026dda..f29629f 100644
+index 3026dda9..f29629f8 100644
 --- a/src/rime/schema.cc
 +++ b/src/rime/schema.cc
 @@ -4,9 +4,17 @@
@@ -102,7 +102,7 @@ index 3026dda..f29629f 100644
  }
  config_->GetInt("menu/page_size", &page_size_);
 diff --git a/src/rime/schema.h b/src/rime/schema.h
-index bb68bcd..4ef84be 100644
+index bb68bcdb..4ef84beb 100644
 --- a/src/rime/schema.h
 +++ b/src/rime/schema.h
 @@ -10,6 +10,12 @@
@@ -134,11 +134,11 @@ index bb68bcd..4ef84be 100644
  const string& select_keys() const { return select_keys_; }
  void set_select_keys(const string& keys) { select_keys_ = keys; }
 diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index 18e3407..b79a0c1 100644
+index ab64c52a..9e6e1537 100644
 --- a/tools/CMakeLists.txt
 +++ b/tools/CMakeLists.txt
-@@ -44,18 +44,3 @@ install(TARGETS rime_dict_manager DESTINATION ${BIN_INSTALL_DIR})
- endif()
+@@ -54,18 +54,3 @@ install(TARGETS rime_dict_manager DESTINATION ${BIN_INSTALL_DIR})
+ install(TARGETS rime_table_decompiler DESTINATION ${BIN_INSTALL_DIR})
 
  install(TARGETS rime_patch DESTINATION ${BIN_INSTALL_DIR})
 -

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@libreservice/my-rime",
- "version": "0.9.9",
+ "version": "0.10.0",
  "files": [
  "dist"
  ],

scripts/build_lib.ts

@@ -104,9 +104,9 @@ function buildLevelDB () {
 
 function buildMarisaTrie () {
  console.log('Building marisa-trie')
- const src = 'librime/deps'
+ const src = 'librime/deps/marisa-trie'
  const dst = 'build/marisa-trie'
- patch(`${src}/marisa-trie`, 'marisa_patch')
+ patch(src, 'marisa_patch')
  rmSync(dst, rf)
  ensure(spawnSync(emcmake, [
  'cmake', src,
@@ -144,6 +144,7 @@ function buildGlog () {
  const src = 'librime/deps/glog'
  const dst = 'build/glog'
  chdir(src)
+ ensure(spawnSync('git', ['reset', '--hard']))
  ensure(spawnSync('git', [
  'pull',
  'https://github.com/google/glog',

scripts/build_native.ts

@@ -112,8 +112,9 @@ function buildLevelDB () {
 
 function buildMarisaTrie () {
  console.log('Building marisa-trie')
- patch('librime/deps/marisa-trie', 'marisa_patch')
- chdir('librime/deps')
+ const src = 'librime/deps/marisa-trie'
+ patch(src, 'marisa_patch')
+ chdir(src)
  rmSync(dst, rf)
  ensure(spawnSync('cmake', [
  '.',