Merge pull request #102 from stscoundrel/release/2024-02

Release/2024 02
stscoundrel · Feb 24, 2024 · 419624e · 419624e
2 parents 2ef01ea + 4e97f27
commit 419624e
Show file tree

Hide file tree

Showing 19 changed files with 11,540 additions and 7,765 deletions.
diff --git a/.github/workflows/coverage-test.yml b/.github/workflows/coverage-test.yml
@@ -17,7 +17,7 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
-    - run: yarn install --production=false
+    - run: yarn install
     - run: yarn test:coverage
       env:
         CI: true
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -17,7 +17,7 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
-    - run: yarn install --production=false
+    - run: yarn install
     - run: yarn lint
       env:
         CI: true
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -17,7 +17,7 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
-    - run: yarn install --production=false
+    - run: yarn install
     - run: yarn test:unit
       env:
         CI: true
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,12 @@ yarn-error.log*
 tests/integration/logs
 /public/sw.js
 public/workbox-*.js
+
+# Yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.yarn/releases/yarn-4.1.0.cjs b/.yarn/releases/yarn-4.1.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.1.0.cjs
diff --git a/package.json b/package.json
@@ -35,33 +35,37 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "reset-css": "^5.0.2",
-    "sass": "^1.70.0",
-    "scandinavian-dictionary-crosslinker": "^0.5.0",
+    "sass": "^1.71.1",
+    "scandinavian-dictionary-crosslinker": "^0.6.0",
     "sharp": "^0.33.2",
     "sitemap": "^7.1.1",
     "slugify": "^1.6.6",
     "teljari": "^1.1.1"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.11.7",
-    "@types/react": "^18.2.48",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
-    "@typescript-eslint/parser": "^6.19.1",
-    "cypress": "^13.6.3",
-    "eslint": "^8.56.0",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.11.20",
+    "@types/react": "^18.2.58",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
+    "cypress": "^13.6.6",
+    "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-next": "^14.1.0",
     "eslint-plugin-cypress": "^2.15.1",
-    "eslint-plugin-jest": "^27.6.3",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jest": "^27.9.0",
     "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "next-router-mock": "^0.9.11",
+    "next-router-mock": "^0.9.12",
     "node-mocks-http": "^1.14.1",
     "react-test-renderer": "^18.2.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
-  }
+  },
+  "packageManager": "yarn@4.1.0"
 }
diff --git a/src/components/Crosslinks/index.tsx b/src/components/Crosslinks/index.tsx
@@ -20,6 +20,10 @@ export default function Crosslinks({ crosslinks }: CrossLinkProps) {
       return 'Old Icelandic - Geir Zoëga\'s Dictionary'
     }
 
+    if (source === 'old-danish') {
+      return 'Old Danish - Otto Kalkar\'s Dictionary'
+    }
+
     return ''
   }
 

diff --git a/src/components/Footer/__snapshots__/Footer.test.tsx.snap b/src/components/Footer/__snapshots__/Footer.test.tsx.snap
@@ -101,6 +101,15 @@ exports[`Footer component Matches snapshot 1`] = `
           Related dictionary projects
         </h4>
         <ul>
+          <li>
+            <a
+              href="https://old-danish-dictionary.vercel.app/"
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              Otto Kalkar's Old Danish Dictionary
+            </a>
+          </li>
           <li>
             <a
               href="https://old-norwegian-dictionary.vercel.app/"

diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
@@ -74,6 +74,12 @@ export default function Footer({ letters }: FooterProps) {
           <nav className={styles.nav}>
             <h4 className={styles.navTitle}>Related dictionary projects</h4>
             <ul>
+            <li>
+                <ExternalLink
+                  title="Otto Kalkar's Old Danish Dictionary"
+                  href="https://old-danish-dictionary.vercel.app/"
+                />
+              </li>
               <li>
                 <ExternalLink
                   title="Dictionary of the Old Norwegian Language"

diff --git a/src/components/Layout/__snapshots__/Layout.test.tsx.snap b/src/components/Layout/__snapshots__/Layout.test.tsx.snap
@@ -570,6 +570,15 @@ exports[`Layout component Letter layout Matches snapshot 1`] = `
             Related dictionary projects
           </h4>
           <ul>
+            <li>
+              <a
+                href="https://old-danish-dictionary.vercel.app/"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                Otto Kalkar's Old Danish Dictionary
+              </a>
+            </li>
             <li>
               <a
                 href="https://old-norwegian-dictionary.vercel.app/"
@@ -1530,6 +1539,15 @@ exports[`Layout component Word layout Matches snapshot 1`] = `
             Related dictionary projects
           </h4>
           <ul>
+            <li>
+              <a
+                href="https://old-danish-dictionary.vercel.app/"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                Otto Kalkar's Old Danish Dictionary
+              </a>
+            </li>
             <li>
               <a
                 href="https://old-norwegian-dictionary.vercel.app/"

diff --git a/tests/unit/lib/services/crosslinks.test.ts b/tests/unit/lib/services/crosslinks.test.ts
@@ -18,7 +18,7 @@ const entry1: DictionaryEntry = {
   slug: 'aremark',
 }
 
-// Dummy entry which produces cross links
+// Dummy entry which produces crosslinks
 const entry2: DictionaryEntry = {
   headword: '',
   partOfSpeech: [''],
@@ -38,10 +38,6 @@ describe('Crosslinks service tests', () => {
 
   test('Returns crosslinks when slugs match', () => {
     const expected = [
-      {
-        url: 'https://old-norwegian-dictionary.vercel.app/word/fadir',
-        source: 'old-norwegian',
-      },
       {
         url: 'https://cleasby-vigfusson-dictionary.vercel.app/word/fadir',
         source: 'old-norse',
@@ -50,6 +46,10 @@ describe('Crosslinks service tests', () => {
         url: 'https://old-icelandic.vercel.app/word/fadir',
         source: 'old-icelandic',
       },
+      {
+        url: 'https://old-norwegian-dictionary.vercel.app/word/fadir',
+        source: 'old-norwegian',
+      },
     ]
 
     const result = getCrossLinks(entry2)

diff --git a/tests/unit/pages/__snapshots__/404.test.tsx.snap b/tests/unit/pages/__snapshots__/404.test.tsx.snap
@@ -568,6 +568,15 @@ exports[`404 page page Matches snapshot 1`] = `
             Related dictionary projects
           </h4>
           <ul>
+            <li>
+              <a
+                href="https://old-danish-dictionary.vercel.app/"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                Otto Kalkar's Old Danish Dictionary
+              </a>
+            </li>
             <li>
               <a
                 href="https://old-norwegian-dictionary.vercel.app/"

diff --git a/tests/unit/pages/__snapshots__/index.test.tsx.snap b/tests/unit/pages/__snapshots__/index.test.tsx.snap
@@ -857,6 +857,15 @@ exports[`Index page Matches snapshot 1`] = `
             Related dictionary projects
           </h4>
           <ul>
+            <li>
+              <a
+                href="https://old-danish-dictionary.vercel.app/"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                Otto Kalkar's Old Danish Dictionary
+              </a>
+            </li>
             <li>
               <a
                 href="https://old-norwegian-dictionary.vercel.app/"

diff --git a/tests/unit/pages/__snapshots__/search.test.tsx.snap b/tests/unit/pages/__snapshots__/search.test.tsx.snap
@@ -636,6 +636,15 @@ exports[`Search page: render Matches snapshot 1`] = `
             Related dictionary projects
           </h4>
           <ul>
+            <li>
+              <a
+                href="https://old-danish-dictionary.vercel.app/"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                Otto Kalkar's Old Danish Dictionary
+              </a>
+            </li>
             <li>
               <a
                 href="https://old-norwegian-dictionary.vercel.app/"

diff --git a/tests/unit/pages/__snapshots__/sources.test.tsx.snap b/tests/unit/pages/__snapshots__/sources.test.tsx.snap
@@ -3820,6 +3820,15 @@ exports[`Sources page Matches snapshot 1`] = `
             Related dictionary projects
           </h4>
           <ul>
+            <li>
+              <a
+                href="https://old-danish-dictionary.vercel.app/"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                Otto Kalkar's Old Danish Dictionary
+              </a>
+            </li>
             <li>
               <a
                 href="https://old-norwegian-dictionary.vercel.app/"

diff --git a/tests/unit/pages/letter/__snapshots__/letter.test.tsx.snap b/tests/unit/pages/letter/__snapshots__/letter.test.tsx.snap
@@ -5460,6 +5460,15 @@ exports[`Letter page: render Matches snapshot 1`] = `
             Related dictionary projects
           </h4>
           <ul>
+            <li>
+              <a
+                href="https://old-danish-dictionary.vercel.app/"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                Otto Kalkar's Old Danish Dictionary
+              </a>
+            </li>
             <li>
               <a
                 href="https://old-norwegian-dictionary.vercel.app/"

diff --git a/tests/unit/pages/word/__snapshots__/word.test.tsx.snap b/tests/unit/pages/word/__snapshots__/word.test.tsx.snap
@@ -774,6 +774,15 @@ exports[`Word page: render & usage Matches snapshot 1`] = `
             Related dictionary projects
           </h4>
           <ul>
+            <li>
+              <a
+                href="https://old-danish-dictionary.vercel.app/"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                Otto Kalkar's Old Danish Dictionary
+              </a>
+            </li>
             <li>
               <a
                 href="https://old-norwegian-dictionary.vercel.app/"