Skip to content

Commit

Permalink
style: ts: strict & fix error
Browse files Browse the repository at this point in the history
  • Loading branch information
wicogohome committed Jul 31, 2024
1 parent 6d6337d commit e94995d
Show file tree
Hide file tree
Showing 10 changed files with 1,104 additions and 1,433 deletions.
7 changes: 1 addition & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@
"browser": true,
"es2022": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:vue/vue3-recommended",
"prettier"
],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/strict", "plugin:vue/vue3-recommended", "prettier"],
"ignorePatterns": ["dist/", "node_modules/"],
"parserOptions": {
"ecmaVersion": "latest",
Expand Down
11 changes: 7 additions & 4 deletions docs/.vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ import { defineConfig } from "vitepress";
import { fileURLToPath, URL } from "url";

import _ from "lodash";
import eslint from "vite-plugin-eslint";
import eslint from "@yf-ui/vite-plugin-eslint";
import { withMermaid } from "vitepress-plugin-mermaid";
import markdownItCheckbox from "markdown-it-task-checkbox";
import useGithubArticles from "./utils/useGithubArticles.ts";
import useViteEnv from "./utils/useViteEnv.js";
import useViteEnv from "./utils/useViteEnv.ts";

import type { PageData, SiteConfig, MarkdownRenderer } from "vitepress";

const srcDir: string = "posts/";
interface Rewrites {
[index: string]: string;
Expand Down Expand Up @@ -79,7 +82,7 @@ export default defineConfig(
markdown: {
// shiki
theme: "vitesse-dark",
config: (md: MarkdownIt) => {
config: (md: MarkdownRenderer) => {
md.use(markdownItCheckbox, {
disabled: true,
divWrap: false,
Expand All @@ -105,7 +108,7 @@ export default defineConfig(
},
},
rewrites,
async transformPageData(pageData, { siteConfig: { site } }) {
async transformPageData(pageData: PageData, { siteConfig: { site } }: { siteConfig: SiteConfig }) {
pageData.frontmatter.head ??= [];
pageData.frontmatter.head.push(
[
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/utils/useBasicFrontmatter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export interface BasicFrontmatter {
title: string;
description: string | null;
description: string;
tags: Array<string>;
date: string;
ogUrl: string;
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/utils/useGithubArticles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default function useGithubArticles() {
return cachedMatteredArticles;
}

function formatContent(oriContent) {
function formatContent(oriContent: string | null) {
if (typeof oriContent !== "string") {
return {};
}
Expand Down
13 changes: 13 additions & 0 deletions docs/types/vite-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ declare module "*.vue" {
const component: DefineComponent<{}, {}, any>;
export default component;
}
declare module "markdown-it-task-checkbox";
declare module "vitepress-plugin-mermaid" {
import type { UserConfig, DefaultTheme } from "vitepress";
import type { MermaidPluginConfig } from "@types/mermaid";

type OriginConfig = UserConfig<DefaultTheme.Config>;
interface withMermaidConfig extends OriginConfig {
mermaid: MermaidPluginConfig;
}
declare function withMermaid(config: withMermaidConfig): withMermaidConfig;
export { withMermaid };
}

interface ImportMetaEnv {
VITE_GITHUB_TOKEN: string;
VITE_GITHUB_OWNER: string;
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "wicogoblog",
"name": "wicogotblog",
"private": true,
"version": "0.0.0",
"type": "module",
Expand All @@ -8,7 +8,7 @@
"build": "vue-tsc && vite build",
"preview": "vite preview",
"prepare": "husky",
"format": "prettier-eslint --write --prettier-last '**/*.{js,jsx,vue,ts,html,json}' --ignore **/.vitepress/cache/**",
"format": "prettier-eslint --write --prettier-last '**/*.{js,jsx,vue,ts,html,json}' --ignore **/.vitepress/cache/** && vue-tsc",
"docs:dev": "vitepress dev docs",
"docs:build": "vitepress build docs",
"docs:preview": "vitepress preview docs"
Expand All @@ -21,6 +21,7 @@
"@fortawesome/vue-fontawesome": "^3.0.8",
"@octokit/core": "^6.1.2",
"@octokit/rest": "^20.1.1",
"@types/mermaid": "^9.2.0",
"gray-matter": "^4.0.3",
"lodash": "^4.17.21",
"luxon": "^3.4.4",
Expand All @@ -39,6 +40,7 @@
"@typescript-eslint/eslint-plugin": "^7.3.1",
"@typescript-eslint/parser": "^7.3.1",
"@vitejs/plugin-vue": "^5.0.4",
"@yf-ui/vite-plugin-eslint": "^1.8.2",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -52,15 +54,14 @@
"prettier-eslint-cli": "^8.0.1",
"sass": "^1.75.0",
"tailwindcss": "^3.4.3",
"typescript": "^5.2.2",
"typescript": "~5.4",
"vite": "^5.1.6",
"vite-plugin-eslint": "^1.8.1",
"vitepress": "^1.1.3",
"vitepress-plugin-mermaid": "^2.0.16",
"vue-eslint-parser": "^9.4.2",
"vue-tsc": "^1.8.27"
"vue-tsc": "^2.0.29"
},
"lint-staged": {
"**/*.{ js,jsx,vue,ts,html,json}": "prettier-eslint --write --prettier-last --ignore **/.vitepress/cache/**"
"**/*.{ js,jsx,vue,ts,html,json}": "prettier-eslint --write --prettier-last --ignore **/.vitepress/cache/** && vue-tsc"
}
}
10 changes: 0 additions & 10 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@ import HelloWorld from "./components/HelloWorld.vue";

<template>
<div>
<a
href="https://vitejs.dev"
target="_blank"
>
<img
src="/vite.svg"
class="logo"
alt="Vite logo"
/>
</a>
<a
href="https://vuejs.org/"
target="_blank"
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"jsx": "preserve",

/* Linting */
"strict": false, // TODO: temp
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
Expand All @@ -32,6 +32,7 @@
"docs/**/*.ts",
"docs/**/*.tsx",
"docs/**/*.vue",

"docs/.**/**/*.ts",
"docs/.**/**/*.tsx",
"docs/.**/**/*.vue"
Expand Down
2 changes: 1 addition & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineConfig } from "vite";
import vue from "@vitejs/plugin-vue";
import eslint from "vite-plugin-eslint";
import eslint from "@yf-ui/vite-plugin-eslint";
import { fileURLToPath, URL } from "url";
// https://vitejs.dev/config/
export default defineConfig({
Expand Down
Loading

0 comments on commit e94995d

Please sign in to comment.