Replace to use lunr-languages

microbit-foundation · Apr 15, 2024 · 47f2f3d · 47f2f3d
1 parent 5b9dc2c
commit 47f2f3d
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,6 @@
     "@codemirror/view": "^6.3.0",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
-    "@microbit/lunr-languages": "^1.9.0-microbit.1",
     "@microbit/microbit-fs": "^0.9.2",
     "@sanity/block-content-to-react": "^3.0.0",
     "@sanity/image-url": "^1.0.1",
@@ -41,6 +40,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.sortby": "^4.7.0",
     "lunr": "^2.3.9",
+    "lunr-languages": "^1.14.0",
     "lzma": "^2.3.2",
     "marked": "^4.0.15",
     "mobile-drag-drop": "^2.3.0-rc.2",

diff --git a/src/documentation/search/lunr-languages.d.ts b/src/documentation/search/lunr-languages.d.ts
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: MIT
  */
-declare module "@microbit/lunr-languages/lunr.stemmer.support";
-declare module "@microbit/lunr-languages/tinyseg";
-declare module "@microbit/lunr-languages/lunr.multi";
+declare module "lunr-languages/lunr.stemmer.support";
+declare module "lunr-languages/tinyseg";
+declare module "lunr-languages/lunr.multi";
 
-declare module "@microbit/lunr-languages/lunr.*" {
+declare module "lunr-languages/lunr.*" {
   import lunr from "lunr";
   function register(l: typeof lunr): void;
   export = register;

diff --git a/src/documentation/search/search.worker.de.ts b/src/documentation/search/search.worker.de.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 import { SearchWorker } from "./search.worker";
-import languageSupport from "@microbit/lunr-languages/lunr.de";
+import languageSupport from "lunr-languages/lunr.de";
 
 new SearchWorker(self as DedicatedWorkerGlobalScope, "de", languageSupport);
diff --git a/src/documentation/search/search.worker.es.ts b/src/documentation/search/search.worker.es.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 import { SearchWorker } from "./search.worker";
-import languageSupport from "@microbit/lunr-languages/lunr.es";
+import languageSupport from "lunr-languages/lunr.es";
 
 // Note the language code is different to the app
 new SearchWorker(self as DedicatedWorkerGlobalScope, "es", languageSupport);
diff --git a/src/documentation/search/search.worker.fr.ts b/src/documentation/search/search.worker.fr.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 import { SearchWorker } from "./search.worker";
-import languageSupport from "@microbit/lunr-languages/lunr.fr";
+import languageSupport from "lunr-languages/lunr.fr";
 
 new SearchWorker(self as DedicatedWorkerGlobalScope, "fr", languageSupport);
diff --git a/src/documentation/search/search.worker.ja.ts b/src/documentation/search/search.worker.ja.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 import { SearchWorker } from "./search.worker";
-import languageSupport from "@microbit/lunr-languages/lunr.ja";
+import languageSupport from "lunr-languages/lunr.ja";
 
 new SearchWorker(self as DedicatedWorkerGlobalScope, "ja", languageSupport);
diff --git a/src/documentation/search/search.worker.ko.ts b/src/documentation/search/search.worker.ko.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 import { SearchWorker } from "./search.worker";
-import languageSupport from "@microbit/lunr-languages/lunr.ko";
+import languageSupport from "lunr-languages/lunr.ko";
 
 new SearchWorker(self as DedicatedWorkerGlobalScope, "ko", languageSupport);
diff --git a/src/documentation/search/search.worker.nl.ts b/src/documentation/search/search.worker.nl.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 import { SearchWorker } from "./search.worker";
-import languageSupport from "@microbit/lunr-languages/lunr.nl";
+import languageSupport from "lunr-languages/lunr.nl";
 
 new SearchWorker(self as DedicatedWorkerGlobalScope, "nl", languageSupport);
diff --git a/src/documentation/search/search.worker.test.ts b/src/documentation/search/search.worker.test.ts
@@ -7,15 +7,15 @@ import lunr from "lunr";
 import { ApiDocsResponse } from "../../language-server/apidocs";
 import { Toolkit } from "../reference/model";
 import { IndexMessage } from "./common";
-import lunrJa from "@microbit/lunr-languages/lunr.ja";
+import lunrJa from "lunr-languages/lunr.ja";
 import {
   buildIndex,
   buildSearchIndex,
   SearchableContent,
   SearchWorker,
 } from "./search.worker";
 import { vi } from "vitest";
-import frLanguageSupport from "@microbit/lunr-languages/lunr.fr";
+import frLanguageSupport from "lunr-languages/lunr.fr";
 
 const searchableReferenceContent: SearchableContent[] = [
   {

diff --git a/src/documentation/search/search.worker.ts b/src/documentation/search/search.worker.ts
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: MIT
  */
-import multi from "@microbit/lunr-languages/lunr.multi";
-import stemmerSupport from "@microbit/lunr-languages/lunr.stemmer.support";
-import tinyseg from "@microbit/lunr-languages/tinyseg";
+import multi from "lunr-languages/lunr.multi";
+import stemmerSupport from "lunr-languages/lunr.stemmer.support";
+import tinyseg from "lunr-languages/tinyseg";
 import lunr from "lunr";
 import { splitDocString } from "../../editor/codemirror/language-server/docstrings";
 import type {