From f8c0d309897c8586ac1b53517d6a9f952f33aaee Mon Sep 17 00:00:00 2001 From: kuuote Date: Tue, 10 Sep 2024 11:44:04 +0900 Subject: [PATCH] Remove esm.sh dependencies --- denops/skkeleton/deps/encoding_japanese.ts | 1 - denops/skkeleton/deps/japanese_numeral.ts | 1 - denops/skkeleton/deps/roman.ts | 1 - denops/skkeleton/dictionary.ts | 8 ++++---- denops/skkeleton/sources/skk_server.ts | 6 +++--- denops/skkeleton/util.ts | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 denops/skkeleton/deps/encoding_japanese.ts delete mode 100644 denops/skkeleton/deps/japanese_numeral.ts delete mode 100644 denops/skkeleton/deps/roman.ts diff --git a/denops/skkeleton/deps/encoding_japanese.ts b/denops/skkeleton/deps/encoding_japanese.ts deleted file mode 100644 index 34719122..00000000 --- a/denops/skkeleton/deps/encoding_japanese.ts +++ /dev/null @@ -1 +0,0 @@ -export * as encoding from "https://esm.sh/encoding-japanese@2.2.0/"; diff --git a/denops/skkeleton/deps/japanese_numeral.ts b/denops/skkeleton/deps/japanese_numeral.ts deleted file mode 100644 index ce8ba401..00000000 --- a/denops/skkeleton/deps/japanese_numeral.ts +++ /dev/null @@ -1 +0,0 @@ -export * as JpNum from "https://esm.sh/@geolonia/japanese-numeral@1.0.2"; diff --git a/denops/skkeleton/deps/roman.ts b/denops/skkeleton/deps/roman.ts deleted file mode 100644 index ddb673bd..00000000 --- a/denops/skkeleton/deps/roman.ts +++ /dev/null @@ -1 +0,0 @@ -export * as RomanNum from "https://esm.sh/cr-numeral@1.1.3"; diff --git a/denops/skkeleton/dictionary.ts b/denops/skkeleton/dictionary.ts index 778ddbad..ed9e77f2 100644 --- a/denops/skkeleton/dictionary.ts +++ b/denops/skkeleton/dictionary.ts @@ -1,7 +1,7 @@ import { config } from "./config.ts"; -import { JpNum } from "./deps/japanese_numeral.ts"; -import { RomanNum } from "./deps/roman.ts"; import type { CompletionData, RankData } from "./types.ts"; +import { number2kanji } from "npm:@geolonia/japanese-numeral@1.0.2"; +import { convertNumberToRoman } from "npm:cr-numeral@1.1.3"; import { toFileUrl } from "jsr:@std/path@~1.0.3/to-file-url"; import { zip } from "jsr:@std/collections@~1.0.5/zip"; @@ -55,8 +55,8 @@ function toKanjiModern(n: number): string { return kanjiNumbers[parseInt(c)]; }); } -const toRoman: (n: number) => string = RomanNum.convertNumberToRoman; -const toKanjiClassic: (n: number) => string = JpNum.number2kanji; +const toRoman: (n: number) => string = convertNumberToRoman; +const toKanjiClassic: (n: number) => string = number2kanji; function toDaiji(n: number): string { return toKanjiClassic(n) diff --git a/denops/skkeleton/sources/skk_server.ts b/denops/skkeleton/sources/skk_server.ts index 9146e9c0..f5cff6fe 100644 --- a/denops/skkeleton/sources/skk_server.ts +++ b/denops/skkeleton/sources/skk_server.ts @@ -1,13 +1,13 @@ import { config } from "../config.ts"; -import { encoding } from "../deps/encoding_japanese.ts"; -import { Encode } from "../types.ts"; -import { getKanaTable } from "../kana.ts"; import { Dictionary as BaseDictionary, HenkanType, Source as BaseSource, } from "../dictionary.ts"; +import { getKanaTable } from "../kana.ts"; +import { Encode } from "../types.ts"; import type { CompletionData, Encoding, SkkServerOptions } from "../types.ts"; +import * as encoding from "npm:encoding-japanese@2.2.0"; import { TextLineStream } from "jsr:@std/streams@~1.0.3/text-line-stream"; diff --git a/denops/skkeleton/util.ts b/denops/skkeleton/util.ts index 18d24a0e..2a304646 100644 --- a/denops/skkeleton/util.ts +++ b/denops/skkeleton/util.ts @@ -1,5 +1,5 @@ import { Denops, fn, op } from "./deps.ts"; -import { encoding } from "./deps/encoding_japanese.ts"; +import * as encoding from "npm:encoding-japanese@2.2.0"; import { basename } from "jsr:@std/path@~1.0.3/basename"; import { parse } from "jsr:@std/path@~1.0.3/parse";