Commit 6ddf1e1d authored by Grant's avatar Grant
Browse files

Merge branch 'dependabot-npm_and_yarn-multi-7710106a89' into 'main' 

Bump react and react-dom

See merge request !43
parents 6ae2942a a6418909

package-lock.json

+71 −62
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
        "@quixo3/prisma-session-store": "^3.1.13",

        "@sentry/react": "^8.47.0",

        "next-themes": "^0.4.4",

        "react": "^18.3.1",

        "react-dom": "^18.3.1",

        "react": "^19.0.0",

        "react-dom": "^19.0.0",

        "react-toastify": "^11.0.2"

      },

      "devDependencies": {
@@ -2600,47 +2600,47 @@ 
      }

    },

    "node_modules/@formatjs/ecma402-abstract": {

      "version": "2.3.1",

      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.1.tgz",

      "integrity": "sha512-Ip9uV+/MpLXWRk03U/GzeJMuPeOXpJBSB5V1tjA6kJhvqssye5J5LoYLc7Z5IAHb7nR62sRoguzrFiVCP/hnzw==",

      "version": "2.3.2",

      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.2.tgz",

      "integrity": "sha512-6sE5nyvDloULiyOMbOTJEEgWL32w+VHkZQs8S02Lnn8Y/O5aQhjOEXwWzvR7SsBE/exxlSpY2EsWZgqHbtLatg==",

      "dependencies": {

        "@formatjs/fast-memoize": "2.2.5",

        "@formatjs/intl-localematcher": "0.5.9",

        "@formatjs/fast-memoize": "2.2.6",

        "@formatjs/intl-localematcher": "0.5.10",

        "decimal.js": "10",

        "tslib": "2"

      }

    },

    "node_modules/@formatjs/fast-memoize": {

      "version": "2.2.5",

      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.5.tgz",

      "integrity": "sha512-6PoewUMrrcqxSoBXAOJDiW1m+AmkrAj0RiXnOMD59GRaswjXhm3MDhgepXPBgonc09oSirAJTsAggzAGQf6A6g==",

      "version": "2.2.6",

      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.6.tgz",

      "integrity": "sha512-luIXeE2LJbQnnzotY1f2U2m7xuQNj2DA8Vq4ce1BY9ebRZaoPB1+8eZ6nXpLzsxuW5spQxr7LdCg+CApZwkqkw==",

      "dependencies": {

        "tslib": "2"

      }

    },

    "node_modules/@formatjs/icu-messageformat-parser": {

      "version": "2.9.7",

      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.7.tgz",

      "integrity": "sha512-cuEHyRM5VqLQobANOjtjlgU7+qmk9Q3fDQuBiRRJ3+Wp3ZoZhpUPtUfuimZXsir6SaI2TaAJ+SLo9vLnV5QcbA==",

      "version": "2.9.8",

      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.8.tgz",

      "integrity": "sha512-hZlLNI3+Lev8IAXuwehLoN7QTKqbx3XXwFW1jh0AdIA9XJdzn9Uzr+2LLBspPm/PX0+NLIfykj/8IKxQqHUcUQ==",

      "dependencies": {

        "@formatjs/ecma402-abstract": "2.3.1",

        "@formatjs/icu-skeleton-parser": "1.8.11",

        "@formatjs/ecma402-abstract": "2.3.2",

        "@formatjs/icu-skeleton-parser": "1.8.12",

        "tslib": "2"

      }

    },

    "node_modules/@formatjs/icu-skeleton-parser": {

      "version": "1.8.11",

      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.11.tgz",

      "integrity": "sha512-8LlHHE/yL/zVJZHAX3pbKaCjZKmBIO6aJY1mkVh4RMSEu/2WRZ4Ysvv3kKXJ9M8RJLBHdnk1/dUQFdod1Dt7Dw==",

      "version": "1.8.12",

      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.12.tgz",

      "integrity": "sha512-QRAY2jC1BomFQHYDMcZtClqHR55EEnB96V7Xbk/UiBodsuFc5kujybzt87+qj1KqmJozFhk6n4KiT1HKwAkcfg==",

      "dependencies": {

        "@formatjs/ecma402-abstract": "2.3.1",

        "@formatjs/ecma402-abstract": "2.3.2",

        "tslib": "2"

      }

    },

    "node_modules/@formatjs/intl-localematcher": {

      "version": "0.5.9",

      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.9.tgz",

      "integrity": "sha512-8zkGu/sv5euxbjfZ/xmklqLyDGQSxsLqg8XOq88JW3cmJtzhCP8EtSJXlaKZnVO4beEaoiT9wj4eIoCQ9smwxA==",

      "version": "0.5.10",

      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.10.tgz",

      "integrity": "sha512-af3qATX+m4Rnd9+wHcjJ4w2ijq+rAVP3CCinJQvFv1kgSu1W6jypUmvleJxcewdxmutM8dmIRZFxO/IQBZmP2Q==",

      "dependencies": {

        "tslib": "2"

      }
@@ -3491,6 +3491,22 @@ 
        "react-dom": ">=18 || >=19.0.0-rc.0"

      }

    },

    "node_modules/@nextui-org/listbox/node_modules/@tanstack/react-virtual": {

      "version": "3.10.9",

      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.10.9.tgz",

      "integrity": "sha512-OXO2uBjFqA4Ibr2O3y0YMnkrRWGVNqcvHQXmGvMu6IK8chZl3PrDxFXdGZ2iZkSrKh3/qUYoFqYe+Rx23RoU0g==",

      "dependencies": {

        "@tanstack/virtual-core": "3.10.9"

      },

      "funding": {

        "type": "github",

        "url": "https://github.com/sponsors/tannerlinsley"

      },

      "peerDependencies": {

        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",

        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"

      }

    },

    "node_modules/@nextui-org/menu": {

      "version": "2.2.8",

      "resolved": "https://registry.npmjs.org/@nextui-org/menu/-/menu-2.2.8.tgz",
@@ -3816,6 +3832,22 @@ 
        "react-dom": ">=18 || >=19.0.0-rc.0"

      }

    },

    "node_modules/@nextui-org/select/node_modules/@tanstack/react-virtual": {

      "version": "3.10.9",

      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.10.9.tgz",

      "integrity": "sha512-OXO2uBjFqA4Ibr2O3y0YMnkrRWGVNqcvHQXmGvMu6IK8chZl3PrDxFXdGZ2iZkSrKh3/qUYoFqYe+Rx23RoU0g==",

      "dependencies": {

        "@tanstack/virtual-core": "3.10.9"

      },

      "funding": {

        "type": "github",

        "url": "https://github.com/sponsors/tannerlinsley"

      },

      "peerDependencies": {

        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",

        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"

      }

    },

    "node_modules/@nextui-org/shared-icons": {

      "version": "2.1.1",

      "resolved": "https://registry.npmjs.org/@nextui-org/shared-icons/-/shared-icons-2.1.1.tgz",
@@ -7702,22 +7734,6 @@ 
        "node": ">=10"

      }

    },

    "node_modules/@tanstack/react-virtual": {

      "version": "3.10.9",

      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.10.9.tgz",

      "integrity": "sha512-OXO2uBjFqA4Ibr2O3y0YMnkrRWGVNqcvHQXmGvMu6IK8chZl3PrDxFXdGZ2iZkSrKh3/qUYoFqYe+Rx23RoU0g==",

      "dependencies": {

        "@tanstack/virtual-core": "3.10.9"

      },

      "funding": {

        "type": "github",

        "url": "https://github.com/sponsors/tannerlinsley"

      },

      "peerDependencies": {

        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",

        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"

      }

    },

    "node_modules/@tanstack/virtual-core": {

      "version": "3.10.9",

      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.10.9.tgz",
@@ -11886,13 +11902,13 @@ 
      }

    },

    "node_modules/intl-messageformat": {

      "version": "10.7.10",

      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.10.tgz",

      "integrity": "sha512-hp7iejCBiJdW3zmOe18FdlJu8U/JsADSDiBPQhfdSeI8B9POtvPRvPh3nMlvhYayGMKLv6maldhR7y3Pf1vkpw==",

      "version": "10.7.11",

      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.11.tgz",

      "integrity": "sha512-IB2N1tmI24k2EFH3PWjU7ivJsnWyLwOWOva0jnXFa29WzB6fb0JZ5EMQGu+XN5lDtjHYFo0/UooP67zBwUg7rQ==",

      "dependencies": {

        "@formatjs/ecma402-abstract": "2.3.1",

        "@formatjs/fast-memoize": "2.2.5",

        "@formatjs/icu-messageformat-parser": "2.9.7",

        "@formatjs/ecma402-abstract": "2.3.2",

        "@formatjs/fast-memoize": "2.2.6",

        "@formatjs/icu-messageformat-parser": "2.9.8",

        "tslib": "2"

      }

    },
@@ -13680,26 +13696,22 @@ 
      }

    },

    "node_modules/react": {

      "version": "18.3.1",

      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",

      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",

      "dependencies": {

        "loose-envify": "^1.1.0"

      },

      "version": "19.0.0",

      "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz",

      "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==",

      "engines": {

        "node": ">=0.10.0"

      }

    },

    "node_modules/react-dom": {

      "version": "18.3.1",

      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",

      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",

      "version": "19.0.0",

      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz",

      "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==",

      "dependencies": {

        "loose-envify": "^1.1.0",

        "scheduler": "^0.23.2"

        "scheduler": "^0.25.0"

      },

      "peerDependencies": {

        "react": "^18.3.1"

        "react": "^19.0.0"

      }

    },

    "node_modules/react-is": {
@@ -14255,12 +14267,9 @@ 
      }

    },

    "node_modules/scheduler": {

      "version": "0.23.2",

      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",

      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",

      "dependencies": {

        "loose-envify": "^1.1.0"

      }

      "version": "0.25.0",

      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz",

      "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA=="

    },

    "node_modules/scroll-into-view-if-needed": {

      "version": "3.0.10",

package.json

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ 
    "@quixo3/prisma-session-store": "^3.1.13",

    "@sentry/react": "^8.47.0",

    "next-themes": "^0.4.4",

    "react": "^18.3.1",

    "react-dom": "^18.3.1",

    "react": "^19.0.0",

    "react-dom": "^19.0.0",

    "react-toastify": "^11.0.2"

  }

}

packages/client/src/lib/alerts.tsx

+5 −4
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


import { IAlert, IAlertKeyedMessages } from "@sc07-canvas/lib/src/net";

import EventEmitter from "eventemitter3";

import { JSX } from "react";

import { toast } from "react-toastify";



/**
@@ -77,19 +78,19 @@ const handleToast = (alert: IAlert<"toast">) => { 


  if ("title" in alert) {

    Body = (

      <>

      <div>

        <b>{alert.title}</b>

        {alert.body && <> {alert.body}</>}

      </>

      </div>

    );

  } else {

    const message = getMessage(alert.message_key, alert.metadata);



    Body = (

      <>

      <div>

        <b>{message.title}</b>

        {message.body}

      </>

      </div>

    );

  }