Feb 2025 - Release 2 (#282)

* Allow custom MIN_REFRESH_TIME * chore(deps): Bump @oclif/core from 4.2.0 to 4.2.6 (#271) Bumps [@oclif/core](https://github.com/oclif/core) from 4.2.0 to 4.2.6. - [Release notes](https://github.com/oclif/core/releases) - [Changelog](https://github.com/oclif/core/blob/main/CHANGELOG.md) - [Commits](oclif/core@4.2.0...4.2.6) --- updated-dependencies: - dependency-name: "@oclif/core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): Bump eslint from 9.17.0 to 9.19.0 in /template (#267) Bumps [eslint](https://github.com/eslint/eslint) from 9.17.0 to 9.19.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v9.17.0...v9.19.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): Bump docker/build-push-action from 6.10.0 to 6.13.0 (#265) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.10.0 to 6.13.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@48aba3b...ca877d9) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): Bump docker/metadata-action (#264) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 906ecf0fc0a80f9110f79d9e6c04b1080f4a2621 to 8e1d5461f02b7886d3c1a774bfbd873650445aa2. - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](docker/metadata-action@906ecf0...8e1d546) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): Bump fs-extra from 11.2.0 to 11.3.0 (#258) Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 11.2.0 to 11.3.0. - [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md) - [Commits](jprichardson/node-fs-extra@11.2.0...11.3.0) --- updated-dependencies: - dependency-name: fs-extra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update [dsid].js * chore(deps): Bump eslint-config-next from 15.1.2 to 15.1.6 in /template (#270) Bumps [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next) from 15.1.2 to 15.1.6. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v15.1.6/packages/eslint-config-next) --- updated-dependencies: - dependency-name: eslint-config-next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): Bump @babel/runtime from 7.26.0 to 7.26.7 in /template (#269) Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.26.0 to 7.26.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.26.7/packages/babel-runtime) --- updated-dependencies: - dependency-name: "@babel/runtime" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): Bump postcss from 8.4.49 to 8.5.1 in /template (#262) Bumps [postcss](https://github.com/postcss/postcss) from 8.4.49 to 8.5.1. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.4.49...8.5.1) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): Bump typescript from 5.7.2 to 5.7.3 in /template (#257) Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.7.2 to 5.7.3. - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](microsoft/TypeScript@v5.7.2...v5.7.3) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): Bump querystring from 0.2.0 to 0.2.1 in /template (#252) Bumps [querystring](https://github.com/Gozala/querystring) from 0.2.0 to 0.2.1. - [Changelog](https://github.com/Gozala/querystring/blob/master/CHANGELOG.md) - [Commits](Gozala/querystring@v0.2.0...v0.2.1) --- updated-dependencies: - dependency-name: querystring dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): Bump cookies-next from 4.3.0 to 5.1.0 in /template (#261) Bumps [cookies-next](https://github.com/andreizanik/cookies-next) from 4.3.0 to 5.1.0. - [Release notes](https://github.com/andreizanik/cookies-next/releases) - [Commits](andreizanik/cookies-next@v4.3.0...v5.1.0) --- updated-dependencies: - dependency-name: cookies-next dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update [dsid].js * fix(167): singlevalueicon from KVstore fix * Fix #167 * Custom refresh time (#275) * Update datasource.js * Add refreshVal to def * Fix postProcessing * Update datasource.js * convert to milliseconds * Splunk viz upgrade fixes (#277) * chore(deps): Bump the angular group across 1 directory with 8 updates Bumps the angular group with 8 updates in the /template directory: | Package | From | To | | --- | --- | --- | | @splunk/dashboard-context | `27.5.1` | `28.1.0` | | @splunk/dashboard-core | `27.5.1` | `28.1.0` | | @splunk/dashboard-presets | `27.5.1` | `28.1.0` | | @splunk/datasource-utils | `27.5.1` | `28.1.0` | | @splunk/datasources | `27.5.1` | `28.1.0` | | @splunk/react-icons | `4.9.0` | `4.10.0` | | @splunk/react-ui | `4.40.0` | `4.41.0` | | @splunk/visualization-context | `27.0.0` | `27.1.0` | Updates `@splunk/dashboard-context` from 27.5.1 to 28.1.0 Updates `@splunk/dashboard-core` from 27.5.1 to 28.1.0 Updates `@splunk/dashboard-presets` from 27.5.1 to 28.1.0 Updates `@splunk/datasource-utils` from 27.5.1 to 28.1.0 Updates `@splunk/datasources` from 27.5.1 to 28.1.0 Updates `@splunk/react-icons` from 4.9.0 to 4.10.0 Updates `@splunk/react-ui` from 4.40.0 to 4.41.0 Updates `@splunk/visualization-context` from 27.0.0 to 27.1.0 --- updated-dependencies: - dependency-name: "@splunk/dashboard-context" dependency-type: direct:production update-type: version-update:semver-major dependency-group: angular - dependency-name: "@splunk/dashboard-core" dependency-type: direct:production update-type: version-update:semver-major dependency-group: angular - dependency-name: "@splunk/dashboard-presets" dependency-type: direct:production update-type: version-update:semver-major dependency-group: angular - dependency-name: "@splunk/datasource-utils" dependency-type: direct:production update-type: version-update:semver-major dependency-group: angular - dependency-name: "@splunk/datasources" dependency-type: direct:production update-type: version-update:semver-major dependency-group: angular - dependency-name: "@splunk/react-icons" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: angular - dependency-name: "@splunk/react-ui" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: angular - dependency-name: "@splunk/visualization-context" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: angular ... Signed-off-by: dependabot[bot] <[email protected]> * Update [dashboard].jsx * Add css and updates * Remove debugging * Update builddash.js * Fix deps * Fix deps --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): Bump the angular group across 1 directory with 2 updates (#278) Bumps the angular group with 2 updates in the /template directory: @splunk/react-icons and @splunk/react-ui. Updates `@splunk/react-icons` from 4.10.0 to 4.11.0 Updates `@splunk/react-ui` from 4.41.0 to 4.42.0 --- updated-dependencies: - dependency-name: "@splunk/react-icons" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: angular - dependency-name: "@splunk/react-ui" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: angular ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Ws remote screenshots (#279) Add ability to use remote screenshotting service (Experimental) * chore(deps): Bump prettier from 3.4.2 to 3.5.0 (#280) Bumps [prettier](https://github.com/prettier/prettier) from 3.4.2 to 3.5.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](prettier/prettier@3.4.2...3.5.0) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): Bump eslint from 9.19.0 to 9.20.0 in /template (#281) Bumps [eslint](https://github.com/eslint/eslint) from 9.19.0 to 9.20.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v9.19.0...v9.20.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update getScreenshotUrl.js --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
livehybrid · Feb 10, 2025 · 2916ec8 · 2916ec8
1 parent 42e9dcc
commit 2916ec8
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 40 deletions.
diff --git a/docker/README.md b/docker/README.md
@@ -1,5 +1,3 @@
-# Docker Instructions
-
 Use one of the options below to deploy your Dashboard Publisher App. This is aimed to be a starting point to enable you to publish your dashboards. Depending on your use-cases, you may wish to consider additional configuration, such as caching/screenshotting/authentication/logging, and high-availability.  
 Due to the nature of how the production site is built, it is not recommended to run two containers and load-balance between them, as certain cached files may not exist in a secondary container. HA is possible using this approach but requires further configuration.
 
@@ -25,6 +23,7 @@ Note: that this image is maintained by @livehybrid and not maintained by Splunk.
 | DASHPUB_TITLE | "Dashboards" | Set the page `<title>` and the header title on the front page. |
 | DASHPUB_VERCEL | *None* | Whether to deploy to Vercel, Set to `n` to prevent deploying to Vercel and continue with the local running of the app. This is used to remove the need for interactive configuration/setup. *Future enhancement in progress to remove the need to set this when within Docker Container* |
 | SEARCH_JOB_DELAY_MS | 250 | Sets the number of milliseconds to wait between checking if the search job has completed, defaults to 250ms if not set |
+| NEXT_PUBLIC_BASE_SCREENSHOT_URL | *None* | Use remote endpoint for Screenshots - *Experimental* - Designed for use with https://beta.dashpub.online
 | NODE_TLS_REJECT_UNAUTHORIZED | 1 | Check for validity of SSL certificate if connecting to Splunk with https:// - Set to 0 to disable SSL validation |
 | VERCEL_URL | *None* | Used in conjunction with `DASHPUB_SCREENSHOTS` to set HTML Metadata to display Dashboard screenshot when URL is *unfurled* (e.g., posting in Slack/LinkedIn etc) |
 

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -8,6 +8,7 @@ export NEXT_PUBLIC_DASHPUBHOSTEDBY=$DASHPUB_HOSTEDBY_NAME
 export NEXT_PUBLIC_DASHPUBHOSTEDURL=$DASHPUB_HOSTEDBY_URL
 export NEXT_PUBLIC_DASHPUBFOOTER=$DASHPUB_FOOTER
 export NEXT_PUBLIC_DASHPUBREPO=$DASHPUB_REPO
+export NEXT_PUBLIC_URL=$VERCEL_URL
 ENV_MODE="${ENV_MODE:-production}"
 NODE_ENV="${NODE_ENV:-production}"
 

diff --git a/template/package.json b/template/package.json
@@ -34,7 +34,7 @@
     },
     "devDependencies": {
         "@babel/plugin-proposal-private-property-in-object": "*",
-        "eslint": "^9.19.0"
+        "eslint": "^9.20.0"
     },
     "resolutions": {
         "@splunk/datasource-utils": "28.1.0",

diff --git a/template/src/components/getScreenshotUrl.js b/template/src/components/getScreenshotUrl.js
@@ -0,0 +1,28 @@
+import crypto from 'crypto';
+import { format } from "util";
+
+const BASE_SCREENSHOT_URL = process.env.NEXT_PUBLIC_BASE_SCREENSHOT_URL || null;
+const BASE_DASHBOARD_URL = process.env.NEXT_PUBLIC_URL ? `https://${process.env.NEXT_PUBLIC_URL}` : "http://localhost";
+
+const generateHash = (url) => {
+    return crypto.createHash("sha256").update(url).digest("hex").substring(0, 32);
+};
+
+/**
+ * Returns the URL to the screenshot of the specified dashboard.
+ * @param {string} dashboardKey - The unique key of the dashboard.
+ * @returns {string|null} - The screenshot URL or null if screenshots are disabled.
+ */
+const getScreenshotUrl = (dashboardKey) => {
+    if (BASE_SCREENSHOT_URL) {
+        // Generate the hash and construct the screenshot URL
+        const adjustedDashboardKey = (dashboardKey === "index") ? "" : dashboardKey;
+        const dashboardURL = `${BASE_DASHBOARD_URL}/${adjustedDashboardKey}`;
+        const hash = generateHash(dashboardURL);
+        return `${BASE_SCREENSHOT_URL}/screenshots/${hash}.jpg`;
+    }
+    // Fallback to the original local logic if BASE_SCREENSHOT_URL is not set
+    return format("/%s/%s.%s", process.env.NEXT_PUBLIC_DASHPUBSCREENSHOTDIR || "screens" , dashboardKey, process.env.NEXT_PUBLIC_DASHPUBSCREENSHOTEXT || "png");
+};
+
+export default getScreenshotUrl;
diff --git a/template/src/components/home.js b/template/src/components/home.js
@@ -18,7 +18,7 @@ import React, { Component } from 'react';
 import styled from 'styled-components';
 import { variables } from '@splunk/themes';
 import dashboardManifest from '../_dashboards.json';
-
+import getScreenshotUrl from './getScreenshotUrl';
 //import {Tag} from '@styled-icons/bootstrap';
 import { Tag } from 'react-bootstrap-icons';
 
@@ -135,15 +135,22 @@ class Home extends Component {
     }
 
     render() {
-        const INSERT_SCREENSHOTS = process.env.NEXT_PUBLIC_DASHPUBSCREENSHOTS || false;
+        const INSERT_SCREENSHOTS = process.env.NEXT_PUBLIC_DASHPUBSCREENSHOTS || false;                
         const renderScreenshot = (k) => {
             if (INSERT_SCREENSHOTS) {
+                const screenshotUrl = getScreenshotUrl(k);
+
                 return (
                     <Card.Body>
-                        <Screenshot style={{ width: 330 }} src={`/screenshots/${k}.jpg`} alt={dashboardManifest[k]['title']} />
+                        <Screenshot 
+                            style={{ width: 330 }} 
+                            src={screenshotUrl} 
+                            alt={dashboardManifest[k]?.title || "Screenshot"} 
+                        />
                     </Card.Body>
                 );
             }
+            return null;
         };
 
         const renderTags = (k) => {

diff --git a/template/src/components/page.js b/template/src/components/page.js
@@ -29,12 +29,19 @@ const GlobalBackgroundStyle = createGlobalStyle`
 `;
 
 const fullUrl = (baseUrl, path) => {
-    if (!baseUrl) {
-        return path;
+    try {
+        // Check if the path is already an absolute URL
+        const url = new URL(path);
+        return url.href;
+    } catch (e) {
+        // If it's not an absolute URL, construct it using baseUrl
+        if (!baseUrl) {
+            return path;
+        }
+        const u = new URL(baseUrl);
+        u.pathname = path;
+        return u.href;
     }
-    const u = new URL(baseUrl);
-    u.pathname = path;
-    return u.href;
 };
 
 export default function Page({

diff --git a/template/src/pages/[dashboard].jsx b/template/src/pages/[dashboard].jsx
@@ -3,20 +3,20 @@ import React, { Suspense } from 'react';
 import Loading from '../components/loading';
 import NoSSR from '../components/nossr';
 import Page from '../components/page';
+import getScreenshotUrl from '../components/getScreenshotUrl';
 
 const Dashboard = dynamic(() => import('../components/dashboard'), {
   ssr: false,
 });
-//import CdnDataSource from '../datasource';
-
-//const presets = {...CloudViewOnlyPreset, ...{dataSources:{"ds.cdn":"CdnDataSource"}}}
 
 export default function DashboardPage({ definition, dashboardId, baseUrl }) {
+    const screenshotUrl = getScreenshotUrl(dashboardId);
+
     return (
         <Page
             title={definition.title || 'Dashboard'}
             description={definition.description}
-            imageUrl={`/screenshot/${dashboardId}.jpg`}
+            imageUrl={screenshotUrl}
             path={`/${dashboardId}`}
             //  backgroundColor={"#171d21"}
             theme={definition.theme || 'light'}

diff --git a/template/src/pages/index.jsx b/template/src/pages/index.jsx
@@ -4,29 +4,62 @@ import Page from '../components/page';
 import Link from '@splunk/react-ui/Link';
 import styled from 'styled-components';
 import useSplunkTheme from '@splunk/themes/useSplunkTheme';
-import { format } from "util";
 import 'bootstrap/dist/css/bootstrap.css';
+import getScreenshotUrl from '../components/getScreenshotUrl';
 
-export default function Home() {
+export async function getStaticProps() {
+    const screenshotUrl = getScreenshotUrl("index");
+    return {
+        props: {
+            screenshotUrl,
+        },
+    };
+}
+
+export default function Home({ screenshotUrl }) {
     const { focusColor } = useSplunkTheme();
     const Footer = styled.p`
         color: ${focusColor};
-        text-align:center;
-    `
-    const imageUrl = format("/%s/%s.%s", process.env.NEXT_PUBLIC_DASHPUBSCREENSHOTDIR || "screens" , "index", process.env.NEXT_PUBLIC_DASHPUBSCREENSHOTEXT || "png");
+        text-align: center;
+    `;
+
     return (
         <Page
             title={process.env.NEXT_PUBLIC_DASHPUBTITLE || 'Dashboards'}
             theme={process.env.NEXT_PUBLIC_HOMETHEME || 'light'}
-            imageUrl={imageUrl}
+            imageUrl={screenshotUrl}
             baseUrl={process.env.VERCEL_URL ? `https://${process.env.VERCEL_URL}` : null}>
             <Homepage key="home" />
-            { process.env.NEXT_PUBLIC_DASHPUBFOOTER!=="false" ?
-            <Footer align="center">
-                {process.env.NEXT_PUBLIC_DASHPUBFOOTER || "Hosted Splunk Dashboards" }
-                {process.env.NEXT_PUBLIC_DASHPUBHOSTEDBY ? <> by <Link to={process.env.NEXT_PUBLIC_DASHPUBHOSTEDURL || '#'} openInNewContext="">{process.env.NEXT_PUBLIC_DASHPUBHOSTEDBY}</Link> </> : " "}
-                using <Link to={process.env.NEXT_PUBLIC_DASHPUBREPO || "https://github.com/splunk/dashpub"} openInNewContext="">Dashpub</Link>
-            </Footer> : "" }
+            {process.env.NEXT_PUBLIC_DASHPUBFOOTER !== "false" ? (
+                <Footer>
+                    {process.env.NEXT_PUBLIC_DASHPUBFOOTER || "Hosted Splunk Dashboards"}
+                    {process.env.NEXT_PUBLIC_DASHPUBHOSTEDBY ? (
+                        <>
+                            {" by "}
+                            <Link
+                                to={process.env.NEXT_PUBLIC_DASHPUBHOSTEDURL || '#'}
+                                openInNewContext=""
+                            >
+                                {process.env.NEXT_PUBLIC_DASHPUBHOSTEDBY}
+                            </Link>{" "}
+                        </>
+                    ) : (
+                        " "
+                    )}
+                    using{" "}
+                    <Link
+                        to={
+                            process.env.NEXT_PUBLIC_DASHPUBREPO ||
+                            "https://github.com/splunk/dashpub"
+                        }
+                        openInNewContext=""
+                    >
+                        Dashpub
+                    </Link>
+                </Footer>
+            ) : (
+                ""
+            )}
         </Page>
     );
 }
diff --git a/template/yarn.lock b/template/yarn.lock
@@ -305,6 +305,13 @@
   dependencies:
     "@types/json-schema" "^7.0.15"
 
+"@eslint/core@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.11.0.tgz#7a9226e850922e42cbd2ba71361eacbe74352a12"
+  integrity sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
 "@eslint/eslintrc@^3.2.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.2.0.tgz#57470ac4e2e283a6bf76044d63281196e370542c"
@@ -320,10 +327,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.19.0":
-  version "9.19.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.19.0.tgz#51dbb140ed6b49d05adc0b171c41e1a8713b7789"
-  integrity sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==
+"@eslint/js@9.20.0":
+  version "9.20.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.20.0.tgz#7421bcbe74889fcd65d1be59f00130c289856eb4"
+  integrity sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==
 
 "@eslint/object-schema@^2.1.5":
   version "2.1.5"
@@ -2668,17 +2675,17 @@ eslint-visitor-keys@^4.2.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
   integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
-eslint@^9.19.0:
-  version "9.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.19.0.tgz#ffa1d265fc4205e0f8464330d35f09e1d548b1bf"
-  integrity sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA==
+eslint@^9.20.0:
+  version "9.20.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.20.0.tgz#6244c46c1640cd5e577a31ebc460fca87838c0b7"
+  integrity sha512-aL4F8167Hg4IvsW89ejnpTwx+B/UQRzJPGgbIOl+4XqffWsahVVsLEWoZvnrVuwpWmnRd7XeXmQI1zlKcFDteA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.12.1"
     "@eslint/config-array" "^0.19.0"
-    "@eslint/core" "^0.10.0"
+    "@eslint/core" "^0.11.0"
     "@eslint/eslintrc" "^3.2.0"
-    "@eslint/js" "9.19.0"
+    "@eslint/js" "9.20.0"
     "@eslint/plugin-kit" "^0.2.5"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"

diff --git a/yarn.lock b/yarn.lock
@@ -968,9 +968,9 @@ picomatch@^2.3.1:
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 prettier@^3.1.1:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.4.2.tgz#a5ce1fb522a588bf2b78ca44c6e6fe5aa5a2b13f"
-  integrity sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.0.tgz#50325a28887c6dfdf2ca3f8eaba02b66a8429ca7"
+  integrity sha512-quyMrVt6svPS7CjQ9gKb3GLEX/rl3BCL2oa/QkNcXv4YNVBC9olt3s+H7ukto06q7B1Qz46PbrKLO34PR6vXcA==
 
 pretty-ms@^9.0.0:
   version "9.2.0"