refactor: modify eslint rules on type imports (#293)

resir014 · Nov 26, 2024 · a0aaba4 · a0aaba4
1 parent c933243
commit a0aaba4
Show file tree

Hide file tree

Showing 46 changed files with 91 additions and 89 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -33,6 +33,7 @@ module.exports = {
       rules: {
         '@typescript-eslint/no-explicit-any': 'off',
         '@typescript-eslint/no-unsafe-argument': 'warn',
+        'import/consistent-type-specifier-style': 'off',
       },
     },
   ],

diff --git a/lib/item-by-slug.ts b/lib/item-by-slug.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import matter from 'gray-matter';
-import { PostKind } from '~/types/default';
+import type { PostKind } from '~/types/default';
 import { renderMarkdown } from './markdown-to-html';
 import { getContentDirectory } from './content';
 

diff --git a/lib/next.ts b/lib/next.ts
@@ -1,4 +1,4 @@
-import { NextPage, NextPageProps } from '~/types/next';
+import type { NextPage, NextPageProps } from '~/types/next';
 
 /**
  * Helper function to create next pages.

diff --git a/lib/pages.ts b/lib/pages.ts
@@ -1,4 +1,4 @@
-import { BasePageProps } from '~/types/posts';
+import type { BasePageProps } from '~/types/posts';
 import { getContentFiles } from './content';
 import { DEFAULT_PAGE_DIRECTORY, getPageBySlug } from './item-by-slug';
 

diff --git a/lib/posts.ts b/lib/posts.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { PostKind } from '~/types/default';
-import {
+import type { PostKind } from '~/types/default';
+import type {
   BaseBookmarkProps,
   BaseJamProps,
   BasePhotoProps,

diff --git a/lib/projects.ts b/lib/projects.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import matter from 'gray-matter';
-import { BaseProjectProps, ProjectMetadata } from '~/types/projects';
+import type { BaseProjectProps, ProjectMetadata } from '~/types/projects';
 import { getContentDirectory } from './content';
 import { renderMarkdown } from './markdown-to-html';
 

diff --git a/lib/rss.ts b/lib/rss.ts
@@ -1,5 +1,5 @@
 import { Feed } from 'feed';
-import { BasePostProps } from '~/types/posts';
+import type { BasePostProps } from '~/types/posts';
 import siteMetadata from './data/site-metadata';
 import { renderMarkdown } from './markdown-to-html';
 

diff --git a/modules/bookmarks/bookmark-list-item.tsx b/modules/bookmarks/bookmark-list-item.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BaseBookmarkProps } from '~/types/posts';
+import type { BaseBookmarkProps } from '~/types/posts';
 
 export interface BookmarkListItemProps extends React.ComponentPropsWithoutRef<'li'> {
   bookmark: BaseBookmarkProps;

diff --git a/modules/bookmarks/bookmark-list.tsx b/modules/bookmarks/bookmark-list.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BaseBookmarkProps } from '~/types/posts';
+import type { BaseBookmarkProps } from '~/types/posts';
 import { BookmarkListItem } from './bookmark-list-item';
 
 export interface BookmarkListProps extends React.ComponentPropsWithoutRef<'ul'> {

diff --git a/modules/photos/featured-photo.tsx b/modules/photos/featured-photo.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { BasePhotoProps } from '~/types/posts';
+import type { BasePhotoProps } from '~/types/posts';
 import { PhotoListItem } from './photo-list-item';
 
 export interface FeaturedPhotoProps {

diff --git a/modules/photos/photo-list-item.tsx b/modules/photos/photo-list-item.tsx
@@ -2,7 +2,7 @@ import clsx from 'clsx';
 import Link from 'next/link';
 import * as React from 'react';
 import convert from 'htmr';
-import { BasePhotoProps } from '~/types/posts';
+import type { BasePhotoProps } from '~/types/posts';
 import htmrTransform from '~/lib/htmr-transform';
 import { PostMeta } from '../posts';
 import { PhotoWrapper } from './photo-wrapper';

diff --git a/modules/posts/featured-post-list-item.tsx b/modules/posts/featured-post-list-item.tsx
@@ -4,7 +4,7 @@ import clsx from 'clsx';
 import Link from 'next/link';
 import Image from 'next/legacy/image';
 
-import { PostMetadata } from '~/types/posts';
+import type { PostMetadata } from '~/types/posts';
 import { formatPostDate } from '~/lib/date-formatter';
 import { getColorSchemeBySeed } from '~/lib/color-generator';
 

diff --git a/modules/posts/featured-post-list.tsx b/modules/posts/featured-post-list.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 import * as React from 'react';
-import { PostMetadata } from '~/types/posts';
+import type { PostMetadata } from '~/types/posts';
 import { FeaturedPostListItem } from './featured-post-list-item';
 
 export interface FeaturedPostListProps extends React.ComponentPropsWithoutRef<'div'> {

diff --git a/modules/posts/post-body.tsx b/modules/posts/post-body.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import convert from 'htmr';
 
 import { Container, ContainerSizes } from '~/components/layout';
-import { SyndicationFormat } from '~/types/default';
+import type { SyndicationFormat } from '~/types/default';
 import htmrTransform from '~/lib/htmr-transform';
 import { SiteAuthor } from '~/lib/data/site-metadata';
 import { MessageBox } from '~/components/ui/message-box';

diff --git a/modules/posts/post-header.tsx b/modules/posts/post-header.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Container } from '~/components/layout';
-import { PostKind } from '~/types/default';
+import type { PostKind } from '~/types/default';
 import { PostMeta } from './post-meta';
 
 export interface PostHeaderProps {

diff --git a/modules/posts/post-list-item.tsx b/modules/posts/post-list-item.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import clsx from 'clsx';
 import Link from 'next/link';
 
-import { PostMetadata } from '~/types/posts';
+import type { PostMetadata } from '~/types/posts';
 import { formatPostDate } from '~/lib/date-formatter';
 
 export interface PostListItemProps extends React.ComponentPropsWithoutRef<'article'> {

diff --git a/modules/posts/post-list.tsx b/modules/posts/post-list.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 import * as React from 'react';
-import { PostMetadata } from '~/types/posts';
+import type { PostMetadata } from '~/types/posts';
 import { PostListItem } from './post-list-item';
 
 export interface PostListProps extends React.ComponentPropsWithoutRef<'div'> {

diff --git a/modules/posts/post-meta.tsx b/modules/posts/post-meta.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { PostKind } from '~/types/default';
+import type { PostKind } from '~/types/default';
 import siteMetadata from '~/lib/data/site-metadata';
 import { slugByCategory } from './utils/slug-by-category';
 import { PostDate } from './post-date';

diff --git a/modules/posts/utils/get-category-slug.ts b/modules/posts/utils/get-category-slug.ts
@@ -1,4 +1,4 @@
-import { PostKind } from '~/types/default';
+import type { PostKind } from '~/types/default';
 
 function getCategorySlug(category: PostKind = 'article') {
   switch (category) {

diff --git a/modules/posts/utils/slug-by-category.ts b/modules/posts/utils/slug-by-category.ts
@@ -1,4 +1,4 @@
-import { PostKind } from '~/types/default';
+import type { PostKind } from '~/types/default';
 
 export function slugByCategory(slug?: string, category: PostKind = 'article') {
   switch (category) {

diff --git a/modules/projects/featured-project-card.tsx b/modules/projects/featured-project-card.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import Image from 'next/legacy/image';
 import Link from 'next/link';
 import clsx from 'clsx';
-import { BaseProjectProps } from '~/types/projects';
+import type { BaseProjectProps } from '~/types/projects';
 import { ProjectBadge } from './project-badge';
 
 export interface FeaturedProjectCardProps extends React.ComponentPropsWithoutRef<'section'> {

diff --git a/modules/projects/featured-project-section.tsx b/modules/projects/featured-project-section.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 
-import { BaseProjectProps } from '~/types/projects';
+import type { BaseProjectProps } from '~/types/projects';
 import { FeaturedProjectCard } from './featured-project-card';
 
 export interface FeaturedProjectSectionProps extends React.ComponentPropsWithoutRef<'section'> {

diff --git a/modules/projects/project-header.tsx b/modules/projects/project-header.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import Image from 'next/legacy/image';
-import { ProjectMetadata } from '~/types/projects';
+import type { ProjectMetadata } from '~/types/projects';
 import { Container } from '~/components/layout';
 import { PageMetaItem } from '~/components/page';
 

diff --git a/modules/projects/project-item.tsx b/modules/projects/project-item.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import Link from 'next/link';
 import clsx from 'clsx';
 import Image from 'next/legacy/image';
-import { ProjectMetadata } from '~/types/projects';
+import type { ProjectMetadata } from '~/types/projects';
 import { ProjectBadge } from './project-badge';
 
 export interface ProjectFieldProps extends React.ComponentPropsWithoutRef<'article'> {

diff --git a/modules/projects/project-section.tsx b/modules/projects/project-section.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 
-import { ProjectMetadata } from '~/types/projects';
+import type { ProjectMetadata } from '~/types/projects';
 import { ProjectItem } from './project-item';
 
 export interface ProjectSectionProps extends React.ComponentPropsWithoutRef<'section'> {

diff --git a/modules/video/renderFeaturedVideo.tsx b/modules/video/renderFeaturedVideo.tsx
@@ -1,7 +1,7 @@
 import convert from 'htmr';
 import Link from 'next/link';
 import * as React from 'react';
-import { BaseJamProps, BaseVideoProps } from '~/types/posts';
+import type { BaseJamProps, BaseVideoProps } from '~/types/posts';
 import htmrTransform from '~/lib/htmr-transform';
 import { PostMeta } from '../posts';
 import { LiteYouTube } from './lite-youtube';

diff --git a/modules/video/renderVideoList.tsx b/modules/video/renderVideoList.tsx
@@ -1,7 +1,7 @@
 import convert from 'htmr';
 import Link from 'next/link';
 import * as React from 'react';
-import { BaseJamProps, BaseVideoProps } from '~/types/posts';
+import type { BaseJamProps, BaseVideoProps } from '~/types/posts';
 import htmrTransform from '~/lib/htmr-transform';
 import { PostDate } from '../posts/post-date';
 import { LiteYouTube } from './lite-youtube';

diff --git a/pages/[slug].tsx b/pages/[slug].tsx
@@ -6,7 +6,7 @@ import { YouTubePreconnect } from '~/components/perf';
 import { Post, PostHeader, PostHeaderImage } from '~/modules/posts';
 import CustomErrorPage from '~/pages/_error';
 import siteMetadata from '~/lib/data/site-metadata';
-import { BasePageProps } from '~/types/posts';
+import type { BasePageProps } from '~/types/posts';
 import DefaultLayout from '~/layouts/default-layout';
 import { PageBody } from '~/components/page';
 import { getPageBySlug } from '~/lib/item-by-slug';

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -9,7 +9,7 @@ import { defaultOpenGraph, defaultTwitterCard } from '~/lib/seo';
 import { event, pageview } from '~/lib/ga';
 import { trpc } from '~/lib/trpc';
 import siteMetadata from '~/lib/data/site-metadata';
-import { NextAppProps } from '~/types/next';
+import type { NextAppProps } from '~/types/next';
 
 import '~/fonts/jetbrains-mono.css';
 import 'typeface-inter';

diff --git a/pages/bookmarks.tsx b/pages/bookmarks.tsx
@@ -1,11 +1,12 @@
-import { InferGetStaticPropsType, NextPage } from 'next';
+import { InferGetStaticPropsType } from 'next';
 import * as React from 'react';
 import { MainContent } from '~/components/layout';
 import DefaultLayout from '~/layouts/default-layout';
 import { getAllPosts } from '~/lib/posts';
 import { BookmarkList } from '~/modules/bookmarks';
 import { Post, PostBody, PostHeader } from '~/modules/posts';
-import { BaseBookmarkProps } from '~/types/posts';
+import type { NextPage } from '~/types/next';
+import type { BaseBookmarkProps } from '~/types/posts';
 
 export const getStaticProps = async () => {
   const bookmarks: BaseBookmarkProps[] = await getAllPosts(
@@ -20,17 +21,17 @@ type BookmarksPageProps = InferGetStaticPropsType<typeof getStaticProps>;
 
 const BookmarksPage: NextPage<BookmarksPageProps> = ({ bookmarks }) => {
   return (
-    <DefaultLayout>
-      <MainContent pageTitle="Bookmarks" pageDescription="@resir014's reading list.">
-        <Post>
-          <PostHeader title="Bookmarks" lead="@resir014's reading list." />
-          <PostBody>
-            <BookmarkList bookmarks={bookmarks} />
-          </PostBody>
-        </Post>
-      </MainContent>
-    </DefaultLayout>
+    <MainContent pageTitle="Bookmarks" pageDescription="@resir014's reading list.">
+      <Post>
+        <PostHeader title="Bookmarks" lead="@resir014's reading list." />
+        <PostBody>
+          <BookmarkList bookmarks={bookmarks} />
+        </PostBody>
+      </Post>
+    </MainContent>
   );
 };
 
+BookmarksPage.layout = page => <DefaultLayout>{page}</DefaultLayout>;
+
 export default BookmarksPage;
diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx
@@ -1,4 +1,3 @@
-import { NextPage } from 'next';
 import * as React from 'react';
 import { MainContent } from '~/components/layout';
 import { PageBody } from '~/components/page';
@@ -7,24 +6,25 @@ import DefaultLayout from '~/layouts/default-layout';
 import { LiveStreamDashboard } from '~/modules/live/live-stream-dashboard';
 import { Post, PostHeader } from '~/modules/posts';
 import { SpotifyDashboard } from '~/modules/spotify/spotify-dashboard';
+import type { NextPage } from '~/types/next';
 
 const DashboardPage: NextPage = () => {
   return (
-    <DefaultLayout>
-      <MainContent pageTitle="Dashboard">
-        <Post>
-          <PostHeader title="Dashboard" />
-          <PageBody>
-            <div className="space-y-12">
-              <LiveStreamDashboard username="resir014" />
-              <Divider size="lg" />
-              <SpotifyDashboard />
-            </div>
-          </PageBody>
-        </Post>
-      </MainContent>
-    </DefaultLayout>
+    <MainContent pageTitle="Dashboard">
+      <Post>
+        <PostHeader title="Dashboard" />
+        <PageBody>
+          <div className="space-y-12">
+            <LiveStreamDashboard username="resir014" />
+            <Divider size="lg" />
+            <SpotifyDashboard />
+          </div>
+        </PageBody>
+      </Post>
+    </MainContent>
   );
 };
 
+DashboardPage.layout = page => <DefaultLayout>{page}</DefaultLayout>;
+
 export default DashboardPage;
diff --git a/pages/design.tsx b/pages/design.tsx
@@ -1,30 +1,27 @@
-import { NextPage } from 'next';
 import * as React from 'react';
 import { MainContent } from '~/components/layout';
 import DefaultLayout from '~/layouts/default-layout';
 import { ColorSpecs, LogoSpecs, TypographySpecs } from '~/modules/design';
 import { Post, PostBody, PostHeader } from '~/modules/posts';
+import type { NextPage } from '~/types/next';
 
 const DesignPage: NextPage = () => {
   return (
-    <DefaultLayout>
-      <MainContent
-        pageTitle="Brand & Design"
-        pageDescription="Design assets for the resir014 brand."
-      >
-        <Post>
-          <PostHeader title="Brand & Design" />
-          <PostBody>
-            <div className="prose lg:prose-lg prose-base prose-invert prose-chungking">
-              <LogoSpecs />
-              <TypographySpecs />
-              <ColorSpecs />
-            </div>
-          </PostBody>
-        </Post>
-      </MainContent>
-    </DefaultLayout>
+    <MainContent pageTitle="Brand & Design" pageDescription="Design assets for the resir014 brand.">
+      <Post>
+        <PostHeader title="Brand & Design" />
+        <PostBody>
+          <div className="prose lg:prose-lg prose-base prose-invert prose-chungking">
+            <LogoSpecs />
+            <TypographySpecs />
+            <ColorSpecs />
+          </div>
+        </PostBody>
+      </Post>
+    </MainContent>
   );
 };
 
+DesignPage.layout = page => <DefaultLayout>{page}</DefaultLayout>;
+
 export default DesignPage;
diff --git a/pages/etc/[slug].tsx b/pages/etc/[slug].tsx
@@ -7,7 +7,7 @@ import { Post, PostBody, PostHeader, PostHeaderImage } from '~/modules/posts';
 import CustomErrorPage from '~/pages/_error';
 import { getAllPages } from '~/lib/pages';
 import siteMetadata from '~/lib/data/site-metadata';
-import { BasePageProps } from '~/types/posts';
+import type { BasePageProps } from '~/types/posts';
 import DefaultLayout from '~/layouts/default-layout';
 import { getPageBySlug } from '~/lib/item-by-slug';
 

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -19,7 +19,7 @@ import {
   getFeaturedVideo,
 } from '~/lib/posts';
 import { getFeaturedProject } from '~/lib/projects';
-import {
+import type {
   BaseBookmarkProps,
   BaseJamProps,
   BasePhotoProps,

diff --git a/pages/jam/[...slug].tsx b/pages/jam/[...slug].tsx
@@ -10,7 +10,7 @@ import { LiteYouTube, VideoCard } from '~/modules/video';
 import { YouTubePreconnect } from '~/components/perf';
 import { Post, PostBody, PostHeader } from '~/modules/posts';
 import CustomErrorPage from '~/pages/_error';
-import { BaseJamProps } from '~/types/posts';
+import type { BaseJamProps } from '~/types/posts';
 import siteMetadata, { SiteMetadata } from '~/lib/data/site-metadata';
 import DefaultLayout from '~/layouts/default-layout';