From d0a490b200d7f25e85f15a0b84c0903e6fe0c215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Mon, 11 May 2026 20:49:18 -0400 Subject: [PATCH] deps: fix the last conflict --- package-lock.json | 149 ++++++++++++++++++++++++++++++++++++++++++++-- package.json | 8 +-- 2 files changed, 145 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6864b6ba..0e25854e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -110,7 +110,7 @@ "@fortawesome/free-solid-svg-icons": "^6.7.2", "@fortawesome/react-fontawesome": "^0.2.6", "@gr2m/net-interceptor": "^1.0.0", - "@react-nano/use-event-source": "^0.13.0", + "@react-nano/use-event-source": "^0.16.0", "@reduxjs/toolkit": "^2.11.2", "@storybook/addon-a11y": "^10.3.6", "@storybook/addon-docs": "^10.3.6", @@ -273,6 +273,36 @@ "integrity": "sha512-9bVdQ15Tbzpor1z/bteaemC9NvRDZgMD4Cfbu1/r/6Zv6fCBXvIJJoJ6Dh/BMvTlAiT2Xewm36i0VWRnZ4yw6A==", "license": "MIT" }, + "node_modules/@atcute/identity": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@atcute/identity/-/identity-1.1.5.tgz", + "integrity": "sha512-5i9nl1UVnBDPCumUwrLNl4BZpGvQ/XABEXbjhiw3PQwRUfpQA8FqByDGxXy2gWpFDrNvQ9yVuOoNsjzxJgjjVA==", + "license": "0BSD", + "peer": true, + "dependencies": { + "@atcute/lexicons": "^1.3.1", + "@badrap/valita": "^0.4.6" + }, + "peerDependencies": { + "@atcute/lexicons": "^1.0.0" + } + }, + "node_modules/@atcute/identity-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@atcute/identity-resolver/-/identity-resolver-1.2.3.tgz", + "integrity": "sha512-q891zLUMtgoD60y5Pv2YmTg4wIf4ipFuIhZlIuQTTB7qM9sGxmBbe2quzTRCTl3pnsLEmTz7l+3Dszgoutsp5w==", + "license": "0BSD", + "peer": true, + "dependencies": { + "@atcute/lexicons": "^1.3.1", + "@atcute/util-fetch": "^1.0.5", + "@badrap/valita": "^0.4.6" + }, + "peerDependencies": { + "@atcute/identity": "^1.0.0", + "@atcute/lexicons": "^1.0.0" + } + }, "node_modules/@atcute/identity-resolver-node": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@atcute/identity-resolver-node/-/identity-resolver-node-1.0.3.tgz", @@ -304,6 +334,16 @@ "integrity": "sha512-n+lutnbN9mKzSjSVdfsYfzJ40u2971H+iLSL46D6d7zcrA4delxusf/ftGFvj5oGW03OioaFgQOy3Lqa3JmTeA==", "license": "0BSD" }, + "node_modules/@atcute/util-fetch": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@atcute/util-fetch/-/util-fetch-1.0.5.tgz", + "integrity": "sha512-qjHj01BGxjSjIFdPiAjSARnodJIIyKxnCMMEcXMESo9TAyND6XZQqrie5fia+LlYWVXdpsTds8uFQwc9jdKTig==", + "license": "0BSD", + "peer": true, + "dependencies": { + "@badrap/valita": "^0.4.6" + } + }, "node_modules/@atcute/util-text": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@atcute/util-text/-/util-text-1.3.1.tgz", @@ -835,6 +875,16 @@ "node": ">=6.9.0" } }, + "node_modules/@badrap/valita": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/@badrap/valita/-/valita-0.4.6.tgz", + "integrity": "sha512-4kdqcjyxo/8RQ8ayjms47HCWZIF5981oE5nIenbfThKDxWXtEHKipAOWlflpPJzZx9y/JWYQkp18Awr7VuepFg==", + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 18" + } + }, "node_modules/@bufbuild/protobuf": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.2.1.tgz", @@ -3014,13 +3064,13 @@ "license": "BSD-3-Clause" }, "node_modules/@react-nano/use-event-source": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@react-nano/use-event-source/-/use-event-source-0.13.0.tgz", - "integrity": "sha512-RzeoLepE/EnZTUkdIuZc1Odoswcfsu9bcTaoSqFhWkJ7j41T8COxcHatUHytJMiKKr+J7hpuAFoDGATshU98nQ==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@react-nano/use-event-source/-/use-event-source-0.16.0.tgz", + "integrity": "sha512-XiflYfULRrUjWS1s1gGFBIbdsU56RVIbFT/9KnZwydlnUzQiRm6SVMHZI83g0fXnZpmS3Xh09WFZAfK7l36NGA==", "dev": true, "license": "Zlib", "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, "node_modules/@reduxjs/toolkit": { @@ -4355,6 +4405,27 @@ "vite": "^5.2.0 || ^6 || ^7 || ^8" } }, + "node_modules/@testing-library/dom": { + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz", + "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.3.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "picocolors": "1.1.1", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@tsconfig/node18": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@tsconfig/node18/-/node18-1.0.3.tgz", @@ -4373,6 +4444,14 @@ "tslib": "^2.4.0" } }, + "node_modules/@types/aria-query": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", + "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -6792,6 +6871,35 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz", + "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==", + "license": "MIT", + "peer": true, + "dependencies": { + "follow-redirects": "^1.16.0", + "form-data": "^4.0.5", + "proxy-from-env": "^2.1.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", + "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", + "license": "MIT", + "peer": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/babel-plugin-macros": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", @@ -8125,6 +8233,14 @@ "node": ">=6.0.0" } }, + "node_modules/dom-accessibility-api": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", + "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/dotenv": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", @@ -12081,6 +12197,17 @@ "yallist": "^3.0.2" } }, + "node_modules/lz-string": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "lz-string": "bin/bin.js" + } + }, "node_modules/magic-bytes.js": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.13.0.tgz", @@ -13926,6 +14053,16 @@ "dev": true, "license": "MIT" }, + "node_modules/proxy-from-env": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", + "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==", + "license": "MIT", + "peer": true, + "engines": { + "node": ">=10" + } + }, "node_modules/proxy-memoize": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/proxy-memoize/-/proxy-memoize-3.0.1.tgz", @@ -17159,4 +17296,4 @@ } } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index ba2de91e..980a8adf 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "@fortawesome/free-solid-svg-icons": "^6.7.2", "@fortawesome/react-fontawesome": "^0.2.6", "@gr2m/net-interceptor": "^1.0.0", - "@react-nano/use-event-source": "^0.13.0", + "@react-nano/use-event-source": "^0.16.0", "@reduxjs/toolkit": "^2.11.2", "@storybook/addon-a11y": "^10.3.6", "@storybook/addon-docs": "^10.3.6", @@ -237,10 +237,6 @@ "jsondiffpatch-react": { "react": "$react", "react-dom": "$react-dom" - }, - "@curvenote/ansi-to-react": { - "react": "$react", - "react-dom": "$react-dom" } } -} \ No newline at end of file +} -- 2.51.2