+46 -14

app/[leaflet_id]/publish/PublishPost.tsx

··· 15 15 import { Popover } from "components/Popover"; 16 16 import { Input } from "components/Input"; 17 17 import { useReplicache } from "src/replicache"; 18 18 - import { editorStateToFacetedText } from "./BskyPostEditorProsemirror"; 19 18 import { EditorState } from "prosemirror-state"; 19 19 + import { 20 20 + BlueskyPostEditorProsemirror, 21 21 + editorStateToFacetedText, 22 22 + } from "./BskyPostEditorProsemirror"; 20 23 21 24 type Props = { 22 25 title: string; ··· 64 67 65 68 let editorStateRef = useRef<EditorState | null>(null); 66 69 let [isLoading, setIsLoading] = useState(false); 70 70 + let [charCount, setCharCount] = useState(0); 67 71 let params = useParams(); 68 72 let { rep } = useReplicache(); 69 73 ··· 140 144 } 141 145 }} 142 146 > 143 143 - <div className="flex flex-col font-normal w-full gap-0.5"> 147 147 + <div className="flex flex-col"> 144 148 <div className="font-bold">Share on Bluesky</div> 149 149 + <div className="text-sm text-tertiary font-normal"> 150 150 + Pub subscribers will be updated via a custom Bluesky feed 151 151 + </div> 152 152 + 145 153 <div 146 146 - className={`w-full ${shareOption.bluesky === false ? "opacity-50" : ""}`} 154 154 + className={`publishBskyPostEditor opaque-container p-3 rounded-lg! w-full ml-5 mb-4 ${shareOption.bluesky === false ? "opacity-50" : ""}`} 147 155 > 148 148 - <BskyPostComposer 149 149 - profile={props.profile} 150 150 - title={props.title} 151 151 - description={props.description} 152 152 - base_path={props.record?.base_path} 153 153 - postContent={postContent} 154 154 - setPostContent={setPostContent} 155 155 - /> 156 156 + <div className="flex gap-2"> 157 157 + <img 158 158 + className="bg-test rounded-full w-[42px] h-[42px] shrink-0" 159 159 + src={props.profile.avatar} 160 160 + /> 161 161 + <div className="flex flex-col w-full"> 162 162 + <div className="flex gap-2 pb-1"> 163 163 + <p className="font-bold">{props.profile.displayName}</p> 164 164 + <p className="text-tertiary">@{props.profile.handle}</p> 165 165 + </div> 166 166 + <div className="flex flex-col"> 167 167 + <BlueskyPostEditorProsemirror 168 168 + editorStateRef={editorStateRef} 169 169 + onCharCountChange={setCharCount} 170 170 + /> 171 171 + </div> 172 172 + <div className="opaque-container overflow-hidden flex flex-col mt-4 w-full"> 173 173 + {/* <div className="h-[260px] w-full bg-test" /> */} 174 174 + <div className="flex flex-col p-2"> 175 175 + <div className="font-bold">{props.title}</div> 176 176 + <div className="text-tertiary">{props.description}</div> 177 177 + <hr className="border-border-light mt-2 mb-1" /> 178 178 + <p className="text-xs text-tertiary"> 179 179 + {props.record?.base_path} 180 180 + </p> 181 181 + </div> 182 182 + </div> 183 183 + <div className="text-xs text-secondary italic place-self-end pt-2"> 184 184 + {charCount}/300 185 185 + </div> 186 186 + </div> 187 187 + </div> 156 188 </div> 157 189 </div> 158 190 </Checkbox> ··· 254 286 setPostContent: (p: string) => void; 255 287 }) => { 256 288 return ( 257 257 - <div className="opaque-container p-2 pr-3 !rounded-lg"> 289 289 + <div className="opaque-container p-2 pr-3 rounded-lg!"> 258 290 <div className="flex gap-2"> 259 291 <img 260 292 className="rounded-full w-6 h-6 sm:w-8 sm:h-8 shrink-0" ··· 273 305 } 274 306 placeholder="Write a post to share your writing!" 275 307 /> 276 276 - <div className="opaque-container overflow-hidden flex flex-col mt-[10px] w-full text-sm"> 277 277 - <div className="flex flex-col px-2 py-[6px]"> 308 308 + <div className="opaque-container overflow-hidden flex flex-col mt-2.5 w-full text-sm"> 309 309 + <div className="flex flex-col px-2 py-1.5"> 278 310 <div className="font-bold">{props.title}</div> 279 311 <div className="text-tertiary">{props.description}</div> 280 312 <hr className="border-border-light mt-2 mb-0.5" />

+10 -21

app/lish/Subscribe.tsx

··· 30 30 let email = "thisiscelinepark@gmail.com"; 31 31 32 32 export const SubscribeWithBluesky = (props: { 33 33 - isPost?: boolean; 33 33 + isPost: boolean; 34 34 pubName: string; 35 35 pub_uri: string; 36 36 base_url: string; 37 37 subscribers: { identity: string }[]; 38 38 }) => { 39 39 let { identity } = useIdentityData(); 40 40 - let subscribed = false; 41 41 - // identity?.atp_did && 42 42 - // props.subscribers.find((s) => s.identity === identity.atp_did); 40 40 + 41 41 + let subscribed = 42 42 + identity?.atp_did && 43 43 + props.subscribers.find((s) => s.identity === identity.atp_did); 43 44 44 45 if (subscribed) { 45 46 return <ManageSubscriptionButton {...props} />; ··· 58 59 59 60 let SubscribeButton = (props: { 60 61 pub_uri: string; 61 61 - isPost?: boolean; 62 62 + isPost: boolean; 62 63 pubName: string; 63 64 base_url: string; 64 65 subscribers: { identity: string }[]; ··· 70 71 window.location.href + "?refreshAuth", 71 72 ); 72 73 }, null); 73 73 - let { identity } = useIdentityData(); 74 74 - let searchParams = useSearchParams(); 75 75 - let [successModalOpen, setSuccessModalOpen] = useState( 76 76 - !!searchParams.has("showSubscribeSuccess"), 77 77 - ); 78 74 let subscribed = 79 75 identity?.atp_did && 80 76 props.subscribers.find((s) => s.identity === identity.atp_did); 81 77 82 82 - if (successModalOpen) 83 83 - return ( 84 84 - <SubscribeSuccessModal 85 85 - open={successModalOpen} 86 86 - setOpen={setSuccessModalOpen} 87 87 - /> 88 88 - ); 89 78 if (subscribed) { 90 79 return <ManageSubscriptionButton {...props} />; 91 80 } ··· 106 95 </ButtonPrimary> 107 96 } 108 97 > 109 109 - <SubscribeForm pub_uri={props.pub_uri} base_url={props.base_url} /> 98 98 + <SubscribeForm {...props} /> 110 99 </Popover> 111 100 <a href={`${props.base_url}/rss`} className="flex" target="_blank"> 112 101 <RSSSmall className="self-center" /> ··· 117 106 }; 118 107 119 108 const ManageSubscriptionButton = (props: { 120 120 - isPost?: boolean; 109 109 + isPost: boolean; 121 110 pubName: string; 122 111 pub_uri: string; 123 112 base_url: string; ··· 306 295 target="_blank" 307 296 className=" place-self-center" 308 297 > 309 309 - <ButtonPrimary fullWidth compact className="!px-4"> 298 298 + <ButtonPrimary fullWidth compact className="px-4!"> 310 299 View Bluesky Custom Feed 311 300 </ButtonPrimary> 312 301 </a> ··· 369 358 <div className="subscribeEmailInput flex gap-1 relative"> 370 359 <Input 371 360 type="email" 372 372 - className="input-with-border w-full! pr-[36px]!" 361 361 + className="input-with-border w-full! pr-9!" 373 362 placeholder="me@email.com" 374 363 value={props.emailInputValue} 375 364 onChange={(e) => props.setEmailInputValue(e.target.value)}

+1 -1

app/lish/[did]/[publication]/[rkey]/Interactions/InteractionDrawer.tsx

··· 38 38 <div className="snap-center h-full flex z-10 shrink-0 w-[calc(var(--page-width-units)-6px)] sm:w-[calc(var(--page-width-units))]"> 39 39 <div 40 40 id="interaction-drawer" 41 41 - className="opaque-container rounded-l-none! rounded-r-lg! h-full w-full px-3 sm:px-4 pt-2 sm:pt-3 pb-6 overflow-scroll -ml-[1px] " 41 41 + className="opaque-container rounded-l-none! rounded-r-lg! h-full w-full px-3 sm:px-4 pt-2 sm:pt-3 pb-6 overflow-scroll -ml-px " 42 42 > 43 43 {drawer.drawer === "quotes" ? ( 44 44 <Quotes {...props} quotesAndMentions={filteredQuotesAndMentions} />

-102

app/lish/[did]/[publication]/[rkey]/PostPage.tsx

··· 1 1 - "use client"; 2 2 - import { 3 3 - PubLeafletPagesLinearDocument, 4 4 - PubLeafletPublication, 5 5 - } from "lexicons/api"; 6 6 - import { PostPageData } from "./getPostPageData"; 7 7 - import { ProfileViewDetailed } from "@atproto/api/dist/client/types/app/bsky/actor/defs"; 8 8 - import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 9 9 - import { Subscribe } from "app/lish/Subscribe"; 10 10 - import { EditTiny } from "components/Icons/EditTiny"; 11 11 - import { Interactions, useInteractionState } from "./Interactions/Interactions"; 12 12 - import { PostContent } from "./PostContent"; 13 13 - import { PostHeader } from "./PostHeader/PostHeader"; 14 14 - import { useIdentityData } from "components/IdentityProvider"; 15 15 - import { AppBskyFeedDefs } from "@atproto/api"; 16 16 - 17 17 - export function PostPage({ 18 18 - document, 19 19 - blocks, 20 20 - name, 21 21 - did, 22 22 - profile, 23 23 - pubRecord, 24 24 - prerenderedCodeBlocks, 25 25 - bskyPostData, 26 26 - }: { 27 27 - document: PostPageData; 28 28 - blocks: PubLeafletPagesLinearDocument.Block[]; 29 29 - name: string; 30 30 - profile: ProfileViewDetailed; 31 31 - pubRecord: PubLeafletPublication.Record; 32 32 - did: string; 33 33 - prerenderedCodeBlocks?: Map<string, string>; 34 34 - bskyPostData: AppBskyFeedDefs.PostView[]; 35 35 - }) { 36 36 - let { identity } = useIdentityData(); 37 37 - let { drawerOpen } = useInteractionState(); 38 38 - if (!document || !document.documents_in_publications[0].publications) 39 39 - return null; 40 40 - 41 41 - let hasPageBackground = !!pubRecord.theme?.showPageBackground; 42 42 - return ( 43 43 - <> 44 44 - {(drawerOpen || hasPageBackground) && ( 45 45 - <div 46 46 - className="spacer sm:block hidden" 47 47 - style={{ 48 48 - width: `calc(50vw - 12px - ((var(--page-width-units)/2))`, 49 49 - }} 50 50 - /> 51 51 - )} 52 52 - <div 53 53 - id="post-page" 54 54 - className={`postPageWrapper relative overflow-y-auto sm:mx-0 mx-[6px] w-full 55 55 - ${drawerOpen || hasPageBackground ? "max-w-[var(--page-width-units)] shrink-0 snap-center " : "w-full"} 56 56 - ${ 57 57 - hasPageBackground 58 58 - ? "h-full bg-[rgba(var(--bg-page),var(--bg-page-alpha))] rounded-lg border border-border " 59 59 - : "sm:h-[calc(100%+48px)] h-[calc(100%+24px)] sm:-my-6 -my-3 " 60 60 - }`} 61 61 - > 62 62 - <div 63 63 - className={`postPageContent sm:max-w-prose mx-auto h-fit w-full px-3 sm:px-4 ${hasPageBackground ? " pt-2 pb-3 sm:pb-6" : "py-6 sm:py-9"}`} 64 64 - > 65 65 - <PostHeader data={document} profile={profile} name={name} /> 66 66 - <PostContent 67 67 - bskyPostData={bskyPostData} 68 68 - blocks={blocks} 69 69 - did={did} 70 70 - prerenderedCodeBlocks={prerenderedCodeBlocks} 71 71 - /> 72 72 - <Interactions quotes={document.document_mentions_in_bsky} /> 73 73 - <hr className="border-border-light mb-4 mt-4" /> 74 74 - {identity && 75 75 - identity.atp_did === 76 76 - document.documents_in_publications[0]?.publications 77 77 - ?.identity_did ? ( 78 78 - <a 79 79 - href={`https://leaflet.pub/${document.leaflets_in_publications[0].leaflet}`} 80 80 - className="flex gap-2 items-center hover:!no-underline selected-outline px-2 py-0.5 bg-accent-1 text-accent-2 font-bold w-fit rounded-lg !border-accent-1 !outline-accent-1 mx-auto" 81 81 - > 82 82 - <EditTiny /> Edit Post 83 83 - </a> 84 84 - ) : ( 85 85 - <Subscribe 86 86 - isPost 87 87 - base_url={getPublicationURL( 88 88 - document.documents_in_publications[0].publications, 89 89 - )} 90 90 - pub_uri={document.documents_in_publications[0].publications.uri} 91 91 - subscribers={ 92 92 - document.documents_in_publications[0].publications 93 93 - .publication_subscriptions 94 94 - } 95 95 - pubName={name} 96 96 - /> 97 97 - )} 98 98 - </div> 99 99 - </div> 100 100 - </> 101 101 - ); 102 102 - }

+4 -3

app/lish/[did]/[publication]/page.tsx

··· 4 4 import Link from "next/link"; 5 5 import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 6 6 import { BskyAgent } from "@atproto/api"; 7 7 - import { Subscribe } from "app/lish/Subscribe"; 8 7 import React from "react"; 9 8 import { 10 9 PublicationBackgroundProvider, ··· 15 14 import { QuoteTiny } from "components/Icons/QuoteTiny"; 16 15 import { CommentTiny } from "components/Icons/CommentTiny"; 17 16 import { LocalizedDate } from "./LocalizedDate"; 17 17 + import { SubscribeWithBluesky } from "app/lish/Subscribe"; 18 18 19 19 export default async function Publication(props: { 20 20 params: Promise<{ publication: string; did: string }>; ··· 67 67 pub_creator={publication.identity_did} 68 68 > 69 69 <div 70 70 - className={`pubWrapper flex flex-col sm:py-6 h-full ${showPageBackground ? "max-w-prose mx-auto sm:px-0 px-[6px] py-2" : "w-full overflow-y-scroll"}`} 70 70 + className={`pubWrapper flex flex-col sm:py-6 h-full ${showPageBackground ? "max-w-prose mx-auto sm:px-0 px-1.5 py-2" : "w-full overflow-y-scroll"}`} 71 71 > 72 72 <div 73 73 className={`pub sm:max-w-prose max-w-(--page-width-units) w-[1000px] mx-auto px-3 sm:px-4 py-5 ${showPageBackground ? "overflow-auto h-full bg-[rgba(var(--bg-page),var(--bg-page-alpha))] border border-border rounded-lg" : "h-fit"}`} ··· 102 102 </p> 103 103 )} 104 104 <div className="sm:pt-4 pt-4"> 105 105 - <Subscribe 105 105 + <SubscribeWithBluesky 106 106 + isPost={false} 106 107 base_url={getPublicationURL(publication)} 107 108 pubName={publication.name} 108 109 pub_uri={publication.uri}

+2 -2

app/lish/createPub/UpdatePubForm.tsx

··· 204 204 Publication Domain{domains.length > 1 && "s"} 205 205 </p> 206 206 207 207 - <div className="opaque-container px-[6px] py-1"> 207 207 + <div className="opaque-container px-1.5 py-1"> 208 208 {state.type === "addDomain" ? ( 209 209 <AddDomain 210 210 publication_uri={pubData.uri} ··· 392 392 if (!config?.misconfigured && !verification) 393 393 return <div>This domain is verified!</div>; 394 394 return ( 395 395 - <div className="flex flex-col gap-[6px] text-sm text-primary"> 395 395 + <div className="flex flex-col gap-1.5 text-sm text-primary"> 396 396 <div> 397 397 To verify this domain, add the following record to your DNS provider for{" "} 398 398 <strong>{props.domain}</strong>.

+1 -1

components/Blocks/Block.tsx

··· 430 430 className={`listMarker group/list-marker p-2 ${children.length > 0 ? "cursor-pointer" : "cursor-default"}`} 431 431 > 432 432 <div 433 433 - className={`h-[5px] w-[5px] rounded-full bg-secondary shrink-0 right-0 outline outline-1 outline-offset-1 433 433 + className={`h-[5px] w-[5px] rounded-full bg-secondary shrink-0 right-0 outline-offset-1 434 434 ${ 435 435 folded 436 436 ? "outline-secondary"

-957

package-lock.json

··· 23 23 "@mdx-js/react": "^3.1.0", 24 24 "@next/bundle-analyzer": "^15.3.2", 25 25 "@next/mdx": "15.3.2", 26 26 - "@radix-ui/react-dialog": "^1.1.14", 27 27 - "@radix-ui/react-dropdown-menu": "^2.1.14", 28 28 - "@radix-ui/react-popover": "^1.1.13", 29 29 - "@radix-ui/react-slider": "^1.3.4", 30 30 - "@radix-ui/react-tooltip": "^1.2.6", 31 26 "@react-email/components": "^0.5.0", 32 27 "@radix-ui/react-dialog": "^1.1.15", 33 28 "@radix-ui/react-dropdown-menu": "^2.1.16", ··· 588 583 "node": ">=18.7.0" 589 584 } 590 585 }, 591 591 - <<<<<<< HEAD 592 586 "node_modules/@atproto/xrpc-server/node_modules/@atproto/xrpc": { 593 587 "version": "0.7.0", 594 588 "resolved": "https://registry.npmjs.org/@atproto/xrpc/-/xrpc-0.7.0.tgz", ··· 867 861 "node": ">=6.9.0" 868 862 } 869 863 }, 870 870 - ======= 871 871 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 872 864 "node_modules/@babel/helper-string-parser": { 873 865 "version": "7.27.1", 874 866 "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", ··· 1098 1090 } 1099 1091 }, 1100 1092 "node_modules/@emnapi/runtime": { 1101 1101 - <<<<<<< HEAD 1102 1102 - "version": "1.4.5", 1103 1103 - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz", 1104 1104 - "integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==", 1105 1105 - "license": "MIT", 1106 1106 - ======= 1107 1093 "version": "1.5.0", 1108 1094 "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz", 1109 1095 "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==", 1110 1110 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 1111 1096 "optional": true, 1112 1097 "dependencies": { 1113 1098 "tslib": "^2.4.0" ··· 2224 2209 "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", 2225 2210 "dev": true 2226 2211 }, 2227 2227 - <<<<<<< HEAD 2228 2228 - "node_modules/@img/sharp-darwin-arm64": { 2229 2229 - "version": "0.34.1", 2230 2230 - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.1.tgz", 2231 2231 - "integrity": "sha512-pn44xgBtgpEbZsu+lWf2KNb6OAf70X68k+yk69Ic2Xz11zHR/w24/U49XT7AeRwJ0Px+mhALhU5LPci1Aymk7A==", 2232 2232 - "cpu": [ 2233 2233 - "arm64" 2234 2234 - ], 2235 2235 - "dev": true, 2236 2236 - "license": "Apache-2.0", 2237 2237 - ======= 2238 2212 "node_modules/@img/colour": { 2239 2213 "version": "1.0.0", 2240 2214 "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.0.0.tgz", ··· 2250 2224 "cpu": [ 2251 2225 "arm64" 2252 2226 ], 2253 2253 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 2254 2227 "optional": true, 2255 2228 "os": [ 2256 2229 "darwin" ··· 2262 2235 "url": "https://opencollective.com/libvips" 2263 2236 }, 2264 2237 "optionalDependencies": { 2265 2265 - <<<<<<< HEAD 2266 2266 - "@img/sharp-libvips-darwin-arm64": "1.1.0" 2267 2267 - } 2268 2268 - }, 2269 2269 - "node_modules/@img/sharp-darwin-x64": { 2270 2270 - "version": "0.34.1", 2271 2271 - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.1.tgz", 2272 2272 - "integrity": "sha512-VfuYgG2r8BpYiOUN+BfYeFo69nP/MIwAtSJ7/Zpxc5QF3KS22z8Pvg3FkrSFJBPNQ7mmcUcYQFBmEQp7eu1F8Q==", 2273 2273 - "cpu": [ 2274 2274 - "x64" 2275 2275 - ], 2276 2276 - "dev": true, 2277 2277 - "license": "Apache-2.0", 2278 2278 - "optional": true, 2279 2279 - "os": [ 2280 2280 - "darwin" 2281 2281 - ], 2282 2282 - "engines": { 2283 2283 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2284 2284 - }, 2285 2285 - "funding": { 2286 2286 - "url": "https://opencollective.com/libvips" 2287 2287 - }, 2288 2288 - "optionalDependencies": { 2289 2289 - "@img/sharp-libvips-darwin-x64": "1.1.0" 2290 2290 - } 2291 2291 - }, 2292 2292 - "node_modules/@img/sharp-libvips-darwin-arm64": { 2293 2293 - "version": "1.1.0", 2294 2294 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.1.0.tgz", 2295 2295 - "integrity": "sha512-HZ/JUmPwrJSoM4DIQPv/BfNh9yrOA8tlBbqbLz4JZ5uew2+o22Ik+tHQJcih7QJuSa0zo5coHTfD5J8inqj9DA==", 2296 2296 - "cpu": [ 2297 2297 - "arm64" 2298 2298 - ], 2299 2299 - "dev": true, 2300 2300 - "license": "LGPL-3.0-or-later", 2301 2301 - "optional": true, 2302 2302 - "os": [ 2303 2303 - "darwin" 2304 2304 - ], 2305 2305 - "funding": { 2306 2306 - "url": "https://opencollective.com/libvips" 2307 2307 - } 2308 2308 - }, 2309 2309 - "node_modules/@img/sharp-libvips-darwin-x64": { 2310 2310 - "version": "1.1.0", 2311 2311 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.1.0.tgz", 2312 2312 - "integrity": "sha512-Xzc2ToEmHN+hfvsl9wja0RlnXEgpKNmftriQp6XzY/RaSfwD9th+MSh0WQKzUreLKKINb3afirxW7A0fz2YWuQ==", 2313 2313 - "cpu": [ 2314 2314 - "x64" 2315 2315 - ], 2316 2316 - "dev": true, 2317 2317 - "license": "LGPL-3.0-or-later", 2318 2318 - "optional": true, 2319 2319 - "os": [ 2320 2320 - "darwin" 2321 2321 - ], 2322 2322 - "funding": { 2323 2323 - "url": "https://opencollective.com/libvips" 2324 2324 - } 2325 2325 - }, 2326 2326 - "node_modules/@img/sharp-libvips-linux-arm": { 2327 2327 - "version": "1.1.0", 2328 2328 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.1.0.tgz", 2329 2329 - "integrity": "sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==", 2330 2330 - "cpu": [ 2331 2331 - "arm" 2332 2332 - ], 2333 2333 - "dev": true, 2334 2334 - "license": "LGPL-3.0-or-later", 2335 2335 - "optional": true, 2336 2336 - "os": [ 2337 2337 - "linux" 2338 2338 - ], 2339 2339 - "funding": { 2340 2340 - "url": "https://opencollective.com/libvips" 2341 2341 - } 2342 2342 - }, 2343 2343 - "node_modules/@img/sharp-libvips-linux-arm64": { 2344 2344 - "version": "1.1.0", 2345 2345 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.1.0.tgz", 2346 2346 - "integrity": "sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==", 2347 2347 - "cpu": [ 2348 2348 - "arm64" 2349 2349 - ], 2350 2350 - "dev": true, 2351 2351 - "license": "LGPL-3.0-or-later", 2352 2352 - "optional": true, 2353 2353 - "os": [ 2354 2354 - "linux" 2355 2355 - ], 2356 2356 - "funding": { 2357 2357 - "url": "https://opencollective.com/libvips" 2358 2358 - } 2359 2359 - }, 2360 2360 - "node_modules/@img/sharp-libvips-linux-ppc64": { 2361 2361 - "version": "1.1.0", 2362 2362 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.1.0.tgz", 2363 2363 - "integrity": "sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==", 2364 2364 - "cpu": [ 2365 2365 - "ppc64" 2366 2366 - ], 2367 2367 - "dev": true, 2368 2368 - "license": "LGPL-3.0-or-later", 2369 2369 - "optional": true, 2370 2370 - "os": [ 2371 2371 - "linux" 2372 2372 - ], 2373 2373 - "funding": { 2374 2374 - "url": "https://opencollective.com/libvips" 2375 2375 - } 2376 2376 - }, 2377 2377 - "node_modules/@img/sharp-libvips-linux-s390x": { 2378 2378 - "version": "1.1.0", 2379 2379 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.1.0.tgz", 2380 2380 - "integrity": "sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==", 2381 2381 - "cpu": [ 2382 2382 - "s390x" 2383 2383 - ], 2384 2384 - "dev": true, 2385 2385 - "license": "LGPL-3.0-or-later", 2386 2386 - "optional": true, 2387 2387 - "os": [ 2388 2388 - "linux" 2389 2389 - ], 2390 2390 - "funding": { 2391 2391 - "url": "https://opencollective.com/libvips" 2392 2392 - } 2393 2393 - }, 2394 2394 - "node_modules/@img/sharp-libvips-linux-x64": { 2395 2395 - "version": "1.2.0", 2396 2396 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.0.tgz", 2397 2397 - "integrity": "sha512-ZW3FPWIc7K1sH9E3nxIGB3y3dZkpJlMnkk7z5tu1nSkBoCgw2nSRTFHI5pB/3CQaJM0pdzMF3paf9ckKMSE9Tg==", 2398 2398 - ======= 2399 2238 "@img/sharp-libvips-darwin-arm64": "1.2.3" 2400 2239 } 2401 2240 }, ··· 2403 2242 "version": "0.34.4", 2404 2243 "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.4.tgz", 2405 2244 "integrity": "sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg==", 2406 2406 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 2407 2245 "cpu": [ 2408 2246 "x64" 2409 2247 ], ··· 2466 2304 "url": "https://opencollective.com/libvips" 2467 2305 } 2468 2306 }, 2469 2469 - <<<<<<< HEAD 2470 2470 - "node_modules/@img/sharp-libvips-linuxmusl-arm64": { 2471 2471 - "version": "1.1.0", 2472 2472 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.1.0.tgz", 2473 2473 - "integrity": "sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==", 2474 2474 - "cpu": [ 2475 2475 - "arm64" 2476 2476 - ], 2477 2477 - "dev": true, 2478 2478 - "license": "LGPL-3.0-or-later", 2479 2479 - ======= 2480 2307 "node_modules/@img/sharp-libvips-linux-arm64": { 2481 2308 "version": "1.2.3", 2482 2309 "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.3.tgz", ··· 2484 2311 "cpu": [ 2485 2312 "arm64" 2486 2313 ], 2487 2487 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 2488 2314 "optional": true, 2489 2315 "os": [ 2490 2316 "linux" ··· 2493 2319 "url": "https://opencollective.com/libvips" 2494 2320 } 2495 2321 }, 2496 2496 - <<<<<<< HEAD 2497 2497 - "node_modules/@img/sharp-libvips-linuxmusl-x64": { 2498 2498 - "version": "1.1.0", 2499 2499 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.1.0.tgz", 2500 2500 - "integrity": "sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==", 2501 2501 - "cpu": [ 2502 2502 - "x64" 2503 2503 - ], 2504 2504 - "dev": true, 2505 2505 - "license": "LGPL-3.0-or-later", 2506 2506 - "optional": true, 2507 2507 - "os": [ 2508 2508 - "linux" 2509 2509 - ], 2510 2510 - "funding": { 2511 2511 - "url": "https://opencollective.com/libvips" 2512 2512 - } 2513 2513 - }, 2514 2514 - "node_modules/@img/sharp-linux-arm": { 2515 2515 - "version": "0.34.1", 2516 2516 - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.1.tgz", 2517 2517 - "integrity": "sha512-anKiszvACti2sGy9CirTlNyk7BjjZPiML1jt2ZkTdcvpLU1YH6CXwRAZCA2UmRXnhiIftXQ7+Oh62Ji25W72jA==", 2518 2518 - "cpu": [ 2519 2519 - "arm" 2520 2520 - ], 2521 2521 - "dev": true, 2522 2522 - "license": "Apache-2.0", 2523 2523 - "optional": true, 2524 2524 - "os": [ 2525 2525 - "linux" 2526 2526 - ], 2527 2527 - "engines": { 2528 2528 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2529 2529 - }, 2530 2530 - "funding": { 2531 2531 - "url": "https://opencollective.com/libvips" 2532 2532 - }, 2533 2533 - "optionalDependencies": { 2534 2534 - "@img/sharp-libvips-linux-arm": "1.1.0" 2535 2535 - } 2536 2536 - }, 2537 2537 - "node_modules/@img/sharp-linux-arm64": { 2538 2538 - "version": "0.34.1", 2539 2539 - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.1.tgz", 2540 2540 - "integrity": "sha512-kX2c+vbvaXC6vly1RDf/IWNXxrlxLNpBVWkdpRq5Ka7OOKj6nr66etKy2IENf6FtOgklkg9ZdGpEu9kwdlcwOQ==", 2541 2541 - "cpu": [ 2542 2542 - "arm64" 2543 2543 - ], 2544 2544 - "dev": true, 2545 2545 - "license": "Apache-2.0", 2546 2546 - "optional": true, 2547 2547 - "os": [ 2548 2548 - "linux" 2549 2549 - ], 2550 2550 - "engines": { 2551 2551 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2552 2552 - }, 2553 2553 - "funding": { 2554 2554 - "url": "https://opencollective.com/libvips" 2555 2555 - }, 2556 2556 - "optionalDependencies": { 2557 2557 - "@img/sharp-libvips-linux-arm64": "1.1.0" 2558 2558 - } 2559 2559 - }, 2560 2560 - "node_modules/@img/sharp-linux-ppc64": { 2561 2561 - "version": "0.34.3", 2562 2562 - "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.3.tgz", 2563 2563 - "integrity": "sha512-GLtbLQMCNC5nxuImPR2+RgrviwKwVql28FWZIW1zWruy6zLgA5/x2ZXk3mxj58X/tszVF69KK0Is83V8YgWhLA==", 2564 2564 - "cpu": [ 2565 2565 - "ppc64" 2566 2566 - ], 2567 2567 - "license": "Apache-2.0", 2568 2568 - "optional": true, 2569 2569 - "os": [ 2570 2570 - "linux" 2571 2571 - ], 2572 2572 - "engines": { 2573 2573 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2574 2574 - }, 2575 2575 - "funding": { 2576 2576 - "url": "https://opencollective.com/libvips" 2577 2577 - }, 2578 2578 - "optionalDependencies": { 2579 2579 - "@img/sharp-libvips-linux-ppc64": "1.2.0" 2580 2580 - } 2581 2581 - }, 2582 2582 - "node_modules/@img/sharp-linux-ppc64/node_modules/@img/sharp-libvips-linux-ppc64": { 2583 2583 - "version": "1.2.0", 2584 2584 - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.0.tgz", 2585 2585 - "integrity": "sha512-Xod/7KaDDHkYu2phxxfeEPXfVXFKx70EAFZ0qyUdOjCcxbjqyJOEUpDe6RIyaunGxT34Anf9ue/wuWOqBW2WcQ==", 2586 2586 - "cpu": [ 2587 2587 - "ppc64" 2588 2588 - ], 2589 2589 - "dev": true, 2590 2590 - "license": "LGPL-3.0-or-later", 2591 2591 - ======= 2592 2322 "node_modules/@img/sharp-libvips-linux-ppc64": { 2593 2323 "version": "1.2.3", 2594 2324 "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.3.tgz", ··· 2596 2326 "cpu": [ 2597 2327 "ppc64" 2598 2328 ], 2599 2599 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 2600 2329 "optional": true, 2601 2330 "os": [ 2602 2331 "linux" ··· 2605 2334 "url": "https://opencollective.com/libvips" 2606 2335 } 2607 2336 }, 2608 2608 - <<<<<<< HEAD 2609 2609 - "node_modules/@img/sharp-linux-s390x": { 2610 2610 - "version": "0.34.1", 2611 2611 - "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.1.tgz", 2612 2612 - "integrity": "sha512-7s0KX2tI9mZI2buRipKIw2X1ufdTeaRgwmRabt5bi9chYfhur+/C1OXg3TKg/eag1W+6CCWLVmSauV1owmRPxA==", 2613 2613 - "cpu": [ 2614 2614 - "s390x" 2615 2615 - ], 2616 2616 - "dev": true, 2617 2617 - "license": "Apache-2.0", 2618 2618 - ======= 2619 2337 "node_modules/@img/sharp-libvips-linux-s390x": { 2620 2338 "version": "1.2.3", 2621 2339 "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.3.tgz", ··· 2623 2341 "cpu": [ 2624 2342 "s390x" 2625 2343 ], 2626 2626 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 2627 2344 "optional": true, 2628 2345 "os": [ 2629 2346 "linux" 2630 2347 ], 2631 2631 - <<<<<<< HEAD 2632 2632 - "engines": { 2633 2633 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2634 2634 - }, 2635 2635 - "funding": { 2636 2636 - "url": "https://opencollective.com/libvips" 2637 2637 - }, 2638 2638 - "optionalDependencies": { 2639 2639 - "@img/sharp-libvips-linux-s390x": "1.1.0" 2640 2640 - } 2641 2641 - }, 2642 2642 - "node_modules/@img/sharp-linux-x64": { 2643 2643 - "version": "0.34.3", 2644 2644 - "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.3.tgz", 2645 2645 - "integrity": "sha512-8kYso8d806ypnSq3/Ly0QEw90V5ZoHh10yH0HnrzOCr6DKAPI6QVHvwleqMkVQ0m+fc7EH8ah0BB0QPuWY6zJQ==", 2646 2646 - ======= 2647 2348 "funding": { 2648 2349 "url": "https://opencollective.com/libvips" 2649 2350 } ··· 2652 2353 "version": "1.2.3", 2653 2354 "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.3.tgz", 2654 2355 "integrity": "sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg==", 2655 2655 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 2656 2356 "cpu": [ 2657 2357 "x64" 2658 2358 ], ··· 2800 2500 } 2801 2501 }, 2802 2502 "node_modules/@img/sharp-linuxmusl-arm64": { 2803 2803 - "version": "0.34.4", 2804 2804 - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.4.tgz", 2805 2805 - "integrity": "sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA==", 2806 2806 - "cpu": [ 2807 2807 - "arm64" 2808 2808 - ], 2809 2809 - "optional": true, 2810 2810 - "os": [ 2811 2811 - "linux" 2812 2812 - ], 2813 2813 - "engines": { 2814 2814 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2815 2815 - }, 2816 2816 - "funding": { 2817 2817 - "url": "https://opencollective.com/libvips" 2818 2818 - }, 2819 2819 - "optionalDependencies": { 2820 2820 - "@img/sharp-libvips-linuxmusl-arm64": "1.2.3" 2821 2821 - } 2822 2822 - }, 2823 2823 - "node_modules/@img/sharp-linuxmusl-x64": { 2824 2824 - "version": "0.34.4", 2825 2825 - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.4.tgz", 2826 2826 - "integrity": "sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg==", 2827 2827 - "cpu": [ 2828 2828 - "x64" 2829 2829 - ], 2830 2830 - "optional": true, 2831 2831 - "os": [ 2832 2832 - "linux" 2833 2833 - ], 2834 2834 - "engines": { 2835 2835 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2836 2836 - }, 2837 2837 - "funding": { 2838 2838 - "url": "https://opencollective.com/libvips" 2839 2839 - }, 2840 2840 - "optionalDependencies": { 2841 2841 - "@img/sharp-libvips-linuxmusl-x64": "1.2.3" 2842 2842 - } 2843 2843 - }, 2844 2844 - "node_modules/@img/sharp-wasm32": { 2845 2845 - "version": "0.34.4", 2846 2846 - "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.4.tgz", 2847 2847 - "integrity": "sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA==", 2848 2848 - "cpu": [ 2849 2849 - "wasm32" 2850 2850 - ], 2851 2851 - "optional": true, 2852 2852 - "dependencies": { 2853 2853 - "@emnapi/runtime": "^1.5.0" 2854 2854 - }, 2855 2855 - "engines": { 2856 2856 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2857 2857 - }, 2858 2858 - "funding": { 2859 2859 - "url": "https://opencollective.com/libvips" 2860 2860 - } 2861 2861 - }, 2862 2862 - "node_modules/@img/sharp-win32-arm64": { 2863 2863 - "version": "0.34.4", 2864 2864 - "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.4.tgz", 2865 2865 - "integrity": "sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA==", 2866 2866 - "cpu": [ 2867 2867 - "arm64" 2868 2868 - ], 2869 2869 - "optional": true, 2870 2870 - "os": [ 2871 2871 - "win32" 2872 2872 - ], 2873 2873 - "engines": { 2874 2874 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2875 2875 - }, 2876 2876 - "funding": { 2877 2877 - "url": "https://opencollective.com/libvips" 2878 2878 - } 2879 2879 - }, 2880 2880 - "node_modules/@img/sharp-win32-ia32": { 2881 2881 - "version": "0.34.4", 2882 2882 - "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.4.tgz", 2883 2883 - "integrity": "sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw==", 2884 2884 - "cpu": [ 2885 2885 - "ia32" 2886 2886 - ], 2887 2887 - "optional": true, 2888 2888 - "os": [ 2889 2889 - "win32" 2890 2890 - ], 2891 2891 - "engines": { 2892 2892 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2893 2893 - }, 2894 2894 - "funding": { 2895 2895 - "url": "https://opencollective.com/libvips" 2896 2896 - } 2897 2897 - }, 2898 2898 - "node_modules/@img/sharp-win32-x64": { 2899 2899 - "version": "0.34.4", 2900 2900 - "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.4.tgz", 2901 2901 - "integrity": "sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig==", 2902 2902 - "cpu": [ 2903 2903 - "x64" 2904 2904 - ], 2905 2905 - "optional": true, 2906 2906 - "os": [ 2907 2907 - "win32" 2908 2908 - ], 2909 2909 - "engines": { 2910 2910 - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2911 2911 - }, 2912 2912 - "funding": { 2913 2913 - "url": "https://opencollective.com/libvips" 2914 2914 - } 2915 2915 - }, 2916 2916 - "node_modules/@img/sharp-linuxmusl-arm64": { 2917 2503 "version": "0.34.1", 2918 2504 "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.1.tgz", 2919 2505 "integrity": "sha512-DfvyxzHxw4WGdPiTF0SOHnm11Xv4aQexvqhRDAoD00MzHekAj9a/jADXeXYCDFH/DzYruwHbXU7uz+H+nWmSOQ==", ··· 3107 2693 "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==", 3108 2694 "license": "(Apache-2.0 AND MIT)" 3109 2695 }, 3110 3110 - <<<<<<< HEAD 3111 3111 - "node_modules/@isaacs/balanced-match": { 3112 3112 - "version": "4.0.1", 3113 3113 - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", 3114 3114 - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", 3115 3115 - "dev": true, 3116 3116 - "license": "MIT", 3117 3117 - "engines": { 3118 3118 - "node": "20 || >=22" 3119 3119 - } 3120 3120 - }, 3121 3121 - "node_modules/@isaacs/brace-expansion": { 3122 3122 - "version": "5.0.0", 3123 3123 - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", 3124 3124 - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", 3125 3125 - "dev": true, 3126 3126 - "license": "MIT", 3127 3127 - "dependencies": { 3128 3128 - "@isaacs/balanced-match": "^4.0.1" 3129 3129 - }, 3130 3130 - "engines": { 3131 3131 - "node": "20 || >=22" 3132 3132 - } 3133 3133 - }, 3134 3134 - "node_modules/@isaacs/cliui": { 3135 3135 - "version": "8.0.2", 3136 3136 - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", 3137 3137 - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", 3138 3138 - "dev": true, 3139 3139 - "dependencies": { 3140 3140 - "string-width": "^5.1.2", 3141 3141 - "string-width-cjs": "npm:string-width@^4.2.0", 3142 3142 - "strip-ansi": "^7.0.1", 3143 3143 - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", 3144 3144 - "wrap-ansi": "^8.1.0", 3145 3145 - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" 3146 3146 - }, 3147 3147 - "engines": { 3148 3148 - "node": ">=12" 3149 3149 - } 3150 3150 - }, 3151 3151 - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { 3152 3152 - "version": "6.0.1", 3153 3153 - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", 3154 3154 - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", 3155 3155 - "dev": true, 3156 3156 - "engines": { 3157 3157 - "node": ">=12" 3158 3158 - }, 3159 3159 - "funding": { 3160 3160 - "url": "https://github.com/chalk/ansi-regex?sponsor=1" 3161 3161 - } 3162 3162 - }, 3163 3163 - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { 3164 3164 - "version": "6.2.1", 3165 3165 - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", 3166 3166 - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", 3167 3167 - "dev": true, 3168 3168 - "engines": { 3169 3169 - "node": ">=12" 3170 3170 - }, 3171 3171 - "funding": { 3172 3172 - "url": "https://github.com/chalk/ansi-styles?sponsor=1" 3173 3173 - } 3174 3174 - }, 3175 3175 - "node_modules/@isaacs/cliui/node_modules/string-width": { 3176 3176 - "version": "5.1.2", 3177 3177 - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", 3178 3178 - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", 3179 3179 - "dev": true, 3180 3180 - "dependencies": { 3181 3181 - "eastasianwidth": "^0.2.0", 3182 3182 - "emoji-regex": "^9.2.2", 3183 3183 - "strip-ansi": "^7.0.1" 3184 3184 - }, 3185 3185 - "engines": { 3186 3186 - "node": ">=12" 3187 3187 - }, 3188 3188 - "funding": { 3189 3189 - "url": "https://github.com/sponsors/sindresorhus" 3190 3190 - } 3191 3191 - }, 3192 3192 - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { 3193 3193 - "version": "7.1.0", 3194 3194 - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", 3195 3195 - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", 3196 3196 - "dev": true, 3197 3197 - "dependencies": { 3198 3198 - "ansi-regex": "^6.0.1" 3199 3199 - }, 3200 3200 - "engines": { 3201 3201 - "node": ">=12" 3202 3202 - }, 3203 3203 - "funding": { 3204 3204 - "url": "https://github.com/chalk/strip-ansi?sponsor=1" 3205 3205 - } 3206 3206 - }, 3207 3207 - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { 3208 3208 - "version": "8.1.0", 3209 3209 - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", 3210 3210 - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", 3211 3211 - "dev": true, 3212 3212 - "dependencies": { 3213 3213 - "ansi-styles": "^6.1.0", 3214 3214 - "string-width": "^5.0.1", 3215 3215 - "strip-ansi": "^7.0.1" 3216 3216 - }, 3217 3217 - "engines": { 3218 3218 - "node": ">=12" 3219 3219 - }, 3220 3220 - "funding": { 3221 3221 - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" 3222 3222 - } 3223 3223 - }, 3224 3224 - ======= 3225 3225 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3226 2696 "node_modules/@isaacs/fs-minipass": { 3227 2697 "version": "4.0.1", 3228 2698 "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", ··· 3245 2715 "version": "0.3.13", 3246 2716 "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", 3247 2717 "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", 3248 3248 - <<<<<<< HEAD 3249 3249 - "devOptional": true, 3250 3250 - "license": "MIT", 3251 3251 - "dependencies": { 3252 3252 - "@jridgewell/sourcemap-codec": "^1.5.0", 3253 3253 - ======= 3254 2718 "dev": true, 3255 2719 "license": "MIT", 3256 2720 "dependencies": { ··· 3266 2730 "license": "MIT", 3267 2731 "dependencies": { 3268 2732 "@jridgewell/gen-mapping": "^0.3.5", 3269 3269 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3270 2733 "@jridgewell/trace-mapping": "^0.3.24" 3271 2734 } 3272 2735 }, ··· 3279 2742 "node": ">=6.0.0" 3280 2743 } 3281 2744 }, 3282 3282 - <<<<<<< HEAD 3283 3283 - "node_modules/@jridgewell/source-map": { 3284 3284 - "version": "0.3.11", 3285 3285 - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz", 3286 3286 - "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==", 3287 3287 - "devOptional": true, 3288 3288 - "license": "MIT", 3289 3289 - "dependencies": { 3290 3290 - "@jridgewell/gen-mapping": "^0.3.5", 3291 3291 - "@jridgewell/trace-mapping": "^0.3.25" 3292 3292 - } 3293 3293 - }, 3294 3294 - ======= 3295 3295 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3296 2745 "node_modules/@jridgewell/sourcemap-codec": { 3297 2746 "version": "1.5.5", 3298 2747 "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", 3299 2748 "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", 3300 3300 - <<<<<<< HEAD 3301 3301 - "devOptional": true, 3302 3302 - "license": "MIT" 3303 3303 - }, 3304 3304 - "node_modules/@jridgewell/trace-mapping": { 3305 3305 - "version": "0.3.30", 3306 3306 - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz", 3307 3307 - "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==", 3308 3308 - "devOptional": true, 3309 3309 - ======= 3310 2749 "dev": true, 3311 2750 "license": "MIT" 3312 2751 }, ··· 3315 2754 "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", 3316 2755 "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", 3317 2756 "dev": true, 3318 3318 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3319 2757 "license": "MIT", 3320 2758 "dependencies": { 3321 2759 "@jridgewell/resolve-uri": "^3.1.0", ··· 3533 2971 } 3534 2972 }, 3535 2973 "node_modules/@next/swc-darwin-arm64": { 3536 3536 - <<<<<<< HEAD 3537 3537 - "version": "15.4.1", 3538 3538 - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.4.1.tgz", 3539 3539 - "integrity": "sha512-L+81yMsiHq82VRXS2RVq6OgDwjvA4kDksGU8hfiDHEXP+ncKIUhUsadAVB+MRIp2FErs/5hpXR0u2eluWPAhig==", 3540 3540 - ======= 3541 2974 "version": "15.5.3", 3542 2975 "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.3.tgz", 3543 2976 "integrity": "sha512-nzbHQo69+au9wJkGKTU9lP7PXv0d1J5ljFpvb+LnEomLtSbJkbZyEs6sbF3plQmiOB2l9OBtN2tNSvCH1nQ9Jg==", 3544 3544 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3545 2977 "cpu": [ 3546 2978 "arm64" 3547 2979 ], ··· 3556 2988 } 3557 2989 }, 3558 2990 "node_modules/@next/swc-darwin-x64": { 3559 3559 - <<<<<<< HEAD 3560 3560 - "version": "15.4.1", 3561 3561 - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.4.1.tgz", 3562 3562 - "integrity": "sha512-jfz1RXu6SzL14lFl05/MNkcN35lTLMJWPbqt7Xaj35+ZWAX342aePIJrN6xBdGeKl6jPXJm0Yqo3Xvh3Gpo3Uw==", 3563 3563 - ======= 3564 2991 "version": "15.5.3", 3565 2992 "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.3.tgz", 3566 2993 "integrity": "sha512-w83w4SkOOhekJOcA5HBvHyGzgV1W/XvOfpkrxIse4uPWhYTTRwtGEM4v/jiXwNSJvfRvah0H8/uTLBKRXlef8g==", 3567 3567 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3568 2994 "cpu": [ 3569 2995 "x64" 3570 2996 ], ··· 3579 3005 } 3580 3006 }, 3581 3007 "node_modules/@next/swc-linux-arm64-gnu": { 3582 3582 - <<<<<<< HEAD 3583 3583 - "version": "15.4.1", 3584 3584 - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.4.1.tgz", 3585 3585 - "integrity": "sha512-k0tOFn3dsnkaGfs6iQz8Ms6f1CyQe4GacXF979sL8PNQxjYS1swx9VsOyUQYaPoGV8nAZ7OX8cYaeiXGq9ahPQ==", 3586 3586 - ======= 3587 3008 "version": "15.5.3", 3588 3009 "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.3.tgz", 3589 3010 "integrity": "sha512-+m7pfIs0/yvgVu26ieaKrifV8C8yiLe7jVp9SpcIzg7XmyyNE7toC1fy5IOQozmr6kWl/JONC51osih2RyoXRw==", 3590 3590 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3591 3011 "cpu": [ 3592 3012 "arm64" 3593 3013 ], ··· 3602 3022 } 3603 3023 }, 3604 3024 "node_modules/@next/swc-linux-arm64-musl": { 3605 3605 - <<<<<<< HEAD 3606 3606 - "version": "15.4.1", 3607 3607 - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.4.1.tgz", 3608 3608 - "integrity": "sha512-4ogGQ/3qDzbbK3IwV88ltihHFbQVq6Qr+uEapzXHXBH1KsVBZOB50sn6BWHPcFjwSoMX2Tj9eH/fZvQnSIgc3g==", 3609 3609 - ======= 3610 3025 "version": "15.5.3", 3611 3026 "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.3.tgz", 3612 3027 "integrity": "sha512-u3PEIzuguSenoZviZJahNLgCexGFhso5mxWCrrIMdvpZn6lkME5vc/ADZG8UUk5K1uWRy4hqSFECrON6UKQBbQ==", 3613 3613 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3614 3028 "cpu": [ 3615 3029 "arm64" 3616 3030 ], ··· 3657 3071 } 3658 3072 }, 3659 3073 "node_modules/@next/swc-win32-arm64-msvc": { 3660 3660 - <<<<<<< HEAD 3661 3661 - "version": "15.4.1", 3662 3662 - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.4.1.tgz", 3663 3663 - "integrity": "sha512-WodRbZ9g6CQLRZsG3gtrA9w7Qfa9BwDzhFVdlI6sV0OCPq9JrOrJSp9/ioLsezbV8w9RCJ8v55uzJuJ5RgWLZg==", 3664 3664 - ======= 3665 3074 "version": "15.5.3", 3666 3075 "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.3.tgz", 3667 3076 "integrity": "sha512-1CU20FZzY9LFQigRi6jM45oJMU3KziA5/sSG+dXeVaTm661snQP6xu3ykGxxwU5sLG3sh14teO/IOEPVsQMRfA==", 3668 3668 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3669 3077 "cpu": [ 3670 3078 "arm64" 3671 3079 ], ··· 3680 3088 } 3681 3089 }, 3682 3090 "node_modules/@next/swc-win32-x64-msvc": { 3683 3683 - <<<<<<< HEAD 3684 3684 - "version": "15.4.1", 3685 3685 - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.4.1.tgz", 3686 3686 - "integrity": "sha512-y+wTBxelk2xiNofmDOVU7O5WxTHcvOoL3srOM0kxTzKDjQ57kPU0tpnPJ/BWrRnsOwXEv0+3QSbGR7hY4n9LkQ==", 3687 3687 - ======= 3688 3091 "version": "15.5.3", 3689 3092 "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.3.tgz", 3690 3093 "integrity": "sha512-JMoLAq3n3y5tKXPQwCK5c+6tmwkuFDa2XAxz8Wm4+IVthdBZdZGh+lmiLUHg9f9IDwIQpUjp+ysd6OkYTyZRZw==", 3691 3691 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 3692 3094 "cpu": [ 3693 3095 "x64" 3694 3096 ], ··· 11543 10945 "node": ">=8.0.0" 11544 10946 } 11545 10947 }, 11546 11546 - <<<<<<< HEAD 11547 11547 - "node_modules/autoprefixer": { 11548 11548 - "version": "10.4.21", 11549 11549 - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz", 11550 11550 - "integrity": "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==", 11551 11551 - "dev": true, 11552 11552 - "funding": [ 11553 11553 - { 11554 11554 - "type": "opencollective", 11555 11555 - "url": "https://opencollective.com/postcss/" 11556 11556 - }, 11557 11557 - { 11558 11558 - "type": "tidelift", 11559 11559 - "url": "https://tidelift.com/funding/github/npm/autoprefixer" 11560 11560 - }, 11561 11561 - { 11562 11562 - "type": "github", 11563 11563 - "url": "https://github.com/sponsors/ai" 11564 11564 - } 11565 11565 - ], 11566 11566 - "license": "MIT", 11567 11567 - "dependencies": { 11568 11568 - "browserslist": "^4.24.4", 11569 11569 - "caniuse-lite": "^1.0.30001702", 11570 11570 - "fraction.js": "^4.3.7", 11571 11571 - "normalize-range": "^0.1.2", 11572 11572 - "picocolors": "^1.1.1", 11573 11573 - "postcss-value-parser": "^4.2.0" 11574 11574 - }, 11575 11575 - "bin": { 11576 11576 - "autoprefixer": "bin/autoprefixer" 11577 11577 - }, 11578 11578 - "engines": { 11579 11579 - "node": "^10 || ^12 || >=14" 11580 11580 - }, 11581 11581 - "peerDependencies": { 11582 11582 - "postcss": "^8.1.0" 11583 11583 - } 11584 11584 - }, 11585 11585 - ======= 11586 11586 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 11587 10948 "node_modules/available-typed-arrays": { 11588 10949 "version": "1.0.7", 11589 10950 "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", ··· 11867 11228 "node": ">=8" 11868 11229 } 11869 11230 }, 11870 11870 - <<<<<<< HEAD 11871 11871 - "node_modules/browserslist": { 11872 11872 - "version": "4.25.2", 11873 11873 - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz", 11874 11874 - "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==", 11875 11875 - "devOptional": true, 11876 11876 - "funding": [ 11877 11877 - { 11878 11878 - "type": "opencollective", 11879 11879 - "url": "https://opencollective.com/browserslist" 11880 11880 - }, 11881 11881 - { 11882 11882 - "type": "tidelift", 11883 11883 - "url": "https://tidelift.com/funding/github/npm/browserslist" 11884 11884 - }, 11885 11885 - { 11886 11886 - "type": "github", 11887 11887 - "url": "https://github.com/sponsors/ai" 11888 11888 - } 11889 11889 - ], 11890 11890 - "license": "MIT", 11891 11891 - "dependencies": { 11892 11892 - "caniuse-lite": "^1.0.30001733", 11893 11893 - "electron-to-chromium": "^1.5.199", 11894 11894 - "node-releases": "^2.0.19", 11895 11895 - "update-browserslist-db": "^1.1.3" 11896 11896 - }, 11897 11897 - "bin": { 11898 11898 - "browserslist": "cli.js" 11899 11899 - }, 11900 11900 - "engines": { 11901 11901 - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" 11902 11902 - } 11903 11903 - }, 11904 11904 - ======= 11905 11905 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 11906 11231 "node_modules/buffer": { 11907 11232 "version": "6.0.3", 11908 11233 "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", ··· 12505 11830 "node": ">= 8" 12506 11831 } 12507 11832 }, 12508 12508 - <<<<<<< HEAD 12509 12509 - "node_modules/css-select": { 12510 12510 - "version": "5.2.2", 12511 12511 - "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz", 12512 12512 - "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==", 12513 12513 - "dev": true, 12514 12514 - "license": "BSD-2-Clause", 12515 12515 - "dependencies": { 12516 12516 - "boolbase": "^1.0.0", 12517 12517 - "css-what": "^6.1.0", 12518 12518 - "domhandler": "^5.0.2", 12519 12519 - "domutils": "^3.0.1", 12520 12520 - "nth-check": "^2.0.1" 12521 12521 - }, 12522 12522 - "funding": { 12523 12523 - "url": "https://github.com/sponsors/fb55" 12524 12524 - } 12525 12525 - }, 12526 12526 - "node_modules/css-what": { 12527 12527 - "version": "6.2.2", 12528 12528 - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz", 12529 12529 - "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==", 12530 12530 - "dev": true, 12531 12531 - "license": "BSD-2-Clause", 12532 12532 - "engines": { 12533 12533 - "node": ">= 6" 12534 12534 - }, 12535 12535 - "funding": { 12536 12536 - "url": "https://github.com/sponsors/fb55" 12537 12537 - } 12538 12538 - }, 12539 12539 - "node_modules/cssesc": { 12540 12540 - "version": "3.0.0", 12541 12541 - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", 12542 12542 - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", 12543 12543 - "dev": true, 12544 12544 - "bin": { 12545 12545 - "cssesc": "bin/cssesc" 12546 12546 - }, 12547 12547 - "engines": { 12548 12548 - "node": ">=4" 12549 12549 - } 12550 12550 - }, 12551 12551 - ======= 12552 12552 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 12553 11833 "node_modules/csstype": { 12554 11834 "version": "3.1.3", 12555 11835 "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", ··· 13510 12790 "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", 13511 12791 "license": "MIT" 13512 12792 }, 13513 13513 - <<<<<<< HEAD 13514 13514 - "node_modules/electron-to-chromium": { 13515 13515 - "version": "1.5.203", 13516 13516 - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.203.tgz", 13517 13517 - "integrity": "sha512-uz4i0vLhfm6dLZWbz/iH88KNDV+ivj5+2SA+utpgjKaj9Q0iDLuwk6Idhe9BTxciHudyx6IvTvijhkPvFGUQ0g==", 13518 13518 - "devOptional": true, 13519 13519 - "license": "ISC" 13520 13520 - }, 13521 13521 - ======= 13522 13522 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 13523 12793 "node_modules/emoji-regex": { 13524 12794 "version": "9.2.2", 13525 12795 "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", ··· 13535 12805 "node": ">= 0.8" 13536 12806 } 13537 12807 }, 13538 13538 - <<<<<<< HEAD 13539 13539 - "node_modules/engine.io": { 13540 13540 - "version": "6.6.4", 13541 13541 - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz", 13542 13542 - "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==", 13543 13543 - "dev": true, 13544 13544 - "license": "MIT", 13545 13545 - "dependencies": { 13546 13546 - "@types/cors": "^2.8.12", 13547 13547 - "@types/node": ">=10.0.0", 13548 13548 - "accepts": "~1.3.4", 13549 13549 - "base64id": "2.0.0", 13550 13550 - "cookie": "~0.7.2", 13551 13551 - "cors": "~2.8.5", 13552 13552 - "debug": "~4.3.1", 13553 13553 - "engine.io-parser": "~5.2.1", 13554 13554 - "ws": "~8.17.1" 13555 13555 - }, 13556 13556 - "engines": { 13557 13557 - "node": ">=10.2.0" 13558 13558 - } 13559 13559 - }, 13560 13560 - "node_modules/engine.io-client": { 13561 13561 - "version": "6.6.3", 13562 13562 - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz", 13563 13563 - "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==", 13564 13564 - "dev": true, 13565 13565 - "license": "MIT", 13566 13566 - "dependencies": { 13567 13567 - "@socket.io/component-emitter": "~3.1.0", 13568 13568 - "debug": "~4.3.1", 13569 13569 - "engine.io-parser": "~5.2.1", 13570 13570 - "ws": "~8.17.1", 13571 13571 - "xmlhttprequest-ssl": "~2.1.1" 13572 13572 - } 13573 13573 - }, 13574 13574 - "node_modules/engine.io-client/node_modules/debug": { 13575 13575 - "version": "4.3.7", 13576 13576 - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", 13577 13577 - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", 13578 13578 - "dev": true, 13579 13579 - "license": "MIT", 13580 13580 - "dependencies": { 13581 13581 - "ms": "^2.1.3" 13582 13582 - }, 13583 13583 - "engines": { 13584 13584 - "node": ">=6.0" 13585 13585 - }, 13586 13586 - "peerDependenciesMeta": { 13587 13587 - "supports-color": { 13588 13588 - "optional": true 13589 13589 - } 13590 13590 - } 13591 13591 - }, 13592 13592 - "node_modules/engine.io-parser": { 13593 13593 - "version": "5.2.3", 13594 13594 - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz", 13595 13595 - "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==", 13596 13596 - "dev": true, 13597 13597 - "license": "MIT", 13598 13598 - "engines": { 13599 13599 - "node": ">=10.0.0" 13600 13600 - } 13601 13601 - }, 13602 13602 - "node_modules/engine.io/node_modules/cookie": { 13603 13603 - "version": "0.7.2", 13604 13604 - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", 13605 13605 - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", 13606 13606 - "dev": true, 13607 13607 - "license": "MIT", 13608 13608 - "engines": { 13609 13609 - "node": ">= 0.6" 13610 13610 - } 13611 13611 - }, 13612 13612 - "node_modules/engine.io/node_modules/debug": { 13613 13613 - "version": "4.3.7", 13614 13614 - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", 13615 13615 - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", 13616 13616 - "dev": true, 13617 13617 - "license": "MIT", 13618 13618 - "dependencies": { 13619 13619 - "ms": "^2.1.3" 13620 13620 - }, 13621 13621 - "engines": { 13622 13622 - "node": ">=6.0" 13623 13623 - }, 13624 13624 - "peerDependenciesMeta": { 13625 13625 - "supports-color": { 13626 13626 - "optional": true 13627 13627 - } 13628 13628 - } 13629 13629 - }, 13630 13630 - "node_modules/enhanced-resolve": { 13631 13631 - "version": "5.18.3", 13632 13632 - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz", 13633 13633 - "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==", 13634 13634 - "devOptional": true, 13635 13635 - "license": "MIT", 13636 13636 - ======= 13637 12808 "node_modules/enhanced-resolve": { 13638 12809 "version": "5.18.3", 13639 12810 "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz", 13640 12811 "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==", 13641 12812 "dev": true, 13642 12813 "license": "MIT", 13643 13643 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 13644 12814 "dependencies": { 13645 12815 "graceful-fs": "^4.2.4", 13646 12816 "tapable": "^2.2.0" ··· 15356 14526 "url": "https://github.com/sponsors/ljharb" 15357 14527 } 15358 14528 }, 15359 15359 - <<<<<<< HEAD 15360 15360 - "node_modules/foreground-child": { 15361 15361 - "version": "3.3.1", 15362 15362 - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", 15363 15363 - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", 15364 15364 - "dev": true, 15365 15365 - "license": "ISC", 15366 15366 - "dependencies": { 15367 15367 - "cross-spawn": "^7.0.6", 15368 15368 - "signal-exit": "^4.0.1" 15369 15369 - }, 15370 15370 - "engines": { 15371 15371 - "node": ">=14" 15372 15372 - }, 15373 15373 - "funding": { 15374 15374 - "url": "https://github.com/sponsors/isaacs" 15375 15375 - } 15376 15376 - }, 15377 15377 - ======= 15378 15378 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 15379 14529 "node_modules/form-data": { 15380 14530 "version": "4.0.0", 15381 14531 "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", ··· 19535 18685 "node-gyp-build-optional-packages-test": "build-test.js" 19536 18686 } 19537 18687 }, 19538 19538 - <<<<<<< HEAD 19539 19539 - "node_modules/node-html-parser": { 19540 19540 - "version": "7.0.1", 19541 19541 - "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-7.0.1.tgz", 19542 19542 - "integrity": "sha512-KGtmPY2kS0thCWGK0VuPyOS+pBKhhe8gXztzA2ilAOhbUbxa9homF1bOyKvhGzMLXUoRds9IOmr/v5lr/lqNmA==", 19543 19543 - "dev": true, 19544 19544 - "license": "MIT", 19545 19545 - "dependencies": { 19546 19546 - "css-select": "^5.1.0", 19547 19547 - "he": "1.2.0" 19548 19548 - } 19549 19549 - }, 19550 19550 - "node_modules/node-releases": { 19551 19551 - "version": "2.0.19", 19552 19552 - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", 19553 19553 - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", 19554 19554 - "devOptional": true, 19555 19555 - "license": "MIT" 19556 19556 - }, 19557 19557 - ======= 19558 19558 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 19559 18688 "node_modules/normalize-path": { 19560 18689 "version": "3.0.0", 19561 18690 "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", ··· 20040 19169 "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", 20041 19170 "dev": true 20042 19171 }, 20043 20043 - <<<<<<< HEAD 20044 20044 - "node_modules/pathe": { 20045 20045 - "version": "2.0.3", 20046 20046 - "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", 20047 20047 - "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", 20048 20048 - "dev": true, 20049 20049 - "license": "MIT" 20050 20050 - }, 20051 20051 - "node_modules/peberminta": { 20052 20052 - "version": "0.9.0", 20053 20053 - "resolved": "https://registry.npmjs.org/peberminta/-/peberminta-0.9.0.tgz", 20054 20054 - "integrity": "sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==", 20055 20055 - "license": "MIT", 20056 20056 - "funding": { 20057 20057 - "url": "https://ko-fi.com/killymxi" 20058 20058 - } 20059 20059 - }, 20060 20060 - ======= 20061 19172 "node_modules/pg": { 20062 19173 "version": "8.16.3", 20063 19174 "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz", ··· 20098 19209 "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==", 20099 19210 "license": "MIT" 20100 19211 }, 20101 20101 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 20102 19212 "node_modules/pg-int8": { 20103 19213 "version": "1.0.1", 20104 19214 "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", ··· 20204 19314 "integrity": "sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==", 20205 19315 "license": "MIT" 20206 19316 }, 20207 20207 - <<<<<<< HEAD 20208 20208 - "node_modules/pirates": { 20209 20209 - "version": "4.0.6", 20210 20210 - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", 20211 20211 - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", 20212 20212 - "dev": true, 20213 20213 - "engines": { 20214 20214 - "node": ">= 6" 20215 20215 - } 20216 20216 - }, 20217 20217 - "node_modules/pkg-types": { 20218 20218 - "version": "2.2.0", 20219 20219 - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz", 20220 20220 - "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==", 20221 20221 - "dev": true, 20222 20222 - "license": "MIT", 20223 20223 - "dependencies": { 20224 20224 - "confbox": "^0.2.2", 20225 20225 - "exsolve": "^1.0.7", 20226 20226 - "pathe": "^2.0.3" 20227 20227 - } 20228 20228 - }, 20229 20229 - ======= 20230 20230 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 20231 19317 "node_modules/possible-typed-array-names": { 20232 19318 "version": "1.1.0", 20233 19319 "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", ··· 23625 22711 "next-tick": "1" 23626 22712 } 23627 22713 }, 23628 23628 - <<<<<<< HEAD 23629 23629 - "node_modules/tinyexec": { 23630 23630 - "version": "0.3.2", 23631 23631 - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", 23632 23632 - "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", 23633 23633 - "dev": true, 23634 23634 - "license": "MIT" 23635 23635 - ======= 23636 22714 "node_modules/tinyglobby": { 23637 22715 "version": "0.2.15", 23638 22716 "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", ··· 23680 22758 "funding": { 23681 22759 "url": "https://github.com/sponsors/jonschlinkert" 23682 22760 } 23683 23683 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 23684 22761 }, 23685 22762 "node_modules/tlds": { 23686 22763 "version": "1.256.0", ··· 24170 23247 "node": ">= 0.8" 24171 23248 } 24172 23249 }, 24173 24173 - <<<<<<< HEAD 24174 24174 - "node_modules/update-browserslist-db": { 24175 24175 - "version": "1.1.3", 24176 24176 - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", 24177 24177 - "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", 24178 24178 - "devOptional": true, 24179 24179 - "funding": [ 24180 24180 - { 24181 24181 - "type": "opencollective", 24182 24182 - "url": "https://opencollective.com/browserslist" 24183 24183 - }, 24184 24184 - { 24185 24185 - "type": "tidelift", 24186 24186 - "url": "https://tidelift.com/funding/github/npm/browserslist" 24187 24187 - }, 24188 24188 - { 24189 24189 - "type": "github", 24190 24190 - "url": "https://github.com/sponsors/ai" 24191 24191 - } 24192 24192 - ], 24193 24193 - "license": "MIT", 24194 24194 - "dependencies": { 24195 24195 - "escalade": "^3.2.0", 24196 24196 - "picocolors": "^1.1.1" 24197 24197 - }, 24198 24198 - "bin": { 24199 24199 - "update-browserslist-db": "cli.js" 24200 24200 - }, 24201 24201 - "peerDependencies": { 24202 24202 - "browserslist": ">= 4.21.0" 24203 24203 - } 24204 24204 - }, 24205 24205 - ======= 24206 24206 - >>>>>>> 94182057d89cc4edfa5b1b4a8a34ebf4fbde050d 24207 23250 "node_modules/use-callback-ref": { 24208 23251 "version": "1.3.3", 24209 23252 "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",