Merge pull request #161 from github/deps-update

Update Dependencies to resolve security vulns
github · Nov 15, 2023 · d7110d5 · d7110d5
2 parents 8f5d17a + 3b0cd33
commit d7110d5
Show file tree

Hide file tree

Showing 9 changed files with 3,198 additions and 3,033 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Install and Build 🔧
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '>=18.17.0'
 
       - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Install, Test, and Build 🔧
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '>=18.17.0'
 
       - name: Install, Test, and Build 🔧
         run: |

diff --git a/components/button-link/ButtonLink.jsx b/components/button-link/ButtonLink.jsx
@@ -7,10 +7,9 @@ const ButtonLink = ({ href, isExternal, children }) => {
       href={href}
       target={isExternal ? '_blank' : undefined}
       rel={isExternal ? 'noreferrer' : undefined}
+      className="button-link"
     >
-      <a className="button-link">
-        {children} <IconArrowRight />
-      </a>
+      {children} <IconArrowRight />
     </Link>
   )
 }

diff --git a/components/event-detail/EventDetail.jsx b/components/event-detail/EventDetail.jsx
@@ -52,8 +52,8 @@ const EventDetail = ({ event, reverseColumns, isFullPage }) => {
           {isFullPage ? (
             <h1 className="event-detail__title">{event.title}</h1>
           ) : (
-            <Link href={{pathname: event.link}}>
-              <a className="event-detail__title">{event.title}</a>
+            <Link href={{ pathname: event.link }} className="event-detail__title">
+              {event.title}
             </Link>
           )}
 

diff --git a/components/events-list/EventsList.jsx b/components/events-list/EventsList.jsx
@@ -31,12 +31,11 @@ const EventsList = ({ events }) => {
             <div className="events-list__chips">
               <EventTypeChip type={event.type} />
               <Link
-                href={{pathname: event.link}}
+                href={{ pathname: event.link }}
                 aria-label={getLiteral('navigation:schedule')}
+                className="events-list__more"
               >
-                <a className="events-list__more">
-                  {getLiteral('actions:view-more')}
-                </a>
+                {getLiteral('actions:view-more')}
               </Link>
             </div>
             <DateTimeChip
@@ -54,8 +53,8 @@ const EventsList = ({ events }) => {
                 {event.userName}
               </a>
 
-              <Link href={{pathname: event.link}}>
-                <a className="events-list__link">{event.title}</a>
+              <Link href={{ pathname: event.link }} className="events-list__link">
+                {event.title}
               </Link>
             </div>
 
@@ -72,7 +71,7 @@ const EventsList = ({ events }) => {
           </div>
         </div>
       ))}
-      < br / >
+      < br />
       <div>
         <ButtonLink href="https://github.com/github/maintainermonth/issues/new?assignees=&labels=&template=add-to-calendar.yml&title=EVENT_NAME">Add your own activity</ButtonLink>
       </div>

diff --git a/components/header/Header.jsx b/components/header/Header.jsx
@@ -55,14 +55,12 @@ const Header = () => {
     <header className="header">
       <div className="header__content">
         <div className="header__logo">
-          <Link href={ROUTES.HOME.path}>
-            <a className="header__home-link">
-              <GitHubLogo />
-              {getLiteral(isMobile ? 'page:title-mobile' : 'page:title')}
-            </a>
+          <Link href={ROUTES.HOME.path} className="header__home-link">
+            <GitHubLogo />
+            {getLiteral(isMobile ? 'page:title-mobile' : 'page:title')}
           </Link>
 
-          <p className={yearClasses}>{year||getLiteral('page:date')}</p>
+          <p className={yearClasses}>{year || getLiteral('page:date')}</p>
         </div>
 
         <nav className="header__navigation">
@@ -71,60 +69,48 @@ const Header = () => {
               <Link
                 href={ROUTES.NEWS.getPath(year)}
                 aria-label={getLiteral('navigation:news')}
+                className={clsx('header__link', {
+                  ['is-active']: pathname === ROUTES.SCHEDULE.getPath(year),
+                })}
               >
-                <a
-                  className={clsx('header__link', {
-                    ['is-active']: pathname === ROUTES.SCHEDULE.getPath(year),
-                  })}
-                  aria-label={getLiteral('navigation:news')}
-                >
-                  <IconBell />
-                  <span className="header__link-text">
-                    {getLiteral('navigation:news')}
-                  </span>
-                </a>
+                <IconBell />
+                <span className="header__link-text">
+                  {getLiteral('navigation:news')}
+                </span>
               </Link>
             </li>
             <li>
               <Link
                 href={ROUTES.SCHEDULE.getPath(year)}
                 aria-label={getLiteral('navigation:schedule')}
+                className={clsx('header__link', {
+                  ['is-active']: pathname === ROUTES.SCHEDULE.getPath(year),
+                })}
               >
-                <a
-                  className={clsx('header__link', {
-                    ['is-active']: pathname === ROUTES.SCHEDULE.getPath(year),
-                  })}
-                  aria-label={getLiteral('navigation:schedule')}
-                >
-                  <IconCalendar />
-                  <span className="header__link-text">
-                    {getLiteral('navigation:schedule')}
-                  </span>
-                </a>
+                <IconCalendar />
+                <span className="header__link-text">
+                  {getLiteral('navigation:schedule')}
+                </span>
               </Link>
             </li>
             <li>
               <Link
                 href={ROUTES.LIBRARY.getPath(year)}
                 aria-label={getLiteral('navigation:library')}
+                className={clsx('header__link', {
+                  ['is-active']: pathname === ROUTES.LIBRARY.getPath(year),
+                })}
               >
-                <a
-                  className={clsx('header__link', {
-                    ['is-active']: pathname === ROUTES.LIBRARY.getPath(year),
-                  })}
-                  aria-label={getLiteral('navigation:library')}
-                >
-                  <IconBooks />
-                  <span className="header__link-text">
-                    {getLiteral('navigation:library')}
-                  </span>
-                </a>
+                <IconBooks />
+                <span className="header__link-text">
+                  {getLiteral('navigation:library')}
+                </span>
               </Link>
             </li>
           </ul>
         </nav>
       </div>
-    </header>
+    </header >
   )
 }
 

diff --git a/next.config.js b/next.config.js
@@ -1,6 +1,7 @@
 /** @type {import('next').NextConfig} */
 
 const nextConfig = {
+  output: 'export',
   reactStrictMode: true,
 }
 

diff --git a/package.json b/package.json
@@ -4,33 +4,34 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "NODE_ENV=production next build && next export",
+    "build": "NODE_ENV=production next build",
     "start": "next start",
     "lint": "next lint",
     "test": "jest"
   },
   "dependencies": {
-    "clsx": "^1.1.1",
-    "dayjs": "^1.11.0",
-    "fathom-client": "^3.5.0",
+    "clsx": "^2.0.0",
+    "dayjs": "^1.11.10",
+    "fathom-client": "^3.6.0",
     "gray-matter": "^4.0.3",
-    "jimp": "^0.16.1",
-    "markdown-it": "^12.3.2",
-    "next": "12.1.0",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "jimp": "^0.22.10",
+    "markdown-it": "^13.0.2",
+    "next": "^14.0.2",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "smoothscroll-polyfill": "^0.4.4"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.16.11",
-    "@testing-library/jest-dom": "^5.16.4",
-    "@testing-library/react": "^13.0.0",
-    "babel-jest": "^27.5.1",
-    "eslint": "8.11.0",
-    "eslint-config-next": "12.1.0",
-    "jest": "^27.5.1",
+    "@babel/preset-env": "^7.23.3",
+    "@testing-library/jest-dom": "^6.1.4",
+    "@testing-library/react": "^14.1.0",
+    "babel-jest": "^29.7.0",
+    "eslint": "8.53.0",
+    "eslint-config-next": "14.0.2",
+    "jest": "^29.7.0",
     "jest-css-modules": "^2.1.0",
-    "sass": "^1.49.9",
-    "sass-loader": "^12.6.0"
+    "jest-environment-jsdom": "^29.7.0",
+    "sass": "^1.69.5",
+    "sass-loader": "^13.3.2"
   }
 }