From 9889c0005352b481c751099b4421d219ab13abe3 Mon Sep 17 00:00:00 2001 From: ashfame Date: Tue, 26 Nov 2024 19:53:10 +0400 Subject: [PATCH 1/3] upgrade react-router-dom to react-router --- package-lock.json | 68 +++++++++++-------- package.json | 2 +- src/ui/App.tsx | 2 +- src/ui/blueprints/EditBlueprint.tsx | 2 +- src/ui/blueprints/NewBlueprint.tsx | 2 +- src/ui/components/Breadcrumbs.tsx | 2 +- src/ui/import/ImportWithBlueprint.tsx | 2 +- src/ui/import/pages/ImportPage.tsx | 2 +- src/ui/import/pages/SelectNavigation.tsx | 2 +- .../pages/SelectPagesFromNavigation.tsx | 2 +- src/ui/import/pages/Toolbar.tsx | 2 +- src/ui/session/ViewSession.tsx | 2 +- src/ui/start/Home.tsx | 2 +- src/ui/start/NewSession.tsx | 2 +- 14 files changed, 52 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index 095145d2..8685ec22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "@wp-playground/client": "^1.0.11", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router-dom": "^6.28.0", + "react-router": "^7.0.1", "webextension-polyfill": "^0.12.0", "webpack": "^5.96.1" }, @@ -4425,15 +4425,6 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, - "node_modules/@remix-run/router": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", - "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==", - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@rtsao/scc": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", @@ -5090,6 +5081,12 @@ "@types/node": "*" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "license": "MIT" + }, "node_modules/@types/eslint": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", @@ -24713,35 +24710,36 @@ } }, "node_modules/react-router": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", - "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.1.tgz", + "integrity": "sha512-WVAhv9oWCNsja5AkK6KLpXJDSJCQizOIyOd4vvB/+eHGbYx5vkhcmcmwWjQ9yqkRClogi+xjEg9fNEOd5EX/tw==", "license": "MIT", "dependencies": { - "@remix-run/router": "1.21.0" + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8" + "react": ">=18", + "react-dom": ">=18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } } }, - "node_modules/react-router-dom": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", - "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", + "node_modules/react-router/node_modules/cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", "license": "MIT", - "dependencies": { - "@remix-run/router": "1.21.0", - "react-router": "6.28.0" - }, "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" + "node": ">=18" } }, "node_modules/react-style-singleton": { @@ -25913,6 +25911,12 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "license": "ISC" }, + "node_modules/set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==", + "license": "MIT" + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -28055,6 +28059,12 @@ "dev": true, "license": "0BSD" }, + "node_modules/turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==", + "license": "ISC" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index 22656238..e4f5468f 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@wp-playground/client": "^1.0.11", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router-dom": "^6.28.0", + "react-router": "^7.0.1", "webextension-polyfill": "^0.12.0", "webpack": "^5.96.1" } diff --git a/src/ui/App.tsx b/src/ui/App.tsx index c9be22df..e0f5dd5c 100644 --- a/src/ui/App.tsx +++ b/src/ui/App.tsx @@ -10,7 +10,7 @@ import { useLocation, useNavigate, useRouteLoaderData, -} from 'react-router-dom'; +} from 'react-router'; import { StrictMode, useEffect, useState } from 'react'; import { NewSession } from '@/ui/start/NewSession'; import { ViewSession } from '@/ui/session/ViewSession'; diff --git a/src/ui/blueprints/EditBlueprint.tsx b/src/ui/blueprints/EditBlueprint.tsx index 7ba4589e..87cf2f19 100644 --- a/src/ui/blueprints/EditBlueprint.tsx +++ b/src/ui/blueprints/EditBlueprint.tsx @@ -1,4 +1,4 @@ -import { useNavigate, useParams } from 'react-router-dom'; +import { useNavigate, useParams } from 'react-router'; import { ReactElement, useEffect } from 'react'; import { useSessionContext } from '@/ui/session/SessionProvider'; import { BlogPostBlueprintEditor } from '@/ui/blueprints/blog-post/BlogPostBlueprintEditor'; diff --git a/src/ui/blueprints/NewBlueprint.tsx b/src/ui/blueprints/NewBlueprint.tsx index 6d908b91..96ebede3 100644 --- a/src/ui/blueprints/NewBlueprint.tsx +++ b/src/ui/blueprints/NewBlueprint.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import { useSessionContext } from '@/ui/session/SessionProvider'; -import { useNavigate, useParams } from 'react-router-dom'; +import { useNavigate, useParams } from 'react-router'; import { Screens } from '@/ui/App'; import { Toolbar } from '@/ui/components/Toolbar'; import { humanReadableSubjectType, SubjectType } from '@/model/subject/Subject'; diff --git a/src/ui/components/Breadcrumbs.tsx b/src/ui/components/Breadcrumbs.tsx index 8ba2ecec..84efbb7f 100644 --- a/src/ui/components/Breadcrumbs.tsx +++ b/src/ui/components/Breadcrumbs.tsx @@ -1,4 +1,4 @@ -import { Link, useLocation } from 'react-router-dom'; +import { Link, useLocation } from 'react-router'; import { Screens } from '@/ui/App'; import { useSessionContext } from '@/ui/session/SessionProvider'; diff --git a/src/ui/import/ImportWithBlueprint.tsx b/src/ui/import/ImportWithBlueprint.tsx index 3248771e..6521e49c 100644 --- a/src/ui/import/ImportWithBlueprint.tsx +++ b/src/ui/import/ImportWithBlueprint.tsx @@ -1,4 +1,4 @@ -import { useNavigate, useParams } from 'react-router-dom'; +import { useNavigate, useParams } from 'react-router'; import { useBlueprint } from '@/ui/hooks/useBlueprint'; import { humanReadableSubjectType } from '@/model/subject/Subject'; import { Toolbar } from '@/ui/components/Toolbar'; diff --git a/src/ui/import/pages/ImportPage.tsx b/src/ui/import/pages/ImportPage.tsx index 6d03b551..9ba0ced7 100644 --- a/src/ui/import/pages/ImportPage.tsx +++ b/src/ui/import/pages/ImportPage.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import { useSessionContext } from '@/ui/session/SessionProvider'; -import { useNavigate, useParams } from 'react-router-dom'; +import { useNavigate, useParams } from 'react-router'; import { useSelectedPages } from '@/ui/import/pages/useSelectedPages'; import { useSubject } from '@/ui/hooks/useSubject'; import { SubjectType } from '@/model/subject/Subject'; diff --git a/src/ui/import/pages/SelectNavigation.tsx b/src/ui/import/pages/SelectNavigation.tsx index a458d110..834278ae 100644 --- a/src/ui/import/pages/SelectNavigation.tsx +++ b/src/ui/import/pages/SelectNavigation.tsx @@ -5,7 +5,7 @@ import { CommandTypes, sendCommandToContent } from '@/bus/Command'; import { Screens } from '@/ui/App'; import { ContentEventHandler } from '@/ui/blueprints/ContentEventHandler'; import { useSessionContext } from '@/ui/session/SessionProvider'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { useEffect } from 'react'; import { Toolbar } from '@/ui/import/pages/Toolbar'; diff --git a/src/ui/import/pages/SelectPagesFromNavigation.tsx b/src/ui/import/pages/SelectPagesFromNavigation.tsx index 5e931001..0c833fa9 100644 --- a/src/ui/import/pages/SelectPagesFromNavigation.tsx +++ b/src/ui/import/pages/SelectPagesFromNavigation.tsx @@ -1,5 +1,5 @@ import { ReactNode, useEffect, useMemo } from 'react'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { Screens } from '@/ui/App'; import { LinkField } from '@/model/field/LinkField'; import { parseNavigationHtml } from '@/parser/navigation'; diff --git a/src/ui/import/pages/Toolbar.tsx b/src/ui/import/pages/Toolbar.tsx index f6c0a28f..ef7967f0 100644 --- a/src/ui/import/pages/Toolbar.tsx +++ b/src/ui/import/pages/Toolbar.tsx @@ -1,5 +1,5 @@ import { Toolbar as BaseToolbar } from '@/ui/components/Toolbar'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { Button } from '@wordpress/components'; export function Toolbar( props: { diff --git a/src/ui/session/ViewSession.tsx b/src/ui/session/ViewSession.tsx index 1b4ae866..0157e365 100644 --- a/src/ui/session/ViewSession.tsx +++ b/src/ui/session/ViewSession.tsx @@ -1,5 +1,5 @@ import { useSessionContext } from '@/ui/session/SessionProvider'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { Screens } from '@/ui/App'; import { SubjectType } from '@/model/subject/Subject'; import { Button } from '@wordpress/components'; diff --git a/src/ui/start/Home.tsx b/src/ui/start/Home.tsx index efbecde8..faec70bc 100644 --- a/src/ui/start/Home.tsx +++ b/src/ui/start/Home.tsx @@ -1,4 +1,4 @@ -import { useLoaderData, useNavigate } from 'react-router-dom'; +import { useLoaderData, useNavigate } from 'react-router'; import { Screens } from '@/ui/App'; import { Session } from '@/storage/session'; import { Button } from '@wordpress/components'; diff --git a/src/ui/start/NewSession.tsx b/src/ui/start/NewSession.tsx index 67bbcabf..bae7dd3f 100644 --- a/src/ui/start/NewSession.tsx +++ b/src/ui/start/NewSession.tsx @@ -1,4 +1,4 @@ -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { Screens } from '@/ui/App'; import { createSession } from '@/storage/session'; import { From b2615b8d85fccaf69f21fdd32fdc6b238386b501 Mon Sep 17 00:00:00 2001 From: ashfame Date: Tue, 26 Nov 2024 19:59:39 +0400 Subject: [PATCH 2/3] update @wp-playground/client and @wordpress/block-library --- package-lock.json | 352 +++++++++++++++++++++++++++------------------- package.json | 4 +- 2 files changed, 208 insertions(+), 148 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8685ec22..fdfe46d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "packages": { "": { "dependencies": { - "@wordpress/block-library": "^9.11.0", + "@wordpress/block-library": "^9.12.0", "@wordpress/blocks": "^13.10.0", - "@wp-playground/client": "^1.0.11", + "@wp-playground/client": "^1.0.13", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router": "^7.0.1", @@ -3216,9 +3216,9 @@ "license": "MIT" }, "node_modules/@octokit/auth-app/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3259,9 +3259,9 @@ "license": "MIT" }, "node_modules/@octokit/auth-oauth-app/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3289,9 +3289,9 @@ "license": "MIT" }, "node_modules/@octokit/auth-oauth-device/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3321,9 +3321,9 @@ "license": "MIT" }, "node_modules/@octokit/auth-oauth-user/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3376,9 +3376,9 @@ "license": "MIT" }, "node_modules/@octokit/core/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3404,9 +3404,9 @@ "license": "MIT" }, "node_modules/@octokit/endpoint/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3433,9 +3433,9 @@ "license": "MIT" }, "node_modules/@octokit/graphql/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3492,9 +3492,9 @@ "license": "MIT" }, "node_modules/@octokit/oauth-methods/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3617,9 +3617,9 @@ "license": "MIT" }, "node_modules/@octokit/request-error/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3632,9 +3632,9 @@ "license": "MIT" }, "node_modules/@octokit/request/node_modules/@octokit/types": { - "version": "13.6.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz", - "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" @@ -3680,15 +3680,15 @@ "license": "MIT" }, "node_modules/@php-wasm/fs-journal": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@php-wasm/fs-journal/-/fs-journal-1.0.11.tgz", - "integrity": "sha512-bnRYzbM26AYtAuPa4I5Oe+lvp30njSoTBHRQTQPjKdZeSgd/K5ERlcGm8VkCjicT6Y0qJ8WFkxUzNBqnhvibRg==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@php-wasm/fs-journal/-/fs-journal-1.0.13.tgz", + "integrity": "sha512-0F7xIrwBvvJ2bnwcllpqji8eJo0H/4krDd58XqzHDBw9FRd4ic/qnFXYPw+OA/vC9MFePsTyk/I0S18wiu1X4A==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/logger": "1.0.11", - "@php-wasm/node": "1.0.11", - "@php-wasm/universal": "1.0.11", - "@php-wasm/util": "1.0.11", + "@php-wasm/logger": "1.0.13", + "@php-wasm/node": "1.0.13", + "@php-wasm/universal": "1.0.13", + "@php-wasm/util": "1.0.13", "comlink": "^4.4.1", "events": "3.3.0", "express": "4.19.2", @@ -3703,12 +3703,12 @@ } }, "node_modules/@php-wasm/logger": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@php-wasm/logger/-/logger-1.0.11.tgz", - "integrity": "sha512-PWfuH0VK2lYmNVmskNOmWNz/z/Lqc51k8KSYRuXyujIv7tUf06vlhS2m+WPmA/5mHln9ddG/PYOqkZOhvHXWRA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@php-wasm/logger/-/logger-1.0.13.tgz", + "integrity": "sha512-18HpLEFTIfkxwAJ0GcF2r+2zvrJBarwuVMhug5lTzWdWdJavNB/KpQbF57CWteZbsGu+NHvhBObUd93QPM5WeA==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/node-polyfills": "1.0.11" + "@php-wasm/node-polyfills": "1.0.13" }, "engines": { "node": ">=18.18.0", @@ -3716,17 +3716,17 @@ } }, "node_modules/@php-wasm/node": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@php-wasm/node/-/node-1.0.11.tgz", - "integrity": "sha512-AncbckJqy9B5mxLQ/4DBGKERAkuum4L6jWJv3lo+FKwMyDwz37P9xhg4rsoUGktVez7+Jv4itR2RK2OsqqsYPw==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@php-wasm/node/-/node-1.0.13.tgz", + "integrity": "sha512-fRcDW/bVT80nXpZ96XhSAA26RDLjTdU7dEzX66Y2OfN7R/jiNY++Ls5EEUsR6qEKd6CrdL6xgPZBlS2QhG0wjw==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/logger": "1.0.11", - "@php-wasm/node-polyfills": "1.0.11", - "@php-wasm/universal": "1.0.11", - "@php-wasm/util": "1.0.11", - "@wp-playground/common": "1.0.11", - "@wp-playground/wordpress": "1.0.11", + "@php-wasm/logger": "1.0.13", + "@php-wasm/node-polyfills": "1.0.13", + "@php-wasm/universal": "1.0.13", + "@php-wasm/util": "1.0.13", + "@wp-playground/common": "1.0.13", + "@wp-playground/wordpress": "1.0.13", "comlink": "^4.4.1", "events": "3.3.0", "express": "4.19.2", @@ -3741,19 +3741,19 @@ } }, "node_modules/@php-wasm/node-polyfills": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@php-wasm/node-polyfills/-/node-polyfills-1.0.11.tgz", - "integrity": "sha512-vUpgDLAJ5MZ7IcKpkadHG0883GIZdTfj7CjiPjLscE6NmmQQXVfBVLL06TOZB4ZqfqvmptioVqj0XDqSIPRUqw==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@php-wasm/node-polyfills/-/node-polyfills-1.0.13.tgz", + "integrity": "sha512-Blr/d8RXGvVeaZHcfW9cVUHjppkcyTJien2f3F7wVuF3oH7k2wsBgVp2cOHsAvTU3ljV6C9h/xBa+5DU3r0LcA==", "license": "GPL-2.0-or-later" }, "node_modules/@php-wasm/progress": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@php-wasm/progress/-/progress-1.0.11.tgz", - "integrity": "sha512-xGihrbT3jyrQvDY0ROQuFIbSpbTV4VTa1KSL2/Oln7n0nzvOaOO5syxDK2MBe1ipylpMuO8WrOHHbPkQll7vew==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@php-wasm/progress/-/progress-1.0.13.tgz", + "integrity": "sha512-kgBIZp8J5O7143zCjE/DfDVAUIwAsGC/YkObBx/funggHdZjCwKpry9aaJZauD0Aob155iPFx/Af0jJSM7bY1g==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/logger": "1.0.11", - "@php-wasm/node-polyfills": "1.0.11" + "@php-wasm/logger": "1.0.13", + "@php-wasm/node-polyfills": "1.0.13" }, "engines": { "node": ">=18.18.0", @@ -3761,26 +3761,26 @@ } }, "node_modules/@php-wasm/stream-compression": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@php-wasm/stream-compression/-/stream-compression-1.0.11.tgz", - "integrity": "sha512-l7MRxTRCf00AWn8jBajgSxfl0pfmTwhbqqVoP/aoh8HXU0yZccsLCCsreYd1X3+0b8f51AAeqBNZmOa6fi3w5A==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@php-wasm/stream-compression/-/stream-compression-1.0.13.tgz", + "integrity": "sha512-oLSuDEFaJ095G0tvMcvnVPWEPo7oq2DRVrhTk6i18XLR7mW3pBprcFHN9n+ZMyqg5j4vBRgKIxiKs5y2CzQjbg==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/node-polyfills": "1.0.11", - "@php-wasm/util": "1.0.11" + "@php-wasm/node-polyfills": "1.0.13", + "@php-wasm/util": "1.0.13" } }, "node_modules/@php-wasm/universal": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@php-wasm/universal/-/universal-1.0.11.tgz", - "integrity": "sha512-PG0LBFMrMGgr5LTHEYcv1qNCAWc8SgoRg1mqZHehxNEk+NGb5b/NDDReDgEJvBYjBTs9P64FydjHCW7XGAy+Pg==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@php-wasm/universal/-/universal-1.0.13.tgz", + "integrity": "sha512-iX5RDB3WlVEsD0urLxMEKr6kheuKKxKkKgCKm8X/03Zq7dJVJumMA4s1HSAbRZs5JfbB6RG9PfXGjbYJWy+bBg==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/logger": "1.0.11", - "@php-wasm/node-polyfills": "1.0.11", - "@php-wasm/progress": "1.0.11", - "@php-wasm/stream-compression": "1.0.11", - "@php-wasm/util": "1.0.11", + "@php-wasm/logger": "1.0.13", + "@php-wasm/node-polyfills": "1.0.13", + "@php-wasm/progress": "1.0.13", + "@php-wasm/stream-compression": "1.0.13", + "@php-wasm/util": "1.0.13", "comlink": "^4.4.1", "ini": "4.1.2" }, @@ -3790,24 +3790,24 @@ } }, "node_modules/@php-wasm/util": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@php-wasm/util/-/util-1.0.11.tgz", - "integrity": "sha512-RoQA9ndhlysBZlJdNuI5/taT0OZkIzNMeYb40j2juUANLFuyqtPcnTfKRZQRGFQ2bKWiekkOKQQf4jYwd22ICw==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@php-wasm/util/-/util-1.0.13.tgz", + "integrity": "sha512-mHrV67oe6o7j8UdwruOA3Qc341PNq9xxOTmrNi4uAyJOCDqpTyYxAziqmdNBHJTVBfDGdSG+rezHZgsXFUq5cA==", "engines": { "node": ">=18.18.0", "npm": ">=8.11.0" } }, "node_modules/@php-wasm/web": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@php-wasm/web/-/web-1.0.11.tgz", - "integrity": "sha512-kyv1POa5AR9O6pZ4tUusE+Ew5bLuQUmfQ+rFBMLZqU7aHX7hutfBOOyKhFNzNFpeStbr0+5r2Atp9yJctOFMuw==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@php-wasm/web/-/web-1.0.13.tgz", + "integrity": "sha512-85082d2cee1C+ZUMl5ZZlnh5xX4iEfeGgmZpciICcf7Kqg2MU5NGP+LJYklowTSf4mDWR8oumPUtIxJU40oEPw==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/fs-journal": "1.0.11", - "@php-wasm/logger": "1.0.11", - "@php-wasm/universal": "1.0.11", - "@php-wasm/util": "1.0.11", + "@php-wasm/fs-journal": "1.0.13", + "@php-wasm/logger": "1.0.13", + "@php-wasm/universal": "1.0.13", + "@php-wasm/util": "1.0.13", "comlink": "^4.4.1", "events": "3.3.0", "express": "4.19.2", @@ -4972,9 +4972,9 @@ } }, "node_modules/@types/aws-lambda": { - "version": "8.10.145", - "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.145.tgz", - "integrity": "sha512-dtByW6WiFk5W5Jfgz1VM+YPA21xMXTuSFoLYIDY0L44jDLLflVPtZkYuu3/YxpGcvjzKFBZLU+GyKjR0HOYtyw==", + "version": "8.10.146", + "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.146.tgz", + "integrity": "sha512-3BaDXYTh0e6UCJYL/jwV/3+GRslSc08toAiZSmleYtkAUyV5rtvdPYxrG/88uqvTuT6sb27WE9OS90ZNTIuQ0g==", "license": "MIT" }, "node_modules/@types/babel__core": { @@ -6547,6 +6547,18 @@ "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, + "node_modules/@wordpress/block-editor/node_modules/@babel/runtime": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", + "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@wordpress/block-editor/node_modules/@wordpress/components": { "version": "28.7.0", "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-28.7.0.tgz", @@ -6687,9 +6699,9 @@ } }, "node_modules/@wordpress/block-library": { - "version": "9.11.0", - "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-9.11.0.tgz", - "integrity": "sha512-7DBiw/OuBrPwDWlHj4Co5lQynhHAz/D4c+0jnb4hsH0Kdxh45B3BXvMzE5wVq8Tv03tJMBIptuZ1qMC7LHNRJg==", + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-9.12.0.tgz", + "integrity": "sha512-F8DBXsFYwULKszHU4H7Xxn/4mCHhz++PFw2N+4A28NYXFodlOtcUS4ff8CBLhH/Gi2ZZDHQvd9b8oTl8/vxB/w==", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "7.25.7", @@ -7732,6 +7744,18 @@ "react-dom": "^18.0.0" } }, + "node_modules/@wordpress/core-data/node_modules/@babel/runtime": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", + "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@wordpress/core-data/node_modules/uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", @@ -8457,6 +8481,18 @@ "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, + "node_modules/@wordpress/patterns/node_modules/@babel/runtime": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", + "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@wordpress/patterns/node_modules/@wordpress/components": { "version": "28.7.0", "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-28.7.0.tgz", @@ -9023,6 +9059,18 @@ "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, + "node_modules/@wordpress/reusable-blocks/node_modules/@babel/runtime": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", + "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@wordpress/reusable-blocks/node_modules/@wordpress/components": { "version": "28.7.0", "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-28.7.0.tgz", @@ -9869,6 +9917,18 @@ "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, + "node_modules/@wordpress/server-side-render/node_modules/@babel/runtime": { + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", + "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", + "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@wordpress/server-side-render/node_modules/@wordpress/components": { "version": "28.7.0", "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-28.7.0.tgz", @@ -10172,19 +10232,19 @@ } }, "node_modules/@wp-playground/blueprints": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@wp-playground/blueprints/-/blueprints-1.0.11.tgz", - "integrity": "sha512-QNWO+cSiylwU4P7Px/Ebw4xUQs9dwRYDgrj7pJKwx1aY2xVxCIPMV8krWslvoWH0TDiWMBIixtcA/VrV/JuXcg==", - "dependencies": { - "@php-wasm/logger": "1.0.11", - "@php-wasm/node": "1.0.11", - "@php-wasm/node-polyfills": "1.0.11", - "@php-wasm/progress": "1.0.11", - "@php-wasm/universal": "1.0.11", - "@php-wasm/util": "1.0.11", - "@wp-playground/common": "1.0.11", - "@wp-playground/storage": "1.0.11", - "@wp-playground/wordpress": "1.0.11", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@wp-playground/blueprints/-/blueprints-1.0.13.tgz", + "integrity": "sha512-YTSBNiyw4USyuQdR1tX/DN/mWTkGYwUKwiEfMbmZo97+GMEiFi2qH7h7uBb5omF9YObKr22+VFRyRepWVGeZdA==", + "dependencies": { + "@php-wasm/logger": "1.0.13", + "@php-wasm/node": "1.0.13", + "@php-wasm/node-polyfills": "1.0.13", + "@php-wasm/progress": "1.0.13", + "@php-wasm/universal": "1.0.13", + "@php-wasm/util": "1.0.13", + "@wp-playground/common": "1.0.13", + "@wp-playground/storage": "1.0.13", + "@wp-playground/wordpress": "1.0.13", "ajv": "8.12.0", "async-lock": "1.4.1", "buffer": "6.0.3", @@ -10260,18 +10320,18 @@ } }, "node_modules/@wp-playground/client": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@wp-playground/client/-/client-1.0.11.tgz", - "integrity": "sha512-9YCQ991Cn0vUDsKRUBMFrfyTDfW6EO/bI6nIrVnv3+M4XLKo0+zrYYv3t0ZU5FzZPlSDQQnpNQQhnDBbITvEqw==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@wp-playground/client/-/client-1.0.13.tgz", + "integrity": "sha512-TW5SA3lMch1ai/ronBc5cJdXc835dqyDgoKf17slkrd6ytOcJ9o1znwQbL95zoycH26cOL4jQp67hN82B8ZSkA==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/logger": "1.0.11", - "@php-wasm/progress": "1.0.11", - "@php-wasm/universal": "1.0.11", - "@php-wasm/util": "1.0.11", - "@php-wasm/web": "1.0.11", - "@wp-playground/blueprints": "1.0.11", - "@wp-playground/remote": "1.0.11", + "@php-wasm/logger": "1.0.13", + "@php-wasm/progress": "1.0.13", + "@php-wasm/universal": "1.0.13", + "@php-wasm/util": "1.0.13", + "@php-wasm/web": "1.0.13", + "@wp-playground/blueprints": "1.0.13", + "@wp-playground/remote": "1.0.13", "ajv": "8.12.0", "async-lock": "1.4.1", "buffer": "6.0.3", @@ -10347,13 +10407,13 @@ } }, "node_modules/@wp-playground/common": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@wp-playground/common/-/common-1.0.11.tgz", - "integrity": "sha512-iwmrpM3D9tpEy4bMGamoy8PILFrkWY0X8EA0GpdcNzrCIOimHnQv9Pd+920scPMsbBKlUaj+AHfXJW9dpsg2Vg==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@wp-playground/common/-/common-1.0.13.tgz", + "integrity": "sha512-yL/ClfsWFLdjXnREw4l2dgthY40NxqbnKqoqKZqI68k4AiaOXoqcnrpbwBR2tnA20akwvTH1OeY1UueR1F3+3w==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/universal": "1.0.11", - "@php-wasm/util": "1.0.11", + "@php-wasm/universal": "1.0.13", + "@php-wasm/util": "1.0.13", "comlink": "^4.4.1", "ini": "4.1.2" }, @@ -10363,20 +10423,20 @@ } }, "node_modules/@wp-playground/remote": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@wp-playground/remote/-/remote-1.0.11.tgz", - "integrity": "sha512-6mpJbmBf+qrwXl3cfmM1zMw4R+iw5D/q/9ml9IOcgurV3bCQCnEgbXPFV02+QIMosVDU7KcxN7sc/GCiOwtd+g==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@wp-playground/remote/-/remote-1.0.13.tgz", + "integrity": "sha512-onrtnvfRxHp5iMIvLnUIBBPGh/qhRsWju95I3u5D2ZXTidYNe7jSHLFf8JgLg4hee1VVutfVn5w3butWZ8D8nA==", "license": "GPL-2.0-or-later" }, "node_modules/@wp-playground/storage": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@wp-playground/storage/-/storage-1.0.11.tgz", - "integrity": "sha512-soAFnmOxjaBnggotzJS4+kWWNCnN99vhlvsdQOfdyyYp4ymlpTPFwpCo4XQ9/K/ZZG86pxay9YBK8MCYV5MUWw==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@wp-playground/storage/-/storage-1.0.13.tgz", + "integrity": "sha512-WmJch3qC1CgpcH55pLLpQ78JeIEi9u3sNm7guk42p15GnFR1l+BvQ+KegNXW8KHgU3fAlxQNL6yGCTcMoxdJyw==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/universal": "1.0.11", - "@php-wasm/util": "1.0.11", - "@php-wasm/web": "1.0.11", + "@php-wasm/universal": "1.0.13", + "@php-wasm/util": "1.0.13", + "@php-wasm/web": "1.0.13", "async-lock": "^1.4.1", "buffer": "6.0.3", "clean-git-ref": "^2.0.1", @@ -10430,16 +10490,16 @@ "license": "MIT" }, "node_modules/@wp-playground/wordpress": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@wp-playground/wordpress/-/wordpress-1.0.11.tgz", - "integrity": "sha512-F2mzKzDoRDrTfOhGka2KZZTHe1EMhfQS+7SW43k6HK96hxgKI64kTD+bhyTI8aN9k6qplNLTouCiR40qGmqaOg==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@wp-playground/wordpress/-/wordpress-1.0.13.tgz", + "integrity": "sha512-QKiqxIpvg302AI3XUPsC0eGoCq4IyGfdsLcTBzio8DEbE7ieRJouv8E+VRGmq8QHuucQWE1zypMEub54IUVD8A==", "license": "GPL-2.0-or-later", "dependencies": { - "@php-wasm/logger": "1.0.11", - "@php-wasm/node": "1.0.11", - "@php-wasm/universal": "1.0.11", - "@php-wasm/util": "1.0.11", - "@wp-playground/common": "1.0.11", + "@php-wasm/logger": "1.0.13", + "@php-wasm/node": "1.0.13", + "@php-wasm/universal": "1.0.13", + "@php-wasm/util": "1.0.13", + "@wp-playground/common": "1.0.13", "comlink": "^4.4.1", "events": "3.3.0", "express": "4.19.2", @@ -14002,18 +14062,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/decompress-response/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/dedent": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", @@ -21729,6 +21777,18 @@ "node": ">=6" } }, + "node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", diff --git a/package.json b/package.json index e4f5468f..95809e48 100644 --- a/package.json +++ b/package.json @@ -51,9 +51,9 @@ "wp-types": "^4.67.0" }, "dependencies": { - "@wordpress/block-library": "^9.11.0", + "@wordpress/block-library": "^9.12.0", "@wordpress/blocks": "^13.10.0", - "@wp-playground/client": "^1.0.11", + "@wp-playground/client": "^1.0.13", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router": "^7.0.1", From 515c0bc06c6dcce1d450a8f527a99a37b252796b Mon Sep 17 00:00:00 2001 From: ashfame Date: Wed, 4 Dec 2024 14:16:00 +0400 Subject: [PATCH 3/3] Revert "upgrade react-router-dom to react-router" This reverts commit 9889c0005352b481c751099b4421d219ab13abe3. --- package-lock.json | 68 ++++++++----------- package.json | 2 +- src/ui/App.tsx | 2 +- src/ui/blueprints/EditBlueprint.tsx | 2 +- src/ui/blueprints/NewBlueprint.tsx | 2 +- src/ui/components/Breadcrumbs.tsx | 2 +- src/ui/import/ImportWithBlueprint.tsx | 2 +- src/ui/import/pages/ImportPage.tsx | 2 +- src/ui/import/pages/SelectNavigation.tsx | 2 +- .../pages/SelectPagesFromNavigation.tsx | 2 +- src/ui/import/pages/Toolbar.tsx | 2 +- src/ui/session/ViewSession.tsx | 2 +- src/ui/start/Home.tsx | 2 +- src/ui/start/NewSession.tsx | 2 +- 14 files changed, 42 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdfe46d0..e357e191 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "@wp-playground/client": "^1.0.13", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router": "^7.0.1", + "react-router-dom": "^6.28.0", "webextension-polyfill": "^0.12.0", "webpack": "^5.96.1" }, @@ -4425,6 +4425,15 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/@remix-run/router": { + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", + "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@rtsao/scc": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", @@ -5081,12 +5090,6 @@ "@types/node": "*" } }, - "node_modules/@types/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", - "license": "MIT" - }, "node_modules/@types/eslint": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", @@ -24770,36 +24773,35 @@ } }, "node_modules/react-router": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.1.tgz", - "integrity": "sha512-WVAhv9oWCNsja5AkK6KLpXJDSJCQizOIyOd4vvB/+eHGbYx5vkhcmcmwWjQ9yqkRClogi+xjEg9fNEOd5EX/tw==", + "version": "6.28.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", + "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", "license": "MIT", "dependencies": { - "@types/cookie": "^0.6.0", - "cookie": "^1.0.1", - "set-cookie-parser": "^2.6.0", - "turbo-stream": "2.4.0" + "@remix-run/router": "1.21.0" }, "engines": { - "node": ">=20.0.0" + "node": ">=14.0.0" }, "peerDependencies": { - "react": ">=18", - "react-dom": ">=18" - }, - "peerDependenciesMeta": { - "react-dom": { - "optional": true - } + "react": ">=16.8" } }, - "node_modules/react-router/node_modules/cookie": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", - "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "node_modules/react-router-dom": { + "version": "6.28.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", + "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", "license": "MIT", + "dependencies": { + "@remix-run/router": "1.21.0", + "react-router": "6.28.0" + }, "engines": { - "node": ">=18" + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" } }, "node_modules/react-style-singleton": { @@ -25971,12 +25973,6 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "license": "ISC" }, - "node_modules/set-cookie-parser": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", - "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==", - "license": "MIT" - }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -28119,12 +28115,6 @@ "dev": true, "license": "0BSD" }, - "node_modules/turbo-stream": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", - "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==", - "license": "ISC" - }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index 95809e48..b11a307e 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@wp-playground/client": "^1.0.13", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router": "^7.0.1", + "react-router-dom": "^6.28.0", "webextension-polyfill": "^0.12.0", "webpack": "^5.96.1" } diff --git a/src/ui/App.tsx b/src/ui/App.tsx index e0f5dd5c..c9be22df 100644 --- a/src/ui/App.tsx +++ b/src/ui/App.tsx @@ -10,7 +10,7 @@ import { useLocation, useNavigate, useRouteLoaderData, -} from 'react-router'; +} from 'react-router-dom'; import { StrictMode, useEffect, useState } from 'react'; import { NewSession } from '@/ui/start/NewSession'; import { ViewSession } from '@/ui/session/ViewSession'; diff --git a/src/ui/blueprints/EditBlueprint.tsx b/src/ui/blueprints/EditBlueprint.tsx index 87cf2f19..7ba4589e 100644 --- a/src/ui/blueprints/EditBlueprint.tsx +++ b/src/ui/blueprints/EditBlueprint.tsx @@ -1,4 +1,4 @@ -import { useNavigate, useParams } from 'react-router'; +import { useNavigate, useParams } from 'react-router-dom'; import { ReactElement, useEffect } from 'react'; import { useSessionContext } from '@/ui/session/SessionProvider'; import { BlogPostBlueprintEditor } from '@/ui/blueprints/blog-post/BlogPostBlueprintEditor'; diff --git a/src/ui/blueprints/NewBlueprint.tsx b/src/ui/blueprints/NewBlueprint.tsx index 96ebede3..6d908b91 100644 --- a/src/ui/blueprints/NewBlueprint.tsx +++ b/src/ui/blueprints/NewBlueprint.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import { useSessionContext } from '@/ui/session/SessionProvider'; -import { useNavigate, useParams } from 'react-router'; +import { useNavigate, useParams } from 'react-router-dom'; import { Screens } from '@/ui/App'; import { Toolbar } from '@/ui/components/Toolbar'; import { humanReadableSubjectType, SubjectType } from '@/model/subject/Subject'; diff --git a/src/ui/components/Breadcrumbs.tsx b/src/ui/components/Breadcrumbs.tsx index 84efbb7f..8ba2ecec 100644 --- a/src/ui/components/Breadcrumbs.tsx +++ b/src/ui/components/Breadcrumbs.tsx @@ -1,4 +1,4 @@ -import { Link, useLocation } from 'react-router'; +import { Link, useLocation } from 'react-router-dom'; import { Screens } from '@/ui/App'; import { useSessionContext } from '@/ui/session/SessionProvider'; diff --git a/src/ui/import/ImportWithBlueprint.tsx b/src/ui/import/ImportWithBlueprint.tsx index 6521e49c..3248771e 100644 --- a/src/ui/import/ImportWithBlueprint.tsx +++ b/src/ui/import/ImportWithBlueprint.tsx @@ -1,4 +1,4 @@ -import { useNavigate, useParams } from 'react-router'; +import { useNavigate, useParams } from 'react-router-dom'; import { useBlueprint } from '@/ui/hooks/useBlueprint'; import { humanReadableSubjectType } from '@/model/subject/Subject'; import { Toolbar } from '@/ui/components/Toolbar'; diff --git a/src/ui/import/pages/ImportPage.tsx b/src/ui/import/pages/ImportPage.tsx index 9ba0ced7..6d03b551 100644 --- a/src/ui/import/pages/ImportPage.tsx +++ b/src/ui/import/pages/ImportPage.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import { useSessionContext } from '@/ui/session/SessionProvider'; -import { useNavigate, useParams } from 'react-router'; +import { useNavigate, useParams } from 'react-router-dom'; import { useSelectedPages } from '@/ui/import/pages/useSelectedPages'; import { useSubject } from '@/ui/hooks/useSubject'; import { SubjectType } from '@/model/subject/Subject'; diff --git a/src/ui/import/pages/SelectNavigation.tsx b/src/ui/import/pages/SelectNavigation.tsx index 834278ae..a458d110 100644 --- a/src/ui/import/pages/SelectNavigation.tsx +++ b/src/ui/import/pages/SelectNavigation.tsx @@ -5,7 +5,7 @@ import { CommandTypes, sendCommandToContent } from '@/bus/Command'; import { Screens } from '@/ui/App'; import { ContentEventHandler } from '@/ui/blueprints/ContentEventHandler'; import { useSessionContext } from '@/ui/session/SessionProvider'; -import { useNavigate } from 'react-router'; +import { useNavigate } from 'react-router-dom'; import { useEffect } from 'react'; import { Toolbar } from '@/ui/import/pages/Toolbar'; diff --git a/src/ui/import/pages/SelectPagesFromNavigation.tsx b/src/ui/import/pages/SelectPagesFromNavigation.tsx index 0c833fa9..5e931001 100644 --- a/src/ui/import/pages/SelectPagesFromNavigation.tsx +++ b/src/ui/import/pages/SelectPagesFromNavigation.tsx @@ -1,5 +1,5 @@ import { ReactNode, useEffect, useMemo } from 'react'; -import { useNavigate } from 'react-router'; +import { useNavigate } from 'react-router-dom'; import { Screens } from '@/ui/App'; import { LinkField } from '@/model/field/LinkField'; import { parseNavigationHtml } from '@/parser/navigation'; diff --git a/src/ui/import/pages/Toolbar.tsx b/src/ui/import/pages/Toolbar.tsx index ef7967f0..f6c0a28f 100644 --- a/src/ui/import/pages/Toolbar.tsx +++ b/src/ui/import/pages/Toolbar.tsx @@ -1,5 +1,5 @@ import { Toolbar as BaseToolbar } from '@/ui/components/Toolbar'; -import { useNavigate } from 'react-router'; +import { useNavigate } from 'react-router-dom'; import { Button } from '@wordpress/components'; export function Toolbar( props: { diff --git a/src/ui/session/ViewSession.tsx b/src/ui/session/ViewSession.tsx index 0157e365..1b4ae866 100644 --- a/src/ui/session/ViewSession.tsx +++ b/src/ui/session/ViewSession.tsx @@ -1,5 +1,5 @@ import { useSessionContext } from '@/ui/session/SessionProvider'; -import { useNavigate } from 'react-router'; +import { useNavigate } from 'react-router-dom'; import { Screens } from '@/ui/App'; import { SubjectType } from '@/model/subject/Subject'; import { Button } from '@wordpress/components'; diff --git a/src/ui/start/Home.tsx b/src/ui/start/Home.tsx index faec70bc..efbecde8 100644 --- a/src/ui/start/Home.tsx +++ b/src/ui/start/Home.tsx @@ -1,4 +1,4 @@ -import { useLoaderData, useNavigate } from 'react-router'; +import { useLoaderData, useNavigate } from 'react-router-dom'; import { Screens } from '@/ui/App'; import { Session } from '@/storage/session'; import { Button } from '@wordpress/components'; diff --git a/src/ui/start/NewSession.tsx b/src/ui/start/NewSession.tsx index bae7dd3f..67bbcabf 100644 --- a/src/ui/start/NewSession.tsx +++ b/src/ui/start/NewSession.tsx @@ -1,4 +1,4 @@ -import { useNavigate } from 'react-router'; +import { useNavigate } from 'react-router-dom'; import { Screens } from '@/ui/App'; import { createSession } from '@/storage/session'; import {