Merge pull request #359 from stscoundrel/update/deps-2023-08

Update/deps 2023 08

package.json

@@ -25,46 +25,46 @@
   "dependencies": {
     "abbreviatrix": "^1.0.7",
     "markari": "^1.0.7",
-    "next": "^13.4.4",
+    "next": "^13.4.12",
     "next-pwa": "^5.6.0",
     "old-icelandic-zoega": "^1.2.3",
     "old-icelandic-zoega-abbreviations": "^1.0.3",
     "old-norse-alphabet": "^1.2.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "reset-css": "^5.0.1",
-    "sass": "^1.62.1",
-    "scandinavian-dictionary-crosslinker": "^0.4.2",
+    "reset-css": "^5.0.2",
+    "sass": "^1.64.2",
+    "scandinavian-dictionary-crosslinker": "^0.5.0",
     "sitemap": "^7.1.1",
     "slugify": "^1.6.6",
     "teljari": "^1.1.1",
     "younger-futhark": "^1.2.5"
   },
   "devDependencies": {
     "@types/cleasby-vigfusson-dictionary": "^1.0.0",
-    "@types/jest": "^29.5.1",
-    "@types/react": "^18.2.7",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
-    "cypress": "^12.13.0",
-    "eslint": "^8.41.0",
+    "@types/jest": "^29.5.3",
+    "@types/react": "^18.2.18",
+    "@typescript-eslint/eslint-plugin": "^6.2.1",
+    "@typescript-eslint/parser": "^6.2.1",
+    "cypress": "^12.17.3",
+    "eslint": "^8.46.0",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-next": "^13.4.4",
+    "eslint-config-next": "^13.4.12",
     "eslint-plugin-cypress": "^2.13.3",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-jest": "^27.2.3",
     "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react": "^7.33.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "identity-obj-proxy": "^3.0.0",
     "jafningjar": "^1.0.0",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
+    "jest": "^29.6.2",
+    "jest-environment-jsdom": "^29.6.2",
     "node-mocks-http": "^1.12.2",
     "old-norse-alphabet-sort": "^1.1.12",
     "react-test-renderer": "^18.2.0",
     "spyrjari": "^1.0.4",
-    "typescript": "^5.0.4",
-    "volva": "^2.0.4"
+    "typescript": "^5.1.6",
+    "volva": "^2.0.5"
   }
 }

src/components/Breadcrumbs/index.js

@@ -1,6 +1,6 @@
+import Link from 'next/link'
 import { getBreadcrumbs } from 'lib/utils/breadcrumbs'
 import { getSchema } from 'lib/utils/schema'
-import Link from 'next/link'
 import styles from './Breadcrumbs.module.scss'
 
 export default function Breadcrumbs({ type, content }) {

src/components/Crosslinks/Crosslinks.test.tsx

@@ -1,6 +1,6 @@
 import renderer from 'react-test-renderer'
-import { Crosslink } from 'lib/services/crosslinks'
 import { DictionarySource } from 'scandinavian-dictionary-crosslinker'
+import { Crosslink } from 'lib/services/crosslinks'
 import Crosslinks from './index'
 import styles from './Crosslinks.module.scss'
 

src/components/Footer/Footer.test.js

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom/client'
-import Footer from 'components/Footer'
 import renderer from 'react-test-renderer'
+import Footer from 'components/Footer'
 
 const letters = [
   {

src/components/Head/Head.test.js

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom/client'
-import Head from 'components/Head'
 import renderer from 'react-test-renderer'
+import Head from 'components/Head'
 import { getByLetter, getWord } from 'lib/services/dictionary'
 
 describe('Head component', () => {

src/components/Layout/Layout.test.js

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom/client'
-import Layout from 'components/Layout'
 import renderer from 'react-test-renderer'
+import Layout from 'components/Layout'
 import { getByLetter, getWord, getAlphabet } from 'lib/services/dictionary'
 
 describe('Layout component', () => {

src/components/SearchResults/SearchTeaser/index.tsx

@@ -1,5 +1,5 @@
-import { SearchResult } from 'lib/services/search'
 import Link from 'next/link'
+import { SearchResult } from 'lib/services/search'
 import styles from './SearchTeaser.module.scss'
 
 interface SearchTeaserProps {

src/components/WordDefinition/index.js

@@ -1,5 +1,5 @@
-import { capitalize } from 'lib/utils/strings'
 import { lettersToRunes } from 'younger-futhark'
+import { capitalize } from 'lib/utils/strings'
 import { addAbbreviationsToContent } from 'lib/services/abbreviations'
 import Abbreviations from 'components/Abbreviations'
 import Crosslinks from 'components/Crosslinks'

src/pages/api/search.ts

@@ -1,6 +1,6 @@
+import { NextApiRequest, NextApiResponse } from 'next';
 import { getAllWords } from 'lib/services/dictionary'
 import { Criteria, searchDictionary } from 'lib/services/search';
-import { NextApiRequest, NextApiResponse } from 'next';
 
 export const config = {
   api: {

src/pages/api/sitemap.ts

@@ -1,6 +1,6 @@
 import type { NextApiRequest, NextApiResponse } from 'next'
-import { getSitemapContent, formatSitemap } from 'lib/services/sitemap'
 import { SitemapStream, streamToPromise } from 'sitemap'
+import { getSitemapContent, formatSitemap } from 'lib/services/sitemap'
 
 export default async (req: NextApiRequest, res: NextApiResponse) => {
   const content = getSitemapContent()

src/pages/index.tsx

@@ -1,10 +1,10 @@
 // Services.
+import Link from 'next/link'
 import { AlphabetLetter, getAlphabet } from 'lib/services/dictionary'
 
 // Components.
 import Layout from 'components/Layout'
 import ContentArea from 'components/ContentArea'
-import Link from 'next/link'
 import SampleText from 'components/SampleText'
 
 interface IndexProps {

tests/unit/lib/services/crosslinks.test.ts

@@ -37,9 +37,9 @@ describe('Crosslinks service tests', () => {
         url: 'https://old-norwegian-dictionary.vercel.app/word/aaustr',
         source: 'old-norwegian',
       },
-    ]
+    ].sort((a, b) => (a.source > b.source ? 1 : -1))
 
-    const result = getCrossLinks(entry2)
+    const result = getCrossLinks(entry2).sort((a, b) => (a.source > b.source ? 1 : -1))
 
     expect(result).toEqual(expected)
   })

tests/unit/lib/services/dictionary.test.ts

@@ -1,9 +1,9 @@
 import { getDictionary } from 'old-icelandic-zoega'
+import { isArray } from 'volva'
+import { matchesSchema } from 'jafningjar'
 import {
   getAllWords, getByLetter, getWord, getAlphabet,
 } from 'lib/services/dictionary'
-import { isArray } from 'volva'
-import { matchesSchema } from 'jafningjar'
 
 describe('Dictionary tests', () => {
   const dictionary = getAllWords()

tests/unit/lib/services/search.test.ts

@@ -1,7 +1,7 @@
-import { getAllWords } from 'lib/services/dictionary'
-import { searchDictionary } from 'lib/services/search'
 import { isArray } from 'volva'
 import { hasProperty } from 'spyrjari'
+import { getAllWords } from 'lib/services/dictionary'
+import { searchDictionary } from 'lib/services/search'
 
 describe('Search tests', () => {
   const dictionary = getAllWords()

tests/unit/lib/services/sitemap.test.js

@@ -1,7 +1,7 @@
-import { getSitemapContent, formatSitemap } from 'lib/services/sitemap'
 import { SitemapStream, streamToPromise } from 'sitemap'
 import { hasProperty } from 'spyrjari'
 import { isArray } from 'volva'
+import { getSitemapContent, formatSitemap } from 'lib/services/sitemap'
 
 describe('Sitemap tests', () => {
   process.env.NEXT_PUBLIC_SITE_URL = 'https://oldicelandic.test'

tests/unit/pages/404.test.tsx

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom/client'
-import Page404, { getStaticProps } from 'pages/404'
 import renderer from 'react-test-renderer'
+import Page404, { getStaticProps } from 'pages/404'
 import { getAlphabet } from 'lib/services/dictionary'
 
 describe('404 page page', () => {

tests/unit/pages/index.test.tsx

@@ -1,8 +1,8 @@
 import ReactDOM from 'react-dom/client'
-import Index, { getStaticProps } from 'pages/index'
 import renderer from 'react-test-renderer'
-import { getAlphabet } from 'lib/services/dictionary'
 import { matchesSchema } from 'jafningjar'
+import Index, { getStaticProps } from 'pages/index'
+import { getAlphabet } from 'lib/services/dictionary'
 
 describe('Index page', () => {
   test('Does not crash', () => {

tests/unit/pages/letter.test.tsx

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom/client'
-import Letter, { getStaticProps, getStaticPaths } from 'pages/letter/[letter]'
 import renderer from 'react-test-renderer'
+import Letter, { getStaticProps, getStaticPaths } from 'pages/letter/[letter]'
 import { getByLetter, getAlphabet } from 'lib/services/dictionary'
 
 describe('Letter page: render', () => {

tests/unit/pages/search.test.tsx

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom/client'
-import Search, { getStaticProps } from 'pages/search'
 import renderer from 'react-test-renderer'
+import Search, { getStaticProps } from 'pages/search'
 import { getAlphabet } from 'lib/services/dictionary'
 
 /**

tests/unit/pages/word.test.tsx

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom/client'
-import Word, { getStaticProps, getStaticPaths } from 'pages/word/[word]'
 import renderer from 'react-test-renderer'
+import Word, { getStaticProps, getStaticPaths } from 'pages/word/[word]'
 import { getAlphabet } from 'lib/services/dictionary'
 
 const mockHandler = jest.fn()
@@ -140,14 +140,14 @@ describe('Word page: data fetching', () => {
         ],
         letters: getAlphabet(),
         crosslinks: [
-          {
-            url: 'https://cleasby-vigfusson-dictionary.vercel.app/word/leyni-dyrr',
-            source: 'old-norse',
-          },
           {
             source: 'old-norwegian',
             url: 'https://old-norwegian-dictionary.vercel.app/word/leynidyrr',
           },
+          {
+            url: 'https://cleasby-vigfusson-dictionary.vercel.app/word/leyni-dyrr',
+            source: 'old-norse',
+          },
         ],
       },
     }