Merge sync 202604

.github/dependabot.yml

@@ -1,26 +1,27 @@
 version: 2
 updates:
-  - package-ecosystem: "npm"
+  - package-ecosystem: npm
     directory: "/"
-    open-pull-requests-limit: 10
     schedule:
       interval: "weekly"
+    open-pull-requests-limit: 20
     labels:
-      - "dependencies"
-    ignore:
-      - dependency-name: "react"
-      - dependency-name: "react-dom"
-      - dependency-name: "react-router-dom"
-      - dependency-name: "@docsearch/react"
-      - dependency-name: "tailwindcss"
+      - dependencies
+    versioning-strategy: widen
     groups:
       dependencies:
         patterns:
           - "*"
+        update-types:
+          - "minor"
+          - "patch"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+    open-pull-requests-limit: 20
+    labels:
+      - dependencies
     groups:
       dependencies:
         patterns:

.github/workflows/dependabot.yml

@@ -0,0 +1,38 @@
+name: Dependabot
+
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot-auto-merge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Generate Token
+        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
+        id: app-token
+        with:
+          app-id: ${{ secrets.BOT_APP_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+
+      - name: Dependabot metadata
+        id: dependabot-metadata
+        uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
+        with:
+          github-token: "${{ steps.app-token.outputs.token }}"
+
+      - name: Enable auto-merge for Dependabot PRs
+        if: steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major'
+        run: |
+          if [ "$(gh pr status --json reviewDecision -q .currentBranch.reviewDecision)" != "APPROVED" ];
+          then gh pr review --approve "$PR_URL"
+          else echo "PR already approved, skipping additional approvals to minimize emails/notification noise.";
+          fi
+
+          gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/dependency-review.yml

@@ -11,4 +11,4 @@ jobs:
       - name: "Checkout Repository"
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@05fe4576374b728f0c523d6a13d64c25081e0803 # v4.8.3
+        uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0

.github/workflows/deploy.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn

.github/workflows/testing.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
@@ -38,13 +38,14 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
 
       - run: yarn --frozen-lockfile
       - run: yarn lint:js
+      - run: yarn lint:prettier
       - run: yarn lint:markdown
 
   proseLint:
@@ -58,7 +59,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
@@ -84,7 +85,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
           cache: yarn
@@ -95,7 +96,7 @@ jobs:
         uses: ./.github/actions/webpack-persistent-cache
 
       - name: Cypress run
-        uses: cypress-io/github-action@bc22e01685c56e89e7813fd8e26f33dc47f87e15 # v7.1.5
+        uses: cypress-io/github-action@783cb3f07983868532cabaedaa1e6c00ff4786a8 # v7.1.9
         with:
           browser: chrome
           config-file: cypress.config.js

.vale/Speciesism/AnimalIdioms.yml

@@ -4,29 +4,29 @@ link: https://doi.org/10.1007/s43681-023-00380-w
 level: warning
 ignorecase: true
 swap:
-  'kill two birds with one stone': accomplish two things at once
-  'killing two birds with one stone': accomplishing two things at once
-  'killed two birds with one stone': accomplished two things at once
-  'beat a dead horse': belabor the point
-  'beating a dead horse': belaboring the point
-  'flog a dead horse': belabor the point
-  'flogging a dead horse': belaboring the point
-  'bring home the bacon': bring home the results
-  'bringing home the bacon': bringing home the results
-  'brought home the bacon': brought home the results
-  'more than one way to skin a cat': more than one way to solve this
-  'many ways to skin a cat': many ways to approach this
-  'let the cat out of the bag': reveal the secret
-  'letting the cat out of the bag': revealing the secret
-  'open a can of worms': create a complicated situation
-  'opening a can of worms': creating a complicated situation
-  'opened a can of worms': created a complicated situation
-  'wild goose chase': pointless pursuit
-  'take the bull by the horns': face the challenge head-on
-  'taking the bull by the horns': facing the challenge head-on
-  'took the bull by the horns': faced the challenge head-on
-  'like shooting fish in a barrel': extremely easy
-  'straight from the horse''s mouth': directly from the source
-  'from the horse''s mouth': from a reliable source
-  'whack-a-mole': recurring problem
-  'whack a mole': recurring problem
+  "kill two birds with one stone": accomplish two things at once
+  "killing two birds with one stone": accomplishing two things at once
+  "killed two birds with one stone": accomplished two things at once
+  "beat a dead horse": belabor the point
+  "beating a dead horse": belaboring the point
+  "flog a dead horse": belabor the point
+  "flogging a dead horse": belaboring the point
+  "bring home the bacon": bring home the results
+  "bringing home the bacon": bringing home the results
+  "brought home the bacon": brought home the results
+  "more than one way to skin a cat": more than one way to solve this
+  "many ways to skin a cat": many ways to approach this
+  "let the cat out of the bag": reveal the secret
+  "letting the cat out of the bag": revealing the secret
+  "open a can of worms": create a complicated situation
+  "opening a can of worms": creating a complicated situation
+  "opened a can of worms": created a complicated situation
+  "wild goose chase": pointless pursuit
+  "take the bull by the horns": face the challenge head-on
+  "taking the bull by the horns": facing the challenge head-on
+  "took the bull by the horns": faced the challenge head-on
+  "like shooting fish in a barrel": extremely easy
+  "straight from the horse's mouth": directly from the source
+  "from the horse's mouth": from a reliable source
+  "whack-a-mole": recurring problem
+  "whack a mole": recurring problem

.vale/Speciesism/AnimalMetaphors.yml

@@ -4,11 +4,11 @@ link: https://doi.org/10.1007/s43681-023-00380-w
 level: warning
 ignorecase: true
 swap:
-  'guinea pig': test subject
-  'sacred cow': unquestioned belief
-  'sacred cows': unquestioned beliefs
-  'scapegoat(?:ed|ing)?': wrongly blamed
-  'dog-eat-dog': ruthlessly competitive
-  'dog eat dog': ruthlessly competitive
-  'rat race': competitive grind
-  'red herring': false lead
+  "guinea pig": test subject
+  "sacred cow": unquestioned belief
+  "sacred cows": unquestioned beliefs
+  "scapegoat(?:ed|ing)?": wrongly blamed
+  "dog-eat-dog": ruthlessly competitive
+  "dog eat dog": ruthlessly competitive
+  "rat race": competitive grind
+  "red herring": false lead

.vale/Speciesism/TechTerminology.yml

@@ -3,11 +3,11 @@ message: "Consider using '%s' instead of '%s'. This technical term has a more pr
 level: suggestion
 ignorecase: true
 swap:
-  'canary deployment': progressive rollout
-  'canary release': progressive rollout
-  'canary test(?:ing)?': incremental testing
-  'monkey[- ]?patch(?:ed|ing)?': runtime patch
-  'duck[- ]?typ(?:ed|ing)': structural typing
-  'dogfood(?:ing)?': self-hosting
-  'eat(?:ing)? (?:your|our|their) own dogfood': self-testing
-  'rubber duck(?:ing)? debugging': talk-through debugging
+  "canary deployment": progressive rollout
+  "canary release": progressive rollout
+  "canary test(?:ing)?": incremental testing
+  "monkey[- ]?patch(?:ed|ing)?": runtime patch
+  "duck[- ]?typ(?:ed|ing)": structural typing
+  "dogfood(?:ing)?": self-hosting
+  "eat(?:ing)? (?:your|our|their) own dogfood": self-testing
+  "rubber duck(?:ing)? debugging": talk-through debugging

cypress/e2e/click-menu-scroll-top.cy.js

@@ -7,7 +7,8 @@ describe("Click menu", () => {
     // note that there's no hash in url
     cy.get('[data-testid="contributors"]').scrollIntoView();
 
-    const selector = '.sidebar-item__title[href="/concepts/modules/"]';
+    const selector =
+      '[data-testid="sidebar-item-title"][href="/concepts/modules/"]';
 
     cy.get(selector).click();
     cy.window().then((win) => {

cypress/e2e/code-block-with-copy.cy.js

@@ -64,6 +64,9 @@ describe("CodeBlockWithCopy", () => {
   it("copies non-diff code blocks without altering content", () => {
     visitWithClipboardSpy("/concepts/");
 
+    // Wait for Suspense content to load before querying code blocks
+    cy.get("button.copy-button").should("exist");
+
     // Select the first webpack.config.js example and its copy wrapper.
     getFirstWebpackConfigBlock("standardCodeBlock");
 
@@ -73,6 +76,7 @@ describe("CodeBlockWithCopy", () => {
       .find("code")
       .invoke("text")
       .as("expectedCopiedText");
+    cy.get("@standardCodeBlock").find("button.copy-button").should("exist");
     cy.get("@standardCodeBlock").find("button.copy-button").click();
 
     // Assert copied output is unchanged for regular code blocks.
@@ -82,7 +86,7 @@ describe("CodeBlockWithCopy", () => {
 
       cy.get("@expectedCopiedText").then((expectedCopiedText) => {
         expect(copiedText).to.eq(expectedCopiedText);
-        expect(copiedText).to.include("module.exports = {");
+        expect(copiedText).to.include("export default {");
         expect(copiedText).to.include('entry: "./path/to/my/entry/file.js",');
       });
     });

cypress/e2e/page-hash-navigation.cy.js

@@ -0,0 +1,16 @@
+"use strict";
+
+describe("Page hash navigation", () => {
+  it("scrolls to the element specified by the hash", () => {
+    cy.visit("/guides/getting-started/#basic-setup");
+
+    cy.location("hash").should("eq", "#basic-setup");
+
+    cy.get("#basic-setup", { timeout: 10000 })
+      .should("exist")
+      .then(($el) => {
+        const rect = $el[0].getBoundingClientRect();
+        expect(rect.top).to.be.lessThan(200);
+      });
+  });
+});

cypress/e2e/pr_4435.cy.js

@@ -9,16 +9,21 @@ describe("Open page in new tab", { scrollBehavior: false }, () => {
         cy.stub(win, "scrollTo");
       },
     });
+    // wait for page content to load before asserting scroll
+    cy.get(
+      '[data-testid="sidebar-item-title"][href="/concepts/plugins/"]',
+    ).should("exist");
     // there's one call in Page.jsx when componentDidMount
-    cy.window().then((win) => {
+    cy.window().should((win) => {
       expect(win.scrollTo).to.be.calledOnce;
     });
 
-    const selector = '.sidebar-item__title[href="/concepts/plugins/"]';
+    const selector =
+      '[data-testid="sidebar-item-title"][href="/concepts/plugins/"]';
 
     // we click the menu
     cy.get(selector).click();
-    cy.window().then((win) => {
+    cy.window().should((win) => {
       // we don't know whether user has scrolled the page or not although no pathname changed
       expect(win.scrollTo).to.be.calledTwice;
     });
@@ -28,7 +33,7 @@ describe("Open page in new tab", { scrollBehavior: false }, () => {
         metaKey: true,
       });
       // no scrollTo should be called
-      cy.window().then((win) => {
+      cy.window().should((win) => {
         expect(win.scrollTo).to.be.calledTwice;
       });
     } else if (Cypress.platform === "win32" || Cypress.platform === "linux") {
@@ -37,14 +42,14 @@ describe("Open page in new tab", { scrollBehavior: false }, () => {
         ctrlKey: true,
       });
       // no scrollTo should be called
-      cy.window().then((win) => {
+      cy.window().should((win) => {
         expect(win.scrollTo).to.be.calledTwice;
       });
     }
 
     // we click the menu again, scroll to top again
     cy.get(selector).click();
-    cy.window().then((win) => {
+    cy.window().should((win) => {
       expect(win.scrollTo).to.be.calledThrice;
     });
   });

cypress/e2e/search.cy.js

@@ -1,10 +1,30 @@
 "use strict";
 
 describe("Search", () => {
+  beforeEach(() => {
+    cy.intercept("POST", "https://*.algolia.net/**", {
+      statusCode: 200,
+      body: {
+        results: [
+          {
+            hits: [
+              {
+                url: "http://localhost:3000/concepts/",
+                hierarchy: { lvl0: "Concepts" },
+                objectID: "1",
+              },
+            ],
+          },
+        ],
+      },
+    }).as("algoliaSearch");
+  });
+
   it("should visit entry page", () => {
     cy.visit("/concepts/");
     cy.get(".DocSearch").click();
     cy.get("#docsearch-input").type("roadmap");
-    cy.get(".DocSearch-Hits").should("be.visible");
+
+    cy.get(".DocSearch-Modal").should("be.visible");
   });
 });

eslint.config.mjs

@@ -15,6 +15,7 @@ export default defineConfig([
     ".github/**/*.md",
     "**/README.md",
     "src/mdx-components.mjs",
+    "**/setupTests.js",
   ]),
   {
     extends: [configs.recommended],

jest.config.mjs

@@ -1,12 +1,14 @@
 export default {
   verbose: true,
   testEnvironment: "node",
+  setupFiles: ["./src/setupTests.js"],
   transform: {
-    "^.+\\.jsx?$": "babel-jest",
+    "^.+\\.(m|c)?jsx?$": "babel-jest",
   },
   moduleNameMapper: {
     "\\.(scss|css)$": "<rootDir>/src/components/__mocks__/styleMock.js",
     "\\.svg$": "<rootDir>/src/components/__mocks__/svgMock.js",
+    "\\.(png|jpg|jpeg|ico)$": "<rootDir>/src/components/__mocks__/fileMock.js",
   },
   moduleFileExtensions: [
     "js",