From 17bc571dbbee9b7f43f60e274fd01fe962b953d9 Mon Sep 17 00:00:00 2001
From: jahorton <jahorton@sil.org>
Date: Fri, 15 May 2020 12:06:40 +0700
Subject: [PATCH] refactor(common/lmlayer): adjusts lmlayer to use web-utils

---
 common/predictive-text/package-lock.json    | 12 ++++++------
 common/predictive-text/package.json         |  6 +++---
 common/predictive-text/worker/index.ts      |  1 -
 common/predictive-text/worker/tsconfig.json |  6 +++++-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/predictive-text/package-lock.json b/common/predictive-text/package-lock.json
index 9824005596..4469ebdba9 100644
--- a/common/predictive-text/package-lock.json
+++ b/common/predictive-text/package-lock.json
@@ -46,9 +46,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "10.12.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.11.tgz",
-      "integrity": "sha512-3iIOhNiPGTdcUNVCv9e5G7GotfvJJe2pc9w2UgDXlUwnxSZ3RgcUocIU+xYm+rTU54jIKih998QE4dMOyMN1NQ==",
+      "version": "10.17.21",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.21.tgz",
+      "integrity": "sha512-PQKsydPxYxF1DsAFWmunaxd3sOi3iMt6Zmx/tgaagHYmwJ/9cRH91hQkeJZaUGWbvn0K5HlSVEXkn5U/llWPpQ==",
       "dev": true
     },
     "accepts": {
@@ -2001,9 +2001,9 @@
       }
     },
     "typescript": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.1.tgz",
-      "integrity": "sha512-jw7P2z/h6aPT4AENXDGjcfHTu5CSqzsbZc6YlUIebTyBAq8XaKp78x7VcSh30xwSCcsu5irZkYZUSFP1MrAMbg==",
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.2.tgz",
+      "integrity": "sha512-q2ktq4n/uLuNNShyayit+DTobV2ApPEo/6so68JaD5ojvc/6GClBipedB9zNWYxRSAlZXAe405Rlijzl6qDiSw==",
       "dev": true
     },
     "ultron": {
diff --git a/common/predictive-text/package.json b/common/predictive-text/package.json
index 816b6e737c..10c9f4d7e3 100644
--- a/common/predictive-text/package.json
+++ b/common/predictive-text/package.json
@@ -21,7 +21,7 @@
   },
   "homepage": "https://github.com/keymanapp/keyman#readme",
   "devDependencies": {
-    "@types/node": "^10.12.11",
+    "@types/node": "^10.17.21",
     "chai": "^4.2.0",
     "karma": "^4.2.0",
     "karma-browserstack-launcher": "^1.5.1",
@@ -41,10 +41,10 @@
     "mocha-teamcity-reporter": "^2.5.1",
     "sinon": "^7.1.1",
     "ts-node": "^7.0.1",
-    "typescript": "^3.2.1"
+    "typescript": "^3.7.2"
   },
   "dependencies": {
-    "@keymanapp/keyboard-processor": "^14.0.76",
+    "@keymanapp/web-utils": "^14.0.76",
     "@keymanapp/lexical-model-types": "^14.0.76",
     "es6-shim": "^0.35.5",
     "string.prototype.codepointat": "^0.2.1",
diff --git a/common/predictive-text/worker/index.ts b/common/predictive-text/worker/index.ts
index 6e4b6fcf38..de7b70699f 100644
--- a/common/predictive-text/worker/index.ts
+++ b/common/predictive-text/worker/index.ts
@@ -30,7 +30,6 @@
  */
 
 /// <reference path="../message.d.ts" />
-/// <reference path="../node_modules/@keymanapp/keyboard-processor/src/text/kmwstring.ts" />
 /// <reference path="models/dummy-model.ts" />
 /// <reference path="word_breaking/ascii-word-breaker.ts" />
 /// <reference path="./model-compositor.ts" />
diff --git a/common/predictive-text/worker/tsconfig.json b/common/predictive-text/worker/tsconfig.json
index 53abdb642f..e3323708a7 100644
--- a/common/predictive-text/worker/tsconfig.json
+++ b/common/predictive-text/worker/tsconfig.json
@@ -7,5 +7,9 @@
     "sourceMap": true,
     "lib": ["webworker", "es6"],
     "target": "es5"
-  }
+  },
+  "include": [
+    "../node_modules/@keymanapp/web-utils/src/index.ts",
+    "./**/*.ts",
+  ]
 }