v3.8.0

.cspell.json

@@ -21,7 +21,6 @@
   ],
   "ignorePaths": [
     "CHANGELOG.md",
-    "CHANGELOG-v*.md",
     "patches",
     "packages/docusaurus-theme-translations/locales",
     "packages/docusaurus-plugin-ideal-image/src/theme/IdealImageLegacy",

.eslintrc.js

@@ -214,7 +214,7 @@ module.exports = {
     ],
     'no-useless-escape': WARNING,
     'no-void': [ERROR, {allowAsStatement: true}],
-    'prefer-destructuring': OFF,
+    'prefer-destructuring': WARNING,
     'prefer-named-capture-group': WARNING,
     'prefer-template': WARNING,
     yoda: WARNING,
@@ -304,7 +304,7 @@ module.exports = {
     'jest/prefer-expect-resolves': WARNING,
     'jest/prefer-lowercase-title': [WARNING, {ignore: ['describe']}],
     'jest/prefer-spy-on': WARNING,
-    'jest/prefer-to-be': OFF,
+    'jest/prefer-to-be': WARNING,
     'jest/prefer-to-have-length': WARNING,
     'jest/require-top-level-describe': ERROR,
     'jest/valid-title': [

.github/workflows/argos.yml

@@ -27,10 +27,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Use Node.js
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/build-blog-only.yml

@@ -22,9 +22,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn
@@ -32,5 +32,3 @@ jobs:
         run: yarn || yarn || yarn
       - name: Build blog-only
         run: yarn workspace website build:blogOnly
-        env:
-          DOCUSAURUS_PERF_LOGGER: 'true'

.github/workflows/build-hash-router.yml

@@ -25,9 +25,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn
@@ -37,27 +37,26 @@ jobs:
       - name: Build Hash Router
         run: yarn build:website:fast
         env:
-          DOCUSAURUS_PERF_LOGGER: 'true'
           DOCUSAURUS_ROUTER: 'hash'
           # Note: hash router + baseUrl do not play well together
           # This would host at https://facebook.github.io/docusaurus/#/docusaurus/
           # BASE_URL: '/docusaurus/' # hash router +
 
       - name: Upload Website artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: website-hash-router-archive
           path: website/build
 
       #- name: Upload Website Pages artifact
-      #  uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
+      #  uses: actions/upload-pages-artifact@v3
       #  with:
       #    path: website/build
 
       # Deploy to https://facebook.github.io/docusaurus/
       - name: Deploy to GitHub Pages
         if: ${{ github.event_name != 'pull_request' && github.ref_name == 'main' }}
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: website/build
@@ -81,4 +80,4 @@ jobs:
   #  steps:
   #     - name: Deploy to GitHub Pages
   #      id: deployment
-  #      uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
+  #      uses: actions/deploy-pages@v4

.github/workflows/build-perf.yml

@@ -41,14 +41,14 @@ jobs:
         DOCUSAURUS_INFRA: ['SLOWER', 'FASTER']
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn
       - name: Track build size changes
-        uses: preactjs/compressed-size-action@8518045ed95e94e971b83333085e1cb99aa18aa8 # v2.9.0
+        uses: preactjs/compressed-size-action@946a292cd35bd1088e0d7eb92b69d1a8d5b5d76a # v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           build-script: build:website:fast
@@ -62,7 +62,6 @@ jobs:
           comment-key: DOCUSAURUS_INFRA_${{ matrix.DOCUSAURUS_INFRA }}
         env:
           DOCUSAURUS_SLOWER: ${{ matrix.DOCUSAURUS_INFRA == 'SLOWER' && 'true' || 'false'  }}
-          DOCUSAURUS_PERF_LOGGER: 'true'
 
   # Ensures build times stay under reasonable thresholds
   build-time:
@@ -74,9 +73,9 @@ jobs:
         DOCUSAURUS_INFRA: ['SLOWER', 'FASTER']
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn
@@ -89,7 +88,6 @@ jobs:
         timeout-minutes: ${{ matrix.DOCUSAURUS_INFRA == 'SLOWER' && 3 || 2  }}
         env:
           DOCUSAURUS_SLOWER: ${{ matrix.DOCUSAURUS_INFRA == 'SLOWER' && 'true' || 'false'  }}
-          DOCUSAURUS_PERF_LOGGER: 'true'
 
       # Ensure build with a warm cache does not increase too much
       - name: Build (warm cache)
@@ -98,6 +96,5 @@ jobs:
         timeout-minutes: ${{ matrix.DOCUSAURUS_INFRA == 'SLOWER' && 1 || 2  }}
         env:
           DOCUSAURUS_SLOWER: ${{ matrix.DOCUSAURUS_INFRA == 'SLOWER' && 'true' || 'false'  }}
-          DOCUSAURUS_PERF_LOGGER: 'true'
 
     # TODO post a GitHub comment with build with perf warnings?

.github/workflows/canary-release.yml

@@ -20,11 +20,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0 # Needed to get the commit number with "git rev-list --count HEAD"
       - name: Set up Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/codeql-analysis.yml

@@ -33,12 +33,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # 4.31.0
+        uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # 3.26.5
         with:
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # 4.31.0
+        uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # 3.26.5

.github/workflows/continuous-releases.yml

@@ -18,10 +18,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Set up Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/dependency-review.yml

@@ -13,6 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Dependency Review
-        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # 4.8.2
+        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # 4.7.1

.github/workflows/lighthouse-report.yml

@@ -1,7 +1,7 @@
 name: Lighthouse Report
 
 on:
-  pull_request:
+  pull_request_target:
     branches:
       - main
       - docusaurus-v**
@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Use Node.js
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn
@@ -37,7 +37,7 @@ jobs:
 
       - name: Audit URLs using Lighthouse
         id: lighthouse_audit
-        uses: treosh/lighthouse-ci-action@fcd65974f7c4c2bf0ee9d09b84d2489183c29726 # 12.6.1
+        uses: treosh/lighthouse-ci-action@2f8dda6cf4de7d73b29853c3f29e73a01e297bd8 # 12.1.0
         with:
           urls: |
             http://localhost:3000
@@ -53,7 +53,7 @@ jobs:
 
       - name: Format lighthouse score
         id: format_lighthouse_score
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # 8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -65,7 +65,7 @@ jobs:
 
       - name: Add Lighthouse stats as comment
         id: comment_to_pr
-        uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # 2.9.4
+        uses: marocchino/sticky-pull-request-comment@67d0dec7b07ed060a405f9b2a64b8ab319fdd7db # 2.9.2
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           number: ${{ github.event.pull_request.number }}

.github/workflows/lint-autofix.yml

@@ -19,7 +19,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
@@ -42,6 +42,6 @@ jobs:
       - name: Print Diff
         run: git diff
 
-      - uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
+      - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: 'refactor: apply lint autofix'

.github/workflows/lint.yml

@@ -20,9 +20,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/showcase-test.yml

@@ -22,9 +22,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/tests-e2e.yml

@@ -38,12 +38,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['20.0', '20', '22', '24', '25.1']
+        node: ['18.0', '20', '22', '24']
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: ${{ matrix.node }}
           cache: yarn
@@ -72,48 +72,6 @@ jobs:
           DOCUSAURUS_PERF_LOGGER: 'true'
         working-directory: ../test-website
 
-  yarn-v1-windows:
-    name: E2E — Yarn v1 Windows
-    timeout-minutes: 30
-    runs-on: windows-8-core
-    steps:
-      - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-      - name: Use Node.js LTS
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
-        with:
-          node-version: lts/*
-          cache: yarn
-      - name: Installation
-        run: yarn || yarn || yarn
-      - name: Generate test-website project against main branch
-        # Not using test-release.sh => no verdaccio docker image on Windows
-        # run: bash ./admin/scripts/test-release.sh -s
-        run: yarn create-docusaurus test-website-in-workspace classic --typescript
-      - name: Install test-website project with Yarn v1
-        run: yarn || yarn || yarn
-        working-directory: test-website-in-workspace
-      - name: Start test-website project
-        run: yarn start --no-open
-        working-directory: test-website-in-workspace
-        env:
-          E2E_TEST: true
-      - name: Build test-website project
-        # We build 2 locales to ensure a localized site doesn't leak memory
-        # See https://github.com/facebook/docusaurus/pull/10599
-        run: yarn build --locale en --locale fr
-        env:
-          # Our website should build even with limited memory
-          # See https://github.com/facebook/docusaurus/pull/10590
-          NODE_OPTIONS: '--max-old-space-size=300'
-          DOCUSAURUS_PERF_LOGGER: 'true'
-        working-directory: test-website-in-workspace
-      - name: Upload Website artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: website-e2e-windows
-          path: test-website-in-workspace/build
-
   yarn-berry:
     name: E2E — Yarn Berry
     timeout-minutes: 30
@@ -124,9 +82,9 @@ jobs:
         variant: [-s, -st]
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Use Node.js LTS
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn
@@ -193,9 +151,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Use Node.js LTS
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn
@@ -233,9 +191,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Use Node.js LTS
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/tests-swizzle.yml

@@ -26,9 +26,9 @@ jobs:
         variant: ['js', 'ts']
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set up Node LTS
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/tests-windows.yml

@@ -27,14 +27,14 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        node: ['20.0', '20', '22', '24', '25.1']
+        node: ['18.0', '20', '22', '24']
     steps:
       - name: Support longpaths
         run: git config --system core.longpaths true
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: ${{ matrix.node }}
           cache: yarn
@@ -54,20 +54,14 @@ jobs:
         run: yarn workspace website test:swizzle:wrap:ts
       - name: Docusaurus Build
         run: yarn build:website:fast
-        env:
-          DOCUSAURUS_PERF_LOGGER: 'true'
 
       - name: TypeCheck website
+        # TODO temporary, remove TS skipLibCheck
         # see https://github.com/facebook/docusaurus/pull/10486
-        run: yarn workspace website typecheck
+        run: yarn workspace website typecheck --project tsconfig.skipLibCheck.json
       - name: TypeCheck website - min version - v5.1
         run: |
           yarn add typescript@5.1.6 --exact -D -W --ignore-scripts
-
-          # DocSearch@4/ai@5 doesn't support TS 5.1 (with skipLibCheck=false)
-          jq '.resolutions."@docsearch/react" = "^3.9.0"' package.json > package.json.tmp && mv -Force package.json.tmp package.json
-          yarn add @docsearch/react@^3.9.0 --exact -D -W --ignore-scripts
-
           yarn workspace website typecheck
       - name: TypeCheck website - max version - Latest
         # For latest TS there are often lib check errors, so we disable it

.github/workflows/tests.yml

@@ -27,12 +27,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['20.0', '20', '22', '24', '25.1']
+        node: ['18.0', '20', '22', '24']
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: ${{ matrix.node }}
           cache: yarn
@@ -55,16 +55,12 @@ jobs:
         run: yarn workspace website test:css-order
 
       - name: TypeCheck website
+        # TODO temporary, remove TS skipLibCheck
         # see https://github.com/facebook/docusaurus/pull/10486
-        run: yarn workspace website typecheck
+        run: yarn workspace website typecheck --project tsconfig.skipLibCheck.json
       - name: TypeCheck website - min version - v5.1
         run: |
           yarn add typescript@5.1.6 --exact -D -W --ignore-scripts
-
-          # DocSearch@4/ai@5 doesn't support TS 5.1 (with skipLibCheck=false)
-          jq '.resolutions."@docsearch/react" = "^3.9.0"' package.json > package.json.tmp && mv -f package.json.tmp package.json
-          yarn add @docsearch/react@^3.9.0 --exact -D -W --ignore-scripts
-
           yarn workspace website typecheck
       - name: TypeCheck website - max version - Latest
         # For latest TS there are often lib check errors, so we disable it

.gitignore

@@ -47,7 +47,6 @@ website/i18n/**/*
 .netlify
 
 website/rspack-tracing.json
-website/rspack-tracing.pftrace
 website/bundler-cpu-profile.json
 website/profile.json.gz
 

.nvmrc

@@ -1 +1 @@
-22
+18

.prettierignore

@@ -1,7 +1,7 @@
 dist
 node_modules
 .yarn
-**/build/**
+build
 coverage
 .docusaurus
 .idea
@@ -11,8 +11,6 @@ coverage
 
 jest/vendor
 
-argos/test-results
-
 packages/lqip-loader/lib/
 packages/docusaurus/lib/
 packages/docusaurus-*/lib/*

CONTRIBUTING.md

@@ -82,7 +82,7 @@ Apart from the `good first issue`, the following labels are also worth looking a
 - [`help wanted`](https://github.com/facebook/docusaurus/labels/help%20wanted): if you have specific knowledge in one domain, working on these issues can make your expertise shine.
 - [`status: accepting pr`](https://github.com/facebook/docusaurus/labels/status%3A%20accepting%20pr): community contributors can feel free to claim any of these.
 
-If you want to work on any of these issues, just drop a message saying "I am working on this". **You do not need to ask for assignment to work on any issue explicitly marked as welcoming external contributions.** However, don't "cookie lick", or squat on an issue without actually sending a PR. You are automatically considered as giving up if you don't **send a PR within seven days after your comment**, and the issue automatically becomes up for grabs again.
+If you want to work on any of these issues, just drop a message saying "I'd like to work on this", and we will assign the issue to you and update the issue's status as "claimed". **You are expected to send a pull request within seven days** after that, so we can still delegate the issue to someone else if you are unavailable.
 
 Alternatively, when opening an issue, you can also click the "self service" checkbox to indicate that you'd like to work on the issue yourself, which will also make us see the issue as "claimed".
 
@@ -214,16 +214,6 @@ After you have signed the CLA, the CLA bot would automatically update the PR sta
 
 If it happens that you were unavailable and your PR gets closed, feel free to reopen once it's ready! We are still happy to review it, help you complete it, and eventually merge it.
 
-### AI-assisted PRs
-
-We welcome the use of AI tools for authoring PRs, and we love to see people pushing the boundaries of AI capabilities. The core team actively uses different AI tools in our development process. However, we are aware that **many people are sending entirely AI-generated PRs as a low-effort way to farm OSS contributions**, so please be mindful of the following etiquette to show your respect for our time and our codebase:
-
-- **Be transparent**: If a significant portion of your code is AI generated, please indicate that in your PR description.
-- **Be accountable**: You are responsible for the code you submit, regardless of whether it was generated by AI or written by you. You should be able to explain every line of the code, ensure all tests pass, and address our reviews.
-- **Be reasonable**: Sometimes we receive 1k LOC PRs that are obviously AI-generated and implement unsolicited features. Please note that significant changes require prior communication and approval from the team in the form of an issue.
-
-We retain the right to close any PR that we deem as unproductive or low-effort, even when we agree with the spirit of the change.
-
 ### Breaking Changes
 
 When adding a new breaking change, follow this template in your pull request:
@@ -237,10 +227,6 @@ When adding a new breaking change, follow this template in your pull request:
 - **Severity (number of people affected x effort)**:
 ```
 
-> [!NOTE]
->
-> Breaking changes should be discussed in the issue tracker before being implemented.
-
 ### What Happens Next?
 
 The core Docusaurus team will be monitoring pull requests. Do help us by keeping pull requests consistent by following the guidelines above.

README.md

@@ -45,7 +45,7 @@ Short on time? Check out our [5-minute tutorial ⏱️](https://tutorial.docusau
 
 - **Customizable**
 
-> While Docusaurus ships with the key pages and sections you need to get started, including a home page, a docs section, a [blog](https://docusaurus.io/docs/blog), and additional support pages, it is also [customizable](https://docusaurus.io/docs/creating-pages) to ensure you have a site that is [uniquely yours](https://docusaurus.io/docs/styling-layout).
+> While Docusaurus ships with the key pages and sections you need to get started, including a home page, a docs section, a [blog](https://docusaurus.io/docs/blog), and additional support pages, it is also [customizable](https://docusaurus.io/docs/creating-pages) as well to ensure you have a site that is [uniquely yours](https://docusaurus.io/docs/styling-layout).
 
 ## Installation
 
@@ -120,4 +120,4 @@ The Docusaurus documentation (e.g., `.md` files in the `/docs` folder) is [Creat
 
 [![Rocket Validator logo](./admin/img/rocketvalidator-logo.png)](https://rocketvalidator.com/)
 
-[Rocket Validator](https://rocketvalidator.com/) helps us find [HTML markup and accessibility issues](https://rocketvalidator.com/stats/docusaurus.io).
+[Rocket Validator](https://rocketvalidator.com/) helps us find HTML markup or accessibility issues.

admin/new.docusaurus.io/package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.docusaurus.io",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "private": true,
   "scripts": {
     "start": "npx --package netlify-cli netlify dev"

admin/scripts/test-release.sh

@@ -53,8 +53,6 @@ git diff --name-only -- '*.json' | sed 's, ,\\&,g' | xargs git checkout --
 # The website is generated outside the repo to minimize chances of yarn resolving the wrong version
 cd ..
 
-echo Generating test-website in `pwd`
-
 # Build skeleton website with new version
 npm_config_registry="$CUSTOM_REGISTRY_URL" npx --yes --loglevel silly create-docusaurus@"$NEW_VERSION" test-website classic --javascript $EXTRA_OPTS
 

admin/test-bad-package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "test-bad-package",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "private": true,
   "dependencies": {
     "@mdx-js/react": "1.0.1",

argos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "argos",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Argos visual diff tests",
   "license": "MIT",
   "private": true,

argos/tests/screenshot.spec.ts

@@ -134,6 +134,11 @@ function throwOnConsole(page: Page) {
     //  it's already happening in main branch
     'Failed to load resource: the server responded with a status of 404 (Not Found)',
 
+    // TODO legit hydration bugs to fix on embeds of /docs/styling-layout
+    //  useLocation() returns window.search/hash immediately :s
+    '/docs/configuration?docusaurus-theme=light',
+    '/docs/configuration?docusaurus-theme=dark',
+
     // Warning because react-live not supporting React automatic JSX runtime
     // See https://github.com/FormidableLabs/react-live/issues/405
     'Your app (or one of its dependencies) is using an outdated JSX transform. Update to the modern JSX transform for faster performance',

crowdin-v2.yaml

@@ -20,19 +20,6 @@ languages_mapping: &languages_mapping
   two_letters_code:
     pt-BR: pt-BR
 
-# Crowdin regularly update their MDX parser
-# Unfortunately, their v2 parser is more "MDX compliant" and thus can't parse
-# Docusaurus MDX files correctly due to our custom {#headingId} syntax.
-# Adding this type param permits using their older v1.2 parser.
-# Note: you can find the version of a file using browser DevTools
-# The source file icons will have a class such as "file_type_mdx_v1_2"
-#
-# TODO fix our headingId syntax
-# providing an explicit type is annoying and not future-proof
-# there's a risk that when adding an image in /docs, it will be parsed as mdx
-# and duplicating source file configs for various extensions is not great either
-mdx_file_type: &mdx_file_type mdx_v1_2
-
 #
 # Files configuration
 #
@@ -40,33 +27,18 @@ files:
   - source: /website/i18n/en/**/*
     translation: /website/i18n/%two_letters_code%/**/%original_file_name%
     languages_mapping: *languages_mapping
-
-  - source: /website/docs/**/*.mdx
-    translation: /website/i18n/%two_letters_code%/docusaurus-plugin-content-docs/current/**/%original_file_name%
-    languages_mapping: *languages_mapping
-    type: *mdx_file_type
   - source: /website/docs/**/*
     translation: /website/i18n/%two_letters_code%/docusaurus-plugin-content-docs/current/**/%original_file_name%
     languages_mapping: *languages_mapping
-    ignore: [/**/*.mdx]
-
-  - source: /website/versioned_docs/**/*.mdx
-    translation: /website/i18n/%two_letters_code%/docusaurus-plugin-content-docs/**/%original_file_name%
-    languages_mapping: *languages_mapping
-    type: *mdx_file_type
-  - source: /website/versioned_docs/**/*
-    translation: /website/i18n/%two_letters_code%/docusaurus-plugin-content-docs/**/%original_file_name%
-    languages_mapping: *languages_mapping
-    ignore: [/**/*.mdx]
-
   - source: /website/community/**/*
     translation: /website/i18n/%two_letters_code%/docusaurus-plugin-content-docs-community/current/**/%original_file_name%
     languages_mapping: *languages_mapping
-
+  - source: /website/versioned_docs/**/*
+    translation: /website/i18n/%two_letters_code%/docusaurus-plugin-content-docs/**/%original_file_name%
+    languages_mapping: *languages_mapping
   - source: /website/blog/**/*
     translation: /website/i18n/%two_letters_code%/docusaurus-plugin-content-blog/**/%original_file_name%
     languages_mapping: *languages_mapping
-
   - source: /website/src/pages/**/*
     translation: /website/i18n/%two_letters_code%/docusaurus-plugin-content-pages/**/%original_file_name%
     ignore: [/**/*.js, /**/*.jsx, /**/*.ts, /**/*.tsx, /**/*.css]

examples/classic-typescript/README.md

@@ -2,40 +2,40 @@
 
 This website is built using [Docusaurus](https://docusaurus.io/), a modern static website generator.
 
-## Installation
+### Installation
 
 ```bash
-yarn
+$ yarn
 ```
 
-## Local Development
+### Local Development
 
 ```bash
-yarn start
+$ yarn start
 ```
 
 This command starts a local development server and opens up a browser window. Most changes are reflected live without having to restart the server.
 
-## Build
+### Build
 
 ```bash
-yarn build
+$ yarn build
 ```
 
 This command generates static content into the `build` directory and can be served using any static contents hosting service.
 
-## Deployment
+### Deployment
 
 Using SSH:
 
 ```bash
-USE_SSH=true yarn deploy
+$ USE_SSH=true yarn deploy
 ```
 
 Not using SSH:
 
 ```bash
-GIT_USER=<Your GitHub username> yarn deploy
+$ GIT_USER=<Your GitHub username> yarn deploy
 ```
 
 If you are using GitHub pages for hosting, this command is a convenient way to build the website and push to the `gh-pages` branch.

examples/classic-typescript/blog/authors.yml

@@ -1,14 +1,12 @@
 yangshun:
   name: Yangshun Tay
-  title: Ex-Meta Staff Engineer, Co-founder GreatFrontEnd
-  url: https://linkedin.com/in/yangshun
+  title: Front End Engineer @ Facebook
+  url: https://github.com/yangshun
   image_url: https://github.com/yangshun.png
   page: true
   socials:
     x: yangshunz
-    linkedin: yangshun
     github: yangshun
-    newsletter: https://www.greatfrontend.com
 
 slorber:
   name: Sébastien Lorber

examples/classic-typescript/docs/intro.md

@@ -14,7 +14,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new
 
 ### What you'll need
 
-- [Node.js](https://nodejs.org/en/download/) version 20.0 or above:
+- [Node.js](https://nodejs.org/en/download/) version 18.0 or above:
   - When installing Node.js, you are recommended to check all checkboxes related to dependencies.
 
 ## Generate a new site

examples/classic-typescript/docusaurus.config.ts

@@ -9,11 +9,6 @@ const config: Config = {
   tagline: 'Dinosaurs are cool',
   favicon: 'img/favicon.ico',
 
-  // Future flags, see https://docusaurus.io/docs/api/docusaurus-config#future
-  future: {
-    v4: true, // Improve compatibility with the upcoming Docusaurus v4
-  },
-
   // Set the production url of your site here
   url: 'https://your-docusaurus-site.example.com',
   // Set the /<baseUrl>/ pathname under which your site is served
@@ -26,6 +21,7 @@ const config: Config = {
   projectName: 'docusaurus', // Usually your repo name.
 
   onBrokenLinks: 'throw',
+  onBrokenMarkdownLinks: 'warn',
 
   // Even if you don't use internationalization, you can use this field to set
   // useful metadata like html lang. For example, if your site is Chinese, you
@@ -71,9 +67,6 @@ const config: Config = {
   themeConfig: {
     // Replace with your project's social card
     image: 'img/docusaurus-social-card.jpg',
-    colorMode: {
-      respectPrefersColorScheme: true,
-    },
     navbar: {
       title: 'My Site',
       logo: {

examples/classic-typescript/package.json

@@ -16,8 +16,8 @@
     "dev": "docusaurus start"
   },
   "dependencies": {
-    "@docusaurus/core": "3.9.2",
-    "@docusaurus/preset-classic": "3.9.2",
+    "@docusaurus/core": "3.7.0",
+    "@docusaurus/preset-classic": "3.7.0",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.3.0",
@@ -25,9 +25,9 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.9.2",
-    "@docusaurus/tsconfig": "3.9.2",
-    "@docusaurus/types": "3.9.2",
+    "@docusaurus/module-type-aliases": "3.7.0",
+    "@docusaurus/tsconfig": "3.7.0",
+    "@docusaurus/types": "3.7.0",
     "typescript": "~5.6.2"
   },
   "browserslist": {
@@ -43,7 +43,7 @@
     ]
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   },
   "description": "Docusaurus example project (classic-typescript template)"
 }

examples/classic/README.md

@@ -2,40 +2,40 @@
 
 This website is built using [Docusaurus](https://docusaurus.io/), a modern static website generator.
 
-## Installation
+### Installation
 
 ```bash
-yarn
+$ yarn
 ```
 
-## Local Development
+### Local Development
 
 ```bash
-yarn start
+$ yarn start
 ```
 
 This command starts a local development server and opens up a browser window. Most changes are reflected live without having to restart the server.
 
-## Build
+### Build
 
 ```bash
-yarn build
+$ yarn build
 ```
 
 This command generates static content into the `build` directory and can be served using any static contents hosting service.
 
-## Deployment
+### Deployment
 
 Using SSH:
 
 ```bash
-USE_SSH=true yarn deploy
+$ USE_SSH=true yarn deploy
 ```
 
 Not using SSH:
 
 ```bash
-GIT_USER=<Your GitHub username> yarn deploy
+$ GIT_USER=<Your GitHub username> yarn deploy
 ```
 
 If you are using GitHub pages for hosting, this command is a convenient way to build the website and push to the `gh-pages` branch.

examples/classic/blog/authors.yml

@@ -1,14 +1,12 @@
 yangshun:
   name: Yangshun Tay
-  title: Ex-Meta Staff Engineer, Co-founder GreatFrontEnd
-  url: https://linkedin.com/in/yangshun
+  title: Front End Engineer @ Facebook
+  url: https://github.com/yangshun
   image_url: https://github.com/yangshun.png
   page: true
   socials:
     x: yangshunz
-    linkedin: yangshun
     github: yangshun
-    newsletter: https://www.greatfrontend.com
 
 slorber:
   name: Sébastien Lorber

examples/classic/docs/intro.md

@@ -14,7 +14,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new
 
 ### What you'll need
 
-- [Node.js](https://nodejs.org/en/download/) version 20.0 or above:
+- [Node.js](https://nodejs.org/en/download/) version 18.0 or above:
   - When installing Node.js, you are recommended to check all checkboxes related to dependencies.
 
 ## Generate a new site

examples/classic/docusaurus.config.js

@@ -14,11 +14,6 @@ const config = {
   tagline: 'Dinosaurs are cool',
   favicon: 'img/favicon.ico',
 
-  // Future flags, see https://docusaurus.io/docs/api/docusaurus-config#future
-  future: {
-    v4: true, // Improve compatibility with the upcoming Docusaurus v4
-  },
-
   // Set the production url of your site here
   url: 'https://your-docusaurus-site.example.com',
   // Set the /<baseUrl>/ pathname under which your site is served
@@ -31,6 +26,7 @@ const config = {
   projectName: 'docusaurus', // Usually your repo name.
 
   onBrokenLinks: 'throw',
+  onBrokenMarkdownLinks: 'warn',
 
   // Even if you don't use internationalization, you can use this field to set
   // useful metadata like html lang. For example, if your site is Chinese, you
@@ -79,9 +75,6 @@ const config = {
     ({
       // Replace with your project's social card
       image: 'img/docusaurus-social-card.jpg',
-      colorMode: {
-        respectPrefersColorScheme: true,
-      },
       navbar: {
         title: 'My Site',
         logo: {

examples/classic/package.json

@@ -15,8 +15,8 @@
     "dev": "docusaurus start"
   },
   "dependencies": {
-    "@docusaurus/core": "3.9.2",
-    "@docusaurus/preset-classic": "3.9.2",
+    "@docusaurus/core": "3.7.0",
+    "@docusaurus/preset-classic": "3.7.0",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.3.0",
@@ -24,8 +24,8 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.9.2",
-    "@docusaurus/types": "3.9.2"
+    "@docusaurus/module-type-aliases": "3.7.0",
+    "@docusaurus/types": "3.7.0"
   },
   "browserslist": {
     "production": [
@@ -40,7 +40,7 @@
     ]
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   },
   "description": "Docusaurus example project"
 }

jest.config.mjs

@@ -32,16 +32,15 @@ const ignorePatterns = [
 export default {
   rootDir: fileURLToPath(new URL('.', import.meta.url)),
   verbose: true,
-  // Default 5s timeout often fails on Windows :s,
-  // see https://github.com/facebook/docusaurus/pull/8259
-  testTimeout: 15000,
   setupFiles: ['./jest/setup.js'],
   testEnvironmentOptions: {
     url: 'https://docusaurus.io/',
   },
   testEnvironment: 'node',
   testPathIgnorePatterns: ignorePatterns,
-  watchPathIgnorePatterns: ['/\\.docusaurus'],
+  // Default 5s timeout often fails on Windows :s,
+  // see https://github.com/facebook/docusaurus/pull/8259
+  testTimeout: 15000,
   coveragePathIgnorePatterns: [
     ...ignorePatterns,
     // We also ignore all package entry points

jest/deps.d.ts

@@ -12,3 +12,8 @@ declare module 'to-vfile' {
 
   export function read(path: string, encoding?: string): Promise<VFile>;
 }
+
+declare module '@testing-utils/git' {
+  const createTempRepo: typeof import('./utils/git').createTempRepo;
+  export {createTempRepo};
+}

jest/snapshotPathNormalizer.ts

@@ -82,7 +82,7 @@ function normalizePaths<T>(value: T): T {
     (val) => val.split(cwdReal).join('<PROJECT_ROOT>'),
     (val) => val.split(cwd).join('<PROJECT_ROOT>'),
 
-    // Replace temp directory with <TEMP_DIR>
+    // Replace home directory with <TEMP_DIR>
     (val) => val.split(tempDirReal).join('<TEMP_DIR>'),
     (val) => val.split(tempDir).join('<TEMP_DIR>'),
 

jest/utils/git.ts

@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import fs from 'fs-extra';
+import os from 'os';
+import path from 'path';
+import shell from 'shelljs';
+
+class Git {
+  constructor(private dir: string) {
+    const res = shell.exec('git init', {cwd: dir, silent: true});
+    if (res.code !== 0) {
+      throw new Error(`git init exited with code ${res.code}.
+stderr: ${res.stderr}
+stdout: ${res.stdout}`);
+    }
+    // Doesn't matter currently
+    shell.exec('git config user.email "test@jc-verse.com"', {
+      cwd: dir,
+      silent: true,
+    });
+    shell.exec('git config user.name "Test"', {cwd: dir, silent: true});
+
+    shell.exec('git commit --allow-empty -m "First commit"', {
+      cwd: dir,
+      silent: true,
+    });
+  }
+  commit(msg: string, date: string, author: string): void {
+    const addRes = shell.exec('git add .', {cwd: this.dir, silent: true});
+    const commitRes = shell.exec(
+      `git commit -m "${msg}" --date "${date}T00:00:00Z" --author "${author}"`,
+      {
+        cwd: this.dir,
+        env: {GIT_COMMITTER_DATE: `${date}T00:00:00Z`},
+        silent: true,
+      },
+    );
+    if (addRes.code !== 0) {
+      throw new Error(`git add exited with code ${addRes.code}.
+stderr: ${addRes.stderr}
+stdout: ${addRes.stdout}`);
+    }
+    if (commitRes.code !== 0) {
+      throw new Error(`git commit exited with code ${commitRes.code}.
+stderr: ${commitRes.stderr}
+stdout: ${commitRes.stdout}`);
+    }
+  }
+}
+
+// This function is sync so the same mock repo can be shared across tests
+export function createTempRepo(): {repoDir: string; git: Git} {
+  const repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'git-test-repo'));
+
+  const git = new Git(repoDir);
+
+  return {repoDir, git};
+}

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.9.2",
+  "version": "3.8.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "useNx": false,

packages/create-docusaurus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-docusaurus",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Create Docusaurus apps easily.",
   "type": "module",
   "repository": {
@@ -22,10 +22,10 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "3.9.2",
-    "@docusaurus/utils": "3.9.2",
+    "@docusaurus/logger": "3.8.0",
+    "@docusaurus/utils": "3.8.0",
     "commander": "^5.1.0",
-    "execa": "^5.1.1",
+    "execa": "5.1.1",
     "fs-extra": "^11.1.1",
     "lodash": "^4.17.21",
     "prompts": "^2.4.2",
@@ -37,6 +37,6 @@
     "@types/supports-color": "^8.1.1"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   }
 }

packages/create-docusaurus/src/index.ts

@@ -273,10 +273,7 @@ async function getSiteName(
       return 'A website name is required.';
     }
     const dest = path.resolve(rootDir, siteName);
-    if (siteName === '.' && (await fs.readdir(dest)).length > 0) {
-      return logger.interpolate`Directory not empty at path=${dest}!`;
-    }
-    if (siteName !== '.' && (await fs.pathExists(dest))) {
+    if (await fs.pathExists(dest)) {
       return logger.interpolate`Directory already exists at path=${dest}!`;
     }
     return true;

packages/create-docusaurus/templates/classic-typescript/docusaurus.config.ts

@@ -26,6 +26,7 @@ const config: Config = {
   projectName: 'docusaurus', // Usually your repo name.
 
   onBrokenLinks: 'throw',
+  onBrokenMarkdownLinks: 'warn',
 
   // Even if you don't use internationalization, you can use this field to set
   // useful metadata like html lang. For example, if your site is Chinese, you
@@ -71,9 +72,6 @@ const config: Config = {
   themeConfig: {
     // Replace with your project's social card
     image: 'img/docusaurus-social-card.jpg',
-    colorMode: {
-      respectPrefersColorScheme: true,
-    },
     navbar: {
       title: 'My Site',
       logo: {

packages/create-docusaurus/templates/classic-typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-typescript-template",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -15,8 +15,8 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@docusaurus/core": "3.9.2",
-    "@docusaurus/preset-classic": "3.9.2",
+    "@docusaurus/core": "3.8.0",
+    "@docusaurus/preset-classic": "3.8.0",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.3.0",
@@ -24,9 +24,9 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.9.2",
-    "@docusaurus/tsconfig": "3.9.2",
-    "@docusaurus/types": "3.9.2",
+    "@docusaurus/module-type-aliases": "3.8.0",
+    "@docusaurus/tsconfig": "3.8.0",
+    "@docusaurus/types": "3.8.0",
     "typescript": "~5.6.2"
   },
   "browserslist": {
@@ -42,6 +42,6 @@
     ]
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   }
 }

packages/create-docusaurus/templates/classic/docusaurus.config.js

@@ -31,6 +31,7 @@ const config = {
   projectName: 'docusaurus', // Usually your repo name.
 
   onBrokenLinks: 'throw',
+  onBrokenMarkdownLinks: 'warn',
 
   // Even if you don't use internationalization, you can use this field to set
   // useful metadata like html lang. For example, if your site is Chinese, you
@@ -79,9 +80,6 @@ const config = {
     ({
       // Replace with your project's social card
       image: 'img/docusaurus-social-card.jpg',
-      colorMode: {
-        respectPrefersColorScheme: true,
-      },
       navbar: {
         title: 'My Site',
         logo: {

packages/create-docusaurus/templates/classic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-template",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -14,8 +14,8 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "3.9.2",
-    "@docusaurus/preset-classic": "3.9.2",
+    "@docusaurus/core": "3.8.0",
+    "@docusaurus/preset-classic": "3.8.0",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.3.0",
@@ -23,8 +23,8 @@
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.9.2",
-    "@docusaurus/types": "3.9.2"
+    "@docusaurus/module-type-aliases": "3.8.0",
+    "@docusaurus/types": "3.8.0"
   },
   "browserslist": {
     "production": [
@@ -39,6 +39,6 @@
     ]
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   }
 }

packages/create-docusaurus/templates/shared/docs/intro.md

@@ -14,7 +14,7 @@ Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new
 
 ### What you'll need
 
-- [Node.js](https://nodejs.org/en/download/) version 20.0 or above:
+- [Node.js](https://nodejs.org/en/download/) version 18.0 or above:
   - When installing Node.js, you are recommended to check all checkboxes related to dependencies.
 
 ## Generate a new site

packages/docusaurus-babel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/babel",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Docusaurus package for Babel-related utils.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -36,14 +36,15 @@
     "@babel/preset-react": "^7.25.9",
     "@babel/preset-typescript": "^7.25.9",
     "@babel/runtime": "^7.25.9",
+    "@babel/runtime-corejs3": "^7.25.9",
     "@babel/traverse": "^7.25.9",
-    "@docusaurus/logger": "3.9.2",
-    "@docusaurus/utils": "3.9.2",
+    "@docusaurus/logger": "3.8.0",
+    "@docusaurus/utils": "3.8.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "fs-extra": "^11.1.1",
     "tslib": "^2.6.0"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   }
 }

packages/docusaurus-bundler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/bundler",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Docusaurus util package to abstract the current bundler.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -19,24 +19,24 @@
   "license": "MIT",
   "dependencies": {
     "@babel/core": "^7.25.9",
-    "@docusaurus/babel": "3.9.2",
-    "@docusaurus/cssnano-preset": "3.9.2",
-    "@docusaurus/logger": "3.9.2",
-    "@docusaurus/types": "3.9.2",
-    "@docusaurus/utils": "3.9.2",
+    "@docusaurus/babel": "3.8.0",
+    "@docusaurus/cssnano-preset": "3.8.0",
+    "@docusaurus/logger": "3.8.0",
+    "@docusaurus/types": "3.8.0",
+    "@docusaurus/utils": "3.8.0",
     "babel-loader": "^9.2.1",
-    "clean-css": "^5.3.3",
+    "clean-css": "^5.3.2",
     "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.11.0",
+    "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "cssnano": "^6.1.2",
     "file-loader": "^6.2.0",
     "html-minifier-terser": "^7.2.0",
-    "mini-css-extract-plugin": "^2.9.2",
+    "mini-css-extract-plugin": "^2.9.1",
     "null-loader": "^4.0.1",
-    "postcss": "^8.5.4",
-    "postcss-loader": "^7.3.4",
-    "postcss-preset-env": "^10.2.1",
+    "postcss": "^8.4.26",
+    "postcss-loader": "^7.3.3",
+    "postcss-preset-env": "^10.1.0",
     "terser-webpack-plugin": "^5.3.9",
     "tslib": "^2.6.0",
     "url-loader": "^4.1.1",
@@ -55,6 +55,6 @@
     "@total-typescript/shoehorn": "^0.1.2"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   }
 }

packages/docusaurus-bundler/src/currentBundler.ts

@@ -129,8 +129,8 @@ export async function registerBundlerTracing({
 
       await Rspack.experiments.globalTrace.register(
         filter,
-        'perfetto',
-        './rspack-tracing.pftrace',
+        'chrome',
+        './rspack-tracing.json',
       );
 
       console.info(`Rspack tracing registered, filter=${filter}`);

packages/docusaurus-bundler/src/loaders/jsLoader.ts

@@ -28,7 +28,7 @@ async function createSwcJsLoaderFactory(): Promise<
   return ({isServer}) => {
     return {
       loader,
-      options: getOptions({isServer, bundlerName: 'webpack'}),
+      options: getOptions({isServer}),
     };
   };
 }
@@ -42,7 +42,7 @@ async function createRspackSwcJsLoaderFactory(): Promise<
   return ({isServer}) => {
     return {
       loader,
-      options: getOptions({isServer, bundlerName: 'rspack'}),
+      options: getOptions({isServer}),
     };
   };
 }

packages/docusaurus-bundler/src/minification.ts

@@ -142,10 +142,7 @@ async function getRspackMinimizers({
 }: MinimizersConfig): Promise<WebpackPluginInstance[]> {
   const rspack = getCurrentBundlerAsRspack({currentBundler});
   const getBrowserslistQueries = await importGetBrowserslistQueries();
-  const browserslistQueries = getBrowserslistQueries({
-    isServer: false,
-    bundlerName: 'rspack',
-  });
+  const browserslistQueries = getBrowserslistQueries({isServer: false});
   const swcJsMinimizerOptions = await importSwcJsMinimizerOptions();
   return [
     // See https://rspack.dev/plugins/rspack/swc-js-minimizer-rspack-plugin

packages/docusaurus-bundler/src/minifyHtml.ts

@@ -84,10 +84,6 @@ async function getSwcMinifier(): Promise<HtmlMinifier> {
           // TODO maybe it's fine to only keep <!-- --> React comments?
           preserveComments: [],
 
-          // Keep <head> tag: important for social image crawlers like LinkedIn
-          // See https://github.com/swc-project/swc/issues/10994
-          tagOmission: 'keep-head-and-body',
-
           // Sorting these attributes (class) can lead to React hydration errors
           sortSpaceSeparatedAttributeValues: false,
           sortAttributes: false,

packages/docusaurus-cssnano-preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/cssnano-preset",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Advanced cssnano preset for maximum optimization.",
   "main": "lib/index.js",
   "license": "MIT",
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "cssnano-preset-advanced": "^6.1.2",
-    "postcss": "^8.5.4",
+    "postcss": "^8.4.38",
     "postcss-sort-media-queries": "^5.2.0",
     "tslib": "^2.6.0"
   },
@@ -26,6 +26,6 @@
     "to-vfile": "^6.1.0"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   }
 }

packages/docusaurus-cssnano-preset/src/index.ts

@@ -13,9 +13,6 @@ const preset: typeof advancedBasePreset = function preset(opts) {
   const advancedPreset = advancedBasePreset({
     autoprefixer: {add: false},
     discardComments: {removeAll: true},
-    // See CodeBlock custom line number bug: https://github.com/facebook/docusaurus/pull/11487
-    /* cSpell:ignore Idents */
-    reduceIdents: {counter: false},
     /* cSpell:ignore zindex */
     zindex: false,
     ...opts,

packages/docusaurus-faster/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/faster",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Docusaurus experimental package exposing new modern dependencies to make the build faster.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -18,19 +18,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/types": "3.9.2",
-    "@rspack/core": "^1.5.0",
+    "@docusaurus/types": "3.8.0",
+    "@rspack/core": "^1.3.10",
     "@swc/core": "^1.7.39",
-    "@swc/html": "^1.13.5",
+    "@swc/html": "^1.7.39",
     "browserslist": "^4.24.2",
     "lightningcss": "^1.27.0",
-    "semver": "^7.5.4",
     "swc-loader": "^0.2.6",
     "tslib": "^2.6.0",
     "webpack": "^5.95.0"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   },
   "peerDependencies": {
     "@docusaurus/types": "*"

packages/docusaurus-faster/src/index.ts

@@ -9,22 +9,18 @@ import Rspack from '@rspack/core';
 import * as lightningcss from 'lightningcss';
 import browserslist from 'browserslist';
 import {minify as swcHtmlMinifier} from '@swc/html';
-import semver from 'semver';
 import type {JsMinifyOptions, Options as SwcOptions} from '@swc/core';
-import type {CurrentBundler} from '@docusaurus/types';
 
 export const swcLoader = require.resolve('swc-loader');
 
 export const getSwcLoaderOptions = ({
   isServer,
-  bundlerName,
 }: {
   isServer: boolean;
-  bundlerName: CurrentBundler['name'];
 }): SwcOptions => {
   return {
     env: {
-      targets: getBrowserslistQueries({isServer, bundlerName}),
+      targets: getBrowserslistQueries({isServer}),
     },
     jsc: {
       parser: {
@@ -67,53 +63,20 @@ export function getSwcJsMinimizerOptions(): JsMinifyOptions {
   };
 }
 
-// TODO this is not accurate
-//  for Rspack we should read from the built-in browserslist data
-//  see https://github.com/facebook/docusaurus/pull/11496
-function getLastBrowserslistKnownNodeVersion(
-  bundlerName: CurrentBundler['name'],
-): string {
-  if (bundlerName === 'rspack') {
-    // TODO hardcoded value until Rspack exposes its Browserslist data
-    //  see https://github.com/facebook/docusaurus/pull/11496
-    return '22.0.0';
-  }
-  // browserslist('last 1 node versions')[0]!.replace('node ', '')
-  return browserslist.nodeVersions.at(-1)!;
-}
-
-function getMinVersion(v1: string, v2: string): string {
-  return semver.lt(v1, v2) ? v1 : v2;
-}
-
 // We need this because of Rspack built-in LightningCSS integration
 // See https://github.com/orgs/browserslist/discussions/846
 export function getBrowserslistQueries({
   isServer,
-  bundlerName,
 }: {
   isServer: boolean;
-  bundlerName: CurrentBundler['name'];
 }): string[] {
   if (isServer) {
-    // Escape hatch env variable
-    if (process.env.DOCUSAURUS_SERVER_NODE_TARGET) {
-      return [`node ${process.env.DOCUSAURUS_SERVER_NODE_TARGET}`];
-    }
-    // For server builds, we want to use the current Node version as target
-    // But we can't pass a target that Browserslist doesn't know about yet
-    const nodeTarget = getMinVersion(
-      process.versions.node,
-      getLastBrowserslistKnownNodeVersion(bundlerName),
-    );
-
-    return [`node ${nodeTarget}`];
+    return [`node ${process.versions.node}`];
   }
 
   const queries = browserslist.loadConfig({path: process.cwd()}) ?? [
     ...browserslist.defaults,
   ];
-
   return queries;
 }
 

packages/docusaurus-logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/logger",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "An encapsulated logger for semantically formatting console messages.",
   "main": "./lib/index.js",
   "repository": {
@@ -24,7 +24,7 @@
     "tslib": "^2.6.0"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   },
   "devDependencies": {
     "@types/supports-color": "^8.1.1"

packages/docusaurus-mdx-loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/mdx-loader",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Docusaurus Loader for MDX",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "3.9.2",
-    "@docusaurus/utils": "3.9.2",
-    "@docusaurus/utils-validation": "3.9.2",
+    "@docusaurus/logger": "3.8.0",
+    "@docusaurus/utils": "3.8.0",
+    "@docusaurus/utils-validation": "3.8.0",
     "@mdx-js/mdx": "^3.0.0",
     "@slorber/remark-comment": "^1.0.0",
     "escape-html": "^1.0.3",
@@ -44,7 +44,7 @@
     "webpack": "^5.88.1"
   },
   "devDependencies": {
-    "@docusaurus/types": "3.9.2",
+    "@docusaurus/types": "3.8.0",
     "@types/escape-html": "^1.0.2",
     "@types/mdast": "^4.0.2",
     "@types/stringify-object": "^3.3.1",
@@ -62,6 +62,6 @@
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   }
 }

packages/docusaurus-mdx-loader/src/processor.ts

@@ -22,9 +22,6 @@ import type {WebpackCompilerName} from '@docusaurus/utils';
 import type {MDXFrontMatter} from './frontMatter';
 import type {Options} from './options';
 import type {AdmonitionOptions} from './remark/admonitions';
-import type {PluginOptions as ResolveMarkdownLinksOptions} from './remark/resolveMarkdownLinks';
-import type {PluginOptions as TransformLinksOptions} from './remark/transformLinks';
-import type {PluginOptions as TransformImageOptions} from './remark/transformImage';
 import type {ProcessorOptions} from '@mdx-js/mdx';
 
 // TODO as of April 2023, no way to import/re-export this ESM type easily :/
@@ -95,7 +92,7 @@ async function createProcessorFactory() {
         headings,
         {anchorsMaintainCase: options.markdownConfig.anchors.maintainCase},
       ],
-      ...(options.markdownConfig.emoji ? [emoji] : []),
+      emoji,
       toc,
     ];
   }
@@ -124,19 +121,13 @@ async function createProcessorFactory() {
         {
           staticDirs: options.staticDirs,
           siteDir: options.siteDir,
-          onBrokenMarkdownImages:
-            options.markdownConfig.hooks.onBrokenMarkdownImages,
-        } satisfies TransformImageOptions,
+        },
       ],
       // TODO merge this with transformLinks?
       options.resolveMarkdownLink
         ? [
             resolveMarkdownLinks,
-            {
-              resolveMarkdownLink: options.resolveMarkdownLink,
-              onBrokenMarkdownLinks:
-                options.markdownConfig.hooks.onBrokenMarkdownLinks,
-            } satisfies ResolveMarkdownLinksOptions,
+            {resolveMarkdownLink: options.resolveMarkdownLink},
           ]
         : undefined,
       [
@@ -144,9 +135,7 @@ async function createProcessorFactory() {
         {
           staticDirs: options.staticDirs,
           siteDir: options.siteDir,
-          onBrokenMarkdownLinks:
-            options.markdownConfig.hooks.onBrokenMarkdownLinks,
-        } satisfies TransformLinksOptions,
+        },
       ],
       gfm,
       options.markdownConfig.mdx1Compat.comments ? comment : null,

packages/docusaurus-mdx-loader/src/remark/resolveMarkdownLinks/__tests__/index.test.ts

@@ -5,47 +5,22 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {jest} from '@jest/globals';
-import * as path from 'path';
 import plugin from '..';
 import type {PluginOptions} from '../index';
 
-const siteDir = __dirname;
-
-const DefaultTestOptions: PluginOptions = {
-  resolveMarkdownLink: ({linkPathname}) => `/RESOLVED---${linkPathname}`,
-  onBrokenMarkdownLinks: 'throw',
-};
-
-async function process(content: string, optionsInput?: Partial<PluginOptions>) {
-  const options = {
-    ...DefaultTestOptions,
-    ...optionsInput,
-  };
-
+async function process(content: string) {
   const {remark} = await import('remark');
 
-  const result = await remark()
-    .use(plugin, options)
-    .process({
-      value: content,
-      path: path.posix.join(siteDir, 'docs', 'myFile.mdx'),
-    });
+  const options: PluginOptions = {
+    resolveMarkdownLink: ({linkPathname}) => `/RESOLVED---${linkPathname}`,
+  };
+
+  const result = await remark().use(plugin, options).process(content);
 
   return result.value;
 }
 
 describe('resolveMarkdownLinks remark plugin', () => {
-  it('accepts non-md link', async () => {
-    /* language=markdown */
-    const content = `[link1](link1)`;
-    const result = await process(content);
-    expect(result).toMatchInlineSnapshot(`
-        "[link1](link1)
-        "
-      `);
-  });
-
   it('resolves Markdown and MDX links', async () => {
     /* language=markdown */
     const content = `[link1](link1.mdx)
@@ -182,212 +157,4 @@ this is a code block
       "
     `);
   });
-
-  describe('onBrokenMarkdownLinks', () => {
-    const warnMock = jest.spyOn(console, 'warn').mockImplementation(() => {});
-    beforeEach(() => {
-      warnMock.mockClear();
-    });
-
-    async function processResolutionErrors(
-      content: string,
-      onBrokenMarkdownLinks: PluginOptions['onBrokenMarkdownLinks'] = 'throw',
-    ) {
-      return process(content, {
-        resolveMarkdownLink: () => null,
-        onBrokenMarkdownLinks,
-      });
-    }
-
-    describe('throws', () => {
-      it('for unresolvable mdx link', async () => {
-        /* language=markdown */
-        const content = `[link1](link1.mdx)`;
-
-        await expect(() => processResolutionErrors(content)).rejects
-          .toThrowErrorMatchingInlineSnapshot(`
-          "Markdown link with URL \`link1.mdx\` in source file "packages/docusaurus-mdx-loader/src/remark/resolveMarkdownLinks/__tests__/docs/myFile.mdx" (1:1) couldn't be resolved.
-          Make sure it references a local Markdown file that exists within the current plugin.
-          To ignore this error, use the \`siteConfig.markdown.hooks.onBrokenMarkdownLinks\` option, or apply the \`pathname://\` protocol to the broken link URLs."
-        `);
-      });
-
-      it('for unresolvable md link', async () => {
-        /* language=markdown */
-        const content = `[link1](link1.md)`;
-
-        await expect(() => processResolutionErrors(content)).rejects
-          .toThrowErrorMatchingInlineSnapshot(`
-          "Markdown link with URL \`link1.md\` in source file "packages/docusaurus-mdx-loader/src/remark/resolveMarkdownLinks/__tests__/docs/myFile.mdx" (1:1) couldn't be resolved.
-          Make sure it references a local Markdown file that exists within the current plugin.
-          To ignore this error, use the \`siteConfig.markdown.hooks.onBrokenMarkdownLinks\` option, or apply the \`pathname://\` protocol to the broken link URLs."
-        `);
-      });
-    });
-
-    describe('warns', () => {
-      it('for unresolvable md and mdx link', async () => {
-        /* language=markdown */
-        const content = `
-[link1](link1.mdx)
-
-[link2](link2)
-
-[link3](dir/link3.md)
-
-[link 4](/link/4)
-      `;
-
-        const result = await processResolutionErrors(content, 'warn');
-
-        expect(result).toMatchInlineSnapshot(`
-                  "[link1](link1.mdx)
-
-                  [link2](link2)
-
-                  [link3](dir/link3.md)
-
-                  [link 4](/link/4)
-                  "
-              `);
-
-        expect(warnMock).toHaveBeenCalledTimes(2);
-        expect(warnMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "[WARNING] Markdown link with URL \`link1.mdx\` in source file "packages/docusaurus-mdx-loader/src/remark/resolveMarkdownLinks/__tests__/docs/myFile.mdx" (2:1) couldn't be resolved.
-          Make sure it references a local Markdown file that exists within the current plugin.",
-            ],
-            [
-              "[WARNING] Markdown link with URL \`dir/link3.md\` in source file "packages/docusaurus-mdx-loader/src/remark/resolveMarkdownLinks/__tests__/docs/myFile.mdx" (6:1) couldn't be resolved.
-          Make sure it references a local Markdown file that exists within the current plugin.",
-            ],
-          ]
-        `);
-      });
-
-      it('for unresolvable md and mdx link - with recovery', async () => {
-        /* language=markdown */
-        const content = `
-[link1](link1.mdx)
-
-[link2](link2)
-
-[link3](dir/link3.md?query#hash)
-
-[link 4](/link/4)
-      `;
-
-        const result = await processResolutionErrors(content, (params) => {
-          console.warn(`onBrokenMarkdownLinks called with`, params);
-          // We can alter the AST Node
-          params.node.title = 'fixed link title';
-          params.node.url = 'ignored, less important than returned value';
-          // Or return a new URL
-          return `/recovered-link`;
-        });
-
-        expect(result).toMatchInlineSnapshot(`
-          "[link1](/recovered-link "fixed link title")
-
-          [link2](link2)
-
-          [link3](/recovered-link "fixed link title")
-
-          [link 4](/link/4)
-          "
-        `);
-
-        expect(warnMock).toHaveBeenCalledTimes(2);
-        expect(warnMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "onBrokenMarkdownLinks called with",
-              {
-                "node": {
-                  "children": [
-                    {
-                      "position": {
-                        "end": {
-                          "column": 7,
-                          "line": 2,
-                          "offset": 7,
-                        },
-                        "start": {
-                          "column": 2,
-                          "line": 2,
-                          "offset": 2,
-                        },
-                      },
-                      "type": "text",
-                      "value": "link1",
-                    },
-                  ],
-                  "position": {
-                    "end": {
-                      "column": 19,
-                      "line": 2,
-                      "offset": 19,
-                    },
-                    "start": {
-                      "column": 1,
-                      "line": 2,
-                      "offset": 1,
-                    },
-                  },
-                  "title": "fixed link title",
-                  "type": "link",
-                  "url": "/recovered-link",
-                },
-                "sourceFilePath": "packages/docusaurus-mdx-loader/src/remark/resolveMarkdownLinks/__tests__/docs/myFile.mdx",
-                "url": "link1.mdx",
-              },
-            ],
-            [
-              "onBrokenMarkdownLinks called with",
-              {
-                "node": {
-                  "children": [
-                    {
-                      "position": {
-                        "end": {
-                          "column": 7,
-                          "line": 6,
-                          "offset": 43,
-                        },
-                        "start": {
-                          "column": 2,
-                          "line": 6,
-                          "offset": 38,
-                        },
-                      },
-                      "type": "text",
-                      "value": "link3",
-                    },
-                  ],
-                  "position": {
-                    "end": {
-                      "column": 33,
-                      "line": 6,
-                      "offset": 69,
-                    },
-                    "start": {
-                      "column": 1,
-                      "line": 6,
-                      "offset": 37,
-                    },
-                  },
-                  "title": "fixed link title",
-                  "type": "link",
-                  "url": "/recovered-link",
-                },
-                "sourceFilePath": "packages/docusaurus-mdx-loader/src/remark/resolveMarkdownLinks/__tests__/docs/myFile.mdx",
-                "url": "dir/link3.md?query#hash",
-              },
-            ],
-          ]
-        `);
-      });
-    });
-  });
 });

packages/docusaurus-mdx-loader/src/remark/resolveMarkdownLinks/index.ts

@@ -8,18 +8,11 @@
 import {
   parseLocalURLPath,
   serializeURLPath,
-  toMessageRelativeFilePath,
   type URLPath,
 } from '@docusaurus/utils';
-import logger from '@docusaurus/logger';
 
-import {formatNodePositionExtraMessage} from '../utils';
 import type {Plugin, Transformer} from 'unified';
 import type {Definition, Link, Root} from 'mdast';
-import type {
-  MarkdownConfig,
-  OnBrokenMarkdownLinksFunction,
-} from '@docusaurus/types';
 
 type ResolveMarkdownLinkParams = {
   /**
@@ -39,33 +32,6 @@ export type ResolveMarkdownLink = (
 
 export interface PluginOptions {
   resolveMarkdownLink: ResolveMarkdownLink;
-  onBrokenMarkdownLinks: MarkdownConfig['hooks']['onBrokenMarkdownLinks'];
-}
-
-function asFunction(
-  onBrokenMarkdownLinks: PluginOptions['onBrokenMarkdownLinks'],
-): OnBrokenMarkdownLinksFunction {
-  if (typeof onBrokenMarkdownLinks === 'string') {
-    const extraHelp =
-      onBrokenMarkdownLinks === 'throw'
-        ? logger.interpolate`\nTo ignore this error, use the code=${'siteConfig.markdown.hooks.onBrokenMarkdownLinks'} option, or apply the code=${'pathname://'} protocol to the broken link URLs.`
-        : '';
-    return ({sourceFilePath, url: linkUrl, node}) => {
-      const relativePath = toMessageRelativeFilePath(sourceFilePath);
-      logger.report(
-        onBrokenMarkdownLinks,
-      )`Markdown link with URL code=${linkUrl} in source file path=${relativePath}${formatNodePositionExtraMessage(
-        node,
-      )} couldn't be resolved.
-Make sure it references a local Markdown file that exists within the current plugin.${extraHelp}`;
-    };
-  } else {
-    return (params) =>
-      onBrokenMarkdownLinks({
-        ...params,
-        sourceFilePath: toMessageRelativeFilePath(params.sourceFilePath),
-      });
-  }
 }
 
 const HAS_MARKDOWN_EXTENSION = /\.mdx?$/i;
@@ -91,15 +57,10 @@ function parseMarkdownLinkURLPath(link: string): URLPath | null {
  * This is exposed as "data.contentTitle" to the processed vfile
  * Also gives the ability to strip that content title (used for the blog plugin)
  */
-// TODO merge this plugin with "transformLinks"
-//  in general we'd want to avoid traversing multiple times the same AST
 const plugin: Plugin<PluginOptions[], Root> = function plugin(
   options,
 ): Transformer<Root> {
   const {resolveMarkdownLink} = options;
-
-  const onBrokenMarkdownLinks = asFunction(options.onBrokenMarkdownLinks);
-
   return async (root, file) => {
     const {visit} = await import('unist-util-visit');
 
@@ -110,26 +71,18 @@ const plugin: Plugin<PluginOptions[], Root> = function plugin(
         return;
       }
 
-      const sourceFilePath = file.path;
-
       const permalink = resolveMarkdownLink({
-        sourceFilePath,
+        sourceFilePath: file.path,
         linkPathname: linkURLPath.pathname,
       });
 
       if (permalink) {
         // This reapplies the link ?qs#hash part to the resolved pathname
-        link.url = serializeURLPath({
+        const resolvedUrl = serializeURLPath({
           ...linkURLPath,
           pathname: permalink,
         });
-      } else {
-        link.url =
-          onBrokenMarkdownLinks({
-            url: link.url,
-            sourceFilePath,
-            node: link,
-          }) ?? link.url;
+        link.url = resolvedUrl;
       }
     });
   };

packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/fail.md

@@ -0,0 +1 @@
+![img](/img/doesNotExist.png)

packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/fail2.md

@@ -0,0 +1 @@
+![img](./notFound.png)

packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/invalid-img.md

@@ -0,0 +1 @@
+![invalid image](/invalid.png)

packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/noUrl.md

@@ -0,0 +1 @@
+![img]()

packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/pathname.md

@@ -0,0 +1 @@
+![img](pathname:///img/unchecked.png)

packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__snapshots__/index.test.ts.snap

@@ -1,10 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`transformImage plugin does not choke on invalid image 1`] = `
-"<img alt="invalid image" src={require("!<PROJECT_ROOT>/node_modules/url-loader/dist/cjs.js?limit=10000&name=assets/images/[name]-[contenthash].[ext]&fallback=<PROJECT_ROOT>/node_modules/file-loader/dist/cjs.js!./../static/invalid.png").default} />
+"<img alt="invalid image" src={require("!<PROJECT_ROOT>/node_modules/url-loader/dist/cjs.js?limit=10000&name=assets/images/[name]-[contenthash].[ext]&fallback=<PROJECT_ROOT>/node_modules/file-loader/dist/cjs.js!./static/invalid.png").default} />
 "
 `;
 
+exports[`transformImage plugin fail if image does not exist 1`] = `"Image packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/static/img/doesNotExist.png or packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/static2/img/doesNotExist.png used in packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/fail.md not found."`;
+
+exports[`transformImage plugin fail if image relative path does not exist 1`] = `"Image packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/notFound.png used in packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/fail2.md not found."`;
+
+exports[`transformImage plugin fail if image url is absent 1`] = `"Markdown image URL is mandatory in "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/noUrl.md" file"`;
+
 exports[`transformImage plugin pathname protocol 1`] = `
 "![img](/img/unchecked.png)
 "

packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/index.test.ts

@@ -6,361 +6,65 @@
  */
 
 import {jest} from '@jest/globals';
-import * as path from 'path';
+import path from 'path';
 import vfile from 'to-vfile';
 import plugin, {type PluginOptions} from '../index';
 
-const siteDir = path.join(__dirname, '__fixtures__');
+const processFixture = async (
+  name: string,
+  options: Partial<PluginOptions>,
+) => {
+  const {remark} = await import('remark');
+  const {default: mdx} = await import('remark-mdx');
+  const filePath = path.join(__dirname, `__fixtures__/${name}.md`);
+  const file = await vfile.read(filePath);
+
+  const result = await remark()
+    .use(mdx)
+    .use(plugin, {siteDir: __dirname, staticDirs: [], ...options})
+    .process(file);
+
+  return result.value;
+};
 
 const staticDirs = [
   path.join(__dirname, '__fixtures__/static'),
   path.join(__dirname, '__fixtures__/static2'),
 ];
 
-const getProcessor = async (options?: Partial<PluginOptions>) => {
-  const {remark} = await import('remark');
-  const {default: mdx} = await import('remark-mdx');
-  return remark()
-    .use(mdx)
-    .use(plugin, {
-      siteDir,
-      staticDirs,
-      onBrokenMarkdownImages: 'throw',
-      ...options,
-    });
-};
-
-const processFixture = async (
-  name: string,
-  options?: Partial<PluginOptions>,
-) => {
-  const filePath = path.join(__dirname, `__fixtures__/${name}.md`);
-  const file = await vfile.read(filePath);
-  const processor = await getProcessor(options);
-  const result = await processor.process(file);
-  return result.value;
-};
-
-const processContent = async (
-  content: string,
-  options?: Partial<PluginOptions>,
-) => {
-  const processor = await getProcessor(options);
-  const result = await processor.process({
-    value: content,
-    path: path.posix.join(siteDir, 'docs', 'myFile.mdx'),
-  });
-  return result.value.toString();
-};
+const siteDir = path.join(__dirname, '__fixtures__');
 
 describe('transformImage plugin', () => {
+  it('fail if image does not exist', async () => {
+    await expect(
+      processFixture('fail', {staticDirs}),
+    ).rejects.toThrowErrorMatchingSnapshot();
+  });
+  it('fail if image relative path does not exist', async () => {
+    await expect(
+      processFixture('fail2', {staticDirs}),
+    ).rejects.toThrowErrorMatchingSnapshot();
+  });
+  it('fail if image url is absent', async () => {
+    await expect(
+      processFixture('noUrl', {staticDirs}),
+    ).rejects.toThrowErrorMatchingSnapshot();
+  });
+
   it('transform md images to <img />', async () => {
-    // TODO split that large fixture into many smaller test cases?
-    const result = await processFixture('img');
+    const result = await processFixture('img', {staticDirs, siteDir});
     expect(result).toMatchSnapshot();
   });
 
   it('pathname protocol', async () => {
-    const result = await processContent(
-      `![img](pathname:///img/unchecked.png)`,
-    );
+    const result = await processFixture('pathname', {staticDirs});
     expect(result).toMatchSnapshot();
   });
 
   it('does not choke on invalid image', async () => {
     const errorMock = jest.spyOn(console, 'warn').mockImplementation(() => {});
-    const result = await processContent(`![invalid image](/invalid.png)`);
+    const result = await processFixture('invalid-img', {staticDirs});
     expect(result).toMatchSnapshot();
     expect(errorMock).toHaveBeenCalledTimes(1);
   });
-
-  describe('onBrokenMarkdownImages', () => {
-    const fixtures = {
-      doesNotExistAbsolute: `![img](/img/doesNotExist.png)`,
-      doesNotExistRelative: `![img](./doesNotExist.png)`,
-      doesNotExistSiteAlias: `![img](@site/doesNotExist.png)`,
-      urlEmpty: `![img]()`,
-    };
-
-    describe('throws', () => {
-      it('if image absolute path does not exist', async () => {
-        await expect(processContent(fixtures.doesNotExistAbsolute)).rejects
-          .toThrowErrorMatchingInlineSnapshot(`
-          "Markdown image with URL \`/img/doesNotExist.png\` in source file "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx" (1:1) couldn't be resolved to an existing local image file.
-          To ignore this error, use the \`siteConfig.markdown.hooks.onBrokenMarkdownImages\` option, or apply the \`pathname://\` protocol to the broken image URLs."
-        `);
-      });
-
-      it('if image relative path does not exist', async () => {
-        await expect(processContent(fixtures.doesNotExistRelative)).rejects
-          .toThrowErrorMatchingInlineSnapshot(`
-          "Markdown image with URL \`./doesNotExist.png\` in source file "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx" (1:1) couldn't be resolved to an existing local image file.
-          To ignore this error, use the \`siteConfig.markdown.hooks.onBrokenMarkdownImages\` option, or apply the \`pathname://\` protocol to the broken image URLs."
-        `);
-      });
-
-      it('if image @site path does not exist', async () => {
-        await expect(processContent(fixtures.doesNotExistSiteAlias)).rejects
-          .toThrowErrorMatchingInlineSnapshot(`
-          "Markdown image with URL \`@site/doesNotExist.png\` in source file "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx" (1:1) couldn't be resolved to an existing local image file.
-          To ignore this error, use the \`siteConfig.markdown.hooks.onBrokenMarkdownImages\` option, or apply the \`pathname://\` protocol to the broken image URLs."
-        `);
-      });
-
-      it('if image url empty', async () => {
-        await expect(processContent(fixtures.urlEmpty)).rejects
-          .toThrowErrorMatchingInlineSnapshot(`
-          "Markdown image with empty URL found in source file "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx" (1:1).
-          To ignore this error, use the \`siteConfig.markdown.hooks.onBrokenMarkdownImages\` option, or apply the \`pathname://\` protocol to the broken image URLs."
-        `);
-      });
-    });
-
-    describe('warns', () => {
-      function processWarn(content: string) {
-        return processContent(content, {onBrokenMarkdownImages: 'warn'});
-      }
-
-      const warnMock = jest.spyOn(console, 'warn').mockImplementation(() => {});
-      beforeEach(() => {
-        warnMock.mockClear();
-      });
-
-      it('if image absolute path does not exist', async () => {
-        const result = await processWarn(fixtures.doesNotExistAbsolute);
-        expect(result).toMatchInlineSnapshot(`
-          "![img](/img/doesNotExist.png)
-          "
-        `);
-        expect(warnMock).toHaveBeenCalledTimes(1);
-        expect(warnMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "[WARNING] Markdown image with URL \`/img/doesNotExist.png\` in source file "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx" (1:1) couldn't be resolved to an existing local image file.",
-            ],
-          ]
-        `);
-      });
-
-      it('if image relative path does not exist', async () => {
-        const result = await processWarn(fixtures.doesNotExistRelative);
-        expect(result).toMatchInlineSnapshot(`
-          "![img](./doesNotExist.png)
-          "
-        `);
-        expect(warnMock).toHaveBeenCalledTimes(1);
-        expect(warnMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "[WARNING] Markdown image with URL \`./doesNotExist.png\` in source file "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx" (1:1) couldn't be resolved to an existing local image file.",
-            ],
-          ]
-        `);
-      });
-
-      it('if image @site path does not exist', async () => {
-        const result = await processWarn(fixtures.doesNotExistSiteAlias);
-        expect(result).toMatchInlineSnapshot(`
-          "![img](@site/doesNotExist.png)
-          "
-        `);
-        expect(warnMock).toHaveBeenCalledTimes(1);
-        expect(warnMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "[WARNING] Markdown image with URL \`@site/doesNotExist.png\` in source file "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx" (1:1) couldn't be resolved to an existing local image file.",
-            ],
-          ]
-        `);
-      });
-
-      it('if image url empty', async () => {
-        const result = await processWarn(fixtures.urlEmpty);
-        expect(result).toMatchInlineSnapshot(`
-          "![img]()
-          "
-        `);
-        expect(warnMock).toHaveBeenCalledTimes(1);
-        expect(warnMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "[WARNING] Markdown image with empty URL found in source file "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx" (1:1).",
-            ],
-          ]
-        `);
-      });
-    });
-
-    describe('function form', () => {
-      function processWarn(content: string) {
-        return processContent(content, {
-          onBrokenMarkdownImages: (params) => {
-            console.log('onBrokenMarkdownImages called for ', params);
-            // We can alter the AST Node
-            params.node.alt = 'new 404 alt';
-            params.node.url = 'ignored, less important than returned value';
-            // Or return a new URL
-            return '/404.png';
-          },
-        });
-      }
-
-      const logMock = jest.spyOn(console, 'log').mockImplementation(() => {});
-      beforeEach(() => {
-        logMock.mockClear();
-      });
-
-      it('if image absolute path does not exist', async () => {
-        const result = await processWarn(fixtures.doesNotExistAbsolute);
-        expect(result).toMatchInlineSnapshot(`
-          "![new 404 alt](/404.png)
-          "
-        `);
-        expect(logMock).toHaveBeenCalledTimes(1);
-        expect(logMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "onBrokenMarkdownImages called for ",
-              {
-                "node": {
-                  "alt": "new 404 alt",
-                  "position": {
-                    "end": {
-                      "column": 30,
-                      "line": 1,
-                      "offset": 29,
-                    },
-                    "start": {
-                      "column": 1,
-                      "line": 1,
-                      "offset": 0,
-                    },
-                  },
-                  "title": null,
-                  "type": "image",
-                  "url": "/404.png",
-                },
-                "sourceFilePath": "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx",
-                "url": "/img/doesNotExist.png",
-              },
-            ],
-          ]
-        `);
-      });
-
-      it('if image relative path does not exist', async () => {
-        const result = await processWarn(fixtures.doesNotExistRelative);
-        expect(result).toMatchInlineSnapshot(`
-          "![new 404 alt](/404.png)
-          "
-        `);
-        expect(logMock).toHaveBeenCalledTimes(1);
-        expect(logMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "onBrokenMarkdownImages called for ",
-              {
-                "node": {
-                  "alt": "new 404 alt",
-                  "position": {
-                    "end": {
-                      "column": 27,
-                      "line": 1,
-                      "offset": 26,
-                    },
-                    "start": {
-                      "column": 1,
-                      "line": 1,
-                      "offset": 0,
-                    },
-                  },
-                  "title": null,
-                  "type": "image",
-                  "url": "/404.png",
-                },
-                "sourceFilePath": "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx",
-                "url": "./doesNotExist.png",
-              },
-            ],
-          ]
-        `);
-      });
-
-      it('if image @site path does not exist', async () => {
-        const result = await processWarn(fixtures.doesNotExistSiteAlias);
-        expect(result).toMatchInlineSnapshot(`
-          "![new 404 alt](/404.png)
-          "
-        `);
-        expect(logMock).toHaveBeenCalledTimes(1);
-        expect(logMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "onBrokenMarkdownImages called for ",
-              {
-                "node": {
-                  "alt": "new 404 alt",
-                  "position": {
-                    "end": {
-                      "column": 31,
-                      "line": 1,
-                      "offset": 30,
-                    },
-                    "start": {
-                      "column": 1,
-                      "line": 1,
-                      "offset": 0,
-                    },
-                  },
-                  "title": null,
-                  "type": "image",
-                  "url": "/404.png",
-                },
-                "sourceFilePath": "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx",
-                "url": "@site/doesNotExist.png",
-              },
-            ],
-          ]
-        `);
-      });
-
-      it('if image url empty', async () => {
-        const result = await processWarn(fixtures.urlEmpty);
-        expect(result).toMatchInlineSnapshot(`
-          "![new 404 alt](/404.png)
-          "
-        `);
-        expect(logMock).toHaveBeenCalledTimes(1);
-        expect(logMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "onBrokenMarkdownImages called for ",
-              {
-                "node": {
-                  "alt": "new 404 alt",
-                  "position": {
-                    "end": {
-                      "column": 9,
-                      "line": 1,
-                      "offset": 8,
-                    },
-                    "start": {
-                      "column": 1,
-                      "line": 1,
-                      "offset": 0,
-                    },
-                  },
-                  "title": null,
-                  "type": "image",
-                  "url": "/404.png",
-                },
-                "sourceFilePath": "packages/docusaurus-mdx-loader/src/remark/transformImage/__tests__/__fixtures__/docs/myFile.mdx",
-                "url": "",
-              },
-            ],
-          ]
-        `);
-      });
-    });
-  });
 });

packages/docusaurus-mdx-loader/src/remark/transformImage/index.ts

@@ -6,6 +6,7 @@
  */
 
 import path from 'path';
+import url from 'url';
 import fs from 'fs-extra';
 import {
   toMessageRelativeFilePath,
@@ -14,72 +15,26 @@ import {
   findAsyncSequential,
   getFileLoaderUtils,
   parseURLOrPath,
-  parseLocalURLPath,
 } from '@docusaurus/utils';
 import escapeHtml from 'escape-html';
 import {imageSizeFromFile} from 'image-size/fromFile';
 import logger from '@docusaurus/logger';
-import {
-  assetRequireAttributeValue,
-  formatNodePositionExtraMessage,
-  transformNode,
-} from '../utils';
+import {assetRequireAttributeValue, transformNode} from '../utils';
 import type {Plugin, Transformer} from 'unified';
 import type {MdxJsxTextElement} from 'mdast-util-mdx';
 import type {Image, Root} from 'mdast';
 import type {Parent} from 'unist';
-import type {
-  MarkdownConfig,
-  OnBrokenMarkdownImagesFunction,
-} from '@docusaurus/types';
 
-export type PluginOptions = {
+type PluginOptions = {
   staticDirs: string[];
   siteDir: string;
-  onBrokenMarkdownImages: MarkdownConfig['hooks']['onBrokenMarkdownImages'];
 };
 
-type Context = {
-  staticDirs: PluginOptions['staticDirs'];
-  siteDir: PluginOptions['siteDir'];
-  onBrokenMarkdownImages: OnBrokenMarkdownImagesFunction;
+type Context = PluginOptions & {
   filePath: string;
   inlineMarkdownImageFileLoader: string;
 };
 
-function asFunction(
-  onBrokenMarkdownImages: PluginOptions['onBrokenMarkdownImages'],
-): OnBrokenMarkdownImagesFunction {
-  if (typeof onBrokenMarkdownImages === 'string') {
-    const extraHelp =
-      onBrokenMarkdownImages === 'throw'
-        ? logger.interpolate`\nTo ignore this error, use the code=${'siteConfig.markdown.hooks.onBrokenMarkdownImages'} option, or apply the code=${'pathname://'} protocol to the broken image URLs.`
-        : '';
-    return ({sourceFilePath, url: imageUrl, node}) => {
-      const relativePath = toMessageRelativeFilePath(sourceFilePath);
-      if (imageUrl) {
-        logger.report(
-          onBrokenMarkdownImages,
-        )`Markdown image with URL code=${imageUrl} in source file path=${relativePath}${formatNodePositionExtraMessage(
-          node,
-        )} couldn't be resolved to an existing local image file.${extraHelp}`;
-      } else {
-        logger.report(
-          onBrokenMarkdownImages,
-        )`Markdown image with empty URL found in source file path=${relativePath}${formatNodePositionExtraMessage(
-          node,
-        )}.${extraHelp}`;
-      }
-    };
-  } else {
-    return (params) =>
-      onBrokenMarkdownImages({
-        ...params,
-        sourceFilePath: toMessageRelativeFilePath(params.sourceFilePath),
-      });
-  }
-}
-
 type Target = [node: Image, index: number, parent: Parent];
 
 async function toImageRequireNode(
@@ -96,7 +51,7 @@ async function toImageRequireNode(
   );
   relativeImagePath = `./${relativeImagePath}`;
 
-  const parsedUrl = parseURLOrPath(node.url);
+  const parsedUrl = parseURLOrPath(node.url, 'https://example.com');
   const hash = parsedUrl.hash ?? '';
   const search = parsedUrl.search ?? '';
   const requireString = `${context.inlineMarkdownImageFileLoader}${
@@ -158,60 +113,64 @@ ${(err as Error).message}`;
   });
 }
 
-async function getLocalImageAbsolutePath(
-  originalImagePath: string,
+async function ensureImageFileExist(imagePath: string, sourceFilePath: string) {
+  const imageExists = await fs.pathExists(imagePath);
+  if (!imageExists) {
+    throw new Error(
+      `Image ${toMessageRelativeFilePath(
+        imagePath,
+      )} used in ${toMessageRelativeFilePath(sourceFilePath)} not found.`,
+    );
+  }
+}
+
+async function getImageAbsolutePath(
+  imagePath: string,
   {siteDir, filePath, staticDirs}: Context,
 ) {
-  if (originalImagePath.startsWith('@site/')) {
-    const imageFilePath = path.join(
-      siteDir,
-      originalImagePath.replace('@site/', ''),
-    );
-    if (!(await fs.pathExists(imageFilePath))) {
-      return null;
-    }
+  if (imagePath.startsWith('@site/')) {
+    const imageFilePath = path.join(siteDir, imagePath.replace('@site/', ''));
+    await ensureImageFileExist(imageFilePath, filePath);
     return imageFilePath;
-  } else if (path.isAbsolute(originalImagePath)) {
+  } else if (path.isAbsolute(imagePath)) {
     // Absolute paths are expected to exist in the static folder.
-    const possiblePaths = staticDirs.map((dir) =>
-      path.join(dir, originalImagePath),
-    );
+    const possiblePaths = staticDirs.map((dir) => path.join(dir, imagePath));
     const imageFilePath = await findAsyncSequential(
       possiblePaths,
       fs.pathExists,
     );
     if (!imageFilePath) {
-      return null;
-    }
-    return imageFilePath;
-  } else {
-    // relative paths are resolved against the source file's folder
-    const imageFilePath = path.join(path.dirname(filePath), originalImagePath);
-    if (!(await fs.pathExists(imageFilePath))) {
-      return null;
+      throw new Error(
+        `Image ${possiblePaths
+          .map((p) => toMessageRelativeFilePath(p))
+          .join(' or ')} used in ${toMessageRelativeFilePath(
+          filePath,
+        )} not found.`,
+      );
     }
     return imageFilePath;
   }
+  // relative paths are resolved against the source file's folder
+  const imageFilePath = path.join(path.dirname(filePath), imagePath);
+  await ensureImageFileExist(imageFilePath, filePath);
+  return imageFilePath;
 }
 
 async function processImageNode(target: Target, context: Context) {
   const [node] = target;
-
   if (!node.url) {
-    node.url =
-      context.onBrokenMarkdownImages({
-        url: node.url,
-        sourceFilePath: context.filePath,
-        node,
-      }) ?? node.url;
-    return;
+    throw new Error(
+      `Markdown image URL is mandatory in "${toMessageRelativeFilePath(
+        context.filePath,
+      )}" file`,
+    );
   }
 
-  const localUrlPath = parseLocalURLPath(node.url);
-  if (!localUrlPath) {
-    // pathname:// is an escape hatch, in case the user does not want images to
+  const parsedUrl = url.parse(node.url);
+  if (parsedUrl.protocol || !parsedUrl.pathname) {
+    // pathname:// is an escape hatch, in case user does not want her images to
     // be converted to require calls going through webpack loader
-    if (parseURLOrPath(node.url).protocol === 'pathname:') {
+    if (parsedUrl.protocol === 'pathname:') {
       node.url = node.url.replace('pathname://', '');
     }
     return;
@@ -220,31 +179,17 @@ async function processImageNode(target: Target, context: Context) {
   // We decode it first because Node Url.pathname is always encoded
   // while the image file-system path are not.
   // See https://github.com/facebook/docusaurus/discussions/10720
-  const decodedPathname = decodeURIComponent(localUrlPath.pathname);
+  const decodedPathname = decodeURIComponent(parsedUrl.pathname);
 
   // We try to convert image urls without protocol to images with require calls
   // going through webpack ensures that image assets exist at build time
-  const localImagePath = await getLocalImageAbsolutePath(
-    decodedPathname,
-    context,
-  );
-  if (localImagePath === null) {
-    node.url =
-      context.onBrokenMarkdownImages({
-        url: node.url,
-        sourceFilePath: context.filePath,
-        node,
-      }) ?? node.url;
-  } else {
-    await toImageRequireNode(target, localImagePath, context);
-  }
+  const imagePath = await getImageAbsolutePath(decodedPathname, context);
+  await toImageRequireNode(target, imagePath, context);
 }
 
 const plugin: Plugin<PluginOptions[], Root> = function plugin(
   options,
 ): Transformer<Root> {
-  const onBrokenMarkdownImages = asFunction(options.onBrokenMarkdownImages);
-
   return async (root, vfile) => {
     const {visit} = await import('unist-util-visit');
 
@@ -256,7 +201,6 @@ const plugin: Plugin<PluginOptions[], Root> = function plugin(
       filePath: vfile.path!,
       inlineMarkdownImageFileLoader:
         fileLoaderUtils.loaders.inlineMarkdownImageFileLoader,
-      onBrokenMarkdownImages,
     };
 
     const promises: Promise<void>[] = [];

packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/noUrl.md

@@ -0,0 +1 @@
+[asset]()

packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/nonexistentSiteAlias.md

@@ -0,0 +1 @@
+[nonexistent](@site/foo.pdf)

packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/pathname.md

@@ -0,0 +1 @@
+[asset](pathname:///asset/unchecked.pdf)

packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__snapshots__/index.test.ts.snap

@@ -1,6 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`transformLinks plugin transform md links to <a /> 1`] = `
+exports[`transformAsset plugin fail if asset url is absent 1`] = `"Markdown link URL is mandatory in "packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/noUrl.md" file (title: asset, line: 1)."`;
+
+exports[`transformAsset plugin fail if asset with site alias does not exist 1`] = `"Asset packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/foo.pdf used in packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/nonexistentSiteAlias.md not found."`;
+
+exports[`transformAsset plugin pathname protocol 1`] = `
+"[asset](pathname:///asset/unchecked.pdf)
+"
+`;
+
+exports[`transformAsset plugin transform md links to <a /> 1`] = `
 "[asset](https://example.com/asset.pdf)
 
 <a target="_blank" data-noBrokenLinkCheck={true} href={require("!<PROJECT_ROOT>/node_modules/file-loader/dist/cjs.js?name=assets/files/[name]-[contenthash].[ext]!./asset.pdf").default} />
@@ -45,5 +54,6 @@ in paragraph <a target="_blank" data-noBrokenLinkCheck={true} href={require("!<P
 
 <a target="_blank" data-noBrokenLinkCheck={true} href={require("./data.raw!=!<PROJECT_ROOT>/node_modules/file-loader/dist/cjs.js?name=assets/files/[name]-[contenthash].[ext]!./data.json").default}>JSON</a>
 
-<a target="_blank" data-noBrokenLinkCheck={true} href={require("./static/static-json.raw!=!<PROJECT_ROOT>/node_modules/file-loader/dist/cjs.js?name=assets/files/[name]-[contenthash].[ext]!./static/static-json.json").default}>static JSON</a>"
+<a target="_blank" data-noBrokenLinkCheck={true} href={require("./static/static-json.raw!=!<PROJECT_ROOT>/node_modules/file-loader/dist/cjs.js?name=assets/files/[name]-[contenthash].[ext]!./static/static-json.json").default}>static JSON</a>
+"
 `;

packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/index.test.ts

@@ -5,270 +5,53 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {jest} from '@jest/globals';
-import * as path from 'path';
+import path from 'path';
 import vfile from 'to-vfile';
-import plugin, {type PluginOptions} from '..';
-import transformImage from '../../transformImage';
+import plugin from '..';
+import transformImage, {type PluginOptions} from '../../transformImage';
 
-const siteDir = path.join(__dirname, `__fixtures__`);
-
-const staticDirs = [
-  path.join(siteDir, 'static'),
-  path.join(siteDir, 'static2'),
-];
-
-const getProcessor = async (options?: Partial<PluginOptions>) => {
+const processFixture = async (name: string, options?: PluginOptions) => {
   const {remark} = await import('remark');
   const {default: mdx} = await import('remark-mdx');
-  return remark()
-    .use(mdx)
-    .use(transformImage, {
-      siteDir,
-      staticDirs,
-      onBrokenMarkdownImages: 'throw',
-    })
-    .use(plugin, {
-      staticDirs,
-      siteDir,
-      onBrokenMarkdownLinks: 'throw',
-      ...options,
-    });
-};
-
-const processFixture = async (
-  name: string,
-  options?: Partial<PluginOptions>,
-) => {
-  const processor = await getProcessor(options);
+  const siteDir = path.join(__dirname, `__fixtures__`);
+  const staticDirs = [
+    path.join(siteDir, 'static'),
+    path.join(siteDir, 'static2'),
+  ];
   const file = await vfile.read(path.join(siteDir, `${name}.md`));
-  const result = await processor.process(file);
-  return result.value.toString().trim();
+  const result = await remark()
+    .use(mdx)
+    .use(transformImage, {...options, siteDir, staticDirs})
+    .use(plugin, {
+      ...options,
+      staticDirs,
+      siteDir: path.join(__dirname, '__fixtures__'),
+    })
+    .process(file);
+
+  return result.value;
 };
 
-const processContent = async (
-  content: string,
-  options?: Partial<PluginOptions>,
-) => {
-  const processor = await getProcessor(options);
-  const result = await processor.process({
-    value: content,
-    path: path.posix.join(siteDir, 'docs', 'myFile.mdx'),
+describe('transformAsset plugin', () => {
+  it('fail if asset url is absent', async () => {
+    await expect(
+      processFixture('noUrl'),
+    ).rejects.toThrowErrorMatchingSnapshot();
+  });
+
+  it('fail if asset with site alias does not exist', async () => {
+    await expect(
+      processFixture('nonexistentSiteAlias'),
+    ).rejects.toThrowErrorMatchingSnapshot();
   });
-  return result.value.toString().trim();
-};
 
-describe('transformLinks plugin', () => {
   it('transform md links to <a />', async () => {
-    // TODO split fixture in many smaller test cases
     const result = await processFixture('asset');
     expect(result).toMatchSnapshot();
   });
 
   it('pathname protocol', async () => {
-    const result = await processContent(`pathname:///unchecked.pdf)`);
-    expect(result).toMatchInlineSnapshot(`"pathname:///unchecked.pdf)"`);
-  });
-
-  it('accepts absolute file that does not exist', async () => {
-    const result = await processContent(`[file](/dir/file.zip)`);
-    expect(result).toMatchInlineSnapshot(`"[file](/dir/file.zip)"`);
-  });
-
-  it('accepts relative file that does not exist', async () => {
-    const result = await processContent(`[file](dir/file.zip)`);
-    expect(result).toMatchInlineSnapshot(`"[file](dir/file.zip)"`);
-  });
-
-  describe('onBrokenMarkdownLinks', () => {
-    const fixtures = {
-      urlEmpty: `[empty]()`,
-      fileDoesNotExistSiteAlias: `[file](@site/file.zip)`,
-    };
-
-    describe('throws', () => {
-      it('if url is empty', async () => {
-        await expect(processContent(fixtures.urlEmpty)).rejects
-          .toThrowErrorMatchingInlineSnapshot(`
-          "Markdown link with empty URL found in source file "packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/docs/myFile.mdx" (1:1).
-          To ignore this error, use the \`siteConfig.markdown.hooks.onBrokenMarkdownLinks\` option, or apply the \`pathname://\` protocol to the broken link URLs."
-        `);
-      });
-
-      it('if file with site alias does not exist', async () => {
-        await expect(processContent(fixtures.fileDoesNotExistSiteAlias)).rejects
-          .toThrowErrorMatchingInlineSnapshot(`
-          "Markdown link with URL \`@site/file.zip\` in source file "packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/docs/myFile.mdx" (1:1) couldn't be resolved.
-          Make sure it references a local Markdown file that exists within the current plugin.
-          To ignore this error, use the \`siteConfig.markdown.hooks.onBrokenMarkdownLinks\` option, or apply the \`pathname://\` protocol to the broken link URLs."
-        `);
-      });
-    });
-
-    describe('warns', () => {
-      function processWarn(content: string) {
-        return processContent(content, {onBrokenMarkdownLinks: 'warn'});
-      }
-
-      const warnMock = jest.spyOn(console, 'warn').mockImplementation(() => {});
-      beforeEach(() => {
-        warnMock.mockClear();
-      });
-
-      it('if url is empty', async () => {
-        const result = await processWarn(fixtures.urlEmpty);
-        expect(result).toMatchInlineSnapshot(`"[empty]()"`);
-        expect(warnMock).toHaveBeenCalledTimes(1);
-        expect(warnMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "[WARNING] Markdown link with empty URL found in source file "packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/docs/myFile.mdx" (1:1).",
-            ],
-          ]
-        `);
-      });
-
-      it('if file with site alias does not exist', async () => {
-        const result = await processWarn(fixtures.fileDoesNotExistSiteAlias);
-        expect(result).toMatchInlineSnapshot(`"[file](@site/file.zip)"`);
-        expect(warnMock).toHaveBeenCalledTimes(1);
-        expect(warnMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "[WARNING] Markdown link with URL \`@site/file.zip\` in source file "packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/docs/myFile.mdx" (1:1) couldn't be resolved.
-          Make sure it references a local Markdown file that exists within the current plugin.",
-            ],
-          ]
-        `);
-      });
-    });
-
-    describe('function form', () => {
-      function processWarn(content: string) {
-        return processContent(content, {
-          onBrokenMarkdownLinks: (params) => {
-            console.log('onBrokenMarkdownLinks called with', params);
-            // We can alter the AST Node
-            params.node.title = 'fixed link title';
-            params.node.url = 'ignored, less important than returned value';
-            // Or return a new URL
-            return '/404';
-          },
-        });
-      }
-
-      const logMock = jest.spyOn(console, 'log').mockImplementation(() => {});
-      beforeEach(() => {
-        logMock.mockClear();
-      });
-
-      it('if url is empty', async () => {
-        const result = await processWarn(fixtures.urlEmpty);
-        expect(result).toMatchInlineSnapshot(
-          `"[empty](/404 "fixed link title")"`,
-        );
-        expect(logMock).toHaveBeenCalledTimes(1);
-        expect(logMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "onBrokenMarkdownLinks called with",
-              {
-                "node": {
-                  "children": [
-                    {
-                      "position": {
-                        "end": {
-                          "column": 7,
-                          "line": 1,
-                          "offset": 6,
-                        },
-                        "start": {
-                          "column": 2,
-                          "line": 1,
-                          "offset": 1,
-                        },
-                      },
-                      "type": "text",
-                      "value": "empty",
-                    },
-                  ],
-                  "position": {
-                    "end": {
-                      "column": 10,
-                      "line": 1,
-                      "offset": 9,
-                    },
-                    "start": {
-                      "column": 1,
-                      "line": 1,
-                      "offset": 0,
-                    },
-                  },
-                  "title": "fixed link title",
-                  "type": "link",
-                  "url": "/404",
-                },
-                "sourceFilePath": "packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/docs/myFile.mdx",
-                "url": "",
-              },
-            ],
-          ]
-        `);
-      });
-
-      it('if file with site alias does not exist', async () => {
-        const result = await processWarn(fixtures.fileDoesNotExistSiteAlias);
-        expect(result).toMatchInlineSnapshot(
-          `"[file](/404 "fixed link title")"`,
-        );
-        expect(logMock).toHaveBeenCalledTimes(1);
-        expect(logMock.mock.calls).toMatchInlineSnapshot(`
-          [
-            [
-              "onBrokenMarkdownLinks called with",
-              {
-                "node": {
-                  "children": [
-                    {
-                      "position": {
-                        "end": {
-                          "column": 6,
-                          "line": 1,
-                          "offset": 5,
-                        },
-                        "start": {
-                          "column": 2,
-                          "line": 1,
-                          "offset": 1,
-                        },
-                      },
-                      "type": "text",
-                      "value": "file",
-                    },
-                  ],
-                  "position": {
-                    "end": {
-                      "column": 23,
-                      "line": 1,
-                      "offset": 22,
-                    },
-                    "start": {
-                      "column": 1,
-                      "line": 1,
-                      "offset": 0,
-                    },
-                  },
-                  "title": "fixed link title",
-                  "type": "link",
-                  "url": "/404",
-                },
-                "sourceFilePath": "packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/__fixtures__/docs/myFile.mdx",
-                "url": "@site/file.zip",
-              },
-            ],
-          ]
-        `);
-      });
-    });
+    const result = await processFixture('pathname');
+    expect(result).toMatchSnapshot();
   });
 });

packages/docusaurus-mdx-loader/src/remark/transformLinks/index.ts

@@ -6,6 +6,7 @@
  */
 
 import path from 'path';
+import url from 'url';
 import fs from 'fs-extra';
 import {
   toMessageRelativeFilePath,
@@ -14,75 +15,26 @@ import {
   findAsyncSequential,
   getFileLoaderUtils,
   parseURLOrPath,
-  parseLocalURLPath,
 } from '@docusaurus/utils';
 import escapeHtml from 'escape-html';
-import logger from '@docusaurus/logger';
-import {
-  assetRequireAttributeValue,
-  formatNodePositionExtraMessage,
-  transformNode,
-} from '../utils';
+import {assetRequireAttributeValue, transformNode} from '../utils';
 import type {Plugin, Transformer} from 'unified';
 import type {MdxJsxTextElement} from 'mdast-util-mdx';
 import type {Parent} from 'unist';
-import type {Link, Root} from 'mdast';
-import type {
-  MarkdownConfig,
-  OnBrokenMarkdownLinksFunction,
-} from '@docusaurus/types';
+import type {Link, Literal, Root} from 'mdast';
 
-export type PluginOptions = {
+type PluginOptions = {
   staticDirs: string[];
   siteDir: string;
-  onBrokenMarkdownLinks: MarkdownConfig['hooks']['onBrokenMarkdownLinks'];
 };
 
 type Context = PluginOptions & {
-  staticDirs: string[];
-  siteDir: string;
-  onBrokenMarkdownLinks: OnBrokenMarkdownLinksFunction;
   filePath: string;
   inlineMarkdownLinkFileLoader: string;
 };
 
 type Target = [node: Link, index: number, parent: Parent];
 
-function asFunction(
-  onBrokenMarkdownLinks: PluginOptions['onBrokenMarkdownLinks'],
-): OnBrokenMarkdownLinksFunction {
-  if (typeof onBrokenMarkdownLinks === 'string') {
-    const extraHelp =
-      onBrokenMarkdownLinks === 'throw'
-        ? logger.interpolate`\nTo ignore this error, use the code=${'siteConfig.markdown.hooks.onBrokenMarkdownLinks'} option, or apply the code=${'pathname://'} protocol to the broken link URLs.`
-        : '';
-
-    return ({sourceFilePath, url: linkUrl, node}) => {
-      const relativePath = toMessageRelativeFilePath(sourceFilePath);
-      if (linkUrl) {
-        logger.report(
-          onBrokenMarkdownLinks,
-        )`Markdown link with URL code=${linkUrl} in source file path=${relativePath}${formatNodePositionExtraMessage(
-          node,
-        )} couldn't be resolved.
-Make sure it references a local Markdown file that exists within the current plugin.${extraHelp}`;
-      } else {
-        logger.report(
-          onBrokenMarkdownLinks,
-        )`Markdown link with empty URL found in source file path=${relativePath}${formatNodePositionExtraMessage(
-          node,
-        )}.${extraHelp}`;
-      }
-    };
-  } else {
-    return (params) =>
-      onBrokenMarkdownLinks({
-        ...params,
-        sourceFilePath: toMessageRelativeFilePath(params.sourceFilePath),
-      });
-  }
-}
-
 /**
  * Transforms the link node to a JSX `<a>` element with a `require()` call.
  */
@@ -171,15 +123,27 @@ async function toAssetRequireNode(
   });
 }
 
-async function getLocalFileAbsolutePath(
+async function ensureAssetFileExist(assetPath: string, sourceFilePath: string) {
+  const assetExists = await fs.pathExists(assetPath);
+  if (!assetExists) {
+    throw new Error(
+      `Asset ${toMessageRelativeFilePath(
+        assetPath,
+      )} used in ${toMessageRelativeFilePath(sourceFilePath)} not found.`,
+    );
+  }
+}
+
+async function getAssetAbsolutePath(
   assetPath: string,
   {siteDir, filePath, staticDirs}: Context,
 ) {
   if (assetPath.startsWith('@site/')) {
     const assetFilePath = path.join(siteDir, assetPath.replace('@site/', ''));
-    if (await fs.pathExists(assetFilePath)) {
-      return assetFilePath;
-    }
+    // The @site alias is the only way to believe that the user wants an asset.
+    // Everything else can just be a link URL
+    await ensureAssetFileExist(assetFilePath, filePath);
+    return assetFilePath;
   } else if (path.isAbsolute(assetPath)) {
     const assetFilePath = await findAsyncSequential(
       staticDirs.map((dir) => path.join(dir, assetPath)),
@@ -200,71 +164,54 @@ async function getLocalFileAbsolutePath(
 async function processLinkNode(target: Target, context: Context) {
   const [node] = target;
   if (!node.url) {
-    node.url =
-      context.onBrokenMarkdownLinks({
-        url: node.url,
-        sourceFilePath: context.filePath,
-        node,
-      }) ?? node.url;
-    return;
+    // Try to improve error feedback
+    // see https://github.com/facebook/docusaurus/issues/3309#issuecomment-690371675
+    const title =
+      node.title ?? (node.children[0] as Literal | undefined)?.value ?? '?';
+    const line = node.position?.start.line ?? '?';
+    throw new Error(
+      `Markdown link URL is mandatory in "${toMessageRelativeFilePath(
+        context.filePath,
+      )}" file (title: ${title}, line: ${line}).`,
+    );
   }
 
-  const localUrlPath = parseLocalURLPath(node.url);
-  if (!localUrlPath) {
+  const parsedUrl = url.parse(node.url);
+  if (parsedUrl.protocol || !parsedUrl.pathname) {
     // Don't process pathname:// here, it's used by the <Link> component
     return;
   }
-
-  const hasSiteAlias = localUrlPath.pathname.startsWith('@site/');
+  const hasSiteAlias = parsedUrl.pathname.startsWith('@site/');
   const hasAssetLikeExtension =
-    path.extname(localUrlPath.pathname) &&
-    !localUrlPath.pathname.match(/\.(?:mdx?|html)(?:#|$)/);
+    path.extname(parsedUrl.pathname) &&
+    !parsedUrl.pathname.match(/\.(?:mdx?|html)(?:#|$)/);
   if (!hasSiteAlias && !hasAssetLikeExtension) {
     return;
   }
 
-  const localFilePath = await getLocalFileAbsolutePath(
-    decodeURIComponent(localUrlPath.pathname),
+  const assetPath = await getAssetAbsolutePath(
+    decodeURIComponent(parsedUrl.pathname),
     context,
   );
-
-  if (localFilePath) {
-    await toAssetRequireNode(target, localFilePath, context);
-  } else {
-    // The @site alias is the only way to believe that the user wants an asset.
-    if (hasSiteAlias) {
-      node.url =
-        context.onBrokenMarkdownLinks({
-          url: node.url,
-          sourceFilePath: context.filePath,
-          node,
-        }) ?? node.url;
-    } else {
-      // Even if the url has a dot, and it looks like a file extension
-      // it can be risky to throw and fail fast by default
-      // It's perfectly valid for a route path segment to look like a filename
-    }
+  if (assetPath) {
+    await toAssetRequireNode(target, assetPath, context);
   }
 }
 
 const plugin: Plugin<PluginOptions[], Root> = function plugin(
   options,
 ): Transformer<Root> {
-  const onBrokenMarkdownLinks = asFunction(options.onBrokenMarkdownLinks);
-
   return async (root, vfile) => {
     const {visit} = await import('unist-util-visit');
 
     const fileLoaderUtils = getFileLoaderUtils(
       vfile.data.compilerName === 'server',
     );
-
     const context: Context = {
       ...options,
       filePath: vfile.path!,
       inlineMarkdownLinkFileLoader:
         fileLoaderUtils.loaders.inlineMarkdownLinkFileLoader,
-      onBrokenMarkdownLinks,
     };
 
     const promises: Promise<void>[] = [];

packages/docusaurus-mdx-loader/src/remark/unusedDirectives/index.ts

@@ -8,7 +8,7 @@ import path from 'path';
 import process from 'process';
 import logger from '@docusaurus/logger';
 import {posixPath} from '@docusaurus/utils';
-import {formatNodePositionExtraMessage, transformNode} from '../utils';
+import {transformNode} from '../utils';
 import type {Root} from 'mdast';
 import type {Parent} from 'unist';
 import type {Transformer, Processor, Plugin} from 'unified';
@@ -39,9 +39,17 @@ function formatDirectiveName(directive: Directives) {
   return `${prefix}${directive.name}`;
 }
 
+function formatDirectivePosition(directive: Directives): string | undefined {
+  return directive.position?.start
+    ? logger.interpolate`number=${directive.position.start.line}:number=${directive.position.start.column}`
+    : undefined;
+}
+
 function formatUnusedDirectiveMessage(directive: Directives) {
   const name = formatDirectiveName(directive);
-  return `- ${name}${formatNodePositionExtraMessage(directive)}`;
+  const position = formatDirectivePosition(directive);
+
+  return `- ${name} ${position ? `(${position})` : ''}`;
 }
 
 function formatUnusedDirectivesMessage({

packages/docusaurus-mdx-loader/src/remark/utils/index.ts

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import logger from '@docusaurus/logger';
 import type {Node} from 'unist';
 import type {MdxJsxAttributeValueExpression} from 'mdast-util-mdx';
 
@@ -84,16 +83,3 @@ export function assetRequireAttributeValue(
     },
   };
 }
-
-function formatNodePosition(node: Node): string | undefined {
-  return node.position?.start
-    ? logger.interpolate`number=${node.position.start.line}:number=${node.position.start.column}`
-    : undefined;
-}
-
-// Returns " (line:column)" when position info is available
-// The initial space is useful to append easily to any existing message
-export function formatNodePositionExtraMessage(node: Node): string {
-  const position = formatNodePosition(node);
-  return `${position ? ` (${position})` : ''}`;
-}

packages/docusaurus-module-type-aliases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/module-type-aliases",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Docusaurus module type aliases.",
   "types": "./src/index.d.ts",
   "publishConfig": {
@@ -12,7 +12,7 @@
     "directory": "packages/docusaurus-module-type-aliases"
   },
   "dependencies": {
-    "@docusaurus/types": "3.9.2",
+    "@docusaurus/types": "3.8.0",
     "@types/history": "^4.7.11",
     "@types/react": "*",
     "@types/react-router-config": "*",

packages/docusaurus-plugin-client-redirects/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-client-redirects",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Client redirects plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,24 +18,24 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "3.9.2",
-    "@docusaurus/logger": "3.9.2",
-    "@docusaurus/utils": "3.9.2",
-    "@docusaurus/utils-common": "3.9.2",
-    "@docusaurus/utils-validation": "3.9.2",
+    "@docusaurus/core": "3.8.0",
+    "@docusaurus/logger": "3.8.0",
+    "@docusaurus/utils": "3.8.0",
+    "@docusaurus/utils-common": "3.8.0",
+    "@docusaurus/utils-validation": "3.8.0",
     "eta": "^2.2.0",
     "fs-extra": "^11.1.1",
     "lodash": "^4.17.21",
     "tslib": "^2.6.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "3.9.2"
+    "@docusaurus/types": "3.8.0"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   }
 }

packages/docusaurus-plugin-content-blog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "3.9.2",
+  "version": "3.8.0",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -31,14 +31,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "3.9.2",
-    "@docusaurus/logger": "3.9.2",
-    "@docusaurus/mdx-loader": "3.9.2",
-    "@docusaurus/theme-common": "3.9.2",
-    "@docusaurus/types": "3.9.2",
-    "@docusaurus/utils": "3.9.2",
-    "@docusaurus/utils-common": "3.9.2",
-    "@docusaurus/utils-validation": "3.9.2",
+    "@docusaurus/core": "3.8.0",
+    "@docusaurus/logger": "3.8.0",
+    "@docusaurus/mdx-loader": "3.8.0",
+    "@docusaurus/theme-common": "3.8.0",
+    "@docusaurus/types": "3.8.0",
+    "@docusaurus/utils": "3.8.0",
+    "@docusaurus/utils-common": "3.8.0",
+    "@docusaurus/utils-validation": "3.8.0",
     "cheerio": "1.0.0-rc.12",
     "feed": "^4.2.2",
     "fs-extra": "^11.1.1",
@@ -56,7 +56,7 @@
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "engines": {
-    "node": ">=20.0"
+    "node": ">=18.0"
   },
   "devDependencies": {
     "@total-typescript/shoehorn": "^0.1.2",

packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/routes.test.ts.snap

@@ -1,637 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`buildAllRoutes works for realistic blog post 2`] = `
-[
-  {
-    "component": "@theme/BlogPostPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "metadata": {
-      "lastUpdatedAt": undefined,
-      "sourceFilePath": "blog/post1.md",
-    },
-    "modules": {
-      "content": "@site/blog/post1.md",
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/post1",
-  },
-  {
-    "component": "@theme/BlogPostPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "metadata": {
-      "lastUpdatedAt": undefined,
-      "sourceFilePath": "blog/post2.md",
-    },
-    "modules": {
-      "content": "@site/blog/post2.md",
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/post2",
-  },
-  {
-    "component": "@theme/BlogPostPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "metadata": {
-      "lastUpdatedAt": undefined,
-      "sourceFilePath": "blog/post3.md",
-    },
-    "modules": {
-      "content": "@site/blog/post3.md",
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/post3",
-  },
-  {
-    "component": "@theme/BlogPostPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "metadata": {
-      "lastUpdatedAt": undefined,
-      "sourceFilePath": "blog/post4.md",
-    },
-    "modules": {
-      "content": "@site/blog/post4.md",
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/post4",
-  },
-  {
-    "component": "@theme/BlogPostPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "metadata": {
-      "lastUpdatedAt": undefined,
-      "sourceFilePath": "blog/post5.md",
-    },
-    "modules": {
-      "content": "@site/blog/post5.md",
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/post5",
-  },
-  {
-    "component": "@theme/BlogPostPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "metadata": {
-      "lastUpdatedAt": undefined,
-      "sourceFilePath": "blog/post6.md",
-    },
-    "modules": {
-      "content": "@site/blog/post6.md",
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/post6",
-  },
-  {
-    "component": "@theme/BlogListPage",
-    "exact": true,
-    "modules": {
-      "items": [
-        {
-          "content": {
-            "__import": true,
-            "path": "@site/blog/post1.md",
-            "query": {
-              "truncated": true,
-            },
-          },
-        },
-        {
-          "content": {
-            "__import": true,
-            "path": "@site/blog/post2.md",
-            "query": {
-              "truncated": true,
-            },
-          },
-        },
-      ],
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog",
-    "props": {
-      "metadata": {
-        "blogDescription": "Custom blog description",
-        "blogTitle": "Custom blog title",
-        "nextPage": "/blog/page/2",
-        "page": 1,
-        "permalink": "/blog",
-        "postsPerPage": 2,
-        "previousPage": undefined,
-        "totalCount": 5,
-        "totalPages": 3,
-      },
-    },
-  },
-  {
-    "component": "@theme/BlogListPage",
-    "exact": true,
-    "modules": {
-      "items": [
-        {
-          "content": {
-            "__import": true,
-            "path": "@site/blog/post4.md",
-            "query": {
-              "truncated": true,
-            },
-          },
-        },
-        {
-          "content": {
-            "__import": true,
-            "path": "@site/blog/post5.md",
-            "query": {
-              "truncated": true,
-            },
-          },
-        },
-      ],
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/page/2",
-    "props": {
-      "metadata": {
-        "blogDescription": "Custom blog description",
-        "blogTitle": "Custom blog title",
-        "nextPage": "/blog/page/3",
-        "page": 2,
-        "permalink": "/blog/page/2",
-        "postsPerPage": 2,
-        "previousPage": "/blog",
-        "totalCount": 5,
-        "totalPages": 3,
-      },
-    },
-  },
-  {
-    "component": "@theme/BlogListPage",
-    "exact": true,
-    "modules": {
-      "items": [
-        {
-          "content": {
-            "__import": true,
-            "path": "@site/blog/post6.md",
-            "query": {
-              "truncated": true,
-            },
-          },
-        },
-      ],
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/page/3",
-    "props": {
-      "metadata": {
-        "blogDescription": "Custom blog description",
-        "blogTitle": "Custom blog title",
-        "nextPage": undefined,
-        "page": 3,
-        "permalink": "/blog/page/3",
-        "postsPerPage": 2,
-        "previousPage": "/blog/page/2",
-        "totalCount": 5,
-        "totalPages": 3,
-      },
-    },
-  },
-  {
-    "component": "@theme/BlogArchivePage",
-    "exact": true,
-    "path": "/blog/archive",
-    "props": {
-      "archive": {
-        "blogPosts": [
-          {
-            "content": "Content for post1",
-            "id": "post1",
-            "metadata": {
-              "authors": [
-                {
-                  "key": "author1",
-                },
-              ],
-              "date": 2020-01-01T00:00:00.000Z,
-              "description": "Description for post1",
-              "frontMatter": {},
-              "permalink": "/blog/post1",
-              "readingTime": 2,
-              "source": "@site/blog/post1.md",
-              "tags": [],
-              "title": "Title for post1",
-            },
-          },
-          {
-            "content": "Content for post2",
-            "id": "post2",
-            "metadata": {
-              "authors": [
-                {
-                  "key": "author1",
-                },
-              ],
-              "date": 2020-01-01T00:00:00.000Z,
-              "description": "Description for post2",
-              "frontMatter": {},
-              "permalink": "/blog/post2",
-              "readingTime": 2,
-              "source": "@site/blog/post2.md",
-              "tags": [],
-              "title": "Title for post2",
-            },
-          },
-          {
-            "content": "Content for post4",
-            "id": "post4",
-            "metadata": {
-              "authors": [
-                {
-                  "key": "author1",
-                },
-                {
-                  "key": "author2",
-                },
-              ],
-              "date": 2020-01-01T00:00:00.000Z,
-              "description": "Description for post4",
-              "frontMatter": {},
-              "permalink": "/blog/post4",
-              "readingTime": 2,
-              "source": "@site/blog/post4.md",
-              "tags": [],
-              "title": "Title for post4",
-            },
-          },
-          {
-            "content": "Content for post5",
-            "id": "post5",
-            "metadata": {
-              "authors": [
-                {
-                  "key": "author2",
-                },
-                {
-                  "key": "author3",
-                },
-              ],
-              "date": 2020-01-01T00:00:00.000Z,
-              "description": "Description for post5",
-              "frontMatter": {},
-              "permalink": "/blog/post5",
-              "readingTime": 2,
-              "source": "@site/blog/post5.md",
-              "tags": [],
-              "title": "Title for post5",
-            },
-          },
-          {
-            "content": "Content for post6",
-            "id": "post6",
-            "metadata": {
-              "authors": [],
-              "date": 2020-01-01T00:00:00.000Z,
-              "description": "Description for post6",
-              "frontMatter": {},
-              "permalink": "/blog/post6",
-              "readingTime": 2,
-              "source": "@site/blog/post6.md",
-              "tags": [],
-              "title": "Title for post6",
-            },
-          },
-        ],
-      },
-    },
-  },
-  {
-    "component": "@theme/Blog/Pages/BlogAuthorsListPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "modules": {
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/authors",
-    "props": {
-      "authors": [
-        {
-          "count": 3,
-          "key": "author1",
-          "name": "Author 1",
-          "page": {
-            "permalink": "/blog/authors/author1",
-          },
-        },
-        {
-          "count": 2,
-          "key": "author2",
-          "name": "Author 2",
-          "page": null,
-        },
-        {
-          "count": 1,
-          "key": "author3",
-          "name": "Author 3",
-          "page": {
-            "permalink": "/blog/authors/author3",
-          },
-        },
-      ],
-    },
-  },
-  {
-    "component": "@theme/Blog/Pages/BlogAuthorsPostsPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "modules": {
-      "items": [
-        {
-          "content": {
-            "__import": true,
-            "path": "@site/blog/post1.md",
-            "query": {
-              "truncated": true,
-            },
-          },
-        },
-        {
-          "content": {
-            "__import": true,
-            "path": "@site/blog/post2.md",
-            "query": {
-              "truncated": true,
-            },
-          },
-        },
-      ],
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/authors/author1",
-    "props": {
-      "author": {
-        "count": 3,
-        "key": "author1",
-        "name": "Author 1",
-        "page": {
-          "permalink": "/blog/authors/author1",
-        },
-      },
-      "listMetadata": {
-        "blogDescription": "Custom blog description",
-        "blogTitle": "Custom blog title",
-        "nextPage": "/blog/authors/author1/page/2",
-        "page": 1,
-        "permalink": "/blog/authors/author1",
-        "postsPerPage": 2,
-        "previousPage": undefined,
-        "totalCount": 3,
-        "totalPages": 2,
-      },
-    },
-  },
-  {
-    "component": "@theme/Blog/Pages/BlogAuthorsPostsPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "modules": {
-      "items": [
-        {
-          "content": {
-            "__import": true,
-            "path": "@site/blog/post4.md",
-            "query": {
-              "truncated": true,
-            },
-          },
-        },
-      ],
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/authors/author1/page/2",
-    "props": {
-      "author": {
-        "count": 3,
-        "key": "author1",
-        "name": "Author 1",
-        "page": {
-          "permalink": "/blog/authors/author1",
-        },
-      },
-      "listMetadata": {
-        "blogDescription": "Custom blog description",
-        "blogTitle": "Custom blog title",
-        "nextPage": undefined,
-        "page": 2,
-        "permalink": "/blog/authors/author1/page/2",
-        "postsPerPage": 2,
-        "previousPage": "/blog/authors/author1",
-        "totalCount": 3,
-        "totalPages": 2,
-      },
-    },
-  },
-  {
-    "component": "@theme/Blog/Pages/BlogAuthorsPostsPage",
-    "context": {
-      "blogMetadata": "@aliased/data/blogMetadata-default.json",
-    },
-    "exact": true,
-    "modules": {
-      "items": [
-        {
-          "content": {
-            "__import": true,
-            "path": "@site/blog/post5.md",
-            "query": {
-              "truncated": true,
-            },
-          },
-        },
-      ],
-      "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-    },
-    "path": "/blog/authors/author3",
-    "props": {
-      "author": {
-        "count": 1,
-        "key": "author3",
-        "name": "Author 3",
-        "page": {
-          "permalink": "/blog/authors/author3",
-        },
-      },
-      "listMetadata": {
-        "blogDescription": "Custom blog description",
-        "blogTitle": "Custom blog title",
-        "nextPage": undefined,
-        "page": 1,
-        "permalink": "/blog/authors/author3",
-        "postsPerPage": 2,
-        "previousPage": undefined,
-        "totalCount": 1,
-        "totalPages": 1,
-      },
-    },
-  },
-]
-`;
-
-exports[`buildAllRoutes works for realistic blog post 3`] = `
-{
-  "blog-post-list-prop-default.json": {
-    "items": [
-      {
-        "date": 2020-01-01T00:00:00.000Z,
-        "permalink": "/blog/post1",
-        "title": "Title for post1",
-        "unlisted": undefined,
-      },
-      {
-        "date": 2020-01-01T00:00:00.000Z,
-        "permalink": "/blog/post2",
-        "title": "Title for post2",
-        "unlisted": undefined,
-      },
-      {
-        "date": 2020-01-01T00:00:00.000Z,
-        "permalink": "/blog/post3",
-        "title": "Title for post3",
-        "unlisted": true,
-      },
-      {
-        "date": 2020-01-01T00:00:00.000Z,
-        "permalink": "/blog/post4",
-        "title": "Title for post4",
-        "unlisted": undefined,
-      },
-      {
-        "date": 2020-01-01T00:00:00.000Z,
-        "permalink": "/blog/post5",
-        "title": "Title for post5",
-        "unlisted": undefined,
-      },
-    ],
-    "title": "Custom blog sidebar title",
-  },
-  "blogMetadata-default.json": {
-    "authorsListPath": "/blog/authors",
-    "blogBasePath": "/blog",
-    "blogTitle": "Custom blog title",
-  },
-  "site-blog-post-1-md-235.json": {
-    "authors": [
-      {
-        "key": "author1",
-      },
-    ],
-    "date": 2020-01-01T00:00:00.000Z,
-    "description": "Description for post1",
-    "frontMatter": {},
-    "permalink": "/blog/post1",
-    "readingTime": 2,
-    "source": "@site/blog/post1.md",
-    "tags": [],
-    "title": "Title for post1",
-  },
-  "site-blog-post-2-md-b42.json": {
-    "authors": [
-      {
-        "key": "author1",
-      },
-    ],
-    "date": 2020-01-01T00:00:00.000Z,
-    "description": "Description for post2",
-    "frontMatter": {},
-    "permalink": "/blog/post2",
-    "readingTime": 2,
-    "source": "@site/blog/post2.md",
-    "tags": [],
-    "title": "Title for post2",
-  },
-  "site-blog-post-3-md-3b7.json": {
-    "authors": [
-      {
-        "key": "author3",
-      },
-    ],
-    "date": 2020-01-01T00:00:00.000Z,
-    "description": "Description for post3",
-    "frontMatter": {},
-    "permalink": "/blog/post3",
-    "readingTime": 2,
-    "source": "@site/blog/post3.md",
-    "tags": [],
-    "title": "Title for post3",
-    "unlisted": true,
-  },
-  "site-blog-post-4-md-15a.json": {
-    "authors": [
-      {
-        "key": "author1",
-      },
-      {
-        "key": "author2",
-      },
-    ],
-    "date": 2020-01-01T00:00:00.000Z,
-    "description": "Description for post4",
-    "frontMatter": {},
-    "permalink": "/blog/post4",
-    "readingTime": 2,
-    "source": "@site/blog/post4.md",
-    "tags": [],
-    "title": "Title for post4",
-  },
-  "site-blog-post-5-md-274.json": {
-    "authors": [
-      {
-        "key": "author2",
-      },
-      {
-        "key": "author3",
-      },
-    ],
-    "date": 2020-01-01T00:00:00.000Z,
-    "description": "Description for post5",
-    "frontMatter": {},
-    "permalink": "/blog/post5",
-    "readingTime": 2,
-    "source": "@site/blog/post5.md",
-    "tags": [],
-    "title": "Title for post5",
-  },
-  "site-blog-post-6-md-3ca.json": {
-    "authors": [],
-    "date": 2020-01-01T00:00:00.000Z,
-    "description": "Description for post6",
-    "frontMatter": {},
-    "permalink": "/blog/post6",
-    "readingTime": 2,
-    "source": "@site/blog/post6.md",
-    "tags": [],
-    "title": "Title for post6",
-  },
-}
-`;

packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/translations.test.ts.snap

@@ -24,7 +24,24 @@ exports[`getContentTranslationFiles returns translation files matching snapshot
 
 exports[`translateContent falls back when translation is incomplete 1`] = `
 {
-  "blogDescription": "Someone's random blog",
+  "blogListPaginated": [
+    {
+      "items": [
+        "hello",
+      ],
+      "metadata": {
+        "blogDescription": "Someone's random blog",
+        "blogTitle": "My blog",
+        "nextPage": undefined,
+        "page": 1,
+        "permalink": "/",
+        "postsPerPage": 10,
+        "previousPage": undefined,
+        "totalCount": 1,
+        "totalPages": 1,
+      },
+    },
+  ],
   "blogPosts": [
     {
       "content": "",
@@ -46,13 +63,29 @@ exports[`translateContent falls back when translation is incomplete 1`] = `
   "blogSidebarTitle": "All my posts",
   "blogTags": {},
   "blogTagsListPath": "/tags",
-  "blogTitle": "My blog",
 }
 `;
 
 exports[`translateContent returns translated loaded 1`] = `
 {
-  "blogDescription": "Someone's random blog (translated)",
+  "blogListPaginated": [
+    {
+      "items": [
+        "hello",
+      ],
+      "metadata": {
+        "blogDescription": "Someone's random blog (translated)",
+        "blogTitle": "My blog (translated)",
+        "nextPage": undefined,
+        "page": 1,
+        "permalink": "/",
+        "postsPerPage": 10,
+        "previousPage": undefined,
+        "totalCount": 1,
+        "totalPages": 1,
+      },
+    },
+  ],
   "blogPosts": [
     {
       "content": "",
@@ -74,6 +107,5 @@ exports[`translateContent returns translated loaded 1`] = `
   "blogSidebarTitle": "All my posts (translated)",
   "blogTags": {},
   "blogTagsListPath": "/tags",
-  "blogTitle": "My blog (translated)",
 }
 `;

packages/docusaurus-plugin-content-blog/src/__tests__/authorsSocials.test.ts

@@ -21,13 +21,11 @@ describe('normalizeSocials', () => {
       twitch: 'gingergeek',
       youtube: 'gingergeekuk',
       mastodon: 'Mastodon',
-      email: 'seb@example.com',
     };
 
     expect(normalizeSocials(socials)).toMatchInlineSnapshot(`
       {
         "bluesky": "https://bsky.app/profile/gingergeek.co.uk",
-        "email": "mailto:seb@example.com",
         "github": "https://github.com/ozakione",
         "instagram": "https://www.instagram.com/thisweekinreact",
         "linkedin": "https://www.linkedin.com/in/ozakione/",
@@ -50,13 +48,11 @@ describe('normalizeSocials', () => {
       instaGRam: 'thisweekinreact',
       BLUESKY: 'gingergeek.co.uk',
       tHrEaDs: 'gingergeekuk',
-      eMAil: 'seb@example.com',
     };
 
     expect(normalizeSocials(socials)).toMatchInlineSnapshot(`
       {
         "bluesky": "https://bsky.app/profile/gingergeek.co.uk",
-        "email": "mailto:seb@example.com",
         "github": "https://github.com/ozakione",
         "instagram": "https://www.instagram.com/thisweekinreact",
         "linkedin": "https://www.linkedin.com/in/ozakione/",
@@ -73,7 +69,6 @@ describe('normalizeSocials', () => {
       linkedin: 'https://linkedin.com/ozakione',
       github: 'https://github.com/ozakione',
       stackoverflow: 'https://stackoverflow.com/ozakione',
-      email: 'mailto:seb@example.com',
     };
 
     expect(normalizeSocials(socials)).toEqual(socials);
@@ -86,12 +81,10 @@ describe('normalizeSocials', () => {
       github: 'https://github.com/ozakione',
       stackoverflow: 'https://stackoverflow.com/ozakione',
       mastodon: 'https://hachyderm.io/@hachyderm',
-      email: 'mailto:seb@example.com',
     };
 
     expect(normalizeSocials(socials)).toMatchInlineSnapshot(`
       {
-        "email": "mailto:seb@example.com",
         "github": "https://github.com/ozakione",
         "linkedin": "https://www.linkedin.com/in/ozakione/",
         "mastodon": "https://hachyderm.io/@hachyderm",

packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts

@@ -8,10 +8,7 @@
 import {jest} from '@jest/globals';
 import path from 'path';
 import fs from 'fs-extra';
-import {
-  DEFAULT_PARSE_FRONT_MATTER,
-  DEFAULT_VCS_CONFIG,
-} from '@docusaurus/utils';
+import {DEFAULT_PARSE_FRONT_MATTER} from '@docusaurus/utils';
 import {fromPartial} from '@total-typescript/shoehorn';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
 import tree from 'tree-node-cli';
@@ -54,7 +51,7 @@ function getBlogContentPaths(siteDir: string): BlogContentPaths {
 }
 
 async function testGenerateFeeds(
-  contextInput: LoadContext,
+  context: LoadContext,
   optionsInput: Options,
 ): Promise<void> {
   const options = validateOptions({
@@ -65,17 +62,6 @@ async function testGenerateFeeds(
     options: optionsInput,
   });
 
-  const context: LoadContext = {
-    ...contextInput,
-    siteConfig: {
-      ...contextInput.siteConfig,
-      future: {
-        ...contextInput.siteConfig?.future,
-        experimental_vcs: DEFAULT_VCS_CONFIG,
-      },
-    },
-  };
-
   const contentPaths = getBlogContentPaths(context.siteDir);
   const authorsMap = await getAuthorsMap({
     contentPaths,

packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts

@@ -6,9 +6,13 @@
  */
 
 import {jest} from '@jest/globals';
-import * as path from 'path';
+import path from 'path';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
-import {posixPath, getLocaleConfig, TEST_VCS} from '@docusaurus/utils';
+import {
+  posixPath,
+  getFileCommitDate,
+  LAST_UPDATE_FALLBACK,
+} from '@docusaurus/utils';
 import {DEFAULT_FUTURE_CONFIG} from '@docusaurus/core/src/server/configValidation';
 import pluginContentBlog from '../index';
 import {validateOptions} from '../options';
@@ -18,7 +22,6 @@ import type {
   I18n,
   Validate,
   MarkdownConfig,
-  I18nLocaleConfig,
 } from '@docusaurus/types';
 import type {
   BlogPost,
@@ -27,10 +30,6 @@ import type {
   EditUrlFunction,
 } from '@docusaurus/plugin-content-blog';
 
-async function getFileCreationDate(filePath: string): Promise<Date> {
-  return new Date((await TEST_VCS.getFileCreationInfo(filePath)).timestamp);
-}
-
 const markdown: MarkdownConfig = {
   format: 'mdx',
   mermaid: true,
@@ -68,10 +67,7 @@ Available blog post titles are:\n- ${blogPosts
   return post;
 }
 
-function getI18n(
-  locale: string,
-  localeConfigOptions?: Partial<I18nLocaleConfig>,
-): I18n {
+function getI18n(locale: string): I18n {
   return {
     currentLocale: locale,
     locales: [locale],
@@ -84,8 +80,6 @@ function getI18n(
         htmlLang: locale,
         direction: 'ltr',
         path: locale,
-        translate: true,
-        ...localeConfigOptions,
       },
     },
   };
@@ -100,14 +94,13 @@ const BaseEditUrl = 'https://baseEditUrl.com/edit';
 const getPlugin = async (
   siteDir: string,
   pluginOptions: Partial<PluginOptions> = {},
-  i18nOptions: Partial<I18n> = {},
+  i18n: I18n = DefaultI18N,
 ) => {
-  const i18n = {...DefaultI18N, ...i18nOptions};
   const generatedFilesDir: string = path.resolve(siteDir, '.docusaurus');
   const localizationDir = path.join(
     siteDir,
     i18n.path,
-    getLocaleConfig(i18n).path,
+    i18n.localeConfigs[i18n.currentLocale]!.path,
   );
   const siteConfig = {
     title: 'Hello',
@@ -160,34 +153,20 @@ const getBlogTags = async (
 };
 
 describe('blog plugin', () => {
-  describe('getPathsToWatch', () => {
-    async function runTest({translate}: {translate: boolean}) {
-      const siteDir = path.join(__dirname, '__fixtures__', 'website');
-      const plugin = await getPlugin(siteDir, {}, getI18n('en', {translate}));
-      const pathsToWatch = plugin.getPathsToWatch!();
-      return pathsToWatch.map((p) => posixPath(path.relative(siteDir, p)));
-    }
-
-    it('getPathsToWatch returns right files', async () => {
-      const relativePathsToWatch = await runTest({translate: true});
-      expect(relativePathsToWatch).toEqual([
-        'i18n/en/docusaurus-plugin-content-blog/authors.yml',
-        'i18n/en/docusaurus-plugin-content-blog/tags.yml',
-        // 'blog/authors.yml', // TODO weird that it's not here but tags is?
-        'blog/tags.yml',
-        'i18n/en/docusaurus-plugin-content-blog/**/*.{md,mdx}',
-        'blog/**/*.{md,mdx}',
-      ]);
-    });
-
-    it('getPathsToWatch returns right files (translate: false)', async () => {
-      const relativePathsToWatch = await runTest({translate: false});
-      expect(relativePathsToWatch).toEqual([
-        'blog/authors.yml',
-        'blog/tags.yml',
-        'blog/**/*.{md,mdx}',
-      ]);
-    });
+  it('getPathsToWatch returns right files', async () => {
+    const siteDir = path.join(__dirname, '__fixtures__', 'website');
+    const plugin = await getPlugin(siteDir);
+    const pathsToWatch = plugin.getPathsToWatch!();
+    const relativePathsToWatch = pathsToWatch.map((p) =>
+      posixPath(path.relative(siteDir, p)),
+    );
+    expect(relativePathsToWatch).toEqual([
+      'i18n/en/docusaurus-plugin-content-blog/authors.yml',
+      'i18n/en/docusaurus-plugin-content-blog/tags.yml',
+      'blog/tags.yml',
+      'i18n/en/docusaurus-plugin-content-blog/**/*.{md,mdx}',
+      'blog/**/*.{md,mdx}',
+    ]);
   });
 
   it('builds a simple website', async () => {
@@ -398,54 +377,6 @@ describe('blog plugin', () => {
     });
   });
 
-  describe('i18n config translate is wired properly', () => {
-    async function runTest({translate}: {translate: boolean}) {
-      const siteDir = path.join(__dirname, '__fixtures__', 'website');
-      const blogPosts = await getBlogPosts(
-        siteDir,
-        {},
-        getI18n('en', {translate}),
-      );
-
-      // Simpler to snapshot
-      return blogPosts.map((post) => post.metadata.title);
-    }
-
-    it('works with translate: false', async () => {
-      await expect(runTest({translate: false})).resolves.toMatchInlineSnapshot(`
-        [
-          "test links",
-          "MDX Blog Sample with require calls",
-          "Full Blog Sample",
-          "Complex Slug",
-          "Simple Slug",
-          "draft",
-          "unlisted",
-          "some heading",
-          "date-matter",
-          "Happy 1st Birthday Slash!",
-        ]
-      `);
-    });
-
-    it('works with translate: true', async () => {
-      await expect(runTest({translate: true})).resolves.toMatchInlineSnapshot(`
-        [
-          "test links",
-          "MDX Blog Sample with require calls",
-          "Full Blog Sample",
-          "Complex Slug",
-          "Simple Slug",
-          "draft",
-          "unlisted",
-          "some heading",
-          "date-matter",
-          "Happy 1st Birthday Slash! (translated)",
-        ]
-      `);
-    });
-  });
-
   it('handles edit URL with editLocalizedBlogs: true', async () => {
     const siteDir = path.join(__dirname, '__fixtures__', 'website');
     const blogPosts = await getBlogPosts(siteDir, {editLocalizedFiles: true});
@@ -459,23 +390,6 @@ describe('blog plugin', () => {
     );
   });
 
-  it('handles edit URL with editLocalizedBlogs: true and translate: false', async () => {
-    const siteDir = path.join(__dirname, '__fixtures__', 'website');
-    const blogPosts = await getBlogPosts(
-      siteDir,
-      {editLocalizedFiles: true},
-      getI18n('en', {translate: false}),
-    );
-
-    const localizedBlogPost = blogPosts.find(
-      (v) => v.metadata.title === 'Happy 1st Birthday Slash!',
-    )!;
-
-    expect(localizedBlogPost.metadata.editUrl).toBe(
-      `${BaseEditUrl}/blog/2018-12-14-Happy-First-Birthday-Slash.md`,
-    );
-  });
-
   it('handles edit URL with editUrl function', async () => {
     const siteDir = path.join(__dirname, '__fixtures__', 'website');
 
@@ -560,7 +474,9 @@ describe('blog plugin', () => {
     const blogPosts = await getBlogPosts(siteDir);
     const noDateSource = path.posix.join('@site', PluginPath, 'no date.md');
     const noDateSourceFile = path.posix.join(siteDir, PluginPath, 'no date.md');
-    const noDateSourceTime = await getFileCreationDate(noDateSourceFile);
+    // We know the file exists and we know we have git
+    const result = await getFileCommitDate(noDateSourceFile, {age: 'oldest'});
+    const noDateSourceTime = result.date;
 
     expect({
       ...getByTitle(blogPosts, 'no date').metadata,
@@ -638,7 +554,10 @@ describe('blog plugin', () => {
       },
       DefaultI18N,
     );
-    const {blogPosts, blogTags} = (await plugin.loadContent!())!;
+    const {blogPosts, blogTags, blogListPaginated} =
+      (await plugin.loadContent!())!;
+
+    expect(blogListPaginated).toHaveLength(3);
 
     expect(Object.keys(blogTags)).toHaveLength(2);
     expect(blogTags).toMatchSnapshot();
@@ -668,23 +587,29 @@ describe('last update', () => {
     );
     const {blogPosts} = (await plugin.loadContent!())!;
 
-    const TestLastUpdate = await TEST_VCS.getFileLastUpdateInfo('any path');
-
     expect(blogPosts[0]?.metadata.lastUpdatedBy).toBe('seb');
     expect(blogPosts[0]?.metadata.lastUpdatedAt).toBe(
-      lastUpdateFor('2021-01-01'),
+      LAST_UPDATE_FALLBACK.lastUpdatedAt,
     );
 
-    expect(blogPosts[1]?.metadata.lastUpdatedBy).toBe(TestLastUpdate.author);
+    expect(blogPosts[1]?.metadata.lastUpdatedBy).toBe(
+      LAST_UPDATE_FALLBACK.lastUpdatedBy,
+    );
     expect(blogPosts[1]?.metadata.lastUpdatedAt).toBe(
-      lastUpdateFor('2021-01-01'),
+      LAST_UPDATE_FALLBACK.lastUpdatedAt,
     );
 
     expect(blogPosts[2]?.metadata.lastUpdatedBy).toBe('seb');
-    expect(blogPosts[2]?.metadata.lastUpdatedAt).toBe(TestLastUpdate.timestamp);
+    expect(blogPosts[2]?.metadata.lastUpdatedAt).toBe(
+      lastUpdateFor('2021-01-01'),
+    );
 
-    expect(blogPosts[3]?.metadata.lastUpdatedBy).toBe(TestLastUpdate.author);
-    expect(blogPosts[3]?.metadata.lastUpdatedAt).toBe(TestLastUpdate.timestamp);
+    expect(blogPosts[3]?.metadata.lastUpdatedBy).toBe(
+      LAST_UPDATE_FALLBACK.lastUpdatedBy,
+    );
+    expect(blogPosts[3]?.metadata.lastUpdatedAt).toBe(
+      lastUpdateFor('2021-01-01'),
+    );
   });
 
   it('time only', async () => {
@@ -698,27 +623,29 @@ describe('last update', () => {
     );
     const {blogPosts} = (await plugin.loadContent!())!;
 
-    const TestLastUpdate = await TEST_VCS.getFileLastUpdateInfo('any path');
-
-    expect(blogPosts[0]?.metadata.title).toBe('Both');
+    expect(blogPosts[0]?.metadata.title).toBe('Author');
     expect(blogPosts[0]?.metadata.lastUpdatedBy).toBeUndefined();
     expect(blogPosts[0]?.metadata.lastUpdatedAt).toBe(
-      lastUpdateFor('2021-01-01'),
+      LAST_UPDATE_FALLBACK.lastUpdatedAt,
     );
 
-    expect(blogPosts[1]?.metadata.title).toBe('Last update date');
+    expect(blogPosts[1]?.metadata.title).toBe('Nothing');
     expect(blogPosts[1]?.metadata.lastUpdatedBy).toBeUndefined();
     expect(blogPosts[1]?.metadata.lastUpdatedAt).toBe(
+      LAST_UPDATE_FALLBACK.lastUpdatedAt,
+    );
+
+    expect(blogPosts[2]?.metadata.title).toBe('Both');
+    expect(blogPosts[2]?.metadata.lastUpdatedBy).toBeUndefined();
+    expect(blogPosts[2]?.metadata.lastUpdatedAt).toBe(
       lastUpdateFor('2021-01-01'),
     );
 
-    expect(blogPosts[2]?.metadata.title).toBe('Author');
-    expect(blogPosts[2]?.metadata.lastUpdatedBy).toBeUndefined();
-    expect(blogPosts[2]?.metadata.lastUpdatedAt).toBe(TestLastUpdate.timestamp);
-
-    expect(blogPosts[3]?.metadata.title).toBe('Nothing');
+    expect(blogPosts[3]?.metadata.title).toBe('Last update date');
     expect(blogPosts[3]?.metadata.lastUpdatedBy).toBeUndefined();
-    expect(blogPosts[3]?.metadata.lastUpdatedAt).toBe(TestLastUpdate.timestamp);
+    expect(blogPosts[3]?.metadata.lastUpdatedAt).toBe(
+      lastUpdateFor('2021-01-01'),
+    );
   });
 
   it('author only', async () => {
@@ -732,18 +659,20 @@ describe('last update', () => {
     );
     const {blogPosts} = (await plugin.loadContent!())!;
 
-    const TestLastUpdate = await TEST_VCS.getFileLastUpdateInfo('any path');
-
     expect(blogPosts[0]?.metadata.lastUpdatedBy).toBe('seb');
     expect(blogPosts[0]?.metadata.lastUpdatedAt).toBeUndefined();
 
-    expect(blogPosts[1]?.metadata.lastUpdatedBy).toBe(TestLastUpdate.author);
+    expect(blogPosts[1]?.metadata.lastUpdatedBy).toBe(
+      LAST_UPDATE_FALLBACK.lastUpdatedBy,
+    );
     expect(blogPosts[1]?.metadata.lastUpdatedAt).toBeUndefined();
 
     expect(blogPosts[2]?.metadata.lastUpdatedBy).toBe('seb');
     expect(blogPosts[2]?.metadata.lastUpdatedAt).toBeUndefined();
 
-    expect(blogPosts[3]?.metadata.lastUpdatedBy).toBe(TestLastUpdate.author);
+    expect(blogPosts[3]?.metadata.lastUpdatedBy).toBe(
+      LAST_UPDATE_FALLBACK.lastUpdatedBy,
+    );
     expect(blogPosts[3]?.metadata.lastUpdatedAt).toBeUndefined();
   });
 

packages/docusaurus-plugin-content-blog/src/__tests__/routes.test.ts

@@ -1,324 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import * as _ from 'lodash';
-import {fromPartial} from '@total-typescript/shoehorn';
-import {buildAllRoutes} from '../routes';
-import {DEFAULT_OPTIONS} from '../options';
-import type {PartialDeep} from '@total-typescript/shoehorn';
-import type {BlogPost, BlogPostMetadata} from '@docusaurus/plugin-content-blog';
-
-type Params = Parameters<typeof buildAllRoutes>[0];
-
-async function testBuildAllRoutes(overrides: PartialDeep<Params> = {}) {
-  const createData = jest.fn(
-    async (name: string, _data: unknown) => `/data/${name}`,
-  );
-
-  const params: Params = fromPartial<Params>({
-    baseUrl: '/',
-    aliasedSource: (str: string) => `@aliased${str}`,
-    ...overrides,
-
-    content: {
-      blogTitle: 'Blog Title',
-      blogDescription: 'Blog Description',
-      blogSidebarTitle: 'Blog Sidebar Title',
-      authorsMap: {},
-      blogTagsListPath: '',
-      blogTags: {},
-      blogPosts: [],
-      ...overrides?.content,
-    },
-    options: {
-      ...DEFAULT_OPTIONS,
-      ...overrides?.options,
-    },
-    actions: {
-      createData,
-      ...overrides?.actions,
-    },
-  });
-
-  const routes = await buildAllRoutes(params);
-
-  const data = Object.fromEntries(
-    createData.mock.calls.map((call) => [call[0], call[1]]),
-  );
-
-  function getRouteByPath(path: string) {
-    const route = routes.find((r) => r.path === path);
-    if (!route) {
-      throw new Error(`Route not found for path: ${path}`);
-    }
-    return route;
-  }
-
-  function getRoutesByComponent(component: string) {
-    return routes.filter((r) => r.component === component);
-  }
-
-  return {routes, data, utils: {getRouteByPath, getRoutesByComponent}};
-}
-
-function blogPost(overrides: PartialDeep<BlogPost> = {}): BlogPost {
-  const id = overrides.id ?? 'blog-post';
-  return fromPartial<BlogPost>({
-    id,
-    content: `Content for ${id}`,
-    ...overrides,
-    metadata: fromPartial<BlogPostMetadata>({
-      title: `Title for ${id}`,
-      description: `Description for ${id}`,
-      permalink: `/blog/${id}`,
-      source: `@site/blog/${id}.md`,
-      date: new Date('2020-01-01'),
-      tags: [],
-      readingTime: 2,
-      authors: [],
-      frontMatter: {
-        ...overrides?.metadata?.frontMatter,
-      },
-      ...overrides?.metadata,
-    }),
-  });
-}
-
-describe('buildAllRoutes', () => {
-  it('works for empty blog', async () => {
-    const {routes, data} = await testBuildAllRoutes({
-      content: {
-        blogPosts: [],
-      },
-    });
-
-    expect(routes).toMatchInlineSnapshot(`
-      [
-        {
-          "component": "@theme/BlogListPage",
-          "exact": true,
-          "modules": {
-            "items": [],
-            "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-          },
-          "path": "/blog",
-          "props": {
-            "metadata": {
-              "blogDescription": "Blog Description",
-              "blogTitle": "Blog Title",
-              "nextPage": undefined,
-              "page": 1,
-              "permalink": "/blog",
-              "postsPerPage": 10,
-              "previousPage": undefined,
-              "totalCount": 0,
-              "totalPages": 1,
-            },
-          },
-        },
-      ]
-    `);
-    expect(data).toMatchInlineSnapshot(`
-      {
-        "blog-post-list-prop-default.json": {
-          "items": [],
-          "title": "Blog Sidebar Title",
-        },
-        "blogMetadata-default.json": {
-          "authorsListPath": "/blog/authors",
-          "blogBasePath": "/blog",
-          "blogTitle": "Blog Title",
-        },
-      }
-    `);
-  });
-
-  it('works for single blog post', async () => {
-    const {routes, data} = await testBuildAllRoutes({
-      content: {
-        blogPosts: [blogPost()],
-      },
-    });
-
-    expect(routes).toMatchInlineSnapshot(`
-      [
-        {
-          "component": "@theme/BlogPostPage",
-          "context": {
-            "blogMetadata": "@aliased/data/blogMetadata-default.json",
-          },
-          "exact": true,
-          "metadata": {
-            "lastUpdatedAt": undefined,
-            "sourceFilePath": "blog/blog-post.md",
-          },
-          "modules": {
-            "content": "@site/blog/blog-post.md",
-            "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-          },
-          "path": "/blog/blog-post",
-        },
-        {
-          "component": "@theme/BlogListPage",
-          "exact": true,
-          "modules": {
-            "items": [
-              {
-                "content": {
-                  "__import": true,
-                  "path": "@site/blog/blog-post.md",
-                  "query": {
-                    "truncated": true,
-                  },
-                },
-              },
-            ],
-            "sidebar": "@aliased/data/blog-post-list-prop-default.json",
-          },
-          "path": "/blog",
-          "props": {
-            "metadata": {
-              "blogDescription": "Blog Description",
-              "blogTitle": "Blog Title",
-              "nextPage": undefined,
-              "page": 1,
-              "permalink": "/blog",
-              "postsPerPage": 10,
-              "previousPage": undefined,
-              "totalCount": 1,
-              "totalPages": 1,
-            },
-          },
-        },
-        {
-          "component": "@theme/BlogArchivePage",
-          "exact": true,
-          "path": "/blog/archive",
-          "props": {
-            "archive": {
-              "blogPosts": [
-                {
-                  "content": "Content for blog-post",
-                  "id": "blog-post",
-                  "metadata": {
-                    "authors": [],
-                    "date": 2020-01-01T00:00:00.000Z,
-                    "description": "Description for blog-post",
-                    "frontMatter": {},
-                    "permalink": "/blog/blog-post",
-                    "readingTime": 2,
-                    "source": "@site/blog/blog-post.md",
-                    "tags": [],
-                    "title": "Title for blog-post",
-                  },
-                },
-              ],
-            },
-          },
-        },
-      ]
-    `);
-    expect(data).toMatchInlineSnapshot(`
-      {
-        "blog-post-list-prop-default.json": {
-          "items": [
-            {
-              "date": 2020-01-01T00:00:00.000Z,
-              "permalink": "/blog/blog-post",
-              "title": "Title for blog-post",
-              "unlisted": undefined,
-            },
-          ],
-          "title": "Blog Sidebar Title",
-        },
-        "blogMetadata-default.json": {
-          "authorsListPath": "/blog/authors",
-          "blogBasePath": "/blog",
-          "blogTitle": "Blog Title",
-        },
-        "site-blog-blog-post-md-0d7.json": {
-          "authors": [],
-          "date": 2020-01-01T00:00:00.000Z,
-          "description": "Description for blog-post",
-          "frontMatter": {},
-          "permalink": "/blog/blog-post",
-          "readingTime": 2,
-          "source": "@site/blog/blog-post.md",
-          "tags": [],
-          "title": "Title for blog-post",
-        },
-      }
-    `);
-  });
-
-  it('works for realistic blog post', async () => {
-    const {routes, data} = await testBuildAllRoutes({
-      options: {
-        postsPerPage: 2,
-      },
-      content: {
-        blogTitle: 'Custom blog title',
-        blogDescription: 'Custom blog description',
-        blogSidebarTitle: 'Custom blog sidebar title',
-
-        blogPosts: [
-          blogPost({id: 'post1', metadata: {authors: [{key: 'author1'}]}}),
-          blogPost({id: 'post2', metadata: {authors: [{key: 'author1'}]}}),
-          blogPost({
-            id: 'post3',
-            metadata: {
-              authors: [{key: 'author3'}],
-              unlisted: true,
-            },
-          }),
-          blogPost({
-            id: 'post4',
-            metadata: {
-              authors: [{key: 'author1'}, {key: 'author2'}],
-            },
-          }),
-          blogPost({
-            id: 'post5',
-            metadata: {authors: [{key: 'author2'}, {key: 'author3'}]},
-          }),
-          blogPost({id: 'post6'}),
-        ],
-
-        authorsMap: {
-          author1: {
-            key: 'author1',
-            name: 'Author 1',
-            page: {permalink: '/blog/authors/author1'},
-          },
-          author2: {
-            key: 'author2',
-            name: 'Author 2',
-            page: null,
-          },
-          author3: {
-            key: 'author3',
-            name: 'Author 3',
-            page: {permalink: '/blog/authors/author3'},
-          },
-        },
-      },
-    });
-
-    expect(_.countBy(routes, 'component')).toMatchInlineSnapshot(`
-      {
-        "@theme/Blog/Pages/BlogAuthorsListPage": 1,
-        "@theme/Blog/Pages/BlogAuthorsPostsPage": 3,
-        "@theme/BlogArchivePage": 1,
-        "@theme/BlogListPage": 3,
-        "@theme/BlogPostPage": 6,
-      }
-    `);
-
-    expect(routes).toMatchSnapshot();
-    expect(data).toMatchSnapshot();
-  });
-});

packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts

@@ -6,7 +6,6 @@
  */
 
 import {updateTranslationFileMessages} from '@docusaurus/utils';
-import {fromPartial} from '@total-typescript/shoehorn';
 import {getTranslationFiles, translateContent} from '../translations';
 import {DEFAULT_OPTIONS} from '../options';
 import type {
@@ -17,13 +16,13 @@ import type {
 
 const sampleBlogOptions: PluginOptions = {
   ...DEFAULT_OPTIONS,
+  blogSidebarTitle: 'All my posts',
   blogTitle: 'My blog',
   blogDescription: "Someone's random blog",
-  blogSidebarTitle: 'All my posts',
 };
 
 const sampleBlogPosts: BlogPost[] = [
-  fromPartial({
+  {
     id: 'hello',
     metadata: {
       permalink: '/blog/2021/06/19/hello',
@@ -38,13 +37,27 @@ const sampleBlogPosts: BlogPost[] = [
       unlisted: false,
     },
     content: '',
-  }),
+  },
 ];
 
 const sampleBlogContent: BlogContent = {
-  blogTitle: sampleBlogOptions.blogTitle,
-  blogDescription: sampleBlogOptions.blogDescription,
   blogSidebarTitle: sampleBlogOptions.blogSidebarTitle,
+  blogListPaginated: [
+    {
+      items: ['hello'],
+      metadata: {
+        permalink: '/',
+        page: 1,
+        postsPerPage: 10,
+        totalPages: 1,
+        totalCount: 1,
+        previousPage: undefined,
+        nextPage: undefined,
+        blogTitle: sampleBlogOptions.blogTitle,
+        blogDescription: sampleBlogOptions.blogDescription,
+      },
+    },
+  ],
   blogPosts: sampleBlogPosts,
   blogTags: {},
   blogTagsListPath: '/tags',

packages/docusaurus-plugin-content-blog/src/authorsSocials.ts

@@ -27,7 +27,6 @@ export const AuthorSocialsSchema = Joi.object<AuthorSocials>({
   mastodon: Joi.string(),
   twitch: Joi.string(),
   youtube: Joi.string(),
-  email: Joi.string(),
 }).unknown();
 
 type PredefinedPlatformNormalizer = (value: string) => string;
@@ -48,12 +47,12 @@ const PredefinedPlatformNormalizers: Record<
   mastodon: (handle: string) => `https://mastodon.social/@${handle}`, // can be in format user@other.server and it will redirect if needed
   twitch: (handle: string) => `https://twitch.tv/${handle}`,
   youtube: (handle: string) => `https://youtube.com/@${handle}`, // https://support.google.com/youtube/answer/6180214?hl=en
-  email: (email: string) => `mailto:${email}`,
 };
 
 type SocialEntry = [string, string];
 
 function normalizeSocialEntry([platform, value]: SocialEntry): SocialEntry {
+  const normalizer = PredefinedPlatformNormalizers[platform.toLowerCase()];
   if (typeof value !== 'string') {
     throw new Error(
       `Author socials should be usernames/userIds/handles, or fully qualified HTTP(s) absolute URLs.
@@ -61,9 +60,7 @@ Social platform '${platform}' has illegal value '${value}'`,
     );
   }
   const isAbsoluteUrl =
-    value.startsWith('http://') ||
-    value.startsWith('https://') ||
-    value.startsWith('mailto:');
+    value.startsWith('http://') || value.startsWith('https://');
   if (isAbsoluteUrl) {
     return [platform, value];
   } else if (value.includes('/')) {
@@ -72,7 +69,6 @@ Social platform '${platform}' has illegal value '${value}'`,
 Social platform '${platform}' has illegal value '${value}'`,
     );
   }
-  const normalizer = PredefinedPlatformNormalizers[platform.toLowerCase()];
   if (normalizer && !isAbsoluteUrl) {
     const normalizedPlatform = platform.toLowerCase();
     const normalizedValue = normalizer(value);

packages/docusaurus-plugin-content-blog/src/blogUtils.ts

@@ -19,6 +19,7 @@ import {
   Globby,
   groupTaggedItems,
   getTagVisibility,
+  getFileCommitDate,
   getContentPathList,
   isUnlisted,
   isDraft,
@@ -224,7 +225,6 @@ async function processBlogSourceFile(
     siteConfig: {
       baseUrl,
       markdown: {parseFrontMatter},
-      future: {experimental_vcs: vcs},
     },
     siteDir,
     i18n,
@@ -257,7 +257,6 @@ async function processBlogSourceFile(
     blogSourceAbsolute,
     options,
     frontMatter.last_update,
-    vcs,
   );
 
   const draft = isDraft({frontMatter});
@@ -286,11 +285,17 @@ async function processBlogSourceFile(
       return parsedBlogFileName.date;
     }
 
-    const result = await vcs.getFileCreationInfo(blogSourceAbsolute);
-    if (result == null) {
+    try {
+      const result = await getFileCommitDate(blogSourceAbsolute, {
+        age: 'oldest',
+        includeAuthor: false,
+      });
+
+      return result.date;
+    } catch (err) {
+      logger.warn(err);
       return (await fs.stat(blogSourceAbsolute)).birthtime;
     }
-    return new Date(result.timestamp);
   }
 
   const date = await getDate();
@@ -318,9 +323,7 @@ async function processBlogSourceFile(
     } else if (typeof editUrl === 'string') {
       const isLocalized = blogDirPath === contentPaths.contentPathLocalized;
       const fileContentPath =
-        isLocalized &&
-        options.editLocalizedFiles &&
-        contentPaths.contentPathLocalized
+        isLocalized && options.editLocalizedFiles
           ? contentPaths.contentPathLocalized
           : contentPaths.contentPath;
 
@@ -401,8 +404,6 @@ export async function generateBlogPosts(
     ignore: exclude,
   });
 
-  // TODO this should be done outside of this function
-  //  directly in plugin loadContent()
   const tagsFile = await getTagsFile({contentPaths, tags: options.tags});
 
   async function doProcessBlogSourceFile(blogSourceFile: string) {

packages/docusaurus-plugin-content-blog/src/index.ts

@@ -17,13 +17,14 @@ import {
   createAbsoluteFilePathMatcher,
   getContentPathList,
   getDataFilePath,
+  DEFAULT_PLUGIN_ID,
   resolveMarkdownLinkPathname,
-  getLocaleConfig,
 } from '@docusaurus/utils';
 import {getTagsFilePathsToWatch} from '@docusaurus/utils-validation';
 import {createMDXLoaderItem} from '@docusaurus/mdx-loader';
 import {
   getBlogTags,
+  paginateBlogPosts,
   shouldBeListed,
   applyProcessBlogPosts,
   generateBlogPosts,
@@ -43,6 +44,7 @@ import type {
   Assets,
   BlogTags,
   BlogContent,
+  BlogPaginated,
 } from '@docusaurus/plugin-content-blog';
 import type {RuleSetRule, RuleSetUseItem} from 'webpack';
 
@@ -69,20 +71,17 @@ export default async function pluginContentBlog(
     );
   }
 
-  const {baseUrl} = siteConfig;
+  const {onBrokenMarkdownLinks, baseUrl} = siteConfig;
 
-  const shouldTranslate = getLocaleConfig(context.i18n).translate;
   const contentPaths: BlogContentPaths = {
     contentPath: path.resolve(siteDir, options.path),
-    contentPathLocalized: shouldTranslate
-      ? getPluginI18nPath({
-          localizationDir,
-          pluginName: PluginName,
-          pluginId: options.id,
-        })
-      : undefined,
+    contentPathLocalized: getPluginI18nPath({
+      localizationDir,
+      pluginName: PluginName,
+      pluginId: options.id,
+    }),
   };
-  const pluginId = options.id;
+  const pluginId = options.id ?? DEFAULT_PLUGIN_ID;
 
   const pluginDataDirRoot = path.join(generatedFilesDir, PluginName);
   const dataDir = path.join(pluginDataDirRoot, pluginId);
@@ -155,12 +154,18 @@ export default async function pluginContentBlog(
       },
       markdownConfig: siteConfig.markdown,
       resolveMarkdownLink: ({linkPathname, sourceFilePath}) => {
-        return resolveMarkdownLinkPathname(linkPathname, {
+        const permalink = resolveMarkdownLinkPathname(linkPathname, {
           sourceFilePath,
           sourceToPermalink: contentHelpers.sourceToPermalink,
           siteDir,
           contentPaths,
         });
+        if (permalink === null) {
+          logger.report(
+            onBrokenMarkdownLinks,
+          )`Blog markdown link couldn't be resolved: (url=${linkPathname}) in source file path=${sourceFilePath}`;
+        }
+        return permalink;
       },
     });
 
@@ -257,10 +262,9 @@ export default async function pluginContentBlog(
 
       if (!blogPosts.length) {
         return {
-          blogTitle,
-          blogDescription,
           blogSidebarTitle,
           blogPosts: [],
+          blogListPaginated: [],
           blogTags: {},
           blogTagsListPath,
           authorsMap,
@@ -289,9 +293,15 @@ export default async function pluginContentBlog(
         }
       });
 
-      // TODO this is not the correct place to aggregate and paginate tags
-      //  for reasons similar to https://github.com/facebook/docusaurus/pull/11562
-      //  What we should do here is only read the tags file (similar to authors)
+      const blogListPaginated: BlogPaginated[] = paginateBlogPosts({
+        blogPosts: listedBlogPosts,
+        blogTitle,
+        blogDescription,
+        postsPerPageOption,
+        basePageUrl: baseBlogUrl,
+        pageBasePath,
+      });
+
       const blogTags: BlogTags = getBlogTags({
         blogPosts,
         postsPerPageOption,
@@ -301,10 +311,9 @@ export default async function pluginContentBlog(
       });
 
       return {
-        blogTitle,
-        blogDescription,
         blogSidebarTitle,
         blogPosts,
+        blogListPaginated,
         blogTags,
         blogTagsListPath,
         authorsMap,

packages/docusaurus-plugin-content-blog/src/options.ts

@@ -15,7 +15,7 @@ import {
   RouteBasePathSchema,
   URISchema,
 } from '@docusaurus/utils-validation';
-import {DEFAULT_PLUGIN_ID, GlobExcludeDefault} from '@docusaurus/utils';
+import {GlobExcludeDefault} from '@docusaurus/utils';
 import type {
   PluginOptions,
   Options,
@@ -25,7 +25,6 @@ import type {
 import type {OptionValidationContext} from '@docusaurus/types';
 
 export const DEFAULT_OPTIONS: PluginOptions = {
-  id: DEFAULT_PLUGIN_ID,
   feedOptions: {
     type: ['rss', 'atom'],
     copyright: '',