Skip to content

Commit 22f4df9

Browse files
Replace fork of lunr-languages with upstream package (#1168)
We originally forked it for a Korean PR which has long been merged.
1 parent 5b9dc2c commit 22f4df9

11 files changed

+22
-22
lines changed

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"@codemirror/view": "^6.3.0",
1717
"@emotion/react": "^11.10.6",
1818
"@emotion/styled": "^11.10.6",
19-
"@microbit/lunr-languages": "^1.9.0-microbit.1",
2019
"@microbit/microbit-fs": "^0.9.2",
2120
"@sanity/block-content-to-react": "^3.0.0",
2221
"@sanity/image-url": "^1.0.1",
@@ -41,6 +40,7 @@
4140
"lodash.debounce": "^4.0.8",
4241
"lodash.sortby": "^4.7.0",
4342
"lunr": "^2.3.9",
43+
"lunr-languages": "^1.14.0",
4444
"lzma": "^2.3.2",
4545
"marked": "^4.0.15",
4646
"mobile-drag-drop": "^2.3.0-rc.2",

src/documentation/search/lunr-languages.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
*
44
* SPDX-License-Identifier: MIT
55
*/
6-
declare module "@microbit/lunr-languages/lunr.stemmer.support";
7-
declare module "@microbit/lunr-languages/tinyseg";
8-
declare module "@microbit/lunr-languages/lunr.multi";
6+
declare module "lunr-languages/lunr.stemmer.support";
7+
declare module "lunr-languages/tinyseg";
8+
declare module "lunr-languages/lunr.multi";
99

10-
declare module "@microbit/lunr-languages/lunr.*" {
10+
declare module "lunr-languages/lunr.*" {
1111
import lunr from "lunr";
1212
function register(l: typeof lunr): void;
1313
export = register;

src/documentation/search/search.worker.de.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
* SPDX-License-Identifier: MIT
55
*/
66
import { SearchWorker } from "./search.worker";
7-
import languageSupport from "@microbit/lunr-languages/lunr.de";
7+
import languageSupport from "lunr-languages/lunr.de";
88

99
new SearchWorker(self as DedicatedWorkerGlobalScope, "de", languageSupport);

src/documentation/search/search.worker.es.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: MIT
55
*/
66
import { SearchWorker } from "./search.worker";
7-
import languageSupport from "@microbit/lunr-languages/lunr.es";
7+
import languageSupport from "lunr-languages/lunr.es";
88

99
// Note the language code is different to the app
1010
new SearchWorker(self as DedicatedWorkerGlobalScope, "es", languageSupport);

src/documentation/search/search.worker.fr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
* SPDX-License-Identifier: MIT
55
*/
66
import { SearchWorker } from "./search.worker";
7-
import languageSupport from "@microbit/lunr-languages/lunr.fr";
7+
import languageSupport from "lunr-languages/lunr.fr";
88

99
new SearchWorker(self as DedicatedWorkerGlobalScope, "fr", languageSupport);

src/documentation/search/search.worker.ja.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
* SPDX-License-Identifier: MIT
55
*/
66
import { SearchWorker } from "./search.worker";
7-
import languageSupport from "@microbit/lunr-languages/lunr.ja";
7+
import languageSupport from "lunr-languages/lunr.ja";
88

99
new SearchWorker(self as DedicatedWorkerGlobalScope, "ja", languageSupport);

src/documentation/search/search.worker.ko.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
* SPDX-License-Identifier: MIT
55
*/
66
import { SearchWorker } from "./search.worker";
7-
import languageSupport from "@microbit/lunr-languages/lunr.ko";
7+
import languageSupport from "lunr-languages/lunr.ko";
88

99
new SearchWorker(self as DedicatedWorkerGlobalScope, "ko", languageSupport);

src/documentation/search/search.worker.nl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
* SPDX-License-Identifier: MIT
55
*/
66
import { SearchWorker } from "./search.worker";
7-
import languageSupport from "@microbit/lunr-languages/lunr.nl";
7+
import languageSupport from "lunr-languages/lunr.nl";
88

99
new SearchWorker(self as DedicatedWorkerGlobalScope, "nl", languageSupport);

src/documentation/search/search.worker.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import lunr from "lunr";
77
import { ApiDocsResponse } from "../../language-server/apidocs";
88
import { Toolkit } from "../reference/model";
99
import { IndexMessage } from "./common";
10-
import lunrJa from "@microbit/lunr-languages/lunr.ja";
10+
import lunrJa from "lunr-languages/lunr.ja";
1111
import {
1212
buildIndex,
1313
buildSearchIndex,
1414
SearchableContent,
1515
SearchWorker,
1616
} from "./search.worker";
1717
import { vi } from "vitest";
18-
import frLanguageSupport from "@microbit/lunr-languages/lunr.fr";
18+
import frLanguageSupport from "lunr-languages/lunr.fr";
1919

2020
const searchableReferenceContent: SearchableContent[] = [
2121
{

src/documentation/search/search.worker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
*
44
* SPDX-License-Identifier: MIT
55
*/
6-
import multi from "@microbit/lunr-languages/lunr.multi";
7-
import stemmerSupport from "@microbit/lunr-languages/lunr.stemmer.support";
8-
import tinyseg from "@microbit/lunr-languages/tinyseg";
6+
import multi from "lunr-languages/lunr.multi";
7+
import stemmerSupport from "lunr-languages/lunr.stemmer.support";
8+
import tinyseg from "lunr-languages/tinyseg";
99
import lunr from "lunr";
1010
import { splitDocString } from "../../editor/codemirror/language-server/docstrings";
1111
import type {

0 commit comments

Comments
 (0)