Merge branch 'develop' into resolve-info-html-assignment

2025-11-04 04:44:08 +01:00 · 2023-06-28 01:29:14 +03:00
parent 0a6fc1b582 d9db2edf5a
commit 925e76e283
16 changed files with 140 additions and 103 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -53,8 +53,17 @@ body:
        Please fill out the info below.
        Note that you only need to fill out the relevant section
      value: |-
-        - Mermaid version: 
+        - Mermaid version:
        - Browser and Version: [Chrome, Edge, Firefox]
+  - type: textarea
+    attributes:
+      label: Suggested Solutions
+      description: >
+        If applicable, suggest solutions that could resolve the bug.
+        It would help maintainers/contributors to not waste time looking for the solution. Even pointing the line causing the bug would be great!
+      placeholder: |-
+        - Variable `parser` in file <filepath> is not initialised ...
+        - Add a new type for ...
  - type: textarea
    attributes:
      label: Additional Context
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -0,0 +1,16 @@
+cff-version: 1.2.0
+title: 'Mermaid: Generate diagrams from markdown-like text'
+message: >-
+  If you use this software, please cite it using the metadata from this file.
+type: software
+authors:
+  - family-names: Sveidqvist
+    given-names: Knut
+  - name: 'Contributors to Mermaid'
+repository-code: 'https://github.com/mermaid-js/mermaid'
+date-released: 2014-12-02
+url: 'https://mermaid.js.org/'
+abstract: >-
+  JavaScript based diagramming and charting tool that renders Markdown-inspired
+  text definitions to create and modify diagrams dynamically.
+license: MIT
--- a/cSpell.json
+++ b/cSpell.json
@@ -40,6 +40,7 @@
    "dompurify",
    "edgechromium",
    "elkjs",
+    "elle",
    "faber",
    "flatmap",
    "foswiki",
@@ -86,6 +87,7 @@
    "mkdocs",
    "mmorel",
    "mult",
+    "neurodiverse",
    "nextra",
    "orlandoni",
    "pathe",
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
  mermaid:
-    image: node:18.16.1-alpine3.18
+    image: node:20.3.1-alpine3.18
    stdin_open: true
    tty: true
    working_dir: /mermaid
--- a/docs/config/Tutorials.md
+++ b/docs/config/Tutorials.md
@@ -26,6 +26,10 @@ The definitions that can be generated the Live-Editor are also backwards-compati

 [Eddie Jaoude: Can you code your diagrams?](https://www.youtube.com/watch?v=9HZzKkAqrX8)

+## Mermaid with OpenAI
+
+[Elle Neal: Mind Mapping with AI: An Accessible Approach for Neurodiverse Learners Tutorial:](https://medium.com/@elle.neal_71064/mind-mapping-with-ai-an-accessible-approach-for-neurodiverse-learners-1a74767359ff), [Demo:](https://databutton.com/v/jk9vrghc)
+
 ## Mermaid with HTML

 Examples are provided in [Getting Started](../intro/n00b-gettingStarted.md)
--- a/docs/syntax/timeline.md
+++ b/docs/syntax/timeline.md
@@ -257,9 +257,11 @@ let us look at same example, where we have disabled the multiColor option.

 ### Customizing Color scheme

-You can customize the color scheme using the `cScale0` to `cScale11` theme variables. Mermaid allows you to set unique colors for up-to 12 sections, where `cScale0` variable will drive the value of the first section or time-period, `cScale1` will drive the value of the second section and so on.
+You can customize the color scheme using the `cScale0` to `cScale11` theme variables, which will change the background colors. Mermaid allows you to set unique colors for up-to 12 sections, where `cScale0` variable will drive the value of the first section or time-period, `cScale1` will drive the value of the second section and so on.
 In case you have more than 12 sections, the color scheme will start to repeat.

+If you also want to change the foreground color of a section, you can do so use theme variables corresponding `cScaleLabel0` to `cScaleLabel11` variables.
+
 NOTE: Default values for these theme variables are picked from the selected theme. If you want to override the default values, you can use the `initialize` call to add your custom theme variable values.

 Example:
@@ -268,9 +270,9 @@ Now let's override the default values for the `cScale0` to `cScale2` variables:

 ```mermaid-example
    %%{init: { 'logLevel': 'debug', 'theme': 'default' , 'themeVariables': {
-              'cScale0': '#ff0000',
+              'cScale0': '#ff0000', 'cScaleLabel0': '#ffffff',
              'cScale1': '#00ff00',
-              'cScale2': '#0000ff'
+              'cScale2': '#0000ff', 'cScaleLabel2': '#ffffff'
       } } }%%
       timeline
        title History of Social Media Platform
@@ -286,9 +288,9 @@ Now let's override the default values for the `cScale0` to `cScale2` variables:

 ```mermaid
    %%{init: { 'logLevel': 'debug', 'theme': 'default' , 'themeVariables': {
-              'cScale0': '#ff0000',
+              'cScale0': '#ff0000', 'cScaleLabel0': '#ffffff',
              'cScale1': '#00ff00',
-              'cScale2': '#0000ff'
+              'cScale2': '#0000ff', 'cScaleLabel2': '#ffffff'
       } } }%%
       timeline
        title History of Social Media Platform
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "version": "10.2.3",
  "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
  "type": "module",
-  "packageManager": "pnpm@8.6.4",
+  "packageManager": "pnpm@8.6.5",
  "keywords": [
    "diagram",
    "markdown",
@@ -91,20 +91,20 @@
    "eslint-plugin-cypress": "^2.13.2",
    "eslint-plugin-html": "^7.1.0",
    "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-jsdoc": "^43.0.7",
+    "eslint-plugin-jsdoc": "^46.0.0",
    "eslint-plugin-json": "^3.1.0",
    "eslint-plugin-lodash": "^7.4.0",
    "eslint-plugin-markdown": "^3.0.0",
    "eslint-plugin-no-only-tests": "^3.1.0",
    "eslint-plugin-tsdoc": "^0.2.17",
-    "eslint-plugin-unicorn": "^46.0.0",
+    "eslint-plugin-unicorn": "^47.0.0",
    "express": "^4.18.2",
    "globby": "^13.1.4",
    "husky": "^8.0.3",
    "jest": "^29.5.0",
    "jison": "^0.4.18",
    "js-yaml": "^4.1.0",
-    "jsdom": "^21.1.1",
+    "jsdom": "^22.0.0",
    "lint-staged": "^13.2.1",
    "nyc": "^15.1.0",
    "path-browserify": "^1.0.1",
--- a/packages/mermaid/package.json
+++ b/packages/mermaid/package.json
@@ -92,7 +92,7 @@
    "globby": "^13.1.4",
    "jison": "^0.4.18",
    "js-base64": "^3.7.5",
-    "jsdom": "^21.1.1",
+    "jsdom": "^22.0.0",
    "micromatch": "^4.0.5",
    "path-browserify": "^1.0.1",
    "prettier": "^2.8.8",
--- a/packages/mermaid/src/dagre-wrapper/nodes.js
+++ b/packages/mermaid/src/dagre-wrapper/nodes.js
@@ -602,6 +602,8 @@ const doublecircle = async (parent, node) => {
  const outerCircle = circleGroup.insert('circle');
  const innerCircle = circleGroup.insert('circle');

+  circleGroup.attr('class', node.class);
+
  // center the circle around its coordinate
  outerCircle
    .attr('style', node.style)
--- a/packages/mermaid/src/diagram-api/diagramAPI.ts
+++ b/packages/mermaid/src/diagram-api/diagramAPI.ts
@@ -7,7 +7,6 @@ import { addStylesForDiagram } from '../styles.js';
 import { DiagramDefinition, DiagramDetector } from './types.js';
 import * as _commonDb from '../commonDb.js';
 import { parseDirective as _parseDirective } from '../directiveUtils.js';
-import isEmpty from 'lodash-es/isEmpty.js';

 /*
  Packaging and exposing resources for external diagrams so that they can import
@@ -51,9 +50,7 @@ export const registerDiagram = (
  if (detector) {
    addDetector(id, detector);
  }
-  if (!isEmpty(diagram.styles)) {
-    addStylesForDiagram(id, diagram.styles);
-  }
+  addStylesForDiagram(id, diagram.styles);

  if (diagram.injectUtils) {
    diagram.injectUtils(
--- a/packages/mermaid/src/diagram-api/types.ts
+++ b/packages/mermaid/src/diagram-api/types.ts
@@ -82,3 +82,5 @@ export type ParseDirectiveDefinition = (statement: string, context: string, type
 export type HTML = d3.Selection<HTMLIFrameElement, unknown, Element | null, unknown>;

 export type SVG = d3.Selection<SVGSVGElement, unknown, Element | null, unknown>;
+
+export type DiagramStylesProvider = (options?: any) => string;
--- a/packages/mermaid/src/docs/config/Tutorials.md
+++ b/packages/mermaid/src/docs/config/Tutorials.md
@@ -20,6 +20,10 @@ The definitions that can be generated the Live-Editor are also backwards-compati

 [Eddie Jaoude: Can you code your diagrams?](https://www.youtube.com/watch?v=9HZzKkAqrX8)

+## Mermaid with OpenAI
+
+[Elle Neal: Mind Mapping with AI: An Accessible Approach for Neurodiverse Learners Tutorial:](https://medium.com/@elle.neal_71064/mind-mapping-with-ai-an-accessible-approach-for-neurodiverse-learners-1a74767359ff), [Demo:](https://databutton.com/v/jk9vrghc)
+
 ## Mermaid with HTML

 Examples are provided in [Getting Started](../intro/n00b-gettingStarted.md)
--- a/packages/mermaid/src/docs/package.json
+++ b/packages/mermaid/src/docs/package.json
@@ -31,6 +31,6 @@
    "vite": "^4.3.3",
    "vite-plugin-pwa": "^0.16.0",
    "vitepress": "1.0.0-beta.3",
-    "workbox-window": "^6.5.4"
+    "workbox-window": "^7.0.0"
  }
 }
--- a/packages/mermaid/src/docs/syntax/timeline.md
+++ b/packages/mermaid/src/docs/syntax/timeline.md
@@ -172,9 +172,11 @@ let us look at same example, where we have disabled the multiColor option.

 ### Customizing Color scheme

-You can customize the color scheme using the `cScale0` to `cScale11` theme variables. Mermaid allows you to set unique colors for up-to 12 sections, where `cScale0` variable will drive the value of the first section or time-period, `cScale1` will drive the value of the second section and so on.
+You can customize the color scheme using the `cScale0` to `cScale11` theme variables, which will change the background colors. Mermaid allows you to set unique colors for up-to 12 sections, where `cScale0` variable will drive the value of the first section or time-period, `cScale1` will drive the value of the second section and so on.
 In case you have more than 12 sections, the color scheme will start to repeat.

+If you also want to change the foreground color of a section, you can do so use theme variables corresponding `cScaleLabel0` to `cScaleLabel11` variables.
+
 NOTE: Default values for these theme variables are picked from the selected theme. If you want to override the default values, you can use the `initialize` call to add your custom theme variable values.

 Example:
@@ -183,9 +185,9 @@ Now let's override the default values for the `cScale0` to `cScale2` variables:

 ```mermaid-example
    %%{init: { 'logLevel': 'debug', 'theme': 'default' , 'themeVariables': {
-              'cScale0': '#ff0000',
+              'cScale0': '#ff0000', 'cScaleLabel0': '#ffffff',
              'cScale1': '#00ff00',
-              'cScale2': '#0000ff'
+              'cScale2': '#0000ff', 'cScaleLabel2': '#ffffff'
       } } }%%
       timeline
        title History of Social Media Platform
--- a/packages/mermaid/src/styles.ts
+++ b/packages/mermaid/src/styles.ts
@@ -1,7 +1,8 @@
 import type { FlowChartStyleOptions } from './diagrams/flowchart/styles.js';
 import { log } from './logger.js';
+import type { DiagramStylesProvider } from './diagram-api/types.js';

-const themes: Record<string, any> = {};
+const themes: Record<string, DiagramStylesProvider> = {};

 const getStyles = (
  type: string,
@@ -73,8 +74,10 @@ const getStyles = (
 `;
 };

-export const addStylesForDiagram = (type: string, diagramTheme: unknown): void => {
-  themes[type] = diagramTheme;
+export const addStylesForDiagram = (type: string, diagramTheme?: DiagramStylesProvider): void => {
+  if (diagramTheme !== undefined) {
+    themes[type] = diagramTheme;
+  }
 };

 export default getStyles;
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -105,8 +105,8 @@ importers:
        specifier: ^27.2.1
        version: 27.2.1(@typescript-eslint/eslint-plugin@5.59.0)(eslint@8.39.0)(jest@29.5.0)(typescript@5.1.3)
      eslint-plugin-jsdoc:
-        specifier: ^43.0.7
-        version: 43.0.7(eslint@8.39.0)
+        specifier: ^46.0.0
+        version: 46.0.0(eslint@8.39.0)
      eslint-plugin-json:
        specifier: ^3.1.0
        version: 3.1.0
@@ -123,8 +123,8 @@ importers:
        specifier: ^0.2.17
        version: 0.2.17
      eslint-plugin-unicorn:
-        specifier: ^46.0.0
-        version: 46.0.0(eslint@8.39.0)
+        specifier: ^47.0.0
+        version: 47.0.0(eslint@8.39.0)
      express:
        specifier: ^4.18.2
        version: 4.18.2
@@ -144,8 +144,8 @@ importers:
        specifier: ^4.1.0
        version: 4.1.0
      jsdom:
-        specifier: ^21.1.1
-        version: 21.1.1
+        specifier: ^22.0.0
+        version: 22.0.0
      lint-staged:
        specifier: ^13.2.1
        version: 13.2.1
@@ -187,7 +187,7 @@ importers:
        version: 4.1.0(vite@4.3.9)
      vitest:
        specifier: ^0.32.2
-        version: 0.32.2(@vitest/ui@0.32.2)(jsdom@21.1.1)
+        version: 0.32.2(@vitest/ui@0.32.2)(jsdom@22.0.0)

  packages/mermaid:
    dependencies:
@@ -307,8 +307,8 @@ importers:
        specifier: ^3.7.5
        version: 3.7.5
      jsdom:
-        specifier: ^21.1.1
-        version: 21.1.1
+        specifier: ^22.0.0
+        version: 22.0.0
      micromatch:
        specifier: ^4.0.5
        version: 4.0.5
@@ -443,13 +443,13 @@ importers:
        version: 4.3.3(@types/node@18.16.0)
      vite-plugin-pwa:
        specifier: ^0.16.0
-        version: 0.16.0(vite@4.3.3)(workbox-build@7.0.0)(workbox-window@6.5.4)
+        version: 0.16.0(vite@4.3.3)(workbox-build@7.0.0)(workbox-window@7.0.0)
      vitepress:
        specifier: 1.0.0-beta.3
        version: 1.0.0-beta.3(@algolia/client-search@4.14.2)(@types/node@18.16.0)(search-insights@2.6.0)
      workbox-window:
-        specifier: ^6.5.4
-        version: 6.5.4
+        specifier: ^7.0.0
+        version: 7.0.0

  tests/webpack:
    dependencies:
@@ -878,7 +878,7 @@ packages:
      http-proxy-agent: 5.0.0
      https-proxy-agent: 5.0.1
      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.2
+      nwsapi: 2.2.5
      parse5: 6.0.1
      saxes: 5.0.1
      symbol-tree: 3.2.4
@@ -2824,9 +2824,9 @@ packages:
      - search-insights
    dev: true

-  /@es-joy/jsdoccomment@0.37.1:
-    resolution: {integrity: sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg==}
-    engines: {node: ^14 || ^16 || ^17 || ^18 || ^19 || ^20}
+  /@es-joy/jsdoccomment@0.39.4:
+    resolution: {integrity: sha512-Jvw915fjqQct445+yron7Dufix9A+m9j1fCJYlCo1FWlRvTxa3pjJelxdSTdaLWcTwRU6vbL+NYjO4YuNIS5Qg==}
+    engines: {node: '>=16'}
    dependencies:
      comment-parser: 1.3.1
      esquery: 1.5.0
@@ -4843,7 +4843,7 @@ packages:
    peerDependencies:
      vite-plugin-pwa: '>=0.16.3 <1'
    dependencies:
-      vite-plugin-pwa: 0.16.0(vite@4.3.3)(workbox-build@7.0.0)(workbox-window@6.5.4)
+      vite-plugin-pwa: 0.16.0(vite@4.3.3)(workbox-build@7.0.0)(workbox-window@7.0.0)
    dev: true

  /@vitejs/plugin-vue@4.2.1(vite@4.3.3)(vue@3.2.47):
@@ -4890,7 +4890,7 @@ packages:
      istanbul-lib-source-maps: 4.0.1
      istanbul-reports: 3.1.5
      test-exclude: 6.0.0
-      vitest: 0.32.2(@vitest/ui@0.32.2)(jsdom@21.1.1)
+      vitest: 0.32.2(@vitest/ui@0.32.2)(jsdom@22.0.0)
    transitivePeerDependencies:
      - supports-color
    dev: true
@@ -4938,7 +4938,7 @@ packages:
      pathe: 1.1.0
      picocolors: 1.0.0
      sirv: 2.0.3
-      vitest: 0.32.2(@vitest/ui@0.32.2)(jsdom@21.1.1)
+      vitest: 0.32.2(@vitest/ui@0.32.2)(jsdom@22.0.0)
    dev: true

  /@vitest/utils@0.32.2:
@@ -5479,13 +5479,6 @@ packages:
      acorn-walk: 7.2.0
    dev: true

-  /acorn-globals@7.0.1:
-    resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
-    dependencies:
-      acorn: 8.8.2
-      acorn-walk: 8.2.0
-    dev: true
-
  /acorn-import-assertions@1.8.0(acorn@8.8.0):
    resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
    peerDependencies:
@@ -6388,6 +6381,11 @@ packages:
    engines: {node: '>=8'}
    dev: true

+  /ci-info@3.8.0:
+    resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
+    engines: {node: '>=8'}
+    dev: true
+
  /cjs-module-lexer@1.2.2:
    resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
    dev: true
@@ -6653,7 +6651,7 @@ packages:
      js-string-escape: 1.0.1
      lodash: 4.17.21
      md5-hex: 3.0.1
-      semver: 7.5.0
+      semver: 7.5.3
      well-known-symbols: 2.0.0
    dev: true

@@ -8061,20 +8059,20 @@ packages:
      - typescript
    dev: true

-  /eslint-plugin-jsdoc@43.0.7(eslint@8.39.0):
-    resolution: {integrity: sha512-32Sx5I9VzO/bqbtslCu3L1GHIPo+QEliwqwjWq+qzbUv76wrkH6ifUEE0EbkuNEn+cHlSIOrg/IJ1PGNN72QZA==}
-    engines: {node: ^14 || ^16 || ^17 || ^18 || ^19 || ^20}
+  /eslint-plugin-jsdoc@46.0.0(eslint@8.39.0):
+    resolution: {integrity: sha512-xmB5WleBcPCFYlrFfdjrcfSKOJBLwyGmKa+i+fVqlIHp8g5aAoeQpBGugUzToFtQgd4hNZYlfIcP7QSxC9NYWQ==}
+    engines: {node: '>=16'}
    peerDependencies:
      eslint: ^7.0.0 || ^8.0.0
    dependencies:
-      '@es-joy/jsdoccomment': 0.37.1
+      '@es-joy/jsdoccomment': 0.39.4
      are-docs-informative: 0.0.2
      comment-parser: 1.3.1
      debug: 4.3.4(supports-color@8.1.1)
      escape-string-regexp: 4.0.0
      eslint: 8.39.0
      esquery: 1.5.0
-      semver: 7.5.0
+      semver: 7.5.3
      spdx-expression-parse: 3.0.1
    transitivePeerDependencies:
      - supports-color
@@ -8122,28 +8120,28 @@ packages:
      '@microsoft/tsdoc-config': 0.16.2
    dev: true

-  /eslint-plugin-unicorn@46.0.0(eslint@8.39.0):
-    resolution: {integrity: sha512-j07WkC+PFZwk8J33LYp6JMoHa1lXc1u6R45pbSAipjpfpb7KIGr17VE2D685zCxR5VL4cjrl65kTJflziQWMDA==}
-    engines: {node: '>=14.18'}
+  /eslint-plugin-unicorn@47.0.0(eslint@8.39.0):
+    resolution: {integrity: sha512-ivB3bKk7fDIeWOUmmMm9o3Ax9zbMz1Bsza/R2qm46ufw4T6VBFBaJIR1uN3pCKSmSXm8/9Nri8V+iUut1NhQGA==}
+    engines: {node: '>=16'}
    peerDependencies:
-      eslint: '>=8.28.0'
+      eslint: '>=8.38.0'
    dependencies:
      '@babel/helper-validator-identifier': 7.19.1
      '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0)
-      ci-info: 3.6.2
+      ci-info: 3.8.0
      clean-regexp: 1.0.0
      eslint: 8.39.0
      esquery: 1.5.0
      indent-string: 4.0.0
-      is-builtin-module: 3.2.0
+      is-builtin-module: 3.2.1
      jsesc: 3.0.2
      lodash: 4.17.21
      pluralize: 8.0.0
      read-pkg-up: 7.0.1
      regexp-tree: 0.1.24
-      regjsparser: 0.9.1
+      regjsparser: 0.10.0
      safe-regex: 2.1.1
-      semver: 7.3.8
+      semver: 7.5.3
      strip-indent: 3.0.0
    dev: true

@@ -8548,7 +8546,7 @@ packages:
      proxy-addr: 2.0.7
      rfdc: 1.3.0
      secure-json-parse: 2.7.0
-      semver: 7.5.0
+      semver: 7.5.3
      tiny-lru: 8.0.2
    transitivePeerDependencies:
      - supports-color
@@ -9609,8 +9607,8 @@ packages:
    engines: {node: '>=4'}
    dev: true

-  /is-builtin-module@3.2.0:
-    resolution: {integrity: sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==}
+  /is-builtin-module@3.2.1:
+    resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==}
    engines: {node: '>=6'}
    dependencies:
      builtin-modules: 3.3.0
@@ -9625,7 +9623,7 @@ packages:
    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
    hasBin: true
    dependencies:
-      ci-info: 3.6.2
+      ci-info: 3.8.0
    dev: true

  /is-core-module@2.10.0:
@@ -10074,7 +10072,7 @@ packages:
      '@types/node': 18.16.0
      babel-jest: 29.5.0(@babel/core@7.12.3)
      chalk: 4.1.2
-      ci-info: 3.6.2
+      ci-info: 3.8.0
      deepmerge: 4.2.2
      glob: 7.2.3
      graceful-fs: 4.2.10
@@ -10347,7 +10345,7 @@ packages:
      jest-util: 29.5.0
      natural-compare: 1.4.0
      pretty-format: 29.5.0
-      semver: 7.5.0
+      semver: 7.5.3
    transitivePeerDependencies:
      - supports-color
    dev: true
@@ -10359,7 +10357,7 @@ packages:
      '@jest/types': 29.5.0
      '@types/node': 18.16.0
      chalk: 4.1.2
-      ci-info: 3.6.2
+      ci-info: 3.8.0
      graceful-fs: 4.2.10
      picomatch: 2.3.1
    dev: true
@@ -10525,9 +10523,9 @@ packages:
    engines: {node: '>=12.0.0'}
    dev: true

-  /jsdom@21.1.1:
-    resolution: {integrity: sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==}
-    engines: {node: '>=14'}
+  /jsdom@22.0.0:
+    resolution: {integrity: sha512-p5ZTEb5h+O+iU02t0GfEjAnkdYPrQSkfuTSMkMYyIoMvUNEHsbG0bHHbfXIcfTqD2UfvjQX7mmgiFsyRwGscVw==}
+    engines: {node: '>=16'}
    peerDependencies:
      canvas: ^2.5.0
    peerDependenciesMeta:
@@ -10535,19 +10533,16 @@ packages:
        optional: true
    dependencies:
      abab: 2.0.6
-      acorn: 8.8.2
-      acorn-globals: 7.0.1
      cssstyle: 3.0.0
      data-urls: 4.0.0
      decimal.js: 10.4.3
      domexception: 4.0.0
-      escodegen: 2.0.0
      form-data: 4.0.0
      html-encoding-sniffer: 3.0.0
      http-proxy-agent: 5.0.0
      https-proxy-agent: 5.0.1
      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.2
+      nwsapi: 2.2.5
      parse5: 7.1.2
      rrweb-cssom: 0.6.0
      saxes: 6.0.0
@@ -11801,7 +11796,7 @@ packages:
    dependencies:
      hosted-git-info: 4.1.0
      is-core-module: 2.12.1
-      semver: 7.5.0
+      semver: 7.5.3
      validate-npm-package-license: 3.0.4
    dev: true

@@ -11835,8 +11830,8 @@ packages:
      path-key: 4.0.0
    dev: true

-  /nwsapi@2.2.2:
-    resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==}
+  /nwsapi@2.2.5:
+    resolution: {integrity: sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==}
    dev: true

  /nyc@15.1.0:
@@ -12583,11 +12578,6 @@ packages:
      once: 1.4.0
    dev: true

-  /punycode@2.1.1:
-    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
-    engines: {node: '>=6'}
-    dev: true
-
  /punycode@2.3.0:
    resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
    engines: {node: '>=6'}
@@ -12823,6 +12813,13 @@ packages:
      unicode-match-property-value-ecmascript: 2.1.0
    dev: true

+  /regjsparser@0.10.0:
+    resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==}
+    hasBin: true
+    dependencies:
+      jsesc: 0.5.0
+    dev: true
+
  /regjsparser@0.9.1:
    resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==}
    hasBin: true
@@ -13254,6 +13251,14 @@ packages:
      lru-cache: 6.0.0
    dev: true

+  /semver@7.5.3:
+    resolution: {integrity: sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+    dev: true
+
  /send@0.18.0:
    resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
    engines: {node: '>= 0.8.0'}
@@ -14143,7 +14148,7 @@ packages:
    engines: {node: '>=0.8'}
    dependencies:
      psl: 1.9.0
-      punycode: 2.1.1
+      punycode: 2.3.0
    dev: true

  /tough-cookie@4.1.2:
@@ -14151,7 +14156,7 @@ packages:
    engines: {node: '>=6'}
    dependencies:
      psl: 1.9.0
-      punycode: 2.1.1
+      punycode: 2.3.0
      universalify: 0.2.0
      url-parse: 1.5.10
    dev: true
@@ -14648,7 +14653,7 @@ packages:
  /uri-js@4.4.1:
    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
    dependencies:
-      punycode: 2.1.1
+      punycode: 2.3.0
    dev: true

  /url-parse@1.5.10:
@@ -14776,7 +14781,7 @@ packages:
      - supports-color
    dev: true

-  /vite-plugin-pwa@0.16.0(vite@4.3.3)(workbox-build@7.0.0)(workbox-window@6.5.4):
+  /vite-plugin-pwa@0.16.0(vite@4.3.3)(workbox-build@7.0.0)(workbox-window@7.0.0):
    resolution: {integrity: sha512-E+AQRzHxqNU4ZhEeR8X37/foZB+ezJEhXauE/mcf1UITY6k2Pa1dtlFl+BQu57fTdiVlWim5S0Qy44Yap93Dkg==}
    engines: {node: '>=16.0.0'}
    peerDependencies:
@@ -14789,7 +14794,7 @@ packages:
      pretty-bytes: 6.1.0
      vite: 4.3.3(@types/node@18.16.0)
      workbox-build: 7.0.0
-      workbox-window: 6.5.4
+      workbox-window: 7.0.0
    transitivePeerDependencies:
      - supports-color
    dev: true
@@ -14982,7 +14987,7 @@ packages:
      - universal-cookie
    dev: true

-  /vitest@0.32.2(@vitest/ui@0.32.2)(jsdom@21.1.1):
+  /vitest@0.32.2(@vitest/ui@0.32.2)(jsdom@22.0.0):
    resolution: {integrity: sha512-hU8GNNuQfwuQmqTLfiKcqEhZY72Zxb7nnN07koCUNmntNxbKQnVbeIS6sqUgR3eXSlbOpit8+/gr1KpqoMgWCQ==}
    engines: {node: '>=v14.18.0'}
    hasBin: true
@@ -15028,7 +15033,7 @@ packages:
      chai: 4.3.7
      concordance: 5.0.4
      debug: 4.3.4(supports-color@8.1.1)
-      jsdom: 21.1.1
+      jsdom: 22.0.0
      local-pkg: 0.4.3
      magic-string: 0.30.0
      pathe: 1.1.0
@@ -15604,10 +15609,6 @@ packages:
      workbox-core: 7.0.0
    dev: true

-  /workbox-core@6.5.4:
-    resolution: {integrity: sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q==}
-    dev: true
-
  /workbox-core@7.0.0:
    resolution: {integrity: sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==}
    dev: true
@@ -15682,13 +15683,6 @@ packages:
    resolution: {integrity: sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==}
    dev: true

-  /workbox-window@6.5.4:
-    resolution: {integrity: sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==}
-    dependencies:
-      '@types/trusted-types': 2.0.2
-      workbox-core: 6.5.4
-    dev: true
-
  /workbox-window@7.0.0:
    resolution: {integrity: sha512-j7P/bsAWE/a7sxqTzXo3P2ALb1reTfZdvVp6OJ/uLr/C2kZAMvjeWGm8V4htQhor7DOvYg0sSbFN2+flT5U0qA==}
    dependencies: