Adjusted eslint and prettier settings

pookmish · Jul 11, 2024 · 2d96bec · 2d96bec
1 parent 58bd696
commit 2d96bec
Show file tree

Hide file tree

Showing 130 changed files with 1,275 additions and 1,978 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -7,19 +7,19 @@
   },
   "extends": [
     "next/core-web-vitals",
-    "plugin:storybook/recommended",
+    "prettier",
     "plugin:deprecation/recommended"
   ],
   "rules": {
+    "prettier/prettier": ["error"],
     "@typescript-eslint/no-unused-vars": "off",
     "unused-imports/no-unused-imports": "error",
     "unused-imports/no-unused-vars": [
-      "warn",
+      "error",
       { "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" }
     ],
-    "no-console": ["error", { "allow": ["warn", "error"] }],
-    "quotes": ["error", "double"]
+    "no-console": ["error", { "allow": ["warn", "error"] }]
   },
-  "plugins": ["unused-imports"],
+  "plugins": ["prettier", "unused-imports"],
   "ignorePatterns": ["**/__generated__/**/*"]
-}
+}
diff --git a/.prettierrc b/.prettierrc
@@ -2,9 +2,9 @@
   "arrowParens": "avoid",
   "bracketSameLine": false,
   "bracketSpacing": false,
-  "printWidth": 500,
+  "printWidth": 120,
   "semi": false,
-  "singleAttributePerLine": true,
+  "singleAttributePerLine": false,
   "singleQuote": false,
   "tabWidth": 2,
   "trailingComma": "es5",

diff --git a/.yarn/releases/yarn-4.3.0.cjs → .yarn/releases/yarn-4.3.1.cjs b/.yarn/releases/yarn-4.3.0.cjs → .yarn/releases/yarn-4.3.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.3.0.cjs
+yarnPath: .yarn/releases/yarn-4.3.1.cjs
diff --git a/app/@modal/(.)gallery/[...uuid]/page.tsx b/app/@modal/(.)gallery/[...uuid]/page.tsx
@@ -23,7 +23,9 @@ const Page = async ({params: {uuid}}: Props) => {
   const prevImageIndex = paragraph.suGalleryImages?.[currentImageIndex - 1] ? currentImageIndex - 1 : -1
   const nextImageIndex = paragraph.suGalleryImages?.[currentImageIndex + 1] ? currentImageIndex + 1 : -1
 
-  let galleryImages = mediaUuid ? paragraph.suGalleryImages?.filter(image => image.id === mediaUuid) : paragraph.suGalleryImages
+  let galleryImages = mediaUuid
+    ? paragraph.suGalleryImages?.filter(image => image.id === mediaUuid)
+    : paragraph.suGalleryImages
 
   galleryImages = galleryImages?.filter(image => !!image.suGalleryImage?.url)
 
@@ -45,10 +47,7 @@ const Page = async ({params: {uuid}}: Props) => {
                 />
               </picture>
               {galleryImage.suGalleryCaption && (
-                <figcaption
-                  id={captionId}
-                  className="m-0 table-caption w-full caption-bottom bg-white p-5 text-right"
-                >
+                <figcaption id={captionId} className="m-0 table-caption w-full caption-bottom bg-white p-5 text-right">
                   {galleryImage.suGalleryCaption}
                 </figcaption>
               )}

diff --git a/app/[...slug]/metadata.tsx b/app/[...slug]/metadata.tsx
@@ -1,4 +1,14 @@
-import {Maybe, NodeStanfordEvent, NodeStanfordNews, NodeStanfordPage, NodeStanfordPerson, NodeStanfordPolicy, NodeUnion, ParagraphStanfordWysiwyg, ParagraphUnion} from "@lib/gql/__generated__/drupal.d"
+import {
+  Maybe,
+  NodeStanfordEvent,
+  NodeStanfordNews,
+  NodeStanfordPage,
+  NodeStanfordPerson,
+  NodeStanfordPolicy,
+  NodeUnion,
+  ParagraphStanfordWysiwyg,
+  ParagraphUnion,
+} from "@lib/gql/__generated__/drupal.d"
 import {Metadata} from "next"
 import {decode} from "html-entities"
 
@@ -43,8 +53,11 @@ export const getNodeMetadata = (node: NodeUnion): Metadata => {
 }
 
 const getBasicPageMetaData = (node: NodeStanfordPage) => {
-  const pageTitleBannerImage = node.suPageBanner?.__typename === "ParagraphStanfordPageTitleBanner" && node.suPageBanner.suTitleBannerImage.mediaImage
-  const bannerImage = node.suPageBanner?.__typename === "ParagraphStanfordBanner" && node.suPageBanner.suBannerImage?.mediaImage
+  const pageTitleBannerImage =
+    node.suPageBanner?.__typename === "ParagraphStanfordPageTitleBanner" &&
+    node.suPageBanner.suTitleBannerImage.mediaImage
+  const bannerImage =
+    node.suPageBanner?.__typename === "ParagraphStanfordBanner" && node.suPageBanner.suBannerImage?.mediaImage
   const image = node.suPageImage?.mediaImage || pageTitleBannerImage || bannerImage
 
   const description = node.suPageDescription || getFirstText(node.suPageComponents)
@@ -133,7 +146,9 @@ const getPolicyMetaData = (node: NodeStanfordPolicy) => {
 }
 
 const getFirstText = (components?: Maybe<ParagraphUnion[]>) => {
-  const firstWysiwyg = components?.find(component => component.__typename === "ParagraphStanfordWysiwyg") as ParagraphStanfordWysiwyg
+  const firstWysiwyg = components?.find(
+    component => component.__typename === "ParagraphStanfordWysiwyg"
+  ) as ParagraphStanfordWysiwyg
   if (firstWysiwyg) {
     return getCleanDescription(firstWysiwyg.suWysiwygText?.processed)
   }

diff --git a/app/error.tsx b/app/error.tsx
@@ -7,11 +7,11 @@ const ErrorPage = ({error, reset}: {error: Error; reset: () => void}) => {
   return (
     <div className="my-50 centered mt-32">
       <h1>Something went wrong!</h1>
-      <p>Apologies, an error occurred when attempting to preset the page you are attempting to view. Please try a different path.</p>
-      <Button
-        buttonElem
-        onClick={() => reset()}
-      >
+      <p>
+        Apologies, an error occurred when attempting to preset the page you are attempting to view. Please try a
+        different path.
+      </p>
+      <Button buttonElem onClick={() => reset()}>
         Try again
       </Button>
     </div>

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -13,7 +13,10 @@ const appleIcons: Icon[] = [60, 72, 76, 114, 120, 144, 152, 180].map(size => ({
 }))
 
 const icons: Icon[] = [16, 32, 96, 128, 192, 196].map(size => ({
-  url: size === 128 ? `https://www-media.stanford.edu/assets/favicon/favicon-${size}.png` : `https://www-media.stanford.edu/assets/favicon/favicon-${size}x${size}.png`,
+  url:
+    size === 128
+      ? `https://www-media.stanford.edu/assets/favicon/favicon-${size}.png`
+      : `https://www-media.stanford.edu/assets/favicon/favicon-${size}x${size}.png`,
   sizes: `${size}x${size}`,
 }))
 
@@ -43,29 +46,20 @@ export const revalidate = false
 
 const RootLayout = ({children, modal}: {children: React.ReactNode; modal: React.ReactNode}) => {
   return (
-    <html
-      lang="en"
-      className={sourceSans3.className}
-    >
+    <html lang="en" className={sourceSans3.className}>
       <UserAnalytics />
       <DrupalWindowSync />
       <body>
         <nav aria-label="Skip Links">
-          <a
-            href="#main-content"
-            className="skiplink"
-          >
+          <a href="#main-content" className="skiplink">
             Skip to main content
           </a>
         </nav>
 
         <div className="flex min-h-screen flex-col">
           <PageHeader />
 
-          <main
-            id="main-content"
-            className="mb-32 flex-grow"
-          >
+          <main id="main-content" className="mb-32 flex-grow">
             {children}
           </main>
 

diff --git a/app/page.tsx b/app/page.tsx
@@ -21,10 +21,7 @@ const Home = async () => {
     <article>
       {entity.suPageBanner?.__typename === "ParagraphStanfordBanner" && (
         <header>
-          <BannerParagraph
-            paragraph={entity.suPageBanner}
-            eagerLoadImage
-          />
+          <BannerParagraph paragraph={entity.suPageBanner} eagerLoadImage />
         </header>
       )}
       {entity.suPageComponents && <Rows components={entity.suPageComponents} />}

diff --git a/app/preview/[...slug]/page.tsx b/app/preview/[...slug]/page.tsx
@@ -15,10 +15,7 @@ const PreviewPage = async ({params}: PageProps) => {
 
   return (
     <>
-      <EditorAlert
-        status={entity.status}
-        message="Unpublished Page"
-      />
+      <EditorAlert status={entity.status} message="Unpublished Page" />
       <NodePage node={entity} />
     </>
   )

diff --git a/app/preview/layout.tsx b/app/preview/layout.tsx
@@ -9,10 +9,7 @@ const Layout = ({children}: {children: React.ReactNode}) => {
       {inPreview && (
         <>
           <Editori11y />
-          <EditorAlert
-            status={false}
-            message="Preview Mode"
-          />
+          <EditorAlert status={false} message="Preview Mode" />
         </>
       )}
       {children}

diff --git a/app/search/page.tsx b/app/search/page.tsx
@@ -25,24 +25,23 @@ const Page = async ({searchParams}: {searchParams?: {[_key: string]: string}}) =
   return (
     <div className="centered mt-32">
       <div className="mx-auto 3xl:w-10/12">
-        <H1
-          className="mb-44"
-          id="page-title"
-        >
+        <H1 className="mb-44" id="page-title">
           Search
         </H1>
 
-        {siteSettingsConfig?.suSiteAlgoliaId && siteSettingsConfig?.suSiteAlgoliaIndex && siteSettingsConfig?.suSiteAlgoliaSearch && (
-          <>
-            <AlgoliaSearch
-              appId={siteSettingsConfig.suSiteAlgoliaId}
-              searchIndex={siteSettingsConfig.suSiteAlgoliaIndex}
-              searchApiKey={siteSettingsConfig.suSiteAlgoliaSearch}
-              initialUiState={initialState}
-            />
-            <noscript>Please enable javascript to view search results</noscript>
-          </>
-        )}
+        {siteSettingsConfig?.suSiteAlgoliaId &&
+          siteSettingsConfig?.suSiteAlgoliaIndex &&
+          siteSettingsConfig?.suSiteAlgoliaSearch && (
+            <>
+              <AlgoliaSearch
+                appId={siteSettingsConfig.suSiteAlgoliaId}
+                searchIndex={siteSettingsConfig.suSiteAlgoliaIndex}
+                searchApiKey={siteSettingsConfig.suSiteAlgoliaSearch}
+                initialUiState={initialState}
+              />
+              <noscript>Please enable javascript to view search results</noscript>
+            </>
+          )}
       </div>
     </div>
   )

diff --git a/package.json b/package.json
@@ -16,7 +16,6 @@
   "dependencies": {
     "@formkit/auto-animate": "^0.8.2",
     "@heroicons/react": "^2.1.5",
-    "@js-temporal/polyfill": "^0.4.4",
     "@mui/base": "5.0.0-dev.20240529-082515-213b5e33ab",
     "@next/third-parties": "^14.2.5",
     "@tailwindcss/container-queries": "^0.1.1",
@@ -29,15 +28,12 @@
     "clsx": "^2.1.1",
     "decanter": "^7.3.0",
     "drupal-jsonapi-params": "^2.3.1",
-    "eslint": "^8.57.0",
-    "eslint-config-next": "^14.2.5",
     "graphql": "^16.9.0",
     "graphql-request": "^7.1.0",
     "graphql-tag": "^2.12.6",
     "html-entities": "^2.5.2",
     "html-react-parser": "^5.1.10",
     "next": "^14.2.5",
-    "next-drupal": "^1.6.0",
     "postcss": "^8.4.39",
     "qs": "^6.12.3",
     "react": "^18.3.1",
@@ -71,7 +67,11 @@
     "@types/react-slick": "^0.23.13",
     "concurrently": "^8.2.2",
     "encoding": "^0.1.13",
+    "eslint": "^8.57.0",
+    "eslint-config-next": "^14.2.5",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-deprecation": "^3.0.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-storybook": "^0.8.0",
     "eslint-plugin-unused-imports": "^4.0.0",
     "prettier": "^3.3.2",
@@ -81,5 +81,5 @@
     "storybook-addon-module-mock": "^1.3.0",
     "tsconfig-paths-webpack-plugin": "^4.1.0"
   },
-  "packageManager": "[email protected].0"
+  "packageManager": "[email protected].1"
 }
diff --git a/src/components/algolia/algolia-search.tsx b/src/components/algolia/algolia-search.tsx
@@ -47,10 +47,7 @@ const HitList = () => {
   return (
     <ul className="list-unstyled">
       {hits.map(hit => (
-        <li
-          key={hit.objectID}
-          className="border-b border-gray-300 last:border-0"
-        >
+        <li key={hit.objectID} className="border-b border-gray-300 last:border-0">
           <DefaultHit hit={hit} />
         </li>
       ))}
@@ -91,10 +88,7 @@ const SearchBox = (props?: UseSearchBoxProps) => {
       }}
     >
       <div className="flex flex-col">
-        <label
-          className="font-bold"
-          htmlFor="search-input"
-        >
+        <label className="font-bold" htmlFor="search-input">
           Keywords<span className="sr-only">&nbsp;Search</span>
         </label>
         <input
@@ -114,19 +108,11 @@ const SearchBox = (props?: UseSearchBoxProps) => {
       </div>
       <div className="flex gap-10">
         <Button type="submit">Submit</Button>
-        <Button
-          secondary
-          type="reset"
-          className={query.length === 0 ? "hidden" : undefined}
-        >
+        <Button secondary type="reset" className={query.length === 0 ? "hidden" : undefined}>
           Reset
         </Button>
       </div>
-      <div
-        className="sr-only"
-        aria-live="polite"
-        aria-atomic
-      >
+      <div className="sr-only" aria-live="polite" aria-atomic>
         Showing results for {query}
       </div>
     </form>

diff --git a/src/components/config-pages/global-message.tsx b/src/components/config-pages/global-message.tsx
@@ -33,15 +33,22 @@ const GlobalMessage = async () => {
           {globalMessageConfig.suGlobalMsgLabel}:
         </div>
         <div>
-          {globalMessageConfig.suGlobalMsgHeader && <H2 id={globalMessageConfig.id}>{globalMessageConfig.suGlobalMsgHeader}</H2>}
+          {globalMessageConfig.suGlobalMsgHeader && (
+            <H2 id={globalMessageConfig.id}>{globalMessageConfig.suGlobalMsgHeader}</H2>
+          )}
 
           <Wysiwyg
             html={globalMessageConfig.suGlobalMsgMessage?.processed}
             className={twMerge(
               "[&_a.btn]:border-2 [&_a]:no-underline [&_a]:hocus:underline",
               clsx({
-                "[&_a.btn]:border-white [&_a.btn]:bg-transparent [&_a]:text-white": !["warning", "plain"].includes(globalMessageConfig.suGlobalMsgType),
-                "[&_a.btn]:border-black [&_a.btn]:bg-transparent [&_a]:text-black [&_a]:hocus:text-black": ["warning", "plain"].includes(globalMessageConfig.suGlobalMsgType),
+                "[&_a.btn]:border-white [&_a.btn]:bg-transparent [&_a]:text-white": !["warning", "plain"].includes(
+                  globalMessageConfig.suGlobalMsgType
+                ),
+                "[&_a.btn]:border-black [&_a.btn]:bg-transparent [&_a]:text-black [&_a]:hocus:text-black": [
+                  "warning",
+                  "plain",
+                ].includes(globalMessageConfig.suGlobalMsgType),
               })
             )}
           />