Merge branch 'development' into resolve-conflicts

src/components/modals/SettingsModal.jsx

@@ -145,7 +145,7 @@ const SettingsModal = ({ isOpen, closeModal }) => {
       clearTimeout(checkedENSTimeoutId); 
     };
   }, [copyStatus, checkedENS]);
-
+  
 
   const handleSavePlebbitOptions = async () => {
     let gatewayUrls = gatewayRef.current.value.split('\n').filter((url) => url.trim());
@@ -165,9 +165,9 @@ const SettingsModal = ({ isOpen, closeModal }) => {
     }
 
     const invalidUrls = [
-      ...gatewayUrls || defaultGatewayUrls,
+      ...(Array.isArray(gatewayUrls) ? gatewayUrls : (Array.isArray(defaultGatewayUrls) ? defaultGatewayUrls : [])),
-      ...(ipfsClientsOptions || []),
+      ...(Array.isArray(ipfsClientsOptions) ? ipfsClientsOptions : []),
-      ...pubsubClientsOptions || defaultPubsubHttpClientsOptions,
+      ...(Array.isArray(pubsubClientsOptions) ? pubsubClientsOptions : (Array.isArray(defaultPubsubHttpClientsOptions) ? defaultPubsubHttpClientsOptions : [])),
     ].filter((url) => !isValidURL(url));
 
     if (invalidUrls.length > 0) {
@@ -244,9 +244,9 @@ const SettingsModal = ({ isOpen, closeModal }) => {
     setNewErrorMessage(null);
     setNewSuccessMessage(null);
 
-    gatewayRef.current.value = defaultGatewayUrls.join('\n');
+    gatewayRef.current.value = defaultGatewayUrls ? defaultGatewayUrls.join('\n') : "";
     ipfsRef.current.value = "";
-    pubsubRef.current.value = defaultPubsubHttpClientsOptions.join('\n');
+    pubsubRef.current.value = defaultPubsubHttpClientsOptions ? defaultPubsubHttpClientsOptions.join('\n') : "";
     dataPathRef.current.value = "";
 
     try {

src/components/views/All.jsx

@@ -97,6 +97,7 @@ const All = () => {
   const [prevScrollPos, setPrevScrollPos] = useState(0);
   const [visible, setVisible] = useState(true);
   const [isImageSearchOpen, setIsImageSearchOpen] = useState(false);
+  const [isClientRedirectMenuOpen, setIsClientRedirectMenuOpen] = useState(false);
   const [commentCid, setCommentCid] = useState(null);
   const [menuPosition, setMenuPosition] = useState({top: 0, left: 0});
   const [triggerPublishCommentEdit, setTriggerPublishCommentEdit] = useState(false);
@@ -991,6 +992,32 @@ const All = () => {
                                       </li>
                                     ) : null
                                   }
+                                  <li 
+                                  onMouseOver={() => {setIsClientRedirectMenuOpen(true)}}
+                                  onMouseLeave={() => {setIsClientRedirectMenuOpen(false)}}>
+                                    View on »
+                                    <ul className="dropdown-menu post-menu-catalog"
+                                      style={{display: isClientRedirectMenuOpen ? 'block': 'none'}}>
+                                      <li onClick={() => handleOptionClick(thread.cid)}>
+                                        <a 
+                                        href={`https://plebbitapp.eth.limo/#/p/${selectedAddress}/c/${thread.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebbit</a>
+                                      </li>
+                                      {/* <li onClick={() => handleOptionClick(thread.cid)}>
+                                        <a
+                                        href={`https://seedit.eth.limo/#/p/${selectedAddress}/c/${thread.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Seedit</a>
+                                      </li> */}
+                                      <li onClick={() => handleOptionClick(thread.cid)}>
+                                        <a
+                                        href={`https://plebones.netlify.app/#/p/${selectedAddress}/c/${thread.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebones</a>
+                                      </li>
+                                    </ul>
+                                  </li>
                                 </ul>
                               </div>
                               </PostMenuCatalog>, document.body
@@ -1294,6 +1321,32 @@ const All = () => {
                                       </li>
                                     ) : null
                                   }
+                                  <li 
+                                  onMouseOver={() => {setIsClientRedirectMenuOpen(true)}}
+                                  onMouseLeave={() => {setIsClientRedirectMenuOpen(false)}}>
+                                    View on »
+                                    <ul className="dropdown-menu post-menu-catalog"
+                                      style={{display: isClientRedirectMenuOpen ? 'block': 'none'}}>
+                                      <li onClick={() => handleOptionClick(reply.cid)}>
+                                        <a 
+                                        href={`https://plebbitapp.eth.limo/#/p/${selectedAddress}/c/${reply.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebbit</a>
+                                      </li>
+                                      {/* <li onClick={() => handleOptionClick(reply.cid)}>
+                                        <a
+                                        href={`https://seedit.eth.limo/#/p/${selectedAddress}/c/${reply.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Seedit</a>
+                                      </li> */}
+                                      <li onClick={() => handleOptionClick(reply.cid)}>
+                                        <a
+                                        href={`https://plebones.netlify.app/#/p/${selectedAddress}/c/${reply.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebones</a>
+                                      </li>
+                                    </ul>
+                                  </li>
                                 </ul>
                               </div>
                               </PostMenuCatalog>, document.body

src/components/views/Board.jsx

@@ -125,6 +125,7 @@ const Board = () => {
   const [selectedFeed, setSelectedFeed] = useState(feed);
   const [deletePost, setDeletePost] = useState(false);
   const [isImageSearchOpen, setIsImageSearchOpen] = useState(false);
+  const [isClientRedirectMenuOpen, setIsClientRedirectMenuOpen] = useState(false);
   const [isModerator, setIsModerator] = useState(false);
   const [commentCid, setCommentCid] = useState(null);
   const [menuPosition, setMenuPosition] = useState({top: 0, left: 0});
@@ -1651,6 +1652,32 @@ const Board = () => {
                                             </li>
                                           ) : null
                                         }
+                                        <li 
+                                        onMouseOver={() => {setIsClientRedirectMenuOpen(true)}}
+                                        onMouseLeave={() => {setIsClientRedirectMenuOpen(false)}}>
+                                          View on »
+                                          <ul className="dropdown-menu post-menu-catalog"
+                                            style={{display: isClientRedirectMenuOpen ? 'block': 'none'}}>
+                                            <li onClick={() => handleOptionClick(thread.cid)}>
+                                              <a 
+                                              href={`https://plebbitapp.eth.limo/#/p/${selectedAddress}/c/${thread.cid}`}
+                                              target="_blank" rel="noreferrer"
+                                              >Plebbit</a>
+                                            </li>
+                                            {/* <li onClick={() => handleOptionClick(thread.cid)}>
+                                              <a
+                                              href={`https://seedit.eth.limo/#/p/${selectedAddress}/c/${thread.cid}`}
+                                              target="_blank" rel="noreferrer"
+                                              >Seedit</a>
+                                            </li> */}
+                                            <li onClick={() => handleOptionClick(thread.cid)}>
+                                              <a
+                                              href={`https://plebones.netlify.app/#/p/${selectedAddress}/c/${thread.cid}`}
+                                              target="_blank" rel="noreferrer"
+                                              >Plebones</a>
+                                            </li>
+                                          </ul>
+                                        </li>
                                       </ul>
                                     </div>
                                     </PostMenuCatalog>, document.body
@@ -1948,6 +1975,32 @@ const Board = () => {
                                               </li>
                                             ) : null
                                           }
+                                          <li 
+                                          onMouseOver={() => {setIsClientRedirectMenuOpen(true)}}
+                                          onMouseLeave={() => {setIsClientRedirectMenuOpen(false)}}>
+                                            View on »
+                                            <ul className="dropdown-menu post-menu-catalog"
+                                              style={{display: isClientRedirectMenuOpen ? 'block': 'none'}}>
+                                              <li onClick={() => handleOptionClick(reply.cid)}>
+                                                <a 
+                                                href={`https://plebbitapp.eth.limo/#/p/${selectedAddress}/c/${reply.cid}`}
+                                                target="_blank" rel="noreferrer"
+                                                >Plebbit</a>
+                                              </li>
+                                              {/* <li onClick={() => handleOptionClick(reply.cid)}>
+                                                <a
+                                                href={`https://seedit.eth.limo/#/p/${selectedAddress}/c/${reply.cid}`}
+                                                target="_blank" rel="noreferrer"
+                                                >Seedit</a>
+                                              </li> */}
+                                              <li onClick={() => handleOptionClick(reply.cid)}>
+                                                <a
+                                                href={`https://plebones.netlify.app/#/p/${selectedAddress}/c/${reply.cid}`}
+                                                target="_blank" rel="noreferrer"
+                                                >Plebones</a>
+                                              </li>
+                                            </ul>
+                                          </li>
                                         </ul>
                                       </div>
                                       </PostMenuCatalog>, document.body

src/components/views/NotFound.jsx

@@ -1,6 +1,5 @@
-import React, { useEffect, useRef }  from 'react';
+import React, { useEffect } from 'react';
 import { Helmet } from 'react-helmet-async';
-import useGeneralStore from '../../hooks/stores/useGeneralStore';
 import { Link } from "react-router-dom";
 import { Container, Header, Logo, Page, Boards, BoardsTitle } from '../styled/views/Home.styled';
 import packageJson from '../../../package.json'
@@ -8,31 +7,28 @@ const {version} = packageJson
 
 
 const NotFound = () => {
-  const { 
-    bodyStyle, setBodyStyle,
-    selectedStyle, setSelectedStyle,
-  } = useGeneralStore(state => state);
-
-  const prevStyle = useRef(selectedStyle);
-  const prevBodyStyle = useRef(bodyStyle);
-
-  // prevent dark mode
   useEffect(() => {
-    const currentPrevStyle = prevStyle.current;
+    const yotsubaBodyStyle = {
-    const currentPrevBodyStyle = prevBodyStyle.current;
-
-    setBodyStyle({
       background: "#ffe url(assets/fade.png) top repeat-x",
       color: "maroon",
-      fontFamily: "Helvetica, Arial, sans-serif"
+      fontFamily: "Arial, Helvetica, sans-serif"
-    });
+    };
-    setSelectedStyle("Yotsuba");
+    const originalBodyStyles = {
+      background: document.body.style.background,
+      color: document.body.style.color,
+      fontFamily: document.body.style.fontFamily
+    };
+
+    for (const [key, value] of Object.entries(yotsubaBodyStyle)) {
+      document.body.style[key] = value;
+    }
 
     return () => {
-      setSelectedStyle(currentPrevStyle);
+      for (const [key, value] of Object.entries(originalBodyStyles)) {
-      setBodyStyle(currentPrevBodyStyle);
+        document.body.style[key] = value;
+      }
     };
-  }, [setBodyStyle, setSelectedStyle]);
+  }, []);
 
   return (
     <>

src/components/views/Subscriptions.jsx

@@ -97,6 +97,7 @@ const Subscriptions = () => {
   const [prevScrollPos, setPrevScrollPos] = useState(0);
   const [visible, setVisible] = useState(true);
   const [isImageSearchOpen, setIsImageSearchOpen] = useState(false);
+  const [isClientRedirectMenuOpen, setIsClientRedirectMenuOpen] = useState(false);
   const [commentCid, setCommentCid] = useState(null);
   const [menuPosition, setMenuPosition] = useState({top: 0, left: 0});
   const [triggerPublishCommentEdit, setTriggerPublishCommentEdit] = useState(false);
@@ -1002,6 +1003,32 @@ const Subscriptions = () => {
                                       </li>
                                     ) : null
                                   }
+                                  <li 
+                                  onMouseOver={() => {setIsClientRedirectMenuOpen(true)}}
+                                  onMouseLeave={() => {setIsClientRedirectMenuOpen(false)}}>
+                                    View on »
+                                    <ul className="dropdown-menu post-menu-catalog"
+                                      style={{display: isClientRedirectMenuOpen ? 'block': 'none'}}>
+                                      <li onClick={() => handleOptionClick(thread.cid)}>
+                                        <a 
+                                        href={`https://plebbitapp.eth.limo/#/p/${selectedAddress}/c/${thread.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebbit</a>
+                                      </li>
+                                      {/* <li onClick={() => handleOptionClick(thread.cid)}>
+                                        <a
+                                        href={`https://seedit.eth.limo/#/p/${selectedAddress}/c/${thread.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Seedit</a>
+                                      </li> */}
+                                      <li onClick={() => handleOptionClick(thread.cid)}>
+                                        <a
+                                        href={`https://plebones.netlify.app/#/p/${selectedAddress}/c/${thread.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebones</a>
+                                      </li>
+                                    </ul>
+                                  </li>
                                 </ul>
                               </div>
                               </PostMenuCatalog>, document.body
@@ -1305,6 +1332,32 @@ const Subscriptions = () => {
                                       </li>
                                     ) : null
                                   }
+                                  <li 
+                                  onMouseOver={() => {setIsClientRedirectMenuOpen(true)}}
+                                  onMouseLeave={() => {setIsClientRedirectMenuOpen(false)}}>
+                                    View on »
+                                    <ul className="dropdown-menu post-menu-catalog"
+                                      style={{display: isClientRedirectMenuOpen ? 'block': 'none'}}>
+                                      <li onClick={() => handleOptionClick(reply.cid)}>
+                                        <a 
+                                        href={`https://plebbitapp.eth.limo/#/p/${selectedAddress}/c/${reply.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebbit</a>
+                                      </li>
+                                      {/* <li onClick={() => handleOptionClick(reply.cid)}>
+                                        <a
+                                        href={`https://seedit.eth.limo/#/p/${selectedAddress}/c/${reply.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Seedit</a>
+                                      </li> */}
+                                      <li onClick={() => handleOptionClick(reply.cid)}>
+                                        <a
+                                        href={`https://plebones.netlify.app/#/p/${selectedAddress}/c/${reply.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebones</a>
+                                      </li>
+                                    </ul>
+                                  </li>
                                 </ul>
                               </div>
                               </PostMenuCatalog>, document.body

src/components/views/Thread.jsx

@@ -104,6 +104,7 @@ const Thread = () => {
   const [prevScrollPos, setPrevScrollPos] = useState(0);
   const [visible, setVisible] = useState(true);
   const [isImageSearchOpen, setIsImageSearchOpen] = useState(false);
+  const [isClientRedirectMenuOpen, setIsClientRedirectMenuOpen] = useState(false);
   const [isModerator, setIsModerator] = useState(false);
   const [commentCid, setCommentCid] = useState(null);
   const [menuPosition, setMenuPosition] = useState({top: 0, left: 0});
@@ -1125,6 +1126,32 @@ const Thread = () => {
                                   </li>
                                 ) : null
                               }
+                              <li 
+                              onMouseOver={() => {setIsClientRedirectMenuOpen(true)}}
+                              onMouseLeave={() => {setIsClientRedirectMenuOpen(false)}}>
+                                View on »
+                                <ul className="dropdown-menu post-menu-catalog"
+                                  style={{display: isClientRedirectMenuOpen ? 'block': 'none'}}>
+                                  <li onClick={() => handleOptionClick(comment.cid)}>
+                                    <a 
+                                    href={`https://plebbitapp.eth.limo/#/p/${selectedAddress}/c/${comment.cid}`}
+                                    target="_blank" rel="noreferrer"
+                                    >Plebbit</a>
+                                  </li>
+                                  {/* <li onClick={() => handleOptionClick(comment.cid)}>
+                                    <a
+                                    href={`https://seedit.eth.limo/#/p/${selectedAddress}/c/${comment.cid}`}
+                                    target="_blank" rel="noreferrer"
+                                    >Seedit</a>
+                                  </li> */}
+                                  <li onClick={() => handleOptionClick(comment.cid)}>
+                                    <a
+                                    href={`https://plebones.netlify.app/#/p/${selectedAddress}/c/${comment.cid}`}
+                                    target="_blank" rel="noreferrer"
+                                    >Plebones</a>
+                                  </li>
+                                </ul>
+                              </li>
                             </ul>
                           </div>
                           </PostMenuCatalog>, document.body
@@ -1386,6 +1413,32 @@ const Thread = () => {
                                       </li>
                                     ) : null
                                   }
+                                  <li 
+                                  onMouseOver={() => {setIsClientRedirectMenuOpen(true)}}
+                                  onMouseLeave={() => {setIsClientRedirectMenuOpen(false)}}>
+                                    View on »
+                                    <ul className="dropdown-menu post-menu-catalog"
+                                      style={{display: isClientRedirectMenuOpen ? 'block': 'none'}}>
+                                      <li onClick={() => handleOptionClick(reply.cid)}>
+                                        <a 
+                                        href={`https://plebbitapp.eth.limo/#/p/${selectedAddress}/c/${reply.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebbit</a>
+                                      </li>
+                                      {/* <li onClick={() => handleOptionClick(reply.cid)}>
+                                        <a
+                                        href={`https://seedit.eth.limo/#/p/${selectedAddress}/c/${reply.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Seedit</a>
+                                      </li> */}
+                                      <li onClick={() => handleOptionClick(reply.cid)}>
+                                        <a
+                                        href={`https://plebones.netlify.app/#/p/${selectedAddress}/c/${reply.cid}`}
+                                        target="_blank" rel="noreferrer"
+                                        >Plebones</a>
+                                      </li>
+                                    </ul>
+                                  </li>
                                 </ul>
                               </div>
                               </PostMenuCatalog>, document.body

src/hooks/stores/useGeneralStore.js

@@ -20,6 +20,9 @@ const useGeneralStore = create((set) => ({
   defaultSubplebbits: [],
   setDefaultSubplebbits: (subplebbits) => set({ defaultSubplebbits: subplebbits }),
 
+  deletePost: false,
+  setDeletePost: (deletePost) => set({ deletePost }),
+
   editedComment: '',
   setEditedComment: (comment) => set({ editedComment: comment }),
 
@@ -40,6 +43,12 @@ const useGeneralStore = create((set) => ({
   isCaptchaOpen: false,
   setIsCaptchaOpen: (isOpen) => set({ isCaptchaOpen: isOpen }),
 
+  isEditModalOpen: false,
+  setIsEditModalOpen: (isOpen) => set({ isEditModalOpen: isOpen }),
+
+  isModerator: false,
+  setIsModerator: (isModerator) => set({ isModerator }),
+
   isModerationOpen: false,
   setIsModerationOpen: (isOpen) => set({ isModerationOpen: isOpen }),
 
@@ -52,6 +61,9 @@ const useGeneralStore = create((set) => ({
   moderatingCommentCid: '',
   setModeratingCommentCid: (cid) => set({ moderatingCommentCid: cid }),
 
+  originalCommentContent: null,
+  setOriginalCommentContent: (content) => set({ originalCommentContent: content }),
+
   pendingComment: '',
   setPendingComment: (comment) => set({ pendingComment: comment }),
 

yarn.lock

@@ -3410,9 +3410,9 @@
     form-data "^3.0.0"
 
 "@types/node@*", "@types/node@>=13.7.0":
-  version "20.4.7"
+  version "20.4.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.7.tgz#74d323a93f1391a63477b27b9aec56669c98b2ab"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.8.tgz#b5dda19adaa473a9bf0ab5cbd8f30ec7d43f5c85"
-  integrity sha512-bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g==
+  integrity sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg==
 
 "@types/node@18.15.13":
   version "18.15.13"
@@ -6745,13 +6745,13 @@ eslint-config-react-app@7.0.1, eslint-config-react-app@^7.0.1:
     eslint-plugin-testing-library "^5.0.1"
 
 eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
+  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.8.tgz#be719e72f5e96dcef7a60f74147c842db0c74b06"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+  integrity sha512-tEe+Pok22qIGaK3KoMP+N96GVDS66B/zreoVVmiavLvRUEmGRtvb4B8wO9jwnb8d2lvHtrkhZ7UD73dWBVnf/Q==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.11.0"
+    is-core-module "^2.13.0"
-    resolve "^1.22.1"
+    resolve "^1.22.4"
 
 eslint-module-utils@^2.8.0:
   version "2.8.0"
@@ -6848,9 +6848,9 @@ eslint-plugin-react@^7.27.1:
     string.prototype.matchall "^4.0.8"
 
 eslint-plugin-testing-library@^5.0.1:
-  version "5.11.0"
+  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.0.tgz#0bad7668e216e20dd12f8c3652ca353009163121"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.1.tgz#5b46cdae96d4a78918711c0b4792f90088e62d20"
-  integrity sha512-ELY7Gefo+61OfXKlQeXNIDVVLPcvKTeiQOoMZG9TeuWa7Ln4dUNRv8JdRWBQI9Mbb427XGlVB1aa1QPZxBJM8Q==
+  integrity sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==
   dependencies:
     "@typescript-eslint/utils" "^5.58.0"
 
@@ -8592,10 +8592,10 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.12.0, is-core-module@^2.12.1, is-core-module@^2.5.0, is-core-module@^2.9.0:
+is-core-module@^2.12.1, is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.9.0:
-  version "2.12.1"
+  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
+  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
   dependencies:
     has "^1.0.3"
 
@@ -12813,21 +12813,12 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
   integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.2:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.2, resolve@^1.22.3, resolve@^1.22.4:
-  version "1.22.2"
+  version "1.22.4"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+  integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
   dependencies:
-    is-core-module "^2.11.0"
+    is-core-module "^2.13.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.22.3:
-  version "1.22.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
-  integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
-  dependencies:
-    is-core-module "^2.12.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"