diff --git a/lefthook.yml b/lefthook.yml index cf40278..616dd6f 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -2,7 +2,7 @@ pre-commit: commands: check: glob: "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}" - run: pnpm exec biome check --apply --no-errors-on-unmatched --files-ignore-unknown=true {staged_files} && git update-index --> + run: pnpm exec biome check --apply --no-errors-on-unmatched --files-ignore-unknown=true {staged_files} && git update-index --again commit-msg: commands: diff --git a/skeleton/base/lefthook.yml b/skeleton/base/lefthook.yml index cf40278..616dd6f 100644 --- a/skeleton/base/lefthook.yml +++ b/skeleton/base/lefthook.yml @@ -2,7 +2,7 @@ pre-commit: commands: check: glob: "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}" - run: pnpm exec biome check --apply --no-errors-on-unmatched --files-ignore-unknown=true {staged_files} && git update-index --> + run: pnpm exec biome check --apply --no-errors-on-unmatched --files-ignore-unknown=true {staged_files} && git update-index --again commit-msg: commands: diff --git a/skeleton/base/src/pages/ArticlesPage/ArticleFormDialog.tsx b/skeleton/base/src/pages/ArticlesPage/ArticleFormDialog.tsx index f2e2760..1ddf881 100644 --- a/skeleton/base/src/pages/ArticlesPage/ArticleFormDialog.tsx +++ b/skeleton/base/src/pages/ArticlesPage/ArticleFormDialog.tsx @@ -1,4 +1,4 @@ -import type { RenderDialogProps } from "@components/DialogController/index.ts"; +import type { RenderDialogProps } from "@/components/DialogController/index.ts"; import { zodResolver } from "@hookform/resolvers/zod"; import { Button, Dialog, DialogActions, DialogContent, DialogTitle, Stack } from "@mui/material"; import { RhfTextField } from "mui-rhf-integration"; diff --git a/skeleton/base/src/pages/ArticlesPage/ArticleListItem.tsx b/skeleton/base/src/pages/ArticlesPage/ArticleListItem.tsx index 120a97e..68860d0 100644 --- a/skeleton/base/src/pages/ArticlesPage/ArticleListItem.tsx +++ b/skeleton/base/src/pages/ArticlesPage/ArticleListItem.tsx @@ -1,10 +1,10 @@ -import ConfirmDialog from "@components/ConfirmDialog/index.ts"; -import DialogController from "@components/DialogController/index.ts"; +import ConfirmDialog from "@/components/ConfirmDialog/index.ts"; +import DialogController from "@/components/DialogController/index.ts"; +import { useDeleteArticleMutation } from "@/mutations/article.ts"; +import EditArticleFormDialog from "@/pages/ArticlesPage/EditArticleFormDialog.tsx"; +import type { ListArticle } from "@/queries/article.ts"; import MoreVertIcon from "@mui/icons-material/MoreVert"; import { IconButton, ListItem, ListItemText, Menu, MenuItem } from "@mui/material"; -import { useDeleteArticleMutation } from "@mutations/article.ts"; -import EditArticleFormDialog from "@pages/ArticlesPage/EditArticleFormDialog.tsx"; -import type { ListArticle } from "@queries/article.ts"; import { bindMenu, bindTrigger, usePopupState } from "material-ui-popup-state/hooks"; import { useSnackbar } from "notistack"; import type { ReactNode } from "react"; diff --git a/skeleton/base/src/pages/ArticlesPage/ArticlesPage.tsx b/skeleton/base/src/pages/ArticlesPage/ArticlesPage.tsx index c8cbc02..b93e2f5 100644 --- a/skeleton/base/src/pages/ArticlesPage/ArticlesPage.tsx +++ b/skeleton/base/src/pages/ArticlesPage/ArticlesPage.tsx @@ -1,6 +1,6 @@ -import DialogController from "@components/DialogController/index.ts"; +import DialogController from "@/components/DialogController/index.ts"; +import { useArticlesQuery } from "@/queries/article.ts"; import { Button, ButtonGroup, Container, LinearProgress, List, Typography } from "@mui/material"; -import { useArticlesQuery } from "@queries/article.ts"; import type { PageParams } from "jsonapi-zod-query"; import type { ReactNode } from "react"; import { useState } from "react"; diff --git a/skeleton/base/src/pages/ArticlesPage/CreateArticleFormDialog.tsx b/skeleton/base/src/pages/ArticlesPage/CreateArticleFormDialog.tsx index daa317f..46ebbb1 100644 --- a/skeleton/base/src/pages/ArticlesPage/CreateArticleFormDialog.tsx +++ b/skeleton/base/src/pages/ArticlesPage/CreateArticleFormDialog.tsx @@ -1,5 +1,5 @@ -import type { RenderDialogProps } from "@components/DialogController/index.ts"; -import { useCreateWorldMutation } from "@mutations/article.ts"; +import type { RenderDialogProps } from "@/components/DialogController/index.ts"; +import { useCreateWorldMutation } from "@/mutations/article.ts"; import { useSnackbar } from "notistack"; import type { ReactNode } from "react"; import ArticleFormDialog, { type ArticleFormValues } from "./ArticleFormDialog.tsx"; diff --git a/skeleton/base/src/pages/ArticlesPage/EditArticleFormDialog.tsx b/skeleton/base/src/pages/ArticlesPage/EditArticleFormDialog.tsx index edce697..2d5950d 100644 --- a/skeleton/base/src/pages/ArticlesPage/EditArticleFormDialog.tsx +++ b/skeleton/base/src/pages/ArticlesPage/EditArticleFormDialog.tsx @@ -1,7 +1,7 @@ -import type { RenderDialogProps } from "@components/DialogController/index.ts"; +import type { RenderDialogProps } from "@/components/DialogController/index.ts"; +import { useUpdateArticleMutation } from "@/mutations/article.ts"; +import { useArticleQuery } from "@/queries/article.ts"; import { Backdrop, CircularProgress } from "@mui/material"; -import { useUpdateArticleMutation } from "@mutations/article.ts"; -import { useArticleQuery } from "@queries/article.ts"; import { useSnackbar } from "notistack"; import { useEffect } from "react"; import type { ReactNode } from "react"; diff --git a/skeleton/base/src/router.tsx b/skeleton/base/src/router.tsx index f7c61cd..8a76388 100644 --- a/skeleton/base/src/router.tsx +++ b/skeleton/base/src/router.tsx @@ -1,6 +1,6 @@ -import Layout from "@components/Layout/index.ts"; -import RootErrorBoundary from "@components/RootErrorBoundary/index.ts"; -import HomePage from "@pages/HomePage/index.ts"; +import Layout from "@/components/Layout/index.ts"; +import RootErrorBoundary from "@/components/RootErrorBoundary/index.ts"; +import HomePage from "@/pages/HomePage/index.ts"; import { Outlet, type RouteObject, createBrowserRouter } from "react-router-dom"; const pathRoutes: RouteObject[] = [ diff --git a/skeleton/features/auth0/base/src/components/AuthGuard/AuthGuard.tsx b/skeleton/features/auth0/base/src/components/AuthGuard/AuthGuard.tsx index 14c7d5f..bfba809 100644 --- a/skeleton/features/auth0/base/src/components/AuthGuard/AuthGuard.tsx +++ b/skeleton/features/auth0/base/src/components/AuthGuard/AuthGuard.tsx @@ -1,5 +1,5 @@ +import FullPageSpinner from "@/components/FullPageSpinner/index.ts"; import { useAuth0 } from "@auth0/auth0-react"; -import FullPageSpinner from "@components/FullPageSpinner/index.ts"; import { useEffect } from "react"; import type { ReactNode } from "react"; import AuthError from "./AuthError.tsx"; diff --git a/skeleton/templates/src/main.tsx.mustache b/skeleton/templates/src/main.tsx.mustache index 17a6b44..d51f7c8 100644 --- a/skeleton/templates/src/main.tsx.mustache +++ b/skeleton/templates/src/main.tsx.mustache @@ -1,7 +1,7 @@ import { Auth0Provider } from "@auth0/auth0-react"; -import AuthGuard from "@components/AuthGuard/index.ts"; -import FullPageSpinner from "@components/FullPageSpinner/index.ts"; -import MultiProvider from "@components/MultiProvider/index.ts"; +import AuthGuard from "@/components/AuthGuard/index.ts"; +import FullPageSpinner from "@/components/FullPageSpinner/index.ts"; +import MultiProvider from "@/components/MultiProvider/index.ts"; import "@fontsource/roboto/300.css"; import "@fontsource/roboto/400.css"; import "@fontsource/roboto/500.css"; diff --git a/skeleton/templates/src/mutations/article.ts.mustache b/skeleton/templates/src/mutations/article.ts.mustache index aa3b475..4d1e1b8 100644 --- a/skeleton/templates/src/mutations/article.ts.mustache +++ b/skeleton/templates/src/mutations/article.ts.mustache @@ -1,7 +1,7 @@ -import useAuthenticatedFetch from "@hooks/useAuthenticatedFetch.ts"; -import type { articleAttributesSchema } from "@queries/article.ts"; +import useAuthenticatedFetch from "@/hooks/useAuthenticatedFetch.ts"; +import type { articleAttributesSchema } from "@/queries/article.ts"; import { type UseMutationResult, useMutation, useQueryClient } from "@tanstack/react-query"; -import { apiUrl } from "@utils/api.ts"; +import { apiUrl } from "@/utils/api.ts"; import { handleJsonApiError } from "jsonapi-zod-query"; import type { z } from "zod"; diff --git a/skeleton/templates/src/queries/article.ts.mustache b/skeleton/templates/src/queries/article.ts.mustache index 545b6e8..b3cbcb2 100644 --- a/skeleton/templates/src/queries/article.ts.mustache +++ b/skeleton/templates/src/queries/article.ts.mustache @@ -1,6 +1,6 @@ -import useAuthenticatedFetch from "@hooks/useAuthenticatedFetch.ts"; +import useAuthenticatedFetch from "@/hooks/useAuthenticatedFetch.ts"; import { type UseQueryResult, keepPreviousData, useQuery } from "@tanstack/react-query"; -import { apiUrl } from "@utils/api.ts"; +import { apiUrl } from "@/utils/api.ts"; import { type PageParams, createDataSelector, diff --git a/skeleton/tsconfig.json b/skeleton/tsconfig.json index 36825f4..c4a7ad3 100644 --- a/skeleton/tsconfig.json +++ b/skeleton/tsconfig.json @@ -6,26 +6,8 @@ "strict": true, "noImplicitAny": true, "paths": { - "@assets/*": [ - "./src/assets/*" - ], - "@components/*": [ - "./src/components/*" - ], - "@hooks/*": [ - "./src/hooks/*" - ], - "@mutations/*": [ - "./src/mutations/*" - ], - "@pages/*": [ - "./src/pages/*" - ], - "@queries/*": [ - "./src/queries/*" - ], - "@utils/*": [ - "./src/utils/*" + "@/*": [ + "./src/*" ] } },