Merge pull request #223 from kevin-lee/bump-docusaurus

Bump Docusaurus to 3.1.1
kevin-lee · Mar 8, 2024 · 0fa59d2 · 0fa59d2
2 parents ab06c0b + f6a95d7
commit 0fa59d2
Show file tree

Hide file tree

Showing 5 changed files with 7,772 additions and 14,545 deletions.
diff --git a/.github/workflows/doc-site-build-only.yml b/.github/workflows/doc-site-build-only.yml
@@ -15,7 +15,7 @@ jobs:
         scala:
           - { version: "2.13.10", binary-version: "2.13", java-version: "11", java-distribution: "temurin" }
         node:
-          - { version: "16.16.0" }
+          - { version: "18.13.0" }
 
     steps:
       - uses: actions/checkout@v4
@@ -40,12 +40,12 @@ jobs:
             ${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}-
 
       - name: Cache npm
-        uses: actions/cache@v4
+        uses: actions/cache@v4.0.0
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-node-${{ matrix.node.version }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-
+            ${{ runner.os }}-node-${{ matrix.node.version }}
 
       - name: Build website
         env:

diff --git a/.github/workflows/doc-site-publish.yml b/.github/workflows/doc-site-publish.yml
@@ -14,7 +14,7 @@ jobs:
         scala:
           - { version: "2.13.10", binary-version: "2.13", java-version: "11", java-distribution: "temurin" }
         node:
-          - { version: "16.16.0" }
+          - { version: "18.13.0" }
 
     steps:
       - uses: actions/checkout@v4
@@ -39,12 +39,12 @@ jobs:
             ${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}-
 
       - name: Cache npm
-        uses: actions/cache@v4
+        uses: actions/cache@v4.0.0
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-node-${{ matrix.node.version }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-
+            ${{ runner.os }}-node-${{ matrix.node.version }}
 
       - name: Build and publish website
         env:

diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
@@ -1,10 +1,12 @@
+import {themes as prismThemes} from 'prism-react-renderer';
+
 const algoliaConfig = require('./algolia.config.json');
 const googleAnalyticsConfig = require('./google-analytics.config.json');
 
-const isEmptyObject = obj => {
-  for (field in obj) return false;
-  return true;
-};
+const lightCodeTheme = prismThemes.nightOwlLight;
+const darkCodeTheme = prismThemes.nightOwl;
+
+const isEmptyObject = (obj) => Object.keys(obj).length === 0;
 
 const isSearchable = !isEmptyObject(algoliaConfig);
 const hasGoogleAnalytics = !isEmptyObject(googleAnalyticsConfig);
@@ -20,8 +22,8 @@ const websiteConfig = {
   projectName: 'sbt-github-pages', // Usually your repo name.
   themeConfig: {
     prism: {
-      theme: require('prism-react-renderer/themes/nightOwl'),
-      darkTheme: require('prism-react-renderer/themes/nightOwl'),
+      theme: lightCodeTheme,
+      darkTheme: darkCodeTheme,
       additionalLanguages: ['java', 'scala'],
     },
     navbar: {