diff --git a/_src/entrypoints/default.ts b/_src/entrypoints/default.ts index 3632858..8f54ba2 100644 --- a/_src/entrypoints/default.ts +++ b/_src/entrypoints/default.ts @@ -1,5 +1,4 @@ import "../styles/global.scss"; -// @ts-ignore import { suffix as siteSuffix } from "virtual:jekyll-config"; import { load as loadWebFont } from "webfontloader"; diff --git a/_src/entrypoints/help.ts b/_src/entrypoints/help.ts index b8b88b2..d71c3c4 100644 --- a/_src/entrypoints/help.ts +++ b/_src/entrypoints/help.ts @@ -1,9 +1,8 @@ import { hide_mirrorz as HideMirrorZ, hostname as SiteHostname, - mirrorz_help_link as MirrorzHelpLink, // @ts-ignore + mirrorz_help_link as MirrorzHelpLink, } from "virtual:jekyll-config"; -// @ts-ignore import { options as globalOptions } from "virtual:jekyll-data"; import hljs from "../lib/hljs"; import Mark from "markup-js"; @@ -59,8 +58,8 @@ Array.from(document.querySelectorAll("select.content-select")).map((el) => { }); document.getElementById("help-select").addEventListener("change", (ev) => { - let help_url = - (ev.target as Element).querySelector("option:checked").attributes["data-help-url"].value; + let help_url = (ev.target as Element).querySelector("option:checked") + .attributes["data-help-url"].value; window.location.assign( `${window.location.protocol}//${window.location.host}${help_url}`, ); diff --git a/_src/entrypoints/notfound.ts b/_src/entrypoints/notfound.ts index aca3b5d..f00ad9a 100644 --- a/_src/entrypoints/notfound.ts +++ b/_src/entrypoints/notfound.ts @@ -1,6 +1,5 @@ import "./default"; import "../styles/notfound.scss"; -// @ts-ignore import { issue_tag as IssueTag } from "virtual:jekyll-config"; const tag = `[${IssueTag}]`; diff --git a/_src/lib/mirrorList.ts b/_src/lib/mirrorList.ts index 10514eb..65b1ac3 100644 --- a/_src/lib/mirrorList.ts +++ b/_src/lib/mirrorList.ts @@ -1,5 +1,4 @@ import { TUNASYNC_JSON_PATH } from "../lib/consts"; -// @ts-ignore import { options as globalOptions } from "virtual:jekyll-data"; import { ref, Ref, onMounted, nextTick } from "vue"; import processingHandlers from "../lib/mirrorListDataProcessing"; @@ -7,7 +6,9 @@ import { MirrorInfo } from "./types"; const { postProcessStatusData } = processingHandlers(globalOptions); -export const useMirrorList = (additional: MirrorInfo[] = []): Ref => { +export const useMirrorList = ( + additional: MirrorInfo[] = [], +): Ref => { const mirrorList = ref([] as MirrorInfo[]); let refreshTimer = null; diff --git a/_src/lib/shims/jekyll.d.ts b/_src/lib/shims/jekyll.d.ts new file mode 100644 index 0000000..543a09e --- /dev/null +++ b/_src/lib/shims/jekyll.d.ts @@ -0,0 +1,11 @@ +declare module "virtual:jekyll-data" { + export const options: import("../types").GlobalOptions; +} + +declare module "virtual:jekyll-config" { + export const suffix: string; + export const hostname: string; + export const mirrorz_help_link: string; + export const hide_mirrorz: boolean; + export const issue_tag: string; +} diff --git a/_src/lib/shims/vue.d.ts b/_src/lib/shims/vue.d.ts new file mode 100644 index 0000000..57d3948 --- /dev/null +++ b/_src/lib/shims/vue.d.ts @@ -0,0 +1,5 @@ +declare module "*.vue" { + import Vue from "vue"; + const SFC: Vue.Component; + export default SFC; +} diff --git a/_src/shims-vue.d.ts b/_src/shims-vue.d.ts deleted file mode 100644 index d2f5c1a..0000000 --- a/_src/shims-vue.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -declare module '*.vue' { - import Vue from 'vue'; - const SFC: Vue.Component; - export default SFC; -} diff --git a/_src/tsconfig.json b/_src/tsconfig.json index 17b597c..40678a3 100644 --- a/_src/tsconfig.json +++ b/_src/tsconfig.json @@ -3,7 +3,8 @@ "files": [ "../node_modules/njs-types/ngx_http_js_module.d.ts", "components.d.ts", - "shims-vue.d.ts" + "lib/shims/vue.d.ts", + "lib/shims/jekyll.d.ts", ], "compilerOptions": { "isolatedModules": true,