From 124a462f2cede2c2a57888547d2bb6c49c9c133b Mon Sep 17 00:00:00 2001 From: Traxus Date: Tue, 25 Apr 2023 01:52:15 -0400 Subject: [PATCH] simple-import-sort, sorry. Signed-off-by: Traxus --- package-lock.json | 6 +++--- package.json | 4 ++-- src/pages/blog/index.tsx | 25 ++++++++++++++++++++----- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 52c735a..faddf11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4719,9 +4719,9 @@ "dev": true }, "husky": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", - "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", + "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", "dev": true }, "iconv-lite": { diff --git a/package.json b/package.json index c20f5ea..9457a47 100644 --- a/package.json +++ b/package.json @@ -154,8 +154,8 @@ "@typescript-eslint/no-var-requires": 0, "@typescript-eslint/no-use-before-define": 0, "@typescript-eslint/ban-ts-comment": 0, - "simple-import-sort/imports": "error", - "simple-import-sort/exports": "error", + "simple-import-sort/imports": "warn", + "simple-import-sort/exports": "warn", "react-hooks/exhaustive-deps": "warn", "react/no-unescaped-entities": 0, "curly": [ diff --git a/src/pages/blog/index.tsx b/src/pages/blog/index.tsx index e6336ac..be73869 100644 --- a/src/pages/blog/index.tsx +++ b/src/pages/blog/index.tsx @@ -1,5 +1,24 @@ import { PageLayout } from 'components/layout/page' + +//===== \/ START NEXT_PUBLIC_DATOCMS_BYPASS \/ ==================================================== + +/* +import { + getBlogPosts, + getBlogPosts as serverGetBlogPosts, + getBlogPostsCategories as serverGetBlogPostsCategories +} from 'lib/blog' +*/ + import { getBlogPosts } from 'lib/blog' + +import { + getAllBlogPostsFromSource, + getAllBlogPostsCategoriesFromSource +} from 'lib/datocms-bypass' + +//===== /\ FINISH NEXT_PUBLIC_DATOCMS_BYPASS /\ ==================================================== + import { InferGetStaticPropsType } from 'next' import { useRouter } from 'next/router' import { Fragment, useCallback, useMemo } from 'react' @@ -14,10 +33,6 @@ import SearchBar, { LoadMoreContainer, SearchContainer } from '~/components/sections/blog/search' -import { - getAllBlogPostsFromSource, - getAllBlogPostsCategoriesFromSource -} from '~/lib/datocms-bypass' import { CategoryFragment } from '~/lib/cms/generated' import { FooterQuery } from '~/lib/cms/queries/footer' import { HeaderQuery } from '~/lib/cms/queries/header' @@ -109,7 +124,7 @@ const BlogIndexPage = ({ if ( typeof queriedPosts !== 'undefined' && 'pages' in queriedPosts === true - ) { + ) { if (0 in queriedPosts.pages === true) { if ('pagination' in queriedPosts.pages[0]) { if ('total' in queriedPosts.pages[0].pagination) {