@xcpcio/board-app 0.52.0 → 0.53.0

package/src/composables/type.ts

@@ -1,10 +1,10 @@
 import type { Problem, Submission, Team } from "@xcpcio/core";
 
 export interface AnimatedSubmissionBlockItem {
-  submission: Submission,
-  team: Team,
-  problem: Problem,
-  displayName: string,
+  submission: Submission;
+  team: Team;
+  problem: Problem;
+  displayName: string;
 }
 
 export enum LastBlockDisplayType {

package/src/composables/useQueryBoardData.ts

@@ -1,5 +1,5 @@
-import { useQuery } from "@tanstack/vue-query";
 import type { Contest, Submissions, Teams } from "@xcpcio/types";
+import { useQuery } from "@tanstack/vue-query";
 import { DATA_REGION } from "./constant";
 
 const RETRY = 3;
@@ -34,7 +34,8 @@ async function fetcher(target: string, timestamp?: number): Promise<BoardData> {
   const p = Promise.all([
     contestResp.json(),
     teamsResp.json(),
-    submissionsResp.json()]).then((res) => {
+    submissionsResp.json(),
+  ]).then((res) => {
     return {
       contest: res[0],
       teams: res[1],

package/src/main.ts

@@ -1,13 +1,13 @@
-import { ViteSSG } from "vite-ssg";
-import { setupLayouts } from "virtual:generated-layouts";
+import type { UserModule } from "./types";
+import { VueQueryPlugin } from "@tanstack/vue-query";
 
 import FloatingVue from "floating-vue";
-import { VueQueryPlugin } from "@tanstack/vue-query";
 
+import { setupLayouts } from "virtual:generated-layouts";
+import { ViteSSG } from "vite-ssg";
+import { routes } from "vue-router/auto-routes";
 // import Previewer from 'virtual:vue-component-preview'
 import App from "./App.vue";
-import type { UserModule } from "./types";
-import generatedRoutes from "~pages";
 
 import "floating-vue/dist/style.css";
 import "vue-search-select/dist/VueSearchSelect.css";
@@ -18,12 +18,13 @@ import "uno.css";
 
 import "./styles/main.css";
 
-const routes = setupLayouts(generatedRoutes);
-
 // https://github.com/antfu/vite-ssg
 export const createApp = ViteSSG(
   App,
-  { routes, base: import.meta.env.BASE_URL },
+  {
+    routes: setupLayouts(routes),
+    base: import.meta.env.BASE_URL,
+  },
   (ctx) => {
     // install all modules under `modules/`
     Object.values(import.meta.glob<{ install: UserModule }>("./modules/*.ts", { eager: true }))

package/src/modules/README.md

@@ -3,7 +3,7 @@
 A custom user module system. Place a `.ts` file with the following template, it will be installed automatically.
 
 ```ts
-import { type UserModule } from "~/types";
+import type { UserModule } from "~/types";
 
 export const install: UserModule = ({ app, router, isClient }) => {
   // do something

package/src/modules/i18n.ts

@@ -1,6 +1,6 @@
 import type { Locale } from "vue-i18n";
 import { createI18n } from "vue-i18n";
-import { type UserModule } from "~/types";
+import type { UserModule } from "~/types";
 
 // Import i18n resources
 // https://vitejs.dev/guide/features.html#glob-import

package/src/modules/nprogress.ts

@@ -1,5 +1,5 @@
 import NProgress from "nprogress";
-import { type UserModule } from "~/types";
+import type { UserModule } from "~/types";
 
 export const install: UserModule = ({ isClient, router }) => {
   if (isClient) {

package/src/modules/pinia.ts

@@ -1,5 +1,5 @@
 import { createPinia } from "pinia";
-import { type UserModule } from "~/types";
+import type { UserModule } from "~/types";
 
 // Setup Pinia
 // https://pinia.vuejs.org/

package/src/modules/pwa.ts

@@ -1,4 +1,4 @@
-import { type UserModule } from "~/types";
+import type { UserModule } from "~/types";
 
 // https://github.com/antfu/vite-plugin-pwa#automatic-reload-when-new-content-available
 export const install: UserModule = ({ isClient, router }) => {

package/src/modules/toast.ts

@@ -1,7 +1,7 @@
 import ToastPlugin from "vue-toast-notification";
-import "vue-toast-notification/dist/theme-sugar.css";
+import type { UserModule } from "~/types";
 
-import { type UserModule } from "~/types";
+import "vue-toast-notification/dist/theme-sugar.css";
 
 export const install: UserModule = ({ app }) => {
   app.use(ToastPlugin, {

package/src/pages/index.vue

@@ -1,13 +1,13 @@
 <script setup lang="ts">
+import type { ContestIndexList } from "@xcpcio/core";
+
 import { useFetch } from "@vueuse/core";
 import { useRouteQuery } from "@vueuse/router";
-
 import { createContestIndexList } from "@xcpcio/core";
-import type { ContestIndexList } from "@xcpcio/core";
 
-import { TITLE_SUFFIX } from "~/composables/constant";
-import SearchInput from "~/components/SearchInput.vue";
 import ContestIndexUI from "~/components/ContestIndexUI.vue";
+import SearchInput from "~/components/SearchInput.vue";
+import { TITLE_SUFFIX } from "~/composables/constant";
 
 const { t } = useI18n();
 useTitle(TITLE_SUFFIX);
@@ -42,8 +42,8 @@ function onSearch() {
     s.value = searchText.value;
 
     if (c.contest.name.includes(searchText.value)
-        || c.contest.name.toLowerCase().includes(searchText.value.toLowerCase())
-        || c.boardLink.toLocaleLowerCase().includes(searchText.value.toLowerCase())) {
+      || c.contest.name.toLowerCase().includes(searchText.value.toLowerCase())
+      || c.boardLink.toLocaleLowerCase().includes(searchText.value.toLowerCase())) {
       return true;
     }
 

package/src/pages/rating/index.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { useFetch } from "@vueuse/core";
-
 import type { IRatingIndex } from "@xcpcio/types";
 
+import { useFetch } from "@vueuse/core";
+
 const { t } = useI18n();
 useTitle(RATING_TITLE_SUFFIX);
 

package/src/shims.d.ts

@@ -6,14 +6,16 @@ declare interface Window {
 }
 
 // with vite-plugin-vue-markdown, markdown files can be treated as Vue components
-declare module '*.md' {
-  import { type DefineComponent } from 'vue'
-  const component: DefineComponent<{}, {}, any>
-  export default component
+declare module "*.md" {
+  import type { DefineComponent } from "vue";
+
+  const component: DefineComponent<object, object, any>;
+  export default component;
 }
 
-declare module '*.vue' {
-  import { type DefineComponent } from 'vue'
-  const component: DefineComponent<{}, {}, any>
-  export default component
+declare module "*.vue" {
+  import type { DefineComponent } from "vue";
+
+  const component: DefineComponent<object, object, any>;
+  export default component;
 }

package/src/styles/markdown.css

@@ -12,17 +12,14 @@
   width: 100%;
 }
 
-.shiki-light {
-  background: #f8f8f8 !important;
-}
-.shiki-dark {
-  background: #0e0e0e !important;
-}
-
-html.dark .shiki-light {
-  display: none;
+.shiki,
+.shiki span {
+  color: var(--shiki-light);
+  background: var(--shiki-light-bg);
 }
 
-html:not(.dark) .shiki-dark {
-  display: none;
+html.dark .shiki,
+html.dark .shiki span {
+  color: var(--shiki-dark);
+  background: var(--shiki-dark-bg);
 }

package/src/typed-router.d.ts

@@ -0,0 +1,33 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-router. ‼️ DO NOT MODIFY THIS FILE ‼️
+// It's recommended to commit this file.
+// Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
+
+declare module 'vue-router/auto-routes' {
+  import type {
+    RouteRecordInfo,
+    ParamValue,
+    ParamValueOneOrMore,
+    ParamValueZeroOrMore,
+    ParamValueZeroOrOne,
+  } from 'vue-router'
+
+  /**
+   * Route name map generated by unplugin-vue-router
+   */
+  export interface RouteNamedMap {
+    '/': RouteRecordInfo<'/', '/', Record<never, never>, Record<never, never>>,
+    '/[...all]': RouteRecordInfo<'/[...all]', '/:all(.*)', { all: ParamValue<true> }, { all: ParamValue<false> }>,
+    '/about': RouteRecordInfo<'/about', '/about', Record<never, never>, Record<never, never>>,
+    '/balloon/': RouteRecordInfo<'/balloon/', '/balloon', Record<never, never>, Record<never, never>>,
+    '/board': RouteRecordInfo<'/board', '/board', Record<never, never>, Record<never, never>>,
+    '/countdown/': RouteRecordInfo<'/countdown/', '/countdown', Record<never, never>, Record<never, never>>,
+    '/hi/[name]': RouteRecordInfo<'/hi/[name]', '/hi/:name', { name: ParamValue<true> }, { name: ParamValue<false> }>,
+    '/rating/': RouteRecordInfo<'/rating/', '/rating', Record<never, never>, Record<never, never>>,
+    '/rating/[...all]': RouteRecordInfo<'/rating/[...all]', '/rating/:all(.*)', { all: ParamValue<true> }, { all: ParamValue<false> }>,
+    '/resolver/': RouteRecordInfo<'/resolver/', '/resolver', Record<never, never>, Record<never, never>>,
+    '/test': RouteRecordInfo<'/test', '/test', Record<never, never>, Record<never, never>>,
+  }
+}

package/src/types.ts

@@ -1,3 +1,3 @@
-import { type ViteSSGContext } from "vite-ssg";
+import type { ViteSSGContext } from "vite-ssg";
 
 export type UserModule = (ctx: ViteSSGContext) => void;

package/tsconfig.json

@@ -1,33 +1,32 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
-    "module": "ESNext",
     "target": "ESNext",
-    "lib": ["DOM", "ESNext"],
-    "strict": true,
-    "esModuleInterop": true,
     "jsx": "preserve",
-    "skipLibCheck": true,
-    "isolatedModules": true,
-    "moduleResolution": "node",
+    "lib": ["DOM", "ESNext"],
+    "baseUrl": ".",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "paths": {
+      "~/*": ["src/*"]
+    },
     "resolveJsonModule": true,
-    "noUnusedLocals": true,
-    "strictNullChecks": true,
-    "allowJs": true,
-    "forceConsistentCasingInFileNames": true,
     "types": [
       "vitest",
       "vite/client",
-      "vue/ref-macros",
-      "vite-plugin-pages/client",
-      "vite-plugin-vue-component-preview/client",
       "vite-plugin-vue-layouts/client",
       "vite-plugin-pwa/client",
-      "unplugin-vue-macros/macros-global"
+      "unplugin-vue-macros/macros-global",
+      "unplugin-vue-router/client"
     ],
-    "paths": {
-      "~/*": ["src/*"]
-    }
+    "allowJs": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "noUnusedLocals": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "skipLibCheck": true
   },
   "vueCompilerOptions": {
     "plugins": [

package/vite.config.ts

@@ -1,22 +1,22 @@
 import path from "node:path";
-
-import { defineConfig } from "vite";
-import Vue from "@vitejs/plugin-vue";
-import Pages from "vite-plugin-pages";
-import generateSitemap from "vite-ssg-sitemap";
-import Layouts from "vite-plugin-vue-layouts";
-import Components from "unplugin-vue-components/vite";
-import AutoImport from "unplugin-auto-import/vite";
-import Markdown from "vite-plugin-vue-markdown";
-import { VitePWA } from "vite-plugin-pwa";
 import VueI18n from "@intlify/unplugin-vue-i18n/vite";
-import VueDevTools from "vite-plugin-vue-devtools";
+import Shiki from "@shikijs/markdown-it";
+import Vue from "@vitejs/plugin-vue";
 import LinkAttributes from "markdown-it-link-attributes";
 import Unocss from "unocss/vite";
-import Shiki from "markdown-it-shiki";
+import AutoImport from "unplugin-auto-import/vite";
+import Components from "unplugin-vue-components/vite";
 import VueMacros from "unplugin-vue-macros/vite";
-import WebfontDownload from "vite-plugin-webfont-dl";
+import Markdown from "unplugin-vue-markdown/vite";
+import { VueRouterAutoImports } from "unplugin-vue-router";
+import VueRouter from "unplugin-vue-router/vite";
+import { defineConfig } from "vite";
 import { createHtmlPlugin } from "vite-plugin-html";
+import { VitePWA } from "vite-plugin-pwa";
+import VueDevTools from "vite-plugin-vue-devtools";
+import Layouts from "vite-plugin-vue-layouts";
+import WebfontDownload from "vite-plugin-webfont-dl";
+import generateSitemap from "vite-ssg-sitemap";
 
 import packageJSON from "./package.json";
 
@@ -42,9 +42,10 @@ export default defineConfig({
       },
     }),
 
-    // https://github.com/hannoeru/vite-plugin-pages
-    Pages({
-      extensions: ["vue", "md"],
+    // https://github.com/posva/unplugin-vue-router
+    VueRouter({
+      extensions: [".vue", ".md"],
+      dts: "src/typed-router.d.ts",
     }),
 
     // https://github.com/JohnCampionJr/vite-plugin-vue-layouts
@@ -54,10 +55,14 @@ export default defineConfig({
     AutoImport({
       imports: [
         "vue",
-        "vue-router",
         "vue-i18n",
         "@vueuse/head",
         "@vueuse/core",
+        VueRouterAutoImports,
+        {
+          // add any other imports you were relying on
+          "vue-router/auto": ["useLink"],
+        },
       ],
       dts: "src/auto-imports.d.ts",
       dirs: [
@@ -80,19 +85,12 @@ export default defineConfig({
     // see uno.config.ts for config
     Unocss(),
 
-    // https://github.com/antfu/vite-plugin-vue-markdown
+    // https://github.com/unplugin/unplugin-vue-markdown
     // Don't need this? Try vitesse-lite: https://github.com/antfu/vitesse-lite
     Markdown({
       wrapperClasses: "prose prose-sm m-auto text-left",
       headEnabled: true,
-      markdownItSetup(md) {
-        // https://prismjs.com/
-        md.use(Shiki, {
-          theme: {
-            light: "vitesse-light",
-            dark: "vitesse-dark",
-          },
-        });
+      async markdownItSetup(md) {
         md.use(LinkAttributes, {
           matcher: (link: string) => /^https?:\/\//.test(link),
           attrs: {
@@ -100,6 +98,13 @@ export default defineConfig({
             rel: "noopener",
           },
         });
+        md.use(await Shiki({
+          defaultColor: false,
+          themes: {
+            light: "vitesse-light",
+            dark: "vitesse-dark",
+          },
+        }));
       },
     }),
 
@@ -166,9 +171,6 @@ export default defineConfig({
   test: {
     include: ["test/**/*.test.ts"],
     environment: "jsdom",
-    deps: {
-      inline: ["@vue", "@vueuse", "vue-demi"],
-    },
   },
 
   // https://github.com/antfu/vite-ssg
@@ -199,7 +201,7 @@ export default defineConfig({
   experimental: {
     // eslint-disable-next-line unused-imports/no-unused-vars
     renderBuiltUrl(filename: string, { hostType }: { hostType: "js" | "css" | "html" }) {
-      // eslint-disable-next-line n/prefer-global/process
+      // eslint-disable-next-line node/prefer-global/process
       if (process.env.BUILD_MODE === "npm_publish") {
         const tag = packageJSON.version;
         return `https://cdn.jsdelivr.net/npm/@xcpcio/board-app@${tag}/dist/${filename}`;