diff --git a/.cursorrules b/.cursorrules new file mode 100644 index 000000000..a4aa1c03d --- /dev/null +++ b/.cursorrules @@ -0,0 +1,147 @@ +# React Native/Expo Project + +You are an expert in TypeScript, React Native, Expo, and Mobile UI development with Nativewind. + +Every time you choose to apply a rule(s), explicitly state the rule(s) in the output. You can abbreviate the rule description to a single word or phrase. + +## Project Context + +## Code Style and Structure + +- Write concise, technical TypeScript code with accurate examples +- Use functional and declarative programming patterns; avoid classes +- Prefer iteration and modularization over code duplication +- Use descriptive variable names with auxiliary verbs (e.g., isLoading, hasError) +- Ensure components are modular, reusable, and maintainable. +- Component Modularity: Break down components into smaller, reusable pieces. Keep components focused on a single responsibility and shouldn't be more than 80 lines of code. +- To install new packages use `npx expo install ` +- Structure repository files as follows: + +``` +src + ├── api ## API related code, mainly using axios and react query + ├── app ## the main entry point for expo router(file-based routing), when you can find screens and navigation setup + ├── components ## shared components + │ ├── card.tsx + │ └── ui ## core ui components. buttons, inputs, etc + ├── lib ## shared libraries, auth, env, hooks, i18n, storage, test-utils, utils + ├── translations ## translations files for the app + ├── types ## shared types + +``` + +## Tech Stack + +- Expo +- React Native +- TypeScript +- Nativewind ( Tailwind CSS for React Native ) +- Expo Router +- React Query with React Query Kit +- Zustand +- React Native Keyboard Controller +- React Native SVG +- React Native MMKV + +## Naming Conventions + +- Favor named exports for components and utilities +- Use kebabCase for all files names and directories (e.g., visa-form.tsx) + +## TypeScript Usage + +- Use TypeScript for all code; prefer types over interfaces +- Avoid enums; use const objects with 'as const' assertion +- Use functional components with TypeScript interfaces +- Define strict types for message passing between different parts of the extension +- Use absolute imports for all files @/... +- Avoid try/catch blocks unless there's good reason to translate or handle error in that abstraction +- Use explicit return types for all functions + +## State Management + +- Use React Zustand for global state management +- Implement proper cleanup in useEffect hooks + +## Syntax and Formatting + +- Use "function" keyword for pure functions +- Avoid unnecessary curly braces in conditionals +- Use declarative JSX +- Implement proper TypeScript discriminated unions for message types + +## UI and Styling + +- Use Nativewind for styling and components +- Use built-in ui components such as Button, Input from `@components/ui` +- Ensure high accessibility (a11y) standards using ARIA roles and native accessibility props. +- Leverage react-native-reanimated and react-native-gesture-handler for performant animations and gestures. +- Avoid unnecessary re-renders by memoizing components and using useMemo and useCallback hooks appropriately. +- Make sure to use defined colors and fonts in the tailwind config file. + +Here is a simple example of how a component should be written using : + +```tsx +import * as React from 'react'; + +import { Text, View, Image, SavaAreaView } from '@/components/ui'; + +// Props should be defined in the top of the component +type Props = { + text: string; +}; + +export function Title({ text }: Props) { + return ( + + {text} + + + + + ); +} +``` + +## Error Handling + +- Log errors appropriately for debugging +- Provide user-friendly error messages + +## Testing + +- Write unit tests using Jest and React Native Testing Library. +- Write unit tests for utilities and complex components +- The test file should be named like the component file but with the .test.tsx extension (e.g., component-name.test.tsx) +- Do not write unit tests for simple components that only show data + +## Git Usage + +Commit Message Prefixes: + +- "fix:" for bug fixes +- "feat:" for new features +- "perf:" for performance improvements +- "docs:" for documentation changes +- "style:" for formatting changes +- "refactor:" for code refactoring +- "test:" for adding missing tests +- "chore:" for maintenance tasks + +Rules: + +- Use lowercase for commit messages +- Keep the summary line concise with a maximum of 100 characters +- Reference issue numbers when applicable + +## Documentation + +- Maintain clear README with the following sections: + - Setup ( how to install and run the project ) + - Usage ( listing all the commands and how to use them ) + - Stack ( the tech stack used in the project ) + - Folder Structure ( the folder structure of the project only the important ones inside src ) diff --git a/.github/workflows/eas-build-prod.yml b/.github/workflows/eas-build-prod.yml new file mode 100644 index 000000000..a850bf45e --- /dev/null +++ b/.github/workflows/eas-build-prod.yml @@ -0,0 +1,43 @@ +# 🔗 Links: +# Source file: https://github.com/obytes/react-native-template-obytes/blob/master/.github/workflows/eas-build-prod.yml +# Starter releasing process: https://starter.obytes.com/ci-cd/app-releasing-process/ + +# ✍️ Description: +# This workflow is used to trigger a build on EAS for Prod environment. +# Can be triggered manually from the actions tab. +# This workflow will use ./actions/eas-build action to trigger the build on EAS with production env. + +# 🚨 GITHUB SECRETS REQUIRED: +# - EXPO_TOKEN: Expo token to authenticate with EAS +# - You can get it from https://expo.dev/settings/access-tokens + +name: EAS Production Build (Android & IOS) (EAS) + +on: + workflow_dispatch: + +jobs: + Build: + name: EAS Production Build (Android & IOS) (EAS) + runs-on: ubuntu-latest + steps: + - name: Check for EXPO_TOKEN + run: | + if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then + echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions" + exit 1 + fi + + - name: 📦 Checkout project repo + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: 📦 Setup Node + PNPM + install deps + uses: ./.github/actions/setup-node-pnpm-install + + - name: ⏱️ EAS Build + uses: ./.github/actions/eas-build + with: + APP_ENV: production + EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }} diff --git a/.github/workflows/eas-build-qa.yml b/.github/workflows/eas-build-qa.yml new file mode 100644 index 000000000..7cc4a853d --- /dev/null +++ b/.github/workflows/eas-build-qa.yml @@ -0,0 +1,47 @@ +# 🔗 Links: +# Source file: https://github.com/obytes/react-native-template-obytes/blob/master/.github/workflows/eas-build-qa.yml +# Starter releasing process: https://starter.obytes.com/ci-cd/app-releasing-process/ + +# ✍️ Description: +# This workflow is used to trigger a build on EAS for the QA environment. +# It will run on every GitHub release published on the repo or can be triggered manually from the actions tab. +# This workflow will use ./actions/eas-build action to trigger the build on EAS with staging env. + +# 🚨 GITHUB SECRETS REQUIRED: +# - EXPO_TOKEN: Expo token to authenticate with EAS +# - You can get it from https://expo.dev/settings/access-tokens + +name: EAS QA Build (Android & IOS) (EAS) + +on: + workflow_dispatch: + release: + types: [published] + +jobs: + Build: + name: EAS QA Build (Android & IOS) (EAS) + runs-on: ubuntu-latest + steps: + - name: Check for EXPO_TOKEN + run: | + if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then + echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions" + exit 1 + fi + - name: 📦 Checkout project repo + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: 📦 Setup Node + PNPM + install deps + uses: ./.github/actions/setup-node-pnpm-install + + - name: ⏱️ EAS Build + uses: ./.github/actions/eas-build + with: + APP_ENV: staging + EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }} + VERSION: ${{ github.event.release.tag_name }} + IOS: false # TODO: set as true when IOS account is ready + diff --git a/.github/workflows/expo-doctor.yml b/.github/workflows/expo-doctor.yml index 0f0fc3dbe..908cd3348 100644 --- a/.github/workflows/expo-doctor.yml +++ b/.github/workflows/expo-doctor.yml @@ -44,9 +44,19 @@ jobs: - name: 📦 Setup Node + PNPM + install deps uses: ./.github/actions/setup-node-pnpm-install +<<<<<<< HEAD - name: 🚑 Run Doctor Checks run: | chmod +x .github/scripts/expo-doctor.sh +======= + - name: Run prebuild + run: pnpm run prebuild + + - name: 🚑 Run Doctor Checks + run: | + chmod +x .github/scripts/expo-doctor.sh + rm -rf ios android +>>>>>>> c7bb80d .github/scripts/expo-doctor.sh - name: Add doctor report as comment on PR @@ -54,4 +64,8 @@ jobs: uses: marocchino/sticky-pull-request-comment@v2 with: header: expo-doctor - path: .expo/expo-doctor.md \ No newline at end of file +<<<<<<< HEAD + path: .expo/expo-doctor.md +======= + path: .expo/expo-doctor.md +>>>>>>> c7bb80d diff --git a/.github/workflows/new-app-version.yml b/.github/workflows/new-app-version.yml new file mode 100644 index 000000000..53b42694a --- /dev/null +++ b/.github/workflows/new-app-version.yml @@ -0,0 +1,65 @@ +# 🔗 Links: +# Source file: https://github.com/obytes/react-native-template-obytes/blob/master/.github/workflows/lint-ts.yml +# Starter releasing process: https://starter.obytes.com/ci-cd/app-releasing-process/ + +# ✍️ Description: +# This workflow is used to create a new version of the app and push a new tag to the repo. +# As this workflow will push code to the repo, we set up GitHub Bot as a Git user. +# This Workflow need to be triggered manually from the Actions tab in the repo. +# 1. Choose your release type (patch, minor, major) +# 2. The workflow will run the np-release script which runs the following steps: +# - Bump the version in package.json based on the release type using np +# - Run the prebuild of the app to align the package.json version with the native code +# - Create a new tag with the new version +# - Push the new tag to the repo +# + +# 🚨 GITHUB SECRETS REQUIRED: +# - GH_TOKEN: A GitHub token with write repo access. +# You can generate one from here: https://docs.github.com/en/enterprise-server@3.6/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens +# make sure to add it to the repo secrets with the name GH_TOKEN + +name: New App Version + +on: + workflow_dispatch: + inputs: + release-type: + type: choice + description: 'Release type (one of): patch, minor, major' + required: true + default: 'patch' + options: + - patch + - minor + - major + +jobs: + release: + name: Create New Version and push new tag + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: 🔍 GH_TOKEN + if: env.GH_TOKEN == '' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: echo "GH_TOKEN=${GITHUB_TOKEN}" >> $GITHUB_ENV + - name: 📦 Checkout project repo + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GH_TOKEN }} + + - name: 📝 Git User Setup + run: | + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + + - name: 📦 Setup Node + PNPM + install deps + uses: ./.github/actions/setup-node-pnpm-install + + - name: 🏃‍♂️ Run App release + run: | + pnpm app-release ${{ github.event.inputs.release-type }} diff --git a/.github/workflows/new-github-release.yml b/.github/workflows/new-github-release.yml new file mode 100644 index 000000000..a432b8515 --- /dev/null +++ b/.github/workflows/new-github-release.yml @@ -0,0 +1,34 @@ +# 🔗 Links: +# Source file: https://github.com/obytes/react-native-template-obytes/blob/master/.github/workflows/new-github-release.yml +# Starter releasing process: https://starter.obytes.com/ci-cd/app-releasing-process/ + +# ✍️ Description: +# This workflow will be triggered automatically after the new app version workflow has been executed successfully. +# It will create a new GitHub release with the new app version and the release notes. + +# 🚨 GITHUB SECRETS REQUIRED: None + +name: New GitHub Release + +on: + push: + tags: + - '*' + +jobs: + release: + name: New GitHub Release + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: 📦 Checkout project repo + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: 🏃‍♂️Create A Draft Github Release + uses: ncipollo/release-action@v1 + with: + generateReleaseNotes: true + draft: false diff --git a/.github/workflows/sync-with-upstream.yml b/.github/workflows/sync-with-upstream.yml index eb32c8021..622607a7d 100644 --- a/.github/workflows/sync-with-upstream.yml +++ b/.github/workflows/sync-with-upstream.yml @@ -28,20 +28,29 @@ name: 🔄 Sync with upstream on: schedule: - - cron: '0 12 * * 1-5' # At 12:00 UTC on every day-of-week from Monday through Friday + - cron: "0 12 * * 1-5" # At 12:00 UTC on every day-of-week from Monday through Friday workflow_dispatch: inputs: upstream-version: type: string - description: 'Upstream release version to sync with (e.g. v1.0.0). Leave empty to sync with the latest release.' + description: "Upstream release version to sync with (e.g. v1.0.0). Leave empty to sync with the latest release." required: false - default: '' + default: "" env: UPSTREAM_REPOSITORY: obytes/react-native-template-obytes - DIFF_EXCLUDED_ROUTES: | + DIFF_EXCLUDED_ROUTES: + | # Files/directories we don't want from the upstream repository ios android + .cursorrules + .github/workflows/eas-build-prod.yml + .github/workflows/eas-build-qa.yml + .github/workflows/new-app-version.yml + .github/workflows/new-github-release.yml + docs/public/reviews + src/app/login.tsx + src/components/card.tsx jobs: sync: @@ -90,7 +99,7 @@ jobs: echo "PR_EXISTS=false" >> $GITHUB_ENV fi env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.UPDATE_FROM_UPSTREAM_PAT }} - name: Checkout update release of upstream if: ${{ env.BRANCH_EXISTS == 'false' }} run: | @@ -124,4 +133,4 @@ jobs: run: | gh pr create --title "chore: update upstream to ${{ env.UPSTREAM_UPDATE_VERSION }}" --body "Integrating latest changes from [obytes/react-native-template-obytes@${{ env.UPSTREAM_UPDATE_VERSION }}](https://github.com/obytes/react-native-template-obytes/releases/tag/${{ env.UPSTREAM_UPDATE_VERSION }})" --head ${{ env.BRANCH_NAME }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.UPDATE_FROM_UPSTREAM_PAT }} diff --git a/.github/workflows/type-check.yml b/.github/workflows/type-check.yml index b07947235..a881fa16c 100644 --- a/.github/workflows/type-check.yml +++ b/.github/workflows/type-check.yml @@ -22,6 +22,10 @@ permissions: contents: read pull-requests: write +permissions: + contents: read + pull-requests: write + jobs: type-check: name: Type Check (tsc) diff --git a/.husky/pre-commit b/.husky/pre-commit index e7da137a9..2c6dc6dc3 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,3 +1,7 @@ +<<<<<<< HEAD +======= + +>>>>>>> c7bb80d . "$(dirname "$0")/common.sh" diff --git a/.prettierrc.js b/.prettierrc.js index cd202582c..015155e56 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -2,6 +2,10 @@ const config = { singleQuote: true, endOfLine: 'auto', +<<<<<<< HEAD +======= + trailingComma: 'es5', +>>>>>>> c7bb80d }; module.exports = config; diff --git a/README.md b/README.md index b1d34c507..d1d5af2e0 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ This template brings several key advantages. It provides our team with a consist - 🎯 Localization with [i18next](https://www.i18next.com/), along with Eslint for validation. - Unit testing with [Jest](https://jestjs.io/) and [React Testing Library](https://testing-library.com/docs/react-testing-library/intro/) setup to help you write tests for your app. +<<<<<<< HEAD ## ✍️ Documentation 🚧 UNDER CONSTRUCTION 🚧 - [Create new project ](https://rootstrap.github.io/react-native-template/getting-started/create-new-app/) @@ -50,6 +51,37 @@ This template brings several key advantages. It provides our team with a consist - [Forms](https://rootstrap.github.io/react-native-template/ui-and-theme/forms/) - [Data fetching](https://rootstrap.github.io/react-native-template/guides/data-fetching/) - [Contribute to starter](https://rootstrap.github.io/react-native-template/how-to-contribute/) +======= +## Is this starter for me? + +Yes 😀 + +This starter kit is designed to benefit a wide range of React Native developers, from beginners to experienced professionals. Here's why it might be a good fit for you: + +1. **For beginners:** It provides a solid foundation with best practices and common solutions, helping you learn industry-standard approaches to React Native development. + +2. **For experienced developers:** It offers a well-structured, production-ready setup that can save you time and effort in project initialization and configuration. + +3. **For teams:** It ensures consistency across projects and team members, making it easier to onboard new developers and maintain code quality. + +4. **For explorers:** Even if you prefer not to use starter kits, this project can serve as a valuable reference. You can explore the codebase, documentation, and architectural decisions to gain insights and potentially adopt specific solutions for your projects. + +5. **For learners:** The starter kit incorporates up-to-date libraries and patterns, allowing you to familiarize yourself with current best practices in the React Native ecosystem. + +6. **For AI-assisted development:** This starter kit works well with AI coding tools. It provides a solid structure and best practices that can guide AI-generated code. This helps ensure that AI assistance leads to high-quality, maintainable code that fits well within your project. + +Remember, you don't have to use the entire starter kit as-is. Feel free to cherry-pick ideas, configurations, or code snippets that align with your project needs. Whether you're building a new app from scratch or looking to improve your existing development process, this starter kit can provide valuable insights and practical solutions. + +## Why Expo and not React Native CLI? + +We have been using Expo as our main framework since the introduction of [Continuous Native Generation (CNG)](https://docs.expo.dev/workflow/continuous-native-generation/) concept and we are happy with the experience. + +I think this question is not valid anymore, especially after the last React conference when the core React native team recommended using Expo for new projects. + +> "As of today, the only recommended community framework for React Native is Expo. Folks at Expo have been investing in the React Native ecosystem since the early days of React Native and as of today, we believe the developer experience offered by Expo is best in class." React native core team + +Still hesitating? Check out this [article](https://reactnative.dev/blog/2024/06/25/use-a-framework-to-build-react-native-apps) or this [video](https://www.youtube.com/watch?v=lifGTznLBcw), maybe this one [video](https://www.youtube.com/watch?v=ek_IdGC0G80) too. +>>>>>>> c7bb80d ## 🧑‍💻 Stay up to date diff --git a/__mocks__/expo-localization.ts b/__mocks__/expo-localization.ts index 3463b0622..749c6efe0 100644 --- a/__mocks__/expo-localization.ts +++ b/__mocks__/expo-localization.ts @@ -2,6 +2,7 @@ export const locale = 'en-US'; export const locales = ['en-US']; export const timezone = 'UTC'; export const isRTL = false; +<<<<<<< HEAD export const getLocales = () => [ { @@ -16,3 +17,5 @@ export const getLocales = () => [ regionCode: 'US', }, ]; +======= +>>>>>>> c7bb80d diff --git a/app.config.ts b/app.config.ts index b8494111d..6b7357e90 100644 --- a/app.config.ts +++ b/app.config.ts @@ -42,8 +42,13 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ ios: { supportsTablet: true, bundleIdentifier: Env.BUNDLE_ID, +<<<<<<< HEAD config: { usesNonExemptEncryption: false, +======= + infoPlist: { + ITSAppUsesNonExemptEncryption: false, +>>>>>>> c7bb80d }, }, experiments: { @@ -64,7 +69,11 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ [ 'expo-splash-screen', { +<<<<<<< HEAD backgroundColor: '#000000', +======= + backgroundColor: '#2E3C4B', +>>>>>>> c7bb80d image: './assets/splash-icon.png', imageWidth: 150, }, diff --git a/docs/astro.config.mjs b/docs/astro.config.mjs index 9f5eb3040..0b7ec3702 100644 --- a/docs/astro.config.mjs +++ b/docs/astro.config.mjs @@ -8,11 +8,18 @@ const base = 'react-native-template'; // https://astro.build/config export default defineConfig({ +<<<<<<< HEAD site, base, integrations: [ starlight({ title: 'Rootstrap React Native Template', +======= + site: 'https://starter.obytes.com/', + integrations: [ + starlight({ + title: 'Obytes Starter | React Native Template', +>>>>>>> c7bb80d plugins: [starlightLlmsTxt()], description: `Your All-in-One Solution for Building Outstanding React Native/Expo Apps. From editor setup to store submission, we've got you covered!`, expressiveCode: { diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 697394f5f..a20b0c7de 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -10,7 +10,11 @@ importers: dependencies: '@astrojs/starlight': specifier: ^0.31.1 +<<<<<<< HEAD version: 0.31.1(astro@5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2)) +======= + version: 0.31.1(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)) +>>>>>>> c7bb80d '@expressive-code/plugin-collapsible-sections': specifier: ^0.33.4 version: 0.33.5 @@ -25,12 +29,17 @@ importers: version: 5.2.6 astro: specifier: ^5.1.10 +<<<<<<< HEAD version: 5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2) +======= + version: 5.1.10(rollup@4.32.1)(typescript@5.5.4) +>>>>>>> c7bb80d hast-util-to-html: specifier: ^9.0.0 version: 9.0.5 sharp: specifier: ^0.32.3 +<<<<<<< HEAD version: 0.32.6 starlight-llms-txt: specifier: ^0.4.0 @@ -59,12 +68,43 @@ packages: '@astrojs/sitemap@3.5.1': resolution: {integrity: sha512-uX5z52GLtQTgOe8r3jeGmFRYrFe52mdpLYJzqjvL1cdy5Kg3MLOZEvaZ/OCH0fSq0t7e50uJQ6oBMZG0ffszBg==} +======= + version: 0.32.3 + starlight-llms-txt: + specifier: ^0.4.0 + version: 0.4.0(@astrojs/starlight@0.31.1(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)))(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)) + +packages: + + '@astrojs/compiler@2.10.3': + resolution: {integrity: sha512-bL/O7YBxsFt55YHU021oL+xz+B/9HvGNId3F9xURN16aeqDK9juHGktdkCSXz+U4nqFACq6ZFvWomOzhV+zfPw==} + + '@astrojs/internal-helpers@0.4.2': + resolution: {integrity: sha512-EdDWkC3JJVcpGpqJAU/5hSk2LKXyG3mNGkzGoAuyK+xoPHbaVdSuIWoN1QTnmK3N/gGfaaAfM8gO2KDCAW7S3w==} + + '@astrojs/markdown-remark@6.0.2': + resolution: {integrity: sha512-aAoHGVRK3rebCYbaLjyyR+3VeAuTz4q49syUxJP29Oo5yZHdy4cCAXRqLBdr9mJVlxCUUjZiF0Dau6YBf65SGg==} + + '@astrojs/mdx@4.0.7': + resolution: {integrity: sha512-d3PopBTbbCoX3QOmSLYXW6YCZ0dkhNaeP9/Liz9BhEekflMc9IvBjbtNFf1WCEatsl4LLGftyDisfMM3F3LGMA==} + engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0} + peerDependencies: + astro: ^5.0.0 + + '@astrojs/prism@3.2.0': + resolution: {integrity: sha512-GilTHKGCW6HMq7y3BUv9Ac7GMe/MO9gi9GW62GzKtth0SwukCu/qp2wLiGpEujhY+VVhaG9v7kv/5vFzvf4NYw==} + engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0} + + '@astrojs/sitemap@3.2.1': + resolution: {integrity: sha512-uxMfO8f7pALq0ADL6Lk68UV6dNYjJ2xGUzyjjVj60JLBs5a6smtlkBYv3tQ0DzoqwS7c9n4FUx5lgv0yPo/fgA==} +>>>>>>> c7bb80d '@astrojs/starlight@0.31.1': resolution: {integrity: sha512-VIVkHugwgtEqJPiRH8+ouP0UqUfdmpBO9C64R+6QaQ2qmADNkI/BA3/YAJHTBZYlMQQGEEuLJwD9qpaUovi52Q==} peerDependencies: astro: ^5.1.5 +<<<<<<< HEAD '@astrojs/telemetry@3.3.0': resolution: {integrity: sha512-UFBgfeldP06qu6khs/yY+q1cDAaArM2/7AEIqQ9Cuvf7B1hNLq0xDrZkct+QoIGyjq56y8IaE2I3CTvG99mlhQ==} engines: {node: 18.20.8 || ^20.3.0 || >=22.0.0} @@ -88,6 +128,27 @@ packages: '@babel/types@7.28.4': resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==} +======= + '@astrojs/telemetry@3.2.0': + resolution: {integrity: sha512-wxhSKRfKugLwLlr4OFfcqovk+LIFtKwLyGPqMsv+9/ibqqnW3Gv7tBhtKEb0gAyUAC4G9BTVQeQahqnQAhd6IQ==} + engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0} + + '@babel/helper-string-parser@7.24.8': + resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==} + engines: {node: '>=6.9.0'} + + '@babel/helper-validator-identifier@7.24.7': + resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} + engines: {node: '>=6.9.0'} + + '@babel/parser@7.25.6': + resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==} + engines: {node: '>=6.0.0'} + hasBin: true + + '@babel/runtime@7.26.7': + resolution: {integrity: sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} '@capsizecss/unpack@2.4.0': @@ -104,132 +165,238 @@ packages: '@emnapi/runtime@1.5.0': resolution: {integrity: sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==} +<<<<<<< HEAD '@esbuild/aix-ppc64@0.25.9': resolution: {integrity: sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==} +======= + '@esbuild/aix-ppc64@0.24.2': + resolution: {integrity: sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [ppc64] os: [aix] +<<<<<<< HEAD '@esbuild/android-arm64@0.25.9': resolution: {integrity: sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==} +======= + '@esbuild/android-arm64@0.24.2': + resolution: {integrity: sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [arm64] os: [android] +<<<<<<< HEAD '@esbuild/android-arm@0.25.9': resolution: {integrity: sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==} +======= + '@esbuild/android-arm@0.24.2': + resolution: {integrity: sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [arm] os: [android] +<<<<<<< HEAD '@esbuild/android-x64@0.25.9': resolution: {integrity: sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==} +======= + '@esbuild/android-x64@0.24.2': + resolution: {integrity: sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [x64] os: [android] +<<<<<<< HEAD '@esbuild/darwin-arm64@0.25.9': resolution: {integrity: sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==} +======= + '@esbuild/darwin-arm64@0.24.2': + resolution: {integrity: sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [arm64] os: [darwin] +<<<<<<< HEAD '@esbuild/darwin-x64@0.25.9': resolution: {integrity: sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==} +======= + '@esbuild/darwin-x64@0.24.2': + resolution: {integrity: sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [x64] os: [darwin] +<<<<<<< HEAD '@esbuild/freebsd-arm64@0.25.9': resolution: {integrity: sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==} +======= + '@esbuild/freebsd-arm64@0.24.2': + resolution: {integrity: sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [arm64] os: [freebsd] +<<<<<<< HEAD '@esbuild/freebsd-x64@0.25.9': resolution: {integrity: sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==} +======= + '@esbuild/freebsd-x64@0.24.2': + resolution: {integrity: sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [x64] os: [freebsd] +<<<<<<< HEAD '@esbuild/linux-arm64@0.25.9': resolution: {integrity: sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==} +======= + '@esbuild/linux-arm64@0.24.2': + resolution: {integrity: sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [arm64] os: [linux] +<<<<<<< HEAD '@esbuild/linux-arm@0.25.9': resolution: {integrity: sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==} +======= + '@esbuild/linux-arm@0.24.2': + resolution: {integrity: sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [arm] os: [linux] +<<<<<<< HEAD '@esbuild/linux-ia32@0.25.9': resolution: {integrity: sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==} +======= + '@esbuild/linux-ia32@0.24.2': + resolution: {integrity: sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [ia32] os: [linux] +<<<<<<< HEAD '@esbuild/linux-loong64@0.25.9': resolution: {integrity: sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==} +======= + '@esbuild/linux-loong64@0.24.2': + resolution: {integrity: sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [loong64] os: [linux] +<<<<<<< HEAD '@esbuild/linux-mips64el@0.25.9': resolution: {integrity: sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==} +======= + '@esbuild/linux-mips64el@0.24.2': + resolution: {integrity: sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [mips64el] os: [linux] +<<<<<<< HEAD '@esbuild/linux-ppc64@0.25.9': resolution: {integrity: sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==} +======= + '@esbuild/linux-ppc64@0.24.2': + resolution: {integrity: sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [ppc64] os: [linux] +<<<<<<< HEAD '@esbuild/linux-riscv64@0.25.9': resolution: {integrity: sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==} +======= + '@esbuild/linux-riscv64@0.24.2': + resolution: {integrity: sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [riscv64] os: [linux] +<<<<<<< HEAD '@esbuild/linux-s390x@0.25.9': resolution: {integrity: sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==} +======= + '@esbuild/linux-s390x@0.24.2': + resolution: {integrity: sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [s390x] os: [linux] +<<<<<<< HEAD '@esbuild/linux-x64@0.25.9': resolution: {integrity: sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==} +======= + '@esbuild/linux-x64@0.24.2': + resolution: {integrity: sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [x64] os: [linux] +<<<<<<< HEAD '@esbuild/netbsd-arm64@0.25.9': resolution: {integrity: sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==} +======= + '@esbuild/netbsd-arm64@0.24.2': + resolution: {integrity: sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [arm64] os: [netbsd] +<<<<<<< HEAD '@esbuild/netbsd-x64@0.25.9': resolution: {integrity: sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==} +======= + '@esbuild/netbsd-x64@0.24.2': + resolution: {integrity: sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [x64] os: [netbsd] +<<<<<<< HEAD '@esbuild/openbsd-arm64@0.25.9': resolution: {integrity: sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==} +======= + '@esbuild/openbsd-arm64@0.24.2': + resolution: {integrity: sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [arm64] os: [openbsd] +<<<<<<< HEAD '@esbuild/openbsd-x64@0.25.9': resolution: {integrity: sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==} +======= + '@esbuild/openbsd-x64@0.24.2': + resolution: {integrity: sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [x64] os: [openbsd] +<<<<<<< HEAD '@esbuild/openharmony-arm64@0.25.9': resolution: {integrity: sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==} engines: {node: '>=18'} @@ -238,24 +405,43 @@ packages: '@esbuild/sunos-x64@0.25.9': resolution: {integrity: sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==} +======= + '@esbuild/sunos-x64@0.24.2': + resolution: {integrity: sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [x64] os: [sunos] +<<<<<<< HEAD '@esbuild/win32-arm64@0.25.9': resolution: {integrity: sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==} +======= + '@esbuild/win32-arm64@0.24.2': + resolution: {integrity: sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [arm64] os: [win32] +<<<<<<< HEAD '@esbuild/win32-ia32@0.25.9': resolution: {integrity: sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==} +======= + '@esbuild/win32-ia32@0.24.2': + resolution: {integrity: sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [ia32] os: [win32] +<<<<<<< HEAD '@esbuild/win32-x64@0.25.9': resolution: {integrity: sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==} +======= + '@esbuild/win32-x64@0.24.2': + resolution: {integrity: sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==} +>>>>>>> c7bb80d engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -263,23 +449,41 @@ packages: '@expressive-code/core@0.33.5': resolution: {integrity: sha512-KL0EkKAvd7SSIQL3ZIP19xqe4xNjBaQYNvcJC6RmoBUnQpvxaJNFwRxCBEF/X0ftJEMaSG7WTrabZ9c/zFeqmA==} +<<<<<<< HEAD '@expressive-code/core@0.40.2': resolution: {integrity: sha512-gXY3v7jbgz6nWKvRpoDxK4AHUPkZRuJsM79vHX/5uhV9/qX6Qnctp/U/dMHog/LCVXcuOps+5nRmf1uxQVPb3w==} +======= + '@expressive-code/core@0.40.1': + resolution: {integrity: sha512-j71gxBepyzBgOtZomxzl8M90AjILf6hZarWFePDis7sTjqCwxWrtZEtTCafto8IOURG/ECZN0g7Ys4zExkNU7Q==} +>>>>>>> c7bb80d '@expressive-code/plugin-collapsible-sections@0.33.5': resolution: {integrity: sha512-CCudoABDKXx9oDrshEpxN/Vfu3qwUH+JJPjnd/kvEYrLQtL55yp9ZfpEpXED4d2C/iBMhckJdVVYJH5otcmasQ==} +<<<<<<< HEAD '@expressive-code/plugin-frames@0.40.2': resolution: {integrity: sha512-aLw5IlDlZWb10Jo/TTDCVsmJhKfZ7FJI83Zo9VDrV0OBlmHAg7klZqw68VDz7FlftIBVAmMby53/MNXPnMjTSQ==} +======= + '@expressive-code/plugin-frames@0.40.1': + resolution: {integrity: sha512-qV7BIdTQ9nJ/eLHaJlzMvUq5aqAoZKO3PLFzBVop/q0d0m5rWpwWncIQ8qkufQDabmq2m38PRRWxKgx5FkJ2Rg==} +>>>>>>> c7bb80d '@expressive-code/plugin-line-numbers@0.33.5': resolution: {integrity: sha512-jGHorejNS7tj/FPKwLqV5PCAai43ydlxVQUW4kO8g+/6f0BqkJGD0JaIylOnSD3MWmQXaOFs9a7FEJHn0EZvBQ==} +<<<<<<< HEAD '@expressive-code/plugin-shiki@0.40.2': resolution: {integrity: sha512-t2HMR5BO6GdDW1c1ISBTk66xO503e/Z8ecZdNcr6E4NpUfvY+MRje+LtrcvbBqMwWBBO8RpVKcam/Uy+1GxwKQ==} '@expressive-code/plugin-text-markers@0.40.2': resolution: {integrity: sha512-/XoLjD67K9nfM4TgDlXAExzMJp6ewFKxNpfUw4F7q5Ecy+IU3/9zQQG/O70Zy+RxYTwKGw2MA9kd7yelsxnSmw==} +======= + '@expressive-code/plugin-shiki@0.40.1': + resolution: {integrity: sha512-N5oXhLv5DwLGXmLwJtwMzrfnZPWJl4pHRR5mfDoqK1+NxptdVaaQ0nEjgw13Y5ID/O5Bbze5YcOyph2K52BBrQ==} + + '@expressive-code/plugin-text-markers@0.40.1': + resolution: {integrity: sha512-LsirF7M4F2yWgrFXEocD74F/MaVXsOsHVsRxBLhXQJemSSkWkDp/EZPt//OaqQ8ExnqWZ2lH7E1/KiN46unKjg==} +>>>>>>> c7bb80d '@fontsource/ibm-plex-mono@5.2.6': resolution: {integrity: sha512-LTZJNTcpoT19fmwERZNMDI+ljHueuyhF2Qn+bICJ4Y4hxBLAAoJ2MRsGnyp0QNutW6t/25eyZpvaUK1LDrCo7Q==} @@ -409,15 +613,36 @@ packages: cpu: [x64] os: [win32] +<<<<<<< HEAD '@jridgewell/sourcemap-codec@1.5.5': resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} '@mdx-js/mdx@3.1.1': resolution: {integrity: sha512-f6ZO2ifpwAQIpzGWaBQT2TXxPv6z3RBzQKpVftEWN78Vl/YweF1uwussDx8ECAXVtr3Rs89fKyG9YlzUs9DyGQ==} +======= + '@jridgewell/sourcemap-codec@1.5.0': + resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + + '@mdx-js/mdx@3.1.0': + resolution: {integrity: sha512-/QxEhPAvGwbQmy1Px8F899L5Uc2KZ6JtXwlCgJmjSTBedwOZkByYcBG4GceIGPXRDsmfxhHazuS+hlOShRLeDw==} + + '@nodelib/fs.scandir@2.1.5': + resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} + engines: {node: '>= 8'} + + '@nodelib/fs.stat@2.0.5': + resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} + engines: {node: '>= 8'} + + '@nodelib/fs.walk@1.2.8': + resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} + engines: {node: '>= 8'} +>>>>>>> c7bb80d '@oslojs/encoding@1.1.0': resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==} +<<<<<<< HEAD '@pagefind/darwin-arm64@1.4.0': resolution: {integrity: sha512-2vMqkbv3lbx1Awea90gTaBsvpzgRs7MuSgKDxW0m9oV1GPZCZbZBJg/qL83GIUEN2BFlY46dtUZi54pwH+/pTQ==} cpu: [arm64] @@ -453,6 +678,38 @@ packages: '@rollup/pluginutils@5.3.0': resolution: {integrity: sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==} +======= + '@pagefind/darwin-arm64@1.3.0': + resolution: {integrity: sha512-365BEGl6ChOsauRjyVpBjXybflXAOvoMROw3TucAROHIcdBvXk9/2AmEvGFU0r75+vdQI4LJdJdpH4Y6Yqaj4A==} + cpu: [arm64] + os: [darwin] + + '@pagefind/darwin-x64@1.3.0': + resolution: {integrity: sha512-zlGHA23uuXmS8z3XxEGmbHpWDxXfPZ47QS06tGUq0HDcZjXjXHeLG+cboOy828QIV5FXsm9MjfkP5e4ZNbOkow==} + cpu: [x64] + os: [darwin] + + '@pagefind/default-ui@1.3.0': + resolution: {integrity: sha512-CGKT9ccd3+oRK6STXGgfH+m0DbOKayX6QGlq38TfE1ZfUcPc5+ulTuzDbZUnMo+bubsEOIypm4Pl2iEyzZ1cNg==} + + '@pagefind/linux-arm64@1.3.0': + resolution: {integrity: sha512-8lsxNAiBRUk72JvetSBXs4WRpYrQrVJXjlRRnOL6UCdBN9Nlsz0t7hWstRk36+JqHpGWOKYiuHLzGYqYAqoOnQ==} + cpu: [arm64] + os: [linux] + + '@pagefind/linux-x64@1.3.0': + resolution: {integrity: sha512-hAvqdPJv7A20Ucb6FQGE6jhjqy+vZ6pf+s2tFMNtMBG+fzcdc91uTw7aP/1Vo5plD0dAOHwdxfkyw0ugal4kcQ==} + cpu: [x64] + os: [linux] + + '@pagefind/windows-x64@1.3.0': + resolution: {integrity: sha512-BR1bIRWOMqkf8IoU576YDhij1Wd/Zf2kX/kCI0b2qzCKC8wcc2GQJaaRMCpzvCCrmliO4vtJ6RITp/AnoYUUmQ==} + cpu: [x64] + os: [win32] + + '@rollup/pluginutils@5.1.4': + resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==} +>>>>>>> c7bb80d engines: {node: '>=14.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 @@ -460,6 +717,7 @@ packages: rollup: optional: true +<<<<<<< HEAD '@rollup/rollup-android-arm-eabi@4.50.2': resolution: {integrity: sha512-uLN8NAiFVIRKX9ZQha8wy6UUs06UNSZ32xj6giK/rmMXAgKahwExvK6SsmgU5/brh4w/nSgj8e0k3c1HBQpa0A==} cpu: [arm] @@ -573,10 +831,128 @@ packages: '@shikijs/engine-javascript@1.29.2': resolution: {integrity: sha512-iNEZv4IrLYPv64Q6k7EPpOCE/nuvGiKl7zxdq0WFuRPF5PAE9PRo2JGq/d8crLusM59BRemJ4eOqrFrC4wiQ+A==} +======= + '@rollup/rollup-android-arm-eabi@4.32.1': + resolution: {integrity: sha512-/pqA4DmqyCm8u5YIDzIdlLcEmuvxb0v8fZdFhVMszSpDTgbQKdw3/mB3eMUHIbubtJ6F9j+LtmyCnHTEqIHyzA==} + cpu: [arm] + os: [android] + + '@rollup/rollup-android-arm64@4.32.1': + resolution: {integrity: sha512-If3PDskT77q7zgqVqYuj7WG3WC08G1kwXGVFi9Jr8nY6eHucREHkfpX79c0ACAjLj3QIWKPJR7w4i+f5EdLH5Q==} + cpu: [arm64] + os: [android] + + '@rollup/rollup-darwin-arm64@4.32.1': + resolution: {integrity: sha512-zCpKHioQ9KgZToFp5Wvz6zaWbMzYQ2LJHQ+QixDKq52KKrF65ueu6Af4hLlLWHjX1Wf/0G5kSJM9PySW9IrvHA==} + cpu: [arm64] + os: [darwin] + + '@rollup/rollup-darwin-x64@4.32.1': + resolution: {integrity: sha512-sFvF+t2+TyUo/ZQqUcifrJIgznx58oFZbdHS9TvHq3xhPVL9nOp+yZ6LKrO9GWTP+6DbFtoyLDbjTpR62Mbr3Q==} + cpu: [x64] + os: [darwin] + + '@rollup/rollup-freebsd-arm64@4.32.1': + resolution: {integrity: sha512-NbOa+7InvMWRcY9RG+B6kKIMD/FsnQPH0MWUvDlQB1iXnF/UcKSudCXZtv4lW+C276g3w5AxPbfry5rSYvyeYA==} + cpu: [arm64] + os: [freebsd] + + '@rollup/rollup-freebsd-x64@4.32.1': + resolution: {integrity: sha512-JRBRmwvHPXR881j2xjry8HZ86wIPK2CcDw0EXchE1UgU0ubWp9nvlT7cZYKc6bkypBt745b4bglf3+xJ7hXWWw==} + cpu: [x64] + os: [freebsd] + + '@rollup/rollup-linux-arm-gnueabihf@4.32.1': + resolution: {integrity: sha512-PKvszb+9o/vVdUzCCjL0sKHukEQV39tD3fepXxYrHE3sTKrRdCydI7uldRLbjLmDA3TFDmh418XH19NOsDRH8g==} + cpu: [arm] + os: [linux] + + '@rollup/rollup-linux-arm-musleabihf@4.32.1': + resolution: {integrity: sha512-9WHEMV6Y89eL606ReYowXuGF1Yb2vwfKWKdD1A5h+OYnPZSJvxbEjxTRKPgi7tkP2DSnW0YLab1ooy+i/FQp/Q==} + cpu: [arm] + os: [linux] + + '@rollup/rollup-linux-arm64-gnu@4.32.1': + resolution: {integrity: sha512-tZWc9iEt5fGJ1CL2LRPw8OttkCBDs+D8D3oEM8mH8S1ICZCtFJhD7DZ3XMGM8kpqHvhGUTvNUYVDnmkj4BDXnw==} + cpu: [arm64] + os: [linux] + + '@rollup/rollup-linux-arm64-musl@4.32.1': + resolution: {integrity: sha512-FTYc2YoTWUsBz5GTTgGkRYYJ5NGJIi/rCY4oK/I8aKowx1ToXeoVVbIE4LGAjsauvlhjfl0MYacxClLld1VrOw==} + cpu: [arm64] + os: [linux] + + '@rollup/rollup-linux-loongarch64-gnu@4.32.1': + resolution: {integrity: sha512-F51qLdOtpS6P1zJVRzYM0v6MrBNypyPEN1GfMiz0gPu9jN8ScGaEFIZQwteSsGKg799oR5EaP7+B2jHgL+d+Kw==} + cpu: [loong64] + os: [linux] + + '@rollup/rollup-linux-powerpc64le-gnu@4.32.1': + resolution: {integrity: sha512-wO0WkfSppfX4YFm5KhdCCpnpGbtgQNj/tgvYzrVYFKDpven8w2N6Gg5nB6w+wAMO3AIfSTWeTjfVe+uZ23zAlg==} + cpu: [ppc64] + os: [linux] + + '@rollup/rollup-linux-riscv64-gnu@4.32.1': + resolution: {integrity: sha512-iWswS9cIXfJO1MFYtI/4jjlrGb/V58oMu4dYJIKnR5UIwbkzR0PJ09O0PDZT0oJ3LYWXBSWahNf/Mjo6i1E5/g==} + cpu: [riscv64] + os: [linux] + + '@rollup/rollup-linux-s390x-gnu@4.32.1': + resolution: {integrity: sha512-RKt8NI9tebzmEthMnfVgG3i/XeECkMPS+ibVZjZ6mNekpbbUmkNWuIN2yHsb/mBPyZke4nlI4YqIdFPgKuoyQQ==} + cpu: [s390x] + os: [linux] + + '@rollup/rollup-linux-x64-gnu@4.32.1': + resolution: {integrity: sha512-WQFLZ9c42ECqEjwg/GHHsouij3pzLXkFdz0UxHa/0OM12LzvX7DzedlY0SIEly2v18YZLRhCRoHZDxbBSWoGYg==} + cpu: [x64] + os: [linux] + + '@rollup/rollup-linux-x64-musl@4.32.1': + resolution: {integrity: sha512-BLoiyHDOWoS3uccNSADMza6V6vCNiphi94tQlVIL5de+r6r/CCQuNnerf+1g2mnk2b6edp5dk0nhdZ7aEjOBsA==} + cpu: [x64] + os: [linux] + + '@rollup/rollup-win32-arm64-msvc@4.32.1': + resolution: {integrity: sha512-w2l3UnlgYTNNU+Z6wOR8YdaioqfEnwPjIsJ66KxKAf0p+AuL2FHeTX6qvM+p/Ue3XPBVNyVSfCrfZiQh7vZHLQ==} + cpu: [arm64] + os: [win32] + + '@rollup/rollup-win32-ia32-msvc@4.32.1': + resolution: {integrity: sha512-Am9H+TGLomPGkBnaPWie4F3x+yQ2rr4Bk2jpwy+iV+Gel9jLAu/KqT8k3X4jxFPW6Zf8OMnehyutsd+eHoq1WQ==} + cpu: [ia32] + os: [win32] + + '@rollup/rollup-win32-x64-msvc@4.32.1': + resolution: {integrity: sha512-ar80GhdZb4DgmW3myIS9nRFYcpJRSME8iqWgzH2i44u+IdrzmiXVxeFnExQ5v4JYUSpg94bWjevMG8JHf1Da5Q==} + cpu: [x64] + os: [win32] + + '@shikijs/core@1.29.1': + resolution: {integrity: sha512-Mo1gGGkuOYjDu5H8YwzmOuly9vNr8KDVkqj9xiKhhhFS8jisAtDSEWB9hzqRHLVQgFdA310e8XRJcW4tYhRB2A==} + + '@shikijs/engine-javascript@1.29.1': + resolution: {integrity: sha512-Hpi8k9x77rCQ7F/7zxIOUruNkNidMyBnP5qAGbLFqg4kRrg1HZhkB8btib5EXbQWTtLb5gBHOdBwshk20njD7Q==} + + '@shikijs/engine-oniguruma@1.29.1': + resolution: {integrity: sha512-gSt2WhLNgEeLstcweQOSp+C+MhOpTsgdNXRqr3zP6M+BUBZ8Md9OU2BYwUYsALBxHza7hwaIWtFHjQ/aOOychw==} + + '@shikijs/langs@1.29.1': + resolution: {integrity: sha512-iERn4HlyuT044/FgrvLOaZgKVKf3PozjKjyV/RZ5GnlyYEAZFcgwHGkYboeBv2IybQG1KVS/e7VGgiAU4JY2Gw==} + + '@shikijs/themes@1.29.1': + resolution: {integrity: sha512-lb11zf72Vc9uxkl+aec2oW1HVTHJ2LtgZgumb4Rr6By3y/96VmlU44bkxEb8WBWH3RUtbqAJEN0jljD9cF7H7g==} + + '@shikijs/types@1.29.1': + resolution: {integrity: sha512-aBqAuhYRp5vSir3Pc9+QPu9WESBOjUo03ao0IHLC4TyTioSsp/SkbAZSrIH4ghYYC1T1KTEpRSBa83bas4RnPA==} + + '@shikijs/vscode-textmate@10.0.1': + resolution: {integrity: sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==} +>>>>>>> c7bb80d '@shikijs/engine-javascript@3.12.2': resolution: {integrity: sha512-Nm3/azSsaVS7hk6EwtHEnTythjQfwvrO5tKqMlaH9TwG1P+PNaR8M0EAKZ+GaH2DFwvcr4iSfTveyxMIvXEHMw==} +<<<<<<< HEAD '@shikijs/engine-oniguruma@1.29.2': resolution: {integrity: sha512-7iiOx3SG8+g1MnlzZVDYiaeHe7Ez2Kf2HrJzdmGwkRisT7r4rak0e655AcM/tF9JG/kg5fMNYlLLKglbN7gBqA==} @@ -588,6 +964,10 @@ packages: '@shikijs/langs@3.12.2': resolution: {integrity: sha512-bVx5PfuZHDSHoBal+KzJZGheFuyH4qwwcwG/n+MsWno5cTlKmaNtTsGzJpHYQ8YPbB5BdEdKU1rga5/6JGY8ww==} +======= + '@types/braces@3.0.5': + resolution: {integrity: sha512-SQFof9H+LXeWNz8wDe7oN5zu7ket0qwMu5vZubW4GCJ8Kkeh6nBWUz87+KTz/G3Kqsrp0j/W253XJb3KMEeg3w==} +>>>>>>> c7bb80d '@shikijs/themes@1.29.2': resolution: {integrity: sha512-i9TNZlsq4uoyqSbluIcZkmPL9Bfi3djVxRnofUHwvx/h6SRW3cwgBC5SML7vsDcWyukY0eCzVN980rqP6qNl9g==} @@ -601,8 +981,16 @@ packages: '@shikijs/types@3.12.2': resolution: {integrity: sha512-K5UIBzxCyv0YoxN3LMrKB9zuhp1bV+LgewxuVwHdl4Gz5oePoUFrr9EfgJlGlDeXCU1b/yhdnXeuRvAnz8HN8Q==} +<<<<<<< HEAD '@shikijs/vscode-textmate@10.0.2': resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} +======= + '@types/estree@1.0.6': + resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} + + '@types/hast@2.3.5': + resolution: {integrity: sha512-SvQi0L/lNpThgPoleH53cdjB3y9zpLlVjRbqB3rH8hx1jiRSBGAhyjV3H+URFjNVRqt2EdYNrbZE5IsGlNfpRg==} +>>>>>>> c7bb80d '@swc/helpers@0.5.17': resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==} @@ -631,6 +1019,12 @@ packages: '@types/js-yaml@4.0.9': resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==} +<<<<<<< HEAD +======= + '@types/mdast@4.0.0': + resolution: {integrity: sha512-YLeG8CujC9adtj/kuDzq1N4tCDYKoZ5l/bnjq8d74+t/3q/tHquJOJKUQXJrLCflOHpKjXgcI/a929gpmLOEng==} + +>>>>>>> c7bb80d '@types/mdast@4.0.4': resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==} @@ -640,8 +1034,13 @@ packages: '@types/micromatch@4.0.9': resolution: {integrity: sha512-7V+8ncr22h4UoYRLnLXSpTxjQrNUXtWHGeMPRJt1nULXI57G9bIcpyrHlmrQ7QK24EyyuXvYcSSWAM8GA9nqCg==} +<<<<<<< HEAD '@types/ms@2.1.0': resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==} +======= + '@types/ms@0.7.31': + resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==} +>>>>>>> c7bb80d '@types/nlcst@2.0.3': resolution: {integrity: sha512-vSYNSDe6Ix3q+6Z7ri9lyWqgGhJTmzRjZRqyq15N0Z/1/UnVsno9G/N40NBijoYx2seFDIl0+B2mgAb9mezUCA==} @@ -672,8 +1071,13 @@ packages: peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 +<<<<<<< HEAD acorn@8.15.0: resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==} +======= + acorn@8.14.0: + resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} +>>>>>>> c7bb80d engines: {node: '>=0.4.0'} hasBin: true @@ -688,8 +1092,13 @@ packages: resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==} engines: {node: '>=12'} +<<<<<<< HEAD ansi-styles@6.2.3: resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==} +======= + ansi-styles@6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} +>>>>>>> c7bb80d engines: {node: '>=12'} anymatch@3.1.3: @@ -713,6 +1122,7 @@ packages: resolution: {integrity: sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==} hasBin: true +<<<<<<< HEAD astro-expressive-code@0.40.2: resolution: {integrity: sha512-yJMQId0yXSAbW9I6yqvJ3FcjKzJ8zRL7elbJbllkv1ZJPlsI0NI83Pxn1YL1IapEM347EvOOkSW2GL+2+NO61w==} peerDependencies: @@ -721,6 +1131,16 @@ packages: astro@5.13.7: resolution: {integrity: sha512-Of2tST7ErbE4y1dVb4aWDXaQSIRBAfraJ4jDqaA3PzPRJOn6Ina36+tQ+8BezjYqiWwRRJdOEE07PRAJXnsddw==} engines: {node: 18.20.8 || ^20.3.0 || >=22.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} +======= + astro-expressive-code@0.40.1: + resolution: {integrity: sha512-dQ47XhgtxuRTiKQrZOJKdebMuxvvTBR89U439EHzLP6KR45IILFlGDihGQp3//1aUjj4nwpbINSzms1heJ7vmQ==} + peerDependencies: + astro: ^4.0.0-beta || ^5.0.0-beta || ^3.3.0 + + astro@5.1.10: + resolution: {integrity: sha512-qFu4jC7BRlhwHgk9Pa1sTQWw60zYWlriNTt6bMGMKkPxCd4Dd84fGn+NjbrJ/JeKwF7YXX0gY1saDF/RS6TMVA==} + engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} +>>>>>>> c7bb80d hasBin: true axobject-query@4.1.0: @@ -783,6 +1203,10 @@ packages: bcp-47@2.1.0: resolution: {integrity: sha512-9IIS3UPrvIa1Ej+lVDdDwO7zLehjqsaByECw0bu2RRGP73jALm6FYbzI5gWbgHLvNdkvfXB5YrSbocZdOS0c0w==} + binary-extensions@2.3.0: + resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} + engines: {node: '>=8'} + bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} @@ -800,9 +1224,12 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} +<<<<<<< HEAD brotli@1.3.3: resolution: {integrity: sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==} +======= +>>>>>>> c7bb80d buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} @@ -813,8 +1240,13 @@ packages: ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} +<<<<<<< HEAD chalk@5.6.2: resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} +======= + chalk@5.3.0: + resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} +>>>>>>> c7bb80d engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} character-entities-html4@2.1.0: @@ -829,25 +1261,39 @@ packages: character-reference-invalid@2.0.1: resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==} +<<<<<<< HEAD chokidar@4.0.3: resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} +======= + chokidar@3.6.0: + resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} + engines: {node: '>= 8.10.0'} +>>>>>>> c7bb80d chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} +<<<<<<< HEAD ci-info@4.3.0: resolution: {integrity: sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==} +======= + ci-info@4.1.0: + resolution: {integrity: sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==} +>>>>>>> c7bb80d engines: {node: '>=8'} cli-boxes@3.0.0: resolution: {integrity: sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==} engines: {node: '>=10'} +<<<<<<< HEAD clone@2.1.2: resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==} engines: {node: '>=0.8'} +======= +>>>>>>> c7bb80d clsx@2.1.1: resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} @@ -875,6 +1321,7 @@ packages: common-ancestor-path@1.0.1: resolution: {integrity: sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==} +<<<<<<< HEAD cookie-es@1.2.2: resolution: {integrity: sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==} @@ -887,6 +1334,21 @@ packages: crossws@0.3.5: resolution: {integrity: sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA==} +======= + consola@3.4.0: + resolution: {integrity: sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==} + engines: {node: ^14.18.0 || >=16.10.0} + + cookie-es@1.2.2: + resolution: {integrity: sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==} + + cookie@0.7.2: + resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==} + engines: {node: '>= 0.6'} +>>>>>>> c7bb80d + + crossws@0.3.3: + resolution: {integrity: sha512-/71DJT3xJlqSnBr83uGJesmVHSzZEvgxHt/fIKxBAAngqMHmnBWQNxCphVxxJ2XL3xleu5+hJD6IQ3TglBedcw==} css-selector-parser@1.4.1: resolution: {integrity: sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g==} @@ -903,8 +1365,13 @@ packages: engines: {node: '>=4'} hasBin: true +<<<<<<< HEAD debug@4.4.3: resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} +======= + debug@4.3.7: + resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} +>>>>>>> c7bb80d engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -912,8 +1379,22 @@ packages: supports-color: optional: true +<<<<<<< HEAD decode-named-character-reference@1.2.0: resolution: {integrity: sha512-c6fcElNV6ShtZXmsgNgFFV5tVX2PaV4g+MOAkb8eXHvn6sryJBrZa9r0zV6+dtTyoCKxtDy5tyQ5ZwQuidtd+Q==} +======= + debug@4.4.0: + resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + + decode-named-character-reference@1.0.2: + resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==} +>>>>>>> c7bb80d decompress-response@6.0.0: resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==} @@ -930,8 +1411,17 @@ packages: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} +<<<<<<< HEAD destr@2.0.5: resolution: {integrity: sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==} +======= + destr@2.0.3: + resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==} + + detect-libc@2.0.2: + resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==} + engines: {node: '>=8'} +>>>>>>> c7bb80d detect-libc@2.1.0: resolution: {integrity: sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==} @@ -941,8 +1431,13 @@ packages: resolution: {integrity: sha512-KxektNH63SrbfUyDiwXqRb1rLwKt33AmMv+5Nhsw1kqZ13SJBRTgZHtGbE+hH3a1mVW1cz+4pqSWVPAtLVXTzQ==} engines: {node: '>=18'} +<<<<<<< HEAD devalue@5.3.2: resolution: {integrity: sha512-UDsjUbpQn9kvm68slnrs+mfxwFkIflOhkanmyabZ8zOYk8SMEIbJ3TK+88g70hSIeytu4y18f0z/hYHMTrXIWw==} +======= + devalue@5.1.1: + resolution: {integrity: sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==} +>>>>>>> c7bb80d devlop@1.1.0: resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==} @@ -968,12 +1463,18 @@ packages: emoji-regex-xs@1.0.0: resolution: {integrity: sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==} +<<<<<<< HEAD emoji-regex@10.5.0: resolution: {integrity: sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==} +======= + emoji-regex@10.3.0: + resolution: {integrity: sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==} +>>>>>>> c7bb80d emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} +<<<<<<< HEAD end-of-stream@1.4.5: resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==} @@ -983,6 +1484,17 @@ packages: es-module-lexer@1.7.0: resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==} +======= + end-of-stream@1.4.4: + resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} + + entities@4.5.0: + resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} + engines: {node: '>=0.12'} + + es-module-lexer@1.6.0: + resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==} +>>>>>>> c7bb80d esast-util-from-estree@2.0.0: resolution: {integrity: sha512-4CyanoAudUSBAn5K13H4JhsMH6L9ZP7XbLVe/dKybkxMO7eDyLsT8UHl9TRNrU2Gr9nz+FovfSIjuXWJ81uVwQ==} @@ -990,8 +1502,13 @@ packages: esast-util-from-js@2.0.1: resolution: {integrity: sha512-8Ja+rNJ0Lt56Pcf3TAmpBZjmx8ZcK5Ts4cAzIOjsjevg9oSXJnl6SUQ2EevU8tv3h6ZLWmoKL5H4fgWvdvfETw==} +<<<<<<< HEAD esbuild@0.25.9: resolution: {integrity: sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==} +======= + esbuild@0.24.2: + resolution: {integrity: sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==} +>>>>>>> c7bb80d engines: {node: '>=18'} hasBin: true @@ -1030,8 +1547,13 @@ packages: resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==} engines: {node: '>=6'} +<<<<<<< HEAD expressive-code@0.40.2: resolution: {integrity: sha512-1zIda2rB0qiDZACawzw2rbdBQiWHBT56uBctS+ezFe5XMAaFaHLnnSYND/Kd+dVzO9HfCXRDpzH3d+3fvOWRcw==} +======= + expressive-code@0.40.1: + resolution: {integrity: sha512-jBsTRX+MPsqiqYQsE9vRXMiAkUafU11j2zuWAaOX9vubLutNB0er8c0FJWeudVDH5D52V4Lf4vTIqbOE54PUcQ==} +>>>>>>> c7bb80d extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} @@ -1042,6 +1564,7 @@ packages: fast-fifo@1.3.2: resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==} +<<<<<<< HEAD fdir@6.5.0: resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} engines: {node: '>=12.0.0'} @@ -1050,6 +1573,14 @@ packages: peerDependenciesMeta: picomatch: optional: true +======= + fast-glob@3.3.3: + resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} + engines: {node: '>=8.6.0'} + + fastq@1.17.1: + resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} +>>>>>>> c7bb80d fill-range@7.1.1: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} @@ -1073,8 +1604,13 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] +<<<<<<< HEAD get-east-asian-width@1.4.0: resolution: {integrity: sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==} +======= + get-east-asian-width@1.2.0: + resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==} +>>>>>>> c7bb80d engines: {node: '>=18'} github-from-package@0.0.0: @@ -1083,8 +1619,20 @@ packages: github-slugger@2.0.0: resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==} +<<<<<<< HEAD h3@1.15.4: resolution: {integrity: sha512-z5cFQWDffyOe4vQ9xIqNfCZdV4p//vy6fBnr8Q1AWnVZ0teurKMG66rLj++TKwKPUP3u7iMUvrvKaEUiQw2QWQ==} +======= + glob-parent@5.1.2: + resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} + engines: {node: '>= 6'} + + graceful-fs@4.2.11: + resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} + + h3@1.14.0: + resolution: {integrity: sha512-ao22eiONdgelqcnknw0iD645qW0s9NnrJHr5OBz4WOMdBdycfSas1EQf1wXRsm+PcB2Yoj43pjBPwqIpJQTeWg==} +>>>>>>> c7bb80d hast-util-embedded@3.0.0: resolution: {integrity: sha512-naH8sld4Pe2ep03qqULEtvYr7EjrLK2QHY8KJR6RJkTUjPGObe1vnx585uzem2hGra+s1q08DZZpfgDVYRbaXA==} @@ -1095,6 +1643,9 @@ packages: hast-util-from-html@2.0.3: resolution: {integrity: sha512-CUSRHXyKjzHov8yKsQjGOElXy/3EKpyX56ELnkHH34vDVw1N1XSQ1ZcAvTyAPtGqLTuKP/uxM+aLkSPqF/EtMw==} + hast-util-from-html@2.0.3: + resolution: {integrity: sha512-CUSRHXyKjzHov8yKsQjGOElXy/3EKpyX56ELnkHH34vDVw1N1XSQ1ZcAvTyAPtGqLTuKP/uxM+aLkSPqF/EtMw==} + hast-util-from-parse5@7.1.2: resolution: {integrity: sha512-Nz7FfPBuljzsN3tCQ4kCBKqdNhQE2l0Tn+X1ubgKBPRoiDIu1mL08Cfw4k7q71+Duyaw7DXDN+VTAp4Vh3oCOw==} @@ -1137,8 +1688,16 @@ packages: hast-util-select@6.0.4: resolution: {integrity: sha512-RqGS1ZgI0MwxLaKLDxjprynNzINEkRHY2i8ln4DDjgv9ZhcYVIHN9rlpiYsqtFwrgpYU361SyWDQcGNIBVu3lw==} +<<<<<<< HEAD hast-util-to-estree@3.1.3: resolution: {integrity: sha512-48+B/rJWAp0jamNbAAf9M7Uf//UVqAoMmgXhBdxTDJLGKY+LRnZ99qcG+Qjl5HfMpYNzS5v4EAwVEF34LeAj7w==} +======= + hast-util-select@6.0.3: + resolution: {integrity: sha512-OVRQlQ1XuuLP8aFVLYmC2atrfWHS5UD3shonxpnyrjcCkwtvmt/+N6kYJdcY4mkMJhxp4kj2EFIxQ9kvkkt/eQ==} + + hast-util-to-estree@3.1.0: + resolution: {integrity: sha512-lfX5g6hqVh9kjS/B9E2gSkvHH4SZNiQFiqWS0x9fENzEl+8W12RqdRxX6d/Cwxi30tPQs3bIO+aolQJNp1bIyw==} +>>>>>>> c7bb80d hast-util-to-html@8.0.4: resolution: {integrity: sha512-4tpQTUOr9BMjtYyNlt0P50mH7xj0Ks2xpo8M943Vykljf99HW6EzulIoJP1N3eKOSScEHzyzi9dm7/cn0RfGwA==} @@ -1149,6 +1708,17 @@ packages: hast-util-to-jsx-runtime@2.3.6: resolution: {integrity: sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==} +<<<<<<< HEAD + hast-util-to-mdast@10.1.2: + resolution: {integrity: sha512-FiCRI7NmOvM4y+f5w32jPRzcxDIz+PUqDwEqn1A+1q2cdp3B8Gx7aVrXORdOKjMNDQsD1ogOr896+0jJHW1EFQ==} +======= + hast-util-to-html@9.0.4: + resolution: {integrity: sha512-wxQzXtdbhiwGAUKrnQJXlOPmHnEehzphwkK7aluUPQ+lEc1xefC8pblMgpp2w5ldBTEfveRIrADcrhGIWrlTDA==} + + hast-util-to-jsx-runtime@2.3.0: + resolution: {integrity: sha512-H/y0+IWPdsLLS738P8tDnrQ8Z+dj12zQQ6WC11TIM21C8WFVoIxcqWXf2H3hiTVZjF1AWqoimGwrTWecWrnmRQ==} +>>>>>>> c7bb80d + hast-util-to-mdast@10.1.2: resolution: {integrity: sha512-FiCRI7NmOvM4y+f5w32jPRzcxDIz+PUqDwEqn1A+1q2cdp3B8Gx7aVrXORdOKjMNDQsD1ogOr896+0jJHW1EFQ==} @@ -1197,6 +1767,9 @@ packages: i18next@23.16.8: resolution: {integrity: sha512-06r/TitrM88Mg5FdUXAKL96dJMzgqLE5dv3ryBAra4KCwD9mJ4ndOTS95ZuymIGoE+2hzfdaMak2X11/es7ZWg==} + i18next@23.16.8: + resolution: {integrity: sha512-06r/TitrM88Mg5FdUXAKL96dJMzgqLE5dv3ryBAra4KCwD9mJ4ndOTS95ZuymIGoE+2hzfdaMak2X11/es7ZWg==} + ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} @@ -1215,6 +1788,9 @@ packages: iron-webcrypto@1.2.1: resolution: {integrity: sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==} + iron-webcrypto@1.2.1: + resolution: {integrity: sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==} + is-alphabetical@2.0.1: resolution: {integrity: sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==} @@ -1224,6 +1800,10 @@ packages: is-arrayish@0.3.4: resolution: {integrity: sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==} + is-binary-path@2.1.0: + resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} + engines: {node: '>=8'} + is-buffer@2.0.5: resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==} engines: {node: '>=4'} @@ -1236,6 +1816,13 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true +<<<<<<< HEAD +======= + is-extglob@2.1.1: + resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} + engines: {node: '>=0.10.0'} + +>>>>>>> c7bb80d is-fullwidth-code-point@3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} @@ -1260,6 +1847,13 @@ packages: resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==} engines: {node: '>=16'} +<<<<<<< HEAD +======= + js-yaml@3.14.1: + resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} + hasBin: true + +>>>>>>> c7bb80d js-yaml@4.1.0: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true @@ -1272,14 +1866,34 @@ packages: resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} engines: {node: '>=6'} +<<<<<<< HEAD +======= + load-yaml-file@0.2.0: + resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==} + engines: {node: '>=6'} + + locate-path@5.0.0: + resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} + engines: {node: '>=8'} + +>>>>>>> c7bb80d longest-streak@3.1.0: resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==} lru-cache@10.4.3: resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} +<<<<<<< HEAD magic-string@0.30.19: resolution: {integrity: sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==} +======= + lru-cache@6.0.0: + resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} + engines: {node: '>=10'} + + magic-string@0.30.17: + resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} +>>>>>>> c7bb80d magicast@0.3.5: resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==} @@ -1460,6 +2074,14 @@ packages: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} +<<<<<<< HEAD +======= + mime@3.0.0: + resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} + engines: {node: '>=10.0.0'} + hasBin: true + +>>>>>>> c7bb80d mimic-response@3.1.0: resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==} engines: {node: '>=10'} @@ -1482,8 +2104,18 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true +<<<<<<< HEAD napi-build-utils@2.0.0: resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==} +======= + nanoid@3.3.8: + resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + + napi-build-utils@1.0.2: + resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==} +>>>>>>> c7bb80d neotraverse@0.6.18: resolution: {integrity: sha512-Z4SmBUweYa09+o6pG+eASabEpP6QkQ70yHj351pQoEXIs8uHbaU2DWVmzBANKgflPa47A50PtB2+NgRpQvr7vA==} @@ -1499,6 +2131,7 @@ packages: node-addon-api@6.1.0: resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==} +<<<<<<< HEAD node-fetch-native@1.6.7: resolution: {integrity: sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==} @@ -1513,6 +2146,10 @@ packages: node-mock-http@1.0.3: resolution: {integrity: sha512-jN8dK25fsfnMrVsEhluUTPkBFY+6ybu7jSB1n+ri/vOGjJxU8J9CZhpSGkHXSkFjtUhbmoncG/YG9ta5Ludqog==} +======= + node-fetch-native@1.6.6: + resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==} +>>>>>>> c7bb80d normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} @@ -1527,12 +2164,18 @@ packages: ofetch@1.4.1: resolution: {integrity: sha512-QZj2DfGplQAr2oj9KzceK9Hwz6Whxazmn85yYeVuS3u9XTMOGMRx0kO95MQ+vLsj/S/NwBDMMLU5hpxvI6Tklw==} +<<<<<<< HEAD ohash@2.0.11: resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==} +======= + ohash@1.1.4: + resolution: {integrity: sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g==} +>>>>>>> c7bb80d once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} +<<<<<<< HEAD oniguruma-parser@0.12.1: resolution: {integrity: sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w==} @@ -1552,13 +2195,41 @@ packages: p-timeout@6.1.4: resolution: {integrity: sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==} +======= + oniguruma-to-es@2.3.0: + resolution: {integrity: sha512-bwALDxriqfKGfUufKGGepCzu9x7nJQuoRoAFp4AnwehhC2crqrDIAP/uN2qdlsAvSMpeRC3+Yzhqc7hLmle5+g==} + + p-limit@2.3.0: + resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} + engines: {node: '>=6'} + + p-limit@6.2.0: + resolution: {integrity: sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA==} + engines: {node: '>=18'} + + p-locate@4.1.0: + resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} + engines: {node: '>=8'} + + p-queue@8.0.1: + resolution: {integrity: sha512-NXzu9aQJTAzbBqOt2hwsR63ea7yvxJc0PwN/zobNAudYfb1B7R08SzB4TsLeSbUCuG467NhnoT0oO6w1qRO+BA==} + engines: {node: '>=18'} + + p-timeout@6.1.2: + resolution: {integrity: sha512-UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ==} +>>>>>>> c7bb80d engines: {node: '>=14.16'} package-manager-detector@1.3.0: resolution: {integrity: sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==} +<<<<<<< HEAD pagefind@1.4.0: resolution: {integrity: sha512-z2kY1mQlL4J8q5EIsQkLzQjilovKzfNVhX8De6oyE6uHpfFtyBaqUpcl/XzJC/4fjD8vBDyh1zolimIcVrCn9g==} +======= + pagefind@1.3.0: + resolution: {integrity: sha512-8KPLGT5g9s+olKMRTU9LFekLizkVIu9tes90O1/aigJ0T5LmyPqTzGJrETnSw3meSYg58YH7JTzhTTW/3z6VAw==} +>>>>>>> c7bb80d hasBin: true pako@0.2.9: @@ -1576,6 +2247,24 @@ packages: parse5@7.3.0: resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==} +<<<<<<< HEAD + picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} +======= + path-exists@4.0.0: + resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} + engines: {node: '>=8'} + + pathe@1.1.2: + resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} + + picocolors@1.0.0: + resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + + picocolors@1.1.0: + resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==} +>>>>>>> c7bb80d + picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} @@ -1583,9 +2272,19 @@ packages: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} +<<<<<<< HEAD picomatch@4.0.3: resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} engines: {node: '>=12'} +======= + picomatch@4.0.2: + resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} + engines: {node: '>=12'} + + pify@4.0.1: + resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} + engines: {node: '>=6'} +>>>>>>> c7bb80d postcss-nested@6.2.0: resolution: {integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==} @@ -1601,8 +2300,21 @@ packages: resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==} engines: {node: ^10 || ^12 || >=14} +<<<<<<< HEAD prebuild-install@7.1.3: resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==} +======= + postcss@8.4.45: + resolution: {integrity: sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==} + engines: {node: ^10 || ^12 || >=14} + + postcss@8.5.1: + resolution: {integrity: sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==} + engines: {node: ^10 || ^12 || >=14} + + prebuild-install@7.1.1: + resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} +>>>>>>> c7bb80d engines: {node: '>=10'} hasBin: true @@ -1626,6 +2338,9 @@ packages: radix3@1.1.2: resolution: {integrity: sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==} + radix3@1.1.2: + resolution: {integrity: sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==} + rc@1.2.8: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} hasBin: true @@ -1634,9 +2349,42 @@ packages: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} engines: {node: '>= 6'} +<<<<<<< HEAD readdirp@4.1.2: resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} engines: {node: '>= 14.18.0'} +======= + readdirp@3.6.0: + resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} + engines: {node: '>=8.10.0'} + + recma-build-jsx@1.0.0: + resolution: {integrity: sha512-8GtdyqaBcDfva+GUKDr3nev3VpKAhup1+RvkMvUxURHpW7QyIvk9F5wz7Vzo06CEMSilw6uArgRqhpiUcWp8ew==} + + recma-jsx@1.0.0: + resolution: {integrity: sha512-5vwkv65qWwYxg+Atz95acp8DMu1JDSqdGkA2Of1j6rCreyFUE/gp15fC8MnGEuG1W68UKjM6x6+YTWIh7hZM/Q==} + + recma-parse@1.0.0: + resolution: {integrity: sha512-OYLsIGBB5Y5wjnSnQW6t3Xg7q3fQ7FWbw/vcXtORTnyaSFscOtABg+7Pnz6YZ6c27fG1/aN8CjfwoUEUIdwqWQ==} + + recma-stringify@1.0.0: + resolution: {integrity: sha512-cjwII1MdIIVloKvC9ErQ+OgAtwHBmcZ0Bg4ciz78FtbT8In39aAYbaA7zvxQ61xVMSPE8WxhLwLbhif4Js2C+g==} + + regenerator-runtime@0.14.1: + resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} + + regex-recursion@5.1.1: + resolution: {integrity: sha512-ae7SBCbzVNrIjgSbh7wMznPcQel1DNlDtzensnFxpiNpXt1U2ju/bHugH422r+4LAVS1FpW1YCwilmnNsjum9w==} + + regex-utilities@2.3.0: + resolution: {integrity: sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==} + + regex@5.1.1: + resolution: {integrity: sha512-dN5I359AVGPnwzJm2jN1k0W9LPZ+ePvoOeVMMfqIMFz53sSwXkxaJoxr50ptnsC771lK95BnTrVSZxq0b9yCGw==} + + rehype-expressive-code@0.40.1: + resolution: {integrity: sha512-EjmhGHcgmcPoIsb4M6vm2FQQDUctdcgFFiKGCYtPJuMpzr1q+ChCNsc443MaE412MyAgL6Q/XUB7I56Mcl6bnw==} +>>>>>>> c7bb80d recma-build-jsx@1.0.0: resolution: {integrity: sha512-8GtdyqaBcDfva+GUKDr3nev3VpKAhup1+RvkMvUxURHpW7QyIvk9F5wz7Vzo06CEMSilw6uArgRqhpiUcWp8ew==} @@ -1679,17 +2427,41 @@ packages: rehype-parse@9.0.1: resolution: {integrity: sha512-ksCzCD0Fgfh7trPDxr2rSylbwq9iYDkSn8TCDmEJ49ljEUBxDVCzCHv7QNzZOfODanX4+bWQ4WZqLCRWYLfhag==} + rehype-parse@9.0.1: + resolution: {integrity: sha512-ksCzCD0Fgfh7trPDxr2rSylbwq9iYDkSn8TCDmEJ49ljEUBxDVCzCHv7QNzZOfODanX4+bWQ4WZqLCRWYLfhag==} + rehype-raw@7.0.0: resolution: {integrity: sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==} rehype-recma@1.0.0: resolution: {integrity: sha512-lqA4rGUf1JmacCNWWZx0Wv1dHqMwxzsDWYMTowuplHF3xH0N/MmrZ/G3BDZnzAkRmxDadujCjaKM2hqYdCBOGw==} +<<<<<<< HEAD rehype-remark@10.0.1: resolution: {integrity: sha512-EmDndlb5NVwXGfUa4c9GPK+lXeItTilLhE6ADSaQuHr4JUlKw9MidzGzx4HpqZrNCt6vnHmEifXQiiA+CEnjYQ==} rehype-stringify@10.0.1: resolution: {integrity: sha512-k9ecfXHmIPuFVI61B9DeLPN0qFHfawM6RsuX48hoqlaKSF61RskNjSm1lI8PhBEM0MRdLxVVm4WmTqJQccH9mA==} +======= + + rehype-remark@10.0.0: + resolution: {integrity: sha512-+aDXY/icqMFOafJQomVjxe3BAP7aR3lIsQ3GV6VIwpbCD2nvNFOXjGvotMe5p0Ny+Gt6L13DhEf/FjOOpTuUbQ==} + + rehype-stringify@10.0.0: + resolution: {integrity: sha512-1TX1i048LooI9QoecrXy7nGFFbFSufxVRAfc6Y9YMRAi56l+oB0zP51mLSV312uRuvVLPV1opSlJmslozR1XHQ==} + + rehype-stringify@10.0.1: + resolution: {integrity: sha512-k9ecfXHmIPuFVI61B9DeLPN0qFHfawM6RsuX48hoqlaKSF61RskNjSm1lI8PhBEM0MRdLxVVm4WmTqJQccH9mA==} + + rehype@13.0.1: + resolution: {integrity: sha512-AcSLS2mItY+0fYu9xKxOu1LhUZeBZZBx8//5HKzF+0XP+eP8+6a5MXn2+DW2kfXR6Dtp1FEXMVrjyKAcvcU8vg==} + + rehype@13.0.2: + resolution: {integrity: sha512-j31mdaRFrwFRUIlxGeuPXXKWQxet52RBQRvCmzl5eCefn/KGbomK5GMHNMsOJf55fgo3qw5tST5neDuarDYR2A==} + + remark-directive@3.0.0: + resolution: {integrity: sha512-l1UyWJ6Eg1VPU7Hm/9tt0zKtReJQNOA4+iDMAxTyZNWnJnFlbS/7zhiel/rogTLQ2vMYwDzSJa4BiVNqGlqIMA==} +>>>>>>> c7bb80d rehype@13.0.2: resolution: {integrity: sha512-j31mdaRFrwFRUIlxGeuPXXKWQxet52RBQRvCmzl5eCefn/KGbomK5GMHNMsOJf55fgo3qw5tST5neDuarDYR2A==} @@ -1709,6 +2481,9 @@ packages: remark-rehype@11.1.2: resolution: {integrity: sha512-Dh7l57ianaEoIpzbp0PC9UKAdCSVklD8E5Rpw7ETfbTl3FqcOOgq5q2LVDhgGCkaBv7p24JXikPdvhhmHvKMsw==} + remark-rehype@11.1.1: + resolution: {integrity: sha512-g/osARvjkBXb6Wo0XvAeXQohVta8i84ACbenPpoSsxTOQH/Ae0/RGP4WZgnMH5pMLpsj4FG7OHmcIcXxpza8eQ==} + remark-smartypants@3.0.2: resolution: {integrity: sha512-ILTWeOriIluwEvPjv67v7Blgrcx+LZOkAUVtKI3putuhlZm84FnqDORNXPPm+HY3NdZOMhyDwZ1E+eZB/Df5dA==} engines: {node: '>=16.0.0'} @@ -1716,9 +2491,12 @@ packages: remark-stringify@11.0.0: resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==} +<<<<<<< HEAD restructure@3.0.2: resolution: {integrity: sha512-gSfoiOEA0VPE6Tukkrr7I0RBdE0s7H1eFCDBk05l1KIQT1UIKNc5JZy6jdyW6eYH3aR3g5b3PuL77rq0hvwtAw==} +======= +>>>>>>> c7bb80d retext-latin@4.0.0: resolution: {integrity: sha512-hv9woG7Fy0M9IlRQloq/N6atV82NxLGveq+3H2WOi79dtIYWN8OaxogDm77f8YnVXJL2VD3bbqowu5E3EMhBYA==} @@ -1731,8 +2509,17 @@ packages: retext@9.0.0: resolution: {integrity: sha512-sbMDcpHCNjvlheSgMfEcVrZko3cDzdbe1x/e7G66dFp0Ff7Mldvi2uv6JkJQzdRcvLYE8CA8Oe8siQx8ZOgTcA==} +<<<<<<< HEAD rollup@4.50.2: resolution: {integrity: sha512-BgLRGy7tNS9H66aIMASq1qSYbAAJV6Z6WR4QYTvj5FgF15rZ/ympT1uixHXwzbZUBDbkvqUI1KR0fH1FhMaQ9w==} +======= + reusify@1.0.4: + resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} + engines: {iojs: '>=1.0.0', node: '>=0.10.0'} + + rollup@4.32.1: + resolution: {integrity: sha512-z+aeEsOeEa3mEbS1Tjl6sAZ8NE3+AalQz1RJGj81M+fizusbdDMoEJwdJNHfaB40Scr4qNu+welOfes7maKonA==} +>>>>>>> c7bb80d engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -1742,8 +2529,13 @@ packages: sax@1.4.1: resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==} +<<<<<<< HEAD semver@7.7.2: resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==} +======= + semver@7.5.4: + resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} +>>>>>>> c7bb80d engines: {node: '>=10'} hasBin: true @@ -1755,11 +2547,16 @@ packages: resolution: {integrity: sha512-eX2IQ6nFohW4DbvHIOLRB3MHFpYqaqvXd3Tp5e/T/dSH83fxaNJQRvDMhASmkNTsNTVF2/OOopzRCt7xokgPfg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} +<<<<<<< HEAD shiki@1.29.2: resolution: {integrity: sha512-njXuliz/cP+67jU2hukkxCNuH1yUi4QfdZZY+sMr5PPrIyXSu5iTb/qYC4BiWWB0vZ+7TbdvYUCeL23zpwCfbg==} shiki@3.12.2: resolution: {integrity: sha512-uIrKI+f9IPz1zDT+GMz+0RjzKJiijVr6WDWm9Pe3NNY6QigKCfifCEv9v9R2mDASKKjzjQ2QpFLcxaR3iHSnMA==} +======= + shiki@1.29.1: + resolution: {integrity: sha512-TghWKV9pJTd/N+IgAIVJtr0qZkB7FfFCUrrEJc0aRmZupo3D1OCVRknQWVRVA7AX/M0Ld7QfoAruPzr3CnUJuw==} +>>>>>>> c7bb80d simple-concat@1.0.1: resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} @@ -1793,8 +2590,16 @@ packages: space-separated-tokens@2.0.2: resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==} +<<<<<<< HEAD starlight-llms-txt@0.4.1: resolution: {integrity: sha512-lrMvDBOxsZ70je4FIRn77J+aS9J7XVARusxrfjsrWYNoO7sosIyEeEyCK5HEmVBRFdR9uNRXw3uCUuDoz5OabA==} +======= + sprintf-js@1.0.3: + resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} + + starlight-llms-txt@0.4.0: + resolution: {integrity: sha512-lVKGRm86J3YK2Q/Y7nHacb/bbfX6aIVzayuv3YEYHln3DV8AGuJoM4Ldc1XSJVmmv1IsSpvYJtZsTvlyWUw8TQ==} +>>>>>>> c7bb80d engines: {node: ^18.17.1 || ^20.3.0 || >=21.0.0} peerDependencies: '@astrojs/starlight': '>=0.31' @@ -1828,6 +2633,13 @@ packages: resolution: {integrity: sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==} engines: {node: '>=12'} +<<<<<<< HEAD +======= + strip-bom@3.0.0: + resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} + engines: {node: '>=4'} + +>>>>>>> c7bb80d strip-json-comments@2.0.1: resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} engines: {node: '>=0.10.0'} @@ -1838,11 +2650,19 @@ packages: style-to-object@1.0.9: resolution: {integrity: sha512-G4qppLgKu/k6FwRpHiGiKPaPTFcG3g4wNVX/Qsfu+RqQM30E7Tyu/TEgxcL9PNLF5pdRLwQdE3YKKf+KF2Dzlw==} +<<<<<<< HEAD tar-fs@2.1.4: resolution: {integrity: sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==} tar-fs@3.1.1: resolution: {integrity: sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==} +======= + tar-fs@2.1.1: + resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} + + tar-fs@3.0.4: + resolution: {integrity: sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==} +>>>>>>> c7bb80d tar-stream@2.2.0: resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} @@ -1851,8 +2671,13 @@ packages: tar-stream@3.1.7: resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==} +<<<<<<< HEAD text-decoder@1.2.3: resolution: {integrity: sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==} +======= + tinyexec@0.3.2: + resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} +>>>>>>> c7bb80d tiny-inflate@1.0.3: resolution: {integrity: sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==} @@ -1876,12 +2701,21 @@ packages: trim-trailing-lines@2.1.0: resolution: {integrity: sha512-5UR5Biq4VlVOtzqkm2AZlgvSlDJtME46uV0br0gENbwN4l5+mMKT4b9gJKqWtuL2zAIqajGJGuvbCbcAJUZqBg==} +<<<<<<< HEAD trough@2.2.0: resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==} tsconfck@3.1.6: resolution: {integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==} +======= + + trough@2.1.0: + resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==} + + tsconfck@3.1.4: + resolution: {integrity: sha512-kdqWFGVJqe+KGYvlSO9NIaWn9jT1Ny4oKVzAJsKii5eoE9snzTJzL4+MMVOMn+fikWGFmKEylcXL710V/kIPJQ==} +>>>>>>> c7bb80d engines: {node: ^18 || >=20} hasBin: true peerDependencies: @@ -1896,8 +2730,13 @@ packages: tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} +<<<<<<< HEAD type-fest@4.41.0: resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==} +======= + type-fest@4.33.0: + resolution: {integrity: sha512-s6zVrxuyKbbAsSAD5ZPTB77q4YIdRctkTbJ2/Dqlinwz+8ooH2gd+YA7VA6Pa93KML9GockVvoxjZ2vHP+mu8g==} +>>>>>>> c7bb80d engines: {node: '>=16'} typescript@5.9.2: @@ -1905,15 +2744,24 @@ packages: engines: {node: '>=14.17'} hasBin: true +<<<<<<< HEAD ufo@1.6.1: resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} ultrahtml@1.6.0: resolution: {integrity: sha512-R9fBn90VTJrqqLDwyMph+HGne8eqY1iPfYhPzZrvKpIfwkWZbcYlfpsb8B9dTvBfpy1/hqAD7Wi8EKfP9e8zdw==} +======= + ufo@1.5.4: + resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} + + ultrahtml@1.5.3: + resolution: {integrity: sha512-GykOvZwgDWZlTQMtp5jrD4BVL+gNn2NVlVafjcFUJ7taY20tqYdwdoWBFy6GBJsNTZe1GkGPkSl5knQAjtgceg==} +>>>>>>> c7bb80d uncrypto@0.1.3: resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==} +<<<<<<< HEAD undici-types@7.12.0: resolution: {integrity: sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==} @@ -1922,6 +2770,10 @@ packages: unicode-trie@2.0.0: resolution: {integrity: sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==} +======= + unenv@1.10.0: + resolution: {integrity: sha512-wY5bskBQFL9n3Eca5XnhH6KbUo/tfvkwm9OpcdCvLaeA7piBNbavbOKJySEwQ1V0RH6HvNlSAFRTpvTqgKRQXQ==} +>>>>>>> c7bb80d unified@11.0.5: resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==} @@ -1977,12 +2829,18 @@ packages: unist-util-visit@5.0.0: resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==} +<<<<<<< HEAD unstorage@1.17.1: resolution: {integrity: sha512-KKGwRTT0iVBCErKemkJCLs7JdxNVfqTPc/85ae1XES0+bsHbc/sFBfVi5kJp156cc51BHinIH2l3k0EZ24vOBQ==} +======= + unstorage@1.14.4: + resolution: {integrity: sha512-1SYeamwuYeQJtJ/USE1x4l17LkmQBzg7deBJ+U9qOBoHo15d1cDxG4jM31zKRgF7pG0kirZy4wVMX6WL6Zoscg==} +>>>>>>> c7bb80d peerDependencies: '@azure/app-configuration': ^1.8.0 '@azure/cosmos': ^4.2.0 '@azure/data-tables': ^13.3.0 +<<<<<<< HEAD '@azure/identity': ^4.6.0 '@azure/keyvault-secrets': ^4.9.0 '@azure/storage-blob': ^12.26.0 @@ -1993,12 +2851,27 @@ packages: '@upstash/redis': ^1.34.3 '@vercel/blob': '>=0.27.1' '@vercel/functions': ^2.2.12 || ^3.0.0 +======= + '@azure/identity': ^4.5.0 + '@azure/keyvault-secrets': ^4.9.0 + '@azure/storage-blob': ^12.26.0 + '@capacitor/preferences': ^6.0.3 + '@deno/kv': '>=0.8.4' + '@netlify/blobs': ^6.5.0 || ^7.0.0 || ^8.1.0 + '@planetscale/database': ^1.19.0 + '@upstash/redis': ^1.34.3 + '@vercel/blob': '>=0.27.0' +>>>>>>> c7bb80d '@vercel/kv': ^1.0.1 aws4fetch: ^1.0.20 db0: '>=0.2.1' idb-keyval: ^6.2.1 ioredis: ^5.4.2 +<<<<<<< HEAD uploadthing: ^7.4.4 +======= + uploadthing: ^7.4.1 +>>>>>>> c7bb80d peerDependenciesMeta: '@azure/app-configuration': optional: true @@ -2024,8 +2897,11 @@ packages: optional: true '@vercel/blob': optional: true +<<<<<<< HEAD '@vercel/functions': optional: true +======= +>>>>>>> c7bb80d '@vercel/kv': optional: true aws4fetch: @@ -2060,8 +2936,13 @@ packages: vfile@6.0.3: resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==} +<<<<<<< HEAD vite@6.3.6: resolution: {integrity: sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==} +======= + vite@6.0.11: + resolution: {integrity: sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==} +>>>>>>> c7bb80d engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: @@ -2100,10 +2981,17 @@ packages: yaml: optional: true +<<<<<<< HEAD vitefu@1.1.1: resolution: {integrity: sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==} peerDependencies: vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0 +======= + vitefu@1.0.5: + resolution: {integrity: sha512-h4Vflt9gxODPFNGPwp4zAMZRpZR7eslzwH2c5hn5kNZ5rhnKyRJ50U+yGCdc2IRaBs8O4haIgLNGrV5CrpMsCA==} + peerDependencies: + vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 +>>>>>>> c7bb80d peerDependenciesMeta: vite: optional: true @@ -2125,8 +3013,17 @@ packages: resolution: {integrity: sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==} engines: {node: '>=18'} +<<<<<<< HEAD wrap-ansi@9.0.2: resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==} +======= + widest-line@5.0.0: + resolution: {integrity: sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==} + engines: {node: '>=18'} + + wrap-ansi@9.0.0: + resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==} +>>>>>>> c7bb80d engines: {node: '>=18'} wrappy@1.0.2: @@ -2134,6 +3031,12 @@ packages: xxhash-wasm@1.1.0: resolution: {integrity: sha512-147y/6YNh+tlp6nd/2pWq38i9h6mz/EuQ6njIrmW8D1BS5nCqs0P6DG+m6zTGnNz5I+uhZ0SHxBs9BsPrwcKDA==} +<<<<<<< HEAD +======= + + yallist@4.0.0: + resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} +>>>>>>> c7bb80d yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} @@ -2143,6 +3046,7 @@ packages: resolution: {integrity: sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==} engines: {node: '>=12.20'} +<<<<<<< HEAD yocto-spinner@0.2.3: resolution: {integrity: sha512-sqBChb33loEnkoXte1bLg45bEBsOP9N1kzQh5JZNKj/0rik4zAPTNSAVPj3uQAdc6slYJ0Ksc403G2XgxsJQFQ==} engines: {node: '>=18.19'} @@ -2153,6 +3057,18 @@ packages: zod-to-json-schema@3.24.6: resolution: {integrity: sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==} +======= + yocto-spinner@0.1.2: + resolution: {integrity: sha512-VfmLIh/ZSZOJnVRQZc/dvpPP90lWL4G0bmxQMP0+U/2vKBA8GSpcBuWv17y7F+CZItRuO97HN1wdbb4p10uhOg==} + engines: {node: '>=18.19'} + + yoctocolors@2.1.1: + resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==} + engines: {node: '>=18'} + + zod-to-json-schema@3.24.1: + resolution: {integrity: sha512-3h08nf3Vw3Wl3PK+q3ow/lIil81IT2Oa7YpQyUUDsEWbXveMesdfK1xBd2RhCkynwZndAxixji/7SYJJowr62w==} +>>>>>>> c7bb80d peerDependencies: zod: ^3.24.1 @@ -2165,11 +3081,15 @@ packages: zod@3.25.76: resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} + zod@3.24.1: + resolution: {integrity: sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==} + zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} snapshots: +<<<<<<< HEAD '@astrojs/compiler@2.13.0': {} '@astrojs/internal-helpers@0.7.2': {} @@ -2182,16 +3102,37 @@ snapshots: hast-util-from-html: 2.0.3 hast-util-to-text: 4.0.2 import-meta-resolve: 4.2.0 +======= + '@astrojs/compiler@2.10.3': {} + + '@astrojs/internal-helpers@0.4.2': {} + + '@astrojs/markdown-remark@6.0.2': + dependencies: + '@astrojs/prism': 3.2.0 + github-slugger: 2.0.0 + hast-util-from-html: 2.0.3 + hast-util-to-text: 4.0.2 + import-meta-resolve: 4.1.0 +>>>>>>> c7bb80d js-yaml: 4.1.0 mdast-util-definitions: 6.0.0 rehype-raw: 7.0.0 rehype-stringify: 10.0.1 +<<<<<<< HEAD remark-gfm: 4.0.1 remark-parse: 11.0.0 remark-rehype: 11.1.2 remark-smartypants: 3.0.2 shiki: 3.12.2 smol-toml: 1.4.2 +======= + remark-gfm: 4.0.0 + remark-parse: 11.0.0 + remark-rehype: 11.1.1 + remark-smartypants: 3.0.2 + shiki: 1.29.1 +>>>>>>> c7bb80d unified: 11.0.5 unist-util-remove-position: 5.0.0 unist-util-visit: 5.0.0 @@ -2200,6 +3141,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@astrojs/mdx@4.3.5(astro@5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2))': dependencies: '@astrojs/markdown-remark': 6.3.6 @@ -2209,6 +3151,17 @@ snapshots: es-module-lexer: 1.7.0 estree-util-visit: 2.0.0 hast-util-to-html: 9.0.5 +======= + '@astrojs/mdx@4.0.7(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4))': + dependencies: + '@astrojs/markdown-remark': 6.0.2 + '@mdx-js/mdx': 3.1.0(acorn@8.14.0) + acorn: 8.14.0 + astro: 5.1.10(rollup@4.32.1)(typescript@5.5.4) + es-module-lexer: 1.6.0 + estree-util-visit: 2.0.0 + hast-util-to-html: 9.0.4 +>>>>>>> c7bb80d kleur: 4.1.5 rehype-raw: 7.0.0 remark-gfm: 4.0.1 @@ -2219,16 +3172,25 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@astrojs/prism@3.3.0': +======= + '@astrojs/prism@3.2.0': +>>>>>>> c7bb80d dependencies: prismjs: 1.30.0 +<<<<<<< HEAD '@astrojs/sitemap@3.5.1': +======= + '@astrojs/sitemap@3.2.1': +>>>>>>> c7bb80d dependencies: sitemap: 8.0.0 stream-replace-string: 2.0.0 zod: 3.25.76 +<<<<<<< HEAD '@astrojs/starlight@0.31.1(astro@5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2))': dependencies: '@astrojs/mdx': 4.3.5(astro@5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2)) @@ -2253,16 +3215,49 @@ snapshots: rehype: 13.0.2 rehype-format: 5.0.1 remark-directive: 3.0.1 +======= + '@astrojs/starlight@0.31.1(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4))': + dependencies: + '@astrojs/mdx': 4.0.7(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)) + '@astrojs/sitemap': 3.2.1 + '@pagefind/default-ui': 1.3.0 + '@types/hast': 3.0.4 + '@types/js-yaml': 4.0.9 + '@types/mdast': 4.0.4 + astro: 5.1.10(rollup@4.32.1)(typescript@5.5.4) + astro-expressive-code: 0.40.1(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)) + bcp-47: 2.1.0 + hast-util-from-html: 2.0.1 + hast-util-select: 6.0.2 + hast-util-to-string: 3.0.0 + hastscript: 9.0.0 + i18next: 23.16.8 + js-yaml: 4.1.0 + mdast-util-directive: 3.0.0 + mdast-util-to-markdown: 2.1.0 + mdast-util-to-string: 4.0.0 + pagefind: 1.3.0 + rehype: 13.0.1 + rehype-format: 5.0.0 + remark-directive: 3.0.0 +>>>>>>> c7bb80d unified: 11.0.5 unist-util-visit: 5.0.0 vfile: 6.0.3 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@astrojs/telemetry@3.3.0': dependencies: ci-info: 4.3.0 debug: 4.4.3 +======= + '@astrojs/telemetry@3.2.0': + dependencies: + ci-info: 4.1.0 + debug: 4.4.0 +>>>>>>> c7bb80d dlv: 1.1.3 dset: 3.1.4 is-docker: 3.0.0 @@ -2271,6 +3266,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@babel/helper-string-parser@7.27.1': {} '@babel/helper-validator-identifier@7.27.1': {} @@ -2293,6 +3289,25 @@ snapshots: fontkit: 2.0.4 transitivePeerDependencies: - encoding +======= + '@babel/helper-string-parser@7.24.8': {} + + '@babel/helper-validator-identifier@7.24.7': {} + + '@babel/parser@7.25.6': + dependencies: + '@babel/types': 7.25.6 + + '@babel/runtime@7.26.7': + dependencies: + regenerator-runtime: 0.14.1 + + '@babel/types@7.25.6': + dependencies: + '@babel/helper-string-parser': 7.24.8 + '@babel/helper-validator-identifier': 7.24.7 + to-fast-properties: 2.0.0 +>>>>>>> c7bb80d '@ctrl/tinycolor@3.6.1': {} @@ -2303,6 +3318,7 @@ snapshots: tslib: 2.8.1 optional: true +<<<<<<< HEAD '@esbuild/aix-ppc64@0.25.9': optional: true @@ -2370,6 +3386,81 @@ snapshots: optional: true '@esbuild/sunos-x64@0.25.9': +======= + '@esbuild/aix-ppc64@0.24.2': + optional: true + + '@esbuild/android-arm64@0.24.2': + optional: true + + '@esbuild/android-arm@0.24.2': + optional: true + + '@esbuild/android-x64@0.24.2': + optional: true + + '@esbuild/darwin-arm64@0.24.2': + optional: true + + '@esbuild/darwin-x64@0.24.2': + optional: true + + '@esbuild/freebsd-arm64@0.24.2': + optional: true + + '@esbuild/freebsd-x64@0.24.2': + optional: true + + '@esbuild/linux-arm64@0.24.2': + optional: true + + '@esbuild/linux-arm@0.24.2': + optional: true + + '@esbuild/linux-ia32@0.24.2': + optional: true + + '@esbuild/linux-loong64@0.24.2': + optional: true + + '@esbuild/linux-mips64el@0.24.2': + optional: true + + '@esbuild/linux-ppc64@0.24.2': + optional: true + + '@esbuild/linux-riscv64@0.24.2': + optional: true + + '@esbuild/linux-s390x@0.24.2': + optional: true + + '@esbuild/linux-x64@0.24.2': + optional: true + + '@esbuild/netbsd-arm64@0.24.2': + optional: true + + '@esbuild/netbsd-x64@0.24.2': + optional: true + + '@esbuild/openbsd-arm64@0.24.2': + optional: true + + '@esbuild/openbsd-x64@0.24.2': + optional: true + + '@esbuild/sunos-x64@0.24.2': + optional: true + + '@esbuild/win32-arm64@0.24.2': + optional: true + + '@esbuild/win32-ia32@0.24.2': + optional: true + + '@esbuild/win32-x64@0.24.2': +>>>>>>> c7bb80d optional: true '@esbuild/win32-arm64@0.25.9': @@ -2389,7 +3480,11 @@ snapshots: postcss: 8.5.6 postcss-nested: 6.2.0(postcss@8.5.6) +<<<<<<< HEAD '@expressive-code/core@0.40.2': +======= + '@expressive-code/core@0.40.1': +>>>>>>> c7bb80d dependencies: '@ctrl/tinycolor': 4.2.0 hast-util-select: 6.0.4 @@ -2407,15 +3502,22 @@ snapshots: hast-util-select: 5.0.5 hastscript: 7.2.0 +<<<<<<< HEAD '@expressive-code/plugin-frames@0.40.2': dependencies: '@expressive-code/core': 0.40.2 +======= + '@expressive-code/plugin-frames@0.40.1': + dependencies: + '@expressive-code/core': 0.40.1 +>>>>>>> c7bb80d '@expressive-code/plugin-line-numbers@0.33.5': dependencies: '@expressive-code/core': 0.33.5 hastscript: 7.2.0 +<<<<<<< HEAD '@expressive-code/plugin-shiki@0.40.2': dependencies: '@expressive-code/core': 0.40.2 @@ -2424,6 +3526,16 @@ snapshots: '@expressive-code/plugin-text-markers@0.40.2': dependencies: '@expressive-code/core': 0.40.2 +======= + '@expressive-code/plugin-shiki@0.40.1': + dependencies: + '@expressive-code/core': 0.40.1 + shiki: 1.29.1 + + '@expressive-code/plugin-text-markers@0.40.1': + dependencies: + '@expressive-code/core': 0.40.1 +>>>>>>> c7bb80d '@fontsource/ibm-plex-mono@5.2.6': {} @@ -2512,6 +3624,7 @@ snapshots: '@img/sharp-win32-ia32@0.34.3': optional: true +<<<<<<< HEAD '@img/sharp-win32-x64@0.34.3': optional: true @@ -2521,6 +3634,14 @@ snapshots: dependencies: '@types/estree': 1.0.8 '@types/estree-jsx': 1.0.5 +======= + '@jridgewell/sourcemap-codec@1.5.0': {} + + '@mdx-js/mdx@3.1.0(acorn@8.14.0)': + dependencies: + '@types/estree': 1.0.5 + '@types/estree-jsx': 1.0.2 +>>>>>>> c7bb80d '@types/hast': 3.0.4 '@types/mdx': 2.0.13 acorn: 8.15.0 @@ -2529,6 +3650,7 @@ snapshots: estree-util-is-identifier-name: 3.0.0 estree-util-scope: 1.0.0 estree-walker: 3.0.3 +<<<<<<< HEAD hast-util-to-jsx-runtime: 2.3.6 markdown-extensions: 2.0.0 recma-build-jsx: 1.0.0 @@ -2536,6 +3658,15 @@ snapshots: recma-stringify: 1.0.0 rehype-recma: 1.0.0 remark-mdx: 3.1.1 +======= + hast-util-to-jsx-runtime: 2.3.0 + markdown-extensions: 2.0.0 + recma-build-jsx: 1.0.0 + recma-jsx: 1.0.0(acorn@8.14.0) + recma-stringify: 1.0.0 + rehype-recma: 1.0.0 + remark-mdx: 3.0.1 +>>>>>>> c7bb80d remark-parse: 11.0.0 remark-rehype: 11.1.2 source-map: 0.7.6 @@ -2545,6 +3676,7 @@ snapshots: unist-util-visit: 5.0.0 vfile: 6.0.3 transitivePeerDependencies: + - acorn - supports-color '@oslojs/encoding@1.1.0': {} @@ -2571,6 +3703,7 @@ snapshots: '@rollup/pluginutils@5.3.0(rollup@4.50.2)': dependencies: +<<<<<<< HEAD '@types/estree': 1.0.8 estree-walker: 2.0.2 picomatch: 4.0.3 @@ -2700,10 +3833,143 @@ snapshots: '@types/hast': 3.0.4 '@shikijs/types@3.12.2': +======= + '@nodelib/fs.stat': 2.0.5 + run-parallel: 1.2.0 + + '@nodelib/fs.stat@2.0.5': {} + + '@nodelib/fs.walk@1.2.8': + dependencies: + '@nodelib/fs.scandir': 2.1.5 + fastq: 1.17.1 + + '@oslojs/encoding@1.1.0': {} + + '@pagefind/darwin-arm64@1.3.0': + optional: true + + '@pagefind/darwin-x64@1.3.0': + optional: true + + '@pagefind/default-ui@1.3.0': {} + + '@pagefind/linux-arm64@1.3.0': + optional: true + + '@pagefind/linux-x64@1.3.0': + optional: true + + '@pagefind/windows-x64@1.3.0': + optional: true + + '@rollup/pluginutils@5.1.4(rollup@4.32.1)': + dependencies: + '@types/estree': 1.0.5 + estree-walker: 2.0.2 + picomatch: 4.0.2 + optionalDependencies: + rollup: 4.32.1 + + '@rollup/rollup-android-arm-eabi@4.32.1': + optional: true + + '@rollup/rollup-android-arm64@4.32.1': + optional: true + + '@rollup/rollup-darwin-arm64@4.32.1': + optional: true + + '@rollup/rollup-darwin-x64@4.32.1': + optional: true + + '@rollup/rollup-freebsd-arm64@4.32.1': + optional: true + + '@rollup/rollup-freebsd-x64@4.32.1': + optional: true + + '@rollup/rollup-linux-arm-gnueabihf@4.32.1': + optional: true + + '@rollup/rollup-linux-arm-musleabihf@4.32.1': + optional: true + + '@rollup/rollup-linux-arm64-gnu@4.32.1': + optional: true + + '@rollup/rollup-linux-arm64-musl@4.32.1': + optional: true + + '@rollup/rollup-linux-loongarch64-gnu@4.32.1': + optional: true + + '@rollup/rollup-linux-powerpc64le-gnu@4.32.1': + optional: true + + '@rollup/rollup-linux-riscv64-gnu@4.32.1': + optional: true + + '@rollup/rollup-linux-s390x-gnu@4.32.1': + optional: true + + '@rollup/rollup-linux-x64-gnu@4.32.1': + optional: true + + '@rollup/rollup-linux-x64-musl@4.32.1': + optional: true + + '@rollup/rollup-win32-arm64-msvc@4.32.1': + optional: true + + '@rollup/rollup-win32-ia32-msvc@4.32.1': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.32.1': + optional: true + + '@shikijs/core@1.29.1': + dependencies: + '@shikijs/engine-javascript': 1.29.1 + '@shikijs/engine-oniguruma': 1.29.1 + '@shikijs/types': 1.29.1 + '@shikijs/vscode-textmate': 10.0.1 + '@types/hast': 3.0.4 + hast-util-to-html: 9.0.4 + + '@shikijs/engine-javascript@1.29.1': + dependencies: + '@shikijs/types': 1.29.1 + '@shikijs/vscode-textmate': 10.0.1 + oniguruma-to-es: 2.3.0 + + '@shikijs/engine-oniguruma@1.29.1': + dependencies: + '@shikijs/types': 1.29.1 + '@shikijs/vscode-textmate': 10.0.1 + + '@shikijs/langs@1.29.1': + dependencies: + '@shikijs/types': 1.29.1 + + '@shikijs/themes@1.29.1': + dependencies: + '@shikijs/types': 1.29.1 + + '@shikijs/types@1.29.1': + dependencies: + '@shikijs/vscode-textmate': 10.0.1 + '@types/hast': 3.0.4 + + '@shikijs/vscode-textmate@10.0.1': {} + + '@types/acorn@4.0.6': +>>>>>>> c7bb80d dependencies: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 +<<<<<<< HEAD '@shikijs/vscode-textmate@10.0.2': {} '@swc/helpers@0.5.17': @@ -2725,10 +3991,33 @@ snapshots: '@types/fontkit@2.0.8': dependencies: '@types/node': 24.5.0 +======= + '@types/braces@3.0.5': {} +>>>>>>> c7bb80d '@types/hast@2.3.10': dependencies: +<<<<<<< HEAD '@types/unist': 2.0.11 +======= + '@types/ms': 0.7.31 + + '@types/estree-jsx@1.0.2': + dependencies: + '@types/estree': 1.0.5 + + '@types/estree@1.0.5': {} + + '@types/estree@1.0.6': {} + + '@types/hast@2.3.5': + dependencies: + '@types/unist': 2.0.7 + + '@types/hast@3.0.0': + dependencies: + '@types/unist': 3.0.0 +>>>>>>> c7bb80d '@types/hast@3.0.4': dependencies: @@ -2736,6 +4025,13 @@ snapshots: '@types/js-yaml@4.0.9': {} +<<<<<<< HEAD +======= + '@types/mdast@4.0.0': + dependencies: + '@types/unist': 3.0.0 + +>>>>>>> c7bb80d '@types/mdast@4.0.4': dependencies: '@types/unist': 3.0.3 @@ -2746,7 +4042,11 @@ snapshots: dependencies: '@types/braces': 3.0.5 +<<<<<<< HEAD '@types/ms@2.1.0': {} +======= + '@types/ms@0.7.31': {} +>>>>>>> c7bb80d '@types/nlcst@2.0.3': dependencies: @@ -2770,11 +4070,23 @@ snapshots: '@ungap/structured-clone@1.3.0': {} +<<<<<<< HEAD acorn-jsx@5.3.2(acorn@8.15.0): dependencies: acorn: 8.15.0 acorn@8.15.0: {} +======= + '@types/unist@3.0.1': {} + + '@ungap/structured-clone@1.2.0': {} + + acorn-jsx@5.3.2(acorn@8.14.0): + dependencies: + acorn: 8.14.0 + + acorn@8.14.0: {} +>>>>>>> c7bb80d ansi-align@3.0.1: dependencies: @@ -2784,8 +4096,17 @@ snapshots: ansi-regex@6.2.2: {} +<<<<<<< HEAD ansi-styles@6.2.3: {} + anymatch@3.1.3: + dependencies: + normalize-path: 3.0.0 + picomatch: 2.3.1 +======= + ansi-styles@6.2.1: {} +>>>>>>> c7bb80d + anymatch@3.1.3: dependencies: normalize-path: 3.0.0 @@ -2801,6 +4122,7 @@ snapshots: astring@1.9.0: {} +<<<<<<< HEAD astro-expressive-code@0.40.2(astro@5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2)): dependencies: astro: 5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2) @@ -2808,31 +4130,66 @@ snapshots: astro@5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2): dependencies: - '@astrojs/compiler': 2.13.0 - '@astrojs/internal-helpers': 0.7.2 - '@astrojs/markdown-remark': 6.3.6 - '@astrojs/telemetry': 3.3.0 - '@capsizecss/unpack': 2.4.0 + '@astrojs/compiler': 2.13.0 + '@astrojs/internal-helpers': 0.7.2 + '@astrojs/markdown-remark': 6.3.6 + '@astrojs/telemetry': 3.3.0 + '@capsizecss/unpack': 2.4.0 + '@oslojs/encoding': 1.1.0 + '@rollup/pluginutils': 5.3.0(rollup@4.50.2) + acorn: 8.15.0 + aria-query: 5.3.2 + axobject-query: 4.1.0 + boxen: 8.0.1 + ci-info: 4.3.0 + clsx: 2.1.1 + common-ancestor-path: 1.0.1 + cookie: 1.0.2 + cssesc: 3.0.0 + debug: 4.4.3 + deterministic-object-hash: 2.0.2 + devalue: 5.3.2 + diff: 5.2.0 + dlv: 1.1.3 + dset: 3.1.4 + es-module-lexer: 1.7.0 + esbuild: 0.25.9 + estree-walker: 3.0.3 +======= + astro-expressive-code@0.40.1(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)): + dependencies: + astro: 5.1.10(rollup@4.32.1)(typescript@5.5.4) + rehype-expressive-code: 0.40.1 + + astro@5.1.10(rollup@4.32.1)(typescript@5.5.4): + dependencies: + '@astrojs/compiler': 2.10.3 + '@astrojs/internal-helpers': 0.4.2 + '@astrojs/markdown-remark': 6.0.2 + '@astrojs/telemetry': 3.2.0 '@oslojs/encoding': 1.1.0 - '@rollup/pluginutils': 5.3.0(rollup@4.50.2) - acorn: 8.15.0 + '@rollup/pluginutils': 5.1.4(rollup@4.32.1) + '@types/cookie': 0.6.0 + acorn: 8.14.0 aria-query: 5.3.2 axobject-query: 4.1.0 boxen: 8.0.1 - ci-info: 4.3.0 + ci-info: 4.1.0 clsx: 2.1.1 common-ancestor-path: 1.0.1 - cookie: 1.0.2 + cookie: 0.7.2 cssesc: 3.0.0 - debug: 4.4.3 + debug: 4.4.0 deterministic-object-hash: 2.0.2 - devalue: 5.3.2 + devalue: 5.1.1 diff: 5.2.0 dlv: 1.1.3 dset: 3.1.4 - es-module-lexer: 1.7.0 - esbuild: 0.25.9 + es-module-lexer: 1.6.0 + esbuild: 0.24.2 estree-walker: 3.0.3 + fast-glob: 3.3.3 +>>>>>>> c7bb80d flattie: 1.1.1 fontace: 0.3.0 github-slugger: 2.0.0 @@ -2841,11 +4198,16 @@ snapshots: import-meta-resolve: 4.2.0 js-yaml: 4.1.0 kleur: 4.1.5 +<<<<<<< HEAD magic-string: 0.30.19 +======= + magic-string: 0.30.17 +>>>>>>> c7bb80d magicast: 0.3.5 mrmime: 2.0.1 neotraverse: 0.6.18 p-limit: 6.2.0 +<<<<<<< HEAD p-queue: 8.1.1 package-manager-detector: 1.3.0 picomatch: 4.0.3 @@ -2870,6 +4232,29 @@ snapshots: zod: 3.25.76 zod-to-json-schema: 3.24.6(zod@3.25.76) zod-to-ts: 1.2.0(typescript@5.9.2)(zod@3.25.76) +======= + p-queue: 8.0.1 + preferred-pm: 4.0.0 + prompts: 2.4.2 + rehype: 13.0.2 + semver: 7.6.3 + shiki: 1.29.1 + tinyexec: 0.3.2 + tsconfck: 3.1.4(typescript@5.5.4) + ultrahtml: 1.5.3 + unist-util-visit: 5.0.0 + unstorage: 1.14.4 + vfile: 6.0.3 + vite: 6.0.11 + vitefu: 1.0.5(vite@6.0.11) + which-pm: 3.0.0 + xxhash-wasm: 1.1.0 + yargs-parser: 21.1.1 + yocto-spinner: 0.1.2 + zod: 3.24.1 + zod-to-json-schema: 3.24.1(zod@3.24.1) + zod-to-ts: 1.2.0(typescript@5.5.4)(zod@3.24.1) +>>>>>>> c7bb80d optionalDependencies: sharp: 0.34.3 transitivePeerDependencies: @@ -2886,11 +4271,17 @@ snapshots: - '@types/node' - '@upstash/redis' - '@vercel/blob' +<<<<<<< HEAD - '@vercel/functions' - '@vercel/kv' - aws4fetch - db0 - encoding +======= + - '@vercel/kv' + - aws4fetch + - db0 +>>>>>>> c7bb80d - idb-keyval - ioredis - jiti @@ -2962,6 +4353,8 @@ snapshots: is-alphanumerical: 2.0.1 is-decimal: 2.0.1 + binary-extensions@2.3.0: {} + bl@4.1.0: dependencies: buffer: 5.7.1 @@ -2976,21 +4369,33 @@ snapshots: dependencies: ansi-align: 3.0.1 camelcase: 8.0.0 +<<<<<<< HEAD chalk: 5.6.2 cli-boxes: 3.0.0 string-width: 7.2.0 type-fest: 4.41.0 widest-line: 5.0.0 wrap-ansi: 9.0.2 +======= + chalk: 5.3.0 + cli-boxes: 3.0.0 + string-width: 7.2.0 + type-fest: 4.33.0 + widest-line: 5.0.0 + wrap-ansi: 9.0.0 +>>>>>>> c7bb80d braces@3.0.3: dependencies: fill-range: 7.1.1 +<<<<<<< HEAD brotli@1.3.3: dependencies: base64-js: 1.5.1 +======= +>>>>>>> c7bb80d buffer@5.7.1: dependencies: base64-js: 1.5.1 @@ -3000,7 +4405,11 @@ snapshots: ccount@2.0.1: {} +<<<<<<< HEAD chalk@5.6.2: {} +======= + chalk@5.3.0: {} +>>>>>>> c7bb80d character-entities-html4@2.1.0: {} @@ -3010,6 +4419,7 @@ snapshots: character-reference-invalid@2.0.1: {} +<<<<<<< HEAD chokidar@4.0.3: dependencies: readdirp: 4.1.2 @@ -3022,6 +4432,26 @@ snapshots: clone@2.1.2: {} +======= + chokidar@3.6.0: + dependencies: + anymatch: 3.1.3 + braces: 3.0.3 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + + chownr@1.1.4: {} + + ci-info@4.1.0: {} + + cli-boxes@3.0.0: {} + +>>>>>>> c7bb80d clsx@2.1.1: {} collapse-white-space@2.1.0: {} @@ -3046,6 +4476,7 @@ snapshots: common-ancestor-path@1.0.1: {} +<<<<<<< HEAD cookie-es@1.2.2: {} cookie@1.0.2: {} @@ -3057,6 +4488,15 @@ snapshots: - encoding crossws@0.3.5: +======= + consola@3.4.0: {} + + cookie-es@1.2.2: {} + + cookie@0.7.2: {} + + crossws@0.3.3: +>>>>>>> c7bb80d dependencies: uncrypto: 0.1.3 @@ -3071,11 +4511,23 @@ snapshots: cssesc@3.0.0: {} +<<<<<<< HEAD debug@4.4.3: dependencies: ms: 2.1.3 decode-named-character-reference@1.2.0: +======= + debug@4.3.7: + dependencies: + ms: 2.1.3 + + debug@4.4.0: + dependencies: + ms: 2.1.3 + + decode-named-character-reference@1.0.2: +>>>>>>> c7bb80d dependencies: character-entities: 2.0.2 @@ -3089,7 +4541,13 @@ snapshots: dequal@2.0.3: {} +<<<<<<< HEAD destr@2.0.5: {} +======= + destr@2.0.3: {} + + detect-libc@2.0.2: {} +>>>>>>> c7bb80d detect-libc@2.1.0: {} @@ -3097,7 +4555,11 @@ snapshots: dependencies: base-64: 1.0.0 +<<<<<<< HEAD devalue@5.3.2: {} +======= + devalue@5.1.1: {} +>>>>>>> c7bb80d devlop@1.1.0: dependencies: @@ -3115,27 +4577,44 @@ snapshots: emoji-regex-xs@1.0.0: {} +<<<<<<< HEAD emoji-regex@10.5.0: {} emoji-regex@8.0.0: {} end-of-stream@1.4.5: +======= + emoji-regex@10.3.0: {} + + emoji-regex@8.0.0: {} + + end-of-stream@1.4.4: +>>>>>>> c7bb80d dependencies: once: 1.4.0 entities@6.0.1: {} +<<<<<<< HEAD es-module-lexer@1.7.0: {} esast-util-from-estree@2.0.0: dependencies: '@types/estree-jsx': 1.0.5 +======= + es-module-lexer@1.6.0: {} + + esast-util-from-estree@2.0.0: + dependencies: + '@types/estree-jsx': 1.0.2 +>>>>>>> c7bb80d devlop: 1.1.0 estree-util-visit: 2.0.0 unist-util-position-from-estree: 2.0.0 esast-util-from-js@2.0.1: dependencies: +<<<<<<< HEAD '@types/estree-jsx': 1.0.5 acorn: 8.15.0 esast-util-from-estree: 2.0.0 @@ -3169,6 +4648,40 @@ snapshots: '@esbuild/win32-arm64': 0.25.9 '@esbuild/win32-ia32': 0.25.9 '@esbuild/win32-x64': 0.25.9 +======= + '@types/estree-jsx': 1.0.2 + acorn: 8.14.0 + esast-util-from-estree: 2.0.0 + vfile-message: 4.0.2 + + esbuild@0.24.2: + optionalDependencies: + '@esbuild/aix-ppc64': 0.24.2 + '@esbuild/android-arm': 0.24.2 + '@esbuild/android-arm64': 0.24.2 + '@esbuild/android-x64': 0.24.2 + '@esbuild/darwin-arm64': 0.24.2 + '@esbuild/darwin-x64': 0.24.2 + '@esbuild/freebsd-arm64': 0.24.2 + '@esbuild/freebsd-x64': 0.24.2 + '@esbuild/linux-arm': 0.24.2 + '@esbuild/linux-arm64': 0.24.2 + '@esbuild/linux-ia32': 0.24.2 + '@esbuild/linux-loong64': 0.24.2 + '@esbuild/linux-mips64el': 0.24.2 + '@esbuild/linux-ppc64': 0.24.2 + '@esbuild/linux-riscv64': 0.24.2 + '@esbuild/linux-s390x': 0.24.2 + '@esbuild/linux-x64': 0.24.2 + '@esbuild/netbsd-arm64': 0.24.2 + '@esbuild/netbsd-x64': 0.24.2 + '@esbuild/openbsd-arm64': 0.24.2 + '@esbuild/openbsd-x64': 0.24.2 + '@esbuild/sunos-x64': 0.24.2 + '@esbuild/win32-arm64': 0.24.2 + '@esbuild/win32-ia32': 0.24.2 + '@esbuild/win32-x64': 0.24.2 +>>>>>>> c7bb80d escape-string-regexp@5.0.0: {} @@ -3187,7 +4700,11 @@ snapshots: estree-util-scope@1.0.0: dependencies: +<<<<<<< HEAD '@types/estree': 1.0.8 +======= + '@types/estree': 1.0.5 +>>>>>>> c7bb80d devlop: 1.1.0 estree-util-to-js@2.0.0: @@ -3211,12 +4728,21 @@ snapshots: expand-template@2.0.3: {} +<<<<<<< HEAD expressive-code@0.40.2: dependencies: '@expressive-code/core': 0.40.2 '@expressive-code/plugin-frames': 0.40.2 '@expressive-code/plugin-shiki': 0.40.2 '@expressive-code/plugin-text-markers': 0.40.2 +======= + expressive-code@0.40.1: + dependencies: + '@expressive-code/core': 0.40.1 + '@expressive-code/plugin-frames': 0.40.1 + '@expressive-code/plugin-shiki': 0.40.1 + '@expressive-code/plugin-text-markers': 0.40.1 +>>>>>>> c7bb80d extend@3.0.2: {} @@ -3224,9 +4750,23 @@ snapshots: fast-fifo@1.3.2: {} +<<<<<<< HEAD fdir@6.5.0(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 +======= + fast-glob@3.3.3: + dependencies: + '@nodelib/fs.stat': 2.0.5 + '@nodelib/fs.walk': 1.2.8 + glob-parent: 5.1.2 + merge2: 1.4.1 + micromatch: 4.0.8 + + fastq@1.17.1: + dependencies: + reusify: 1.0.4 +>>>>>>> c7bb80d fill-range@7.1.1: dependencies: @@ -3256,7 +4796,11 @@ snapshots: fsevents@2.3.3: optional: true +<<<<<<< HEAD get-east-asian-width@1.4.0: {} +======= + get-east-asian-width@1.2.0: {} +>>>>>>> c7bb80d github-from-package@0.0.0: {} @@ -3264,6 +4808,7 @@ snapshots: h3@1.15.4: dependencies: +<<<<<<< HEAD cookie-es: 1.2.2 crossws: 0.3.5 defu: 6.1.4 @@ -3273,6 +4818,24 @@ snapshots: radix3: 1.1.2 ufo: 1.6.1 uncrypto: 0.1.3 +======= + is-glob: 4.0.3 + + graceful-fs@4.2.11: {} + + h3@1.14.0: + dependencies: + cookie-es: 1.2.2 + crossws: 0.3.3 + defu: 6.1.4 + destr: 2.0.3 + iron-webcrypto: 1.2.1 + ohash: 1.1.4 + radix3: 1.1.2 + ufo: 1.5.4 + uncrypto: 0.1.3 + unenv: 1.10.0 +>>>>>>> c7bb80d hast-util-embedded@3.0.0: dependencies: @@ -3298,6 +4861,15 @@ snapshots: vfile: 6.0.3 vfile-message: 4.0.3 + hast-util-from-html@2.0.3: + dependencies: + '@types/hast': 3.0.4 + devlop: 1.1.0 + hast-util-from-parse5: 8.0.1 + parse5: 7.1.2 + vfile: 6.0.3 + vfile-message: 4.0.2 + hast-util-from-parse5@7.1.2: dependencies: '@types/hast': 2.3.10 @@ -3423,7 +4995,29 @@ snapshots: unist-util-visit: 5.0.0 zwitch: 2.0.4 +<<<<<<< HEAD hast-util-to-estree@3.1.3: +======= + hast-util-select@6.0.3: + dependencies: + '@types/hast': 3.0.4 + '@types/unist': 3.0.1 + bcp-47-match: 2.0.3 + comma-separated-tokens: 2.0.3 + css-selector-parser: 3.0.4 + devlop: 1.1.0 + direction: 2.0.1 + hast-util-has-property: 3.0.0 + hast-util-to-string: 3.0.0 + hast-util-whitespace: 3.0.0 + nth-check: 2.1.1 + property-information: 6.3.0 + space-separated-tokens: 2.0.2 + unist-util-visit: 5.0.0 + zwitch: 2.0.4 + + hast-util-to-estree@3.1.0: +>>>>>>> c7bb80d dependencies: '@types/estree': 1.0.8 '@types/estree-jsx': 1.0.5 @@ -3472,7 +5066,25 @@ snapshots: stringify-entities: 4.0.4 zwitch: 2.0.4 +<<<<<<< HEAD hast-util-to-jsx-runtime@2.3.6: +======= + hast-util-to-html@9.0.4: + dependencies: + '@types/hast': 3.0.4 + '@types/unist': 3.0.1 + ccount: 2.0.1 + comma-separated-tokens: 2.0.3 + hast-util-whitespace: 3.0.0 + html-void-elements: 3.0.0 + mdast-util-to-hast: 13.0.2 + property-information: 6.3.0 + space-separated-tokens: 2.0.2 + stringify-entities: 4.0.3 + zwitch: 2.0.4 + + hast-util-to-jsx-runtime@2.3.0: +>>>>>>> c7bb80d dependencies: '@types/estree': 1.0.8 '@types/hast': 3.0.4 @@ -3496,6 +5108,7 @@ snapshots: dependencies: '@types/hast': 3.0.4 '@types/mdast': 4.0.4 +<<<<<<< HEAD '@ungap/structured-clone': 1.3.0 hast-util-phrasing: 3.0.1 hast-util-to-html: 9.0.5 @@ -3505,6 +5118,17 @@ snapshots: mdast-util-to-hast: 13.2.0 mdast-util-to-string: 4.0.0 rehype-minify-whitespace: 6.0.2 +======= + '@ungap/structured-clone': 1.2.0 + hast-util-phrasing: 3.0.1 + hast-util-to-html: 9.0.4 + hast-util-to-text: 4.0.2 + hast-util-whitespace: 3.0.0 + mdast-util-phrasing: 4.1.0 + mdast-util-to-hast: 13.0.2 + mdast-util-to-string: 4.0.0 + rehype-minify-whitespace: 6.0.0 +>>>>>>> c7bb80d trim-trailing-lines: 2.1.0 unist-util-position: 5.0.0 unist-util-visit: 5.0.0 @@ -3579,6 +5203,10 @@ snapshots: dependencies: '@babel/runtime': 7.28.4 + i18next@23.16.8: + dependencies: + '@babel/runtime': 7.26.7 + ieee754@1.2.1: {} import-meta-resolve@4.2.0: {} @@ -3591,6 +5219,8 @@ snapshots: iron-webcrypto@1.2.1: {} + iron-webcrypto@1.2.1: {} + is-alphabetical@2.0.1: {} is-alphanumerical@2.0.1: @@ -3600,12 +5230,21 @@ snapshots: is-arrayish@0.3.4: {} + is-binary-path@2.1.0: + dependencies: + binary-extensions: 2.3.0 + is-buffer@2.0.5: {} is-decimal@2.0.1: {} is-docker@3.0.0: {} +<<<<<<< HEAD +======= + is-extglob@2.1.1: {} + +>>>>>>> c7bb80d is-fullwidth-code-point@3.0.0: {} is-hexadecimal@2.0.1: {} @@ -3622,6 +5261,14 @@ snapshots: dependencies: is-inside-container: 1.0.0 +<<<<<<< HEAD +======= + js-yaml@3.14.1: + dependencies: + argparse: 1.0.10 + esprima: 4.0.1 + +>>>>>>> c7bb80d js-yaml@4.1.0: dependencies: argparse: 2.0.1 @@ -3630,13 +5277,35 @@ snapshots: kleur@4.1.5: {} +<<<<<<< HEAD +======= + load-yaml-file@0.2.0: + dependencies: + graceful-fs: 4.2.11 + js-yaml: 3.14.1 + pify: 4.0.1 + strip-bom: 3.0.0 + + locate-path@5.0.0: + dependencies: + p-locate: 4.1.0 + +>>>>>>> c7bb80d longest-streak@3.1.0: {} lru-cache@10.4.3: {} magic-string@0.30.19: dependencies: +<<<<<<< HEAD '@jridgewell/sourcemap-codec': 1.5.5 +======= + yallist: 4.0.0 + + magic-string@0.30.17: + dependencies: + '@jridgewell/sourcemap-codec': 1.5.0 +>>>>>>> c7bb80d magicast@0.3.5: dependencies: @@ -3651,7 +5320,11 @@ snapshots: mdast-util-definitions@6.0.0: dependencies: '@types/mdast': 4.0.4 +<<<<<<< HEAD '@types/unist': 3.0.3 +======= + '@types/unist': 3.0.1 +>>>>>>> c7bb80d unist-util-visit: 5.0.0 mdast-util-directive@3.1.0: @@ -3962,10 +5635,17 @@ snapshots: micromark-extension-mdxjs@3.0.0: dependencies: +<<<<<<< HEAD acorn: 8.15.0 acorn-jsx: 5.3.2(acorn@8.15.0) micromark-extension-mdx-expression: 3.0.1 micromark-extension-mdx-jsx: 3.0.2 +======= + acorn: 8.14.0 + acorn-jsx: 5.3.2(acorn@8.14.0) + micromark-extension-mdx-expression: 3.0.0 + micromark-extension-mdx-jsx: 3.0.0 +>>>>>>> c7bb80d micromark-extension-mdx-md: 2.0.0 micromark-extension-mdxjs-esm: 3.0.0 micromark-util-combine-extensions: 2.0.1 @@ -4087,9 +5767,15 @@ snapshots: micromark@4.0.2: dependencies: +<<<<<<< HEAD '@types/debug': 4.1.12 debug: 4.4.3 decode-named-character-reference: 1.2.0 +======= + '@types/debug': 4.1.8 + debug: 4.3.7 + decode-named-character-reference: 1.0.2 +>>>>>>> c7bb80d devlop: 1.1.0 micromark-core-commonmark: 2.0.3 micromark-factory-space: 2.0.1 @@ -4112,19 +5798,34 @@ snapshots: braces: 3.0.3 picomatch: 2.3.1 +<<<<<<< HEAD +======= + mime@3.0.0: {} + +>>>>>>> c7bb80d mimic-response@3.1.0: {} minimist@1.2.8: {} mkdirp-classic@0.5.3: {} +<<<<<<< HEAD mrmime@2.0.1: {} +======= + mrmime@2.0.0: {} +>>>>>>> c7bb80d ms@2.1.3: {} nanoid@3.3.11: {} +<<<<<<< HEAD napi-build-utils@2.0.0: {} +======= + nanoid@3.3.8: {} + + napi-build-utils@1.0.2: {} +>>>>>>> c7bb80d neotraverse@0.6.18: {} @@ -4138,6 +5839,7 @@ snapshots: node-addon-api@6.1.0: {} +<<<<<<< HEAD node-fetch-native@1.6.7: {} node-fetch@2.7.0: @@ -4145,6 +5847,9 @@ snapshots: whatwg-url: 5.0.0 node-mock-http@1.0.3: {} +======= + node-fetch-native@1.6.6: {} +>>>>>>> c7bb80d normalize-path@3.0.0: {} @@ -4156,18 +5861,29 @@ snapshots: ofetch@1.4.1: dependencies: +<<<<<<< HEAD destr: 2.0.5 node-fetch-native: 1.6.7 ufo: 1.6.1 ohash@2.0.11: {} +======= + destr: 2.0.3 + node-fetch-native: 1.6.6 + ufo: 1.5.4 + + ohash@1.1.4: {} +>>>>>>> c7bb80d once@1.4.0: dependencies: wrappy: 1.0.2 +<<<<<<< HEAD oniguruma-parser@0.12.1: {} +======= +>>>>>>> c7bb80d oniguruma-to-es@2.3.0: dependencies: emoji-regex-xs: 1.0.0 @@ -4193,6 +5909,7 @@ snapshots: package-manager-detector@1.3.0: {} +<<<<<<< HEAD pagefind@1.4.0: optionalDependencies: '@pagefind/darwin-arm64': 1.4.0 @@ -4201,6 +5918,15 @@ snapshots: '@pagefind/linux-arm64': 1.4.0 '@pagefind/linux-x64': 1.4.0 '@pagefind/windows-x64': 1.4.0 +======= + pagefind@1.3.0: + optionalDependencies: + '@pagefind/darwin-arm64': 1.3.0 + '@pagefind/darwin-x64': 1.3.0 + '@pagefind/linux-arm64': 1.3.0 + '@pagefind/linux-x64': 1.3.0 + '@pagefind/windows-x64': 1.3.0 +>>>>>>> c7bb80d pako@0.2.9: {} @@ -4229,11 +5955,29 @@ snapshots: dependencies: entities: 6.0.1 +<<<<<<< HEAD + picocolors@1.1.1: {} +======= + path-exists@4.0.0: {} + + pathe@1.1.2: {} + + picocolors@1.0.0: {} + + picocolors@1.1.0: {} +>>>>>>> c7bb80d + picocolors@1.1.1: {} picomatch@2.3.1: {} +<<<<<<< HEAD picomatch@4.0.3: {} +======= + picomatch@4.0.2: {} + + pify@4.0.1: {} +>>>>>>> c7bb80d postcss-nested@6.2.0(postcss@8.5.6): dependencies: @@ -4251,7 +5995,17 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 +<<<<<<< HEAD prebuild-install@7.1.3: +======= + postcss@8.5.1: + dependencies: + nanoid: 3.3.8 + picocolors: 1.1.1 + source-map-js: 1.2.1 + + prebuild-install@7.1.1: +>>>>>>> c7bb80d dependencies: detect-libc: 2.1.0 expand-template: 2.0.3 @@ -4284,6 +6038,8 @@ snapshots: radix3@1.1.2: {} + radix3@1.1.2: {} + rc@1.2.8: dependencies: deep-extend: 0.6.0 @@ -4297,7 +6053,60 @@ snapshots: string_decoder: 1.3.0 util-deprecate: 1.0.2 +<<<<<<< HEAD readdirp@4.1.2: {} +======= + readdirp@3.6.0: + dependencies: + picomatch: 2.3.1 + + recma-build-jsx@1.0.0: + dependencies: + '@types/estree': 1.0.5 + estree-util-build-jsx: 3.0.1 + vfile: 6.0.3 + + recma-jsx@1.0.0(acorn@8.14.0): + dependencies: + acorn-jsx: 5.3.2(acorn@8.14.0) + estree-util-to-js: 2.0.0 + recma-parse: 1.0.0 + recma-stringify: 1.0.0 + unified: 11.0.5 + transitivePeerDependencies: + - acorn + + recma-parse@1.0.0: + dependencies: + '@types/estree': 1.0.5 + esast-util-from-js: 2.0.1 + unified: 11.0.5 + vfile: 6.0.3 + + recma-stringify@1.0.0: + dependencies: + '@types/estree': 1.0.5 + estree-util-to-js: 2.0.0 + unified: 11.0.5 + vfile: 6.0.3 + + regenerator-runtime@0.14.1: {} + + regex-recursion@5.1.1: + dependencies: + regex: 5.1.1 + regex-utilities: 2.3.0 + + regex-utilities@2.3.0: {} + + regex@5.1.1: + dependencies: + regex-utilities: 2.3.0 + + rehype-expressive-code@0.40.1: + dependencies: + expressive-code: 0.40.1 +>>>>>>> c7bb80d recma-build-jsx@1.0.0: dependencies: @@ -4367,6 +6176,12 @@ snapshots: hast-util-from-html: 2.0.3 unified: 11.0.5 + rehype-parse@9.0.1: + dependencies: + '@types/hast': 3.0.4 + hast-util-from-html: 2.0.3 + unified: 11.0.5 + rehype-raw@7.0.0: dependencies: '@types/hast': 3.0.4 @@ -4375,6 +6190,7 @@ snapshots: rehype-recma@1.0.0: dependencies: +<<<<<<< HEAD '@types/estree': 1.0.8 '@types/hast': 3.0.4 hast-util-to-estree: 3.1.3 @@ -4386,6 +6202,32 @@ snapshots: '@types/hast': 3.0.4 '@types/mdast': 4.0.4 hast-util-to-mdast: 10.1.2 +======= + '@types/estree': 1.0.5 + '@types/hast': 3.0.4 + hast-util-to-estree: 3.1.0 + transitivePeerDependencies: + - supports-color + + rehype-remark@10.0.0: + dependencies: + '@types/hast': 3.0.4 + '@types/mdast': 4.0.4 + hast-util-to-mdast: 10.1.2 + unified: 11.0.5 + vfile: 6.0.3 + + rehype-stringify@10.0.0: + dependencies: + '@types/hast': 3.0.4 + hast-util-to-html: 9.0.2 + unified: 11.0.5 + + rehype-stringify@10.0.1: + dependencies: + '@types/hast': 3.0.4 + hast-util-to-html: 9.0.2 +>>>>>>> c7bb80d unified: 11.0.5 vfile: 6.0.3 @@ -4398,11 +6240,19 @@ snapshots: rehype@13.0.2: dependencies: '@types/hast': 3.0.4 +<<<<<<< HEAD rehype-parse: 9.0.1 rehype-stringify: 10.0.1 unified: 11.0.5 remark-directive@3.0.1: +======= + rehype-parse: 9.0.0 + rehype-stringify: 10.0.0 + unified: 11.0.5 + + remark-directive@3.0.0: +>>>>>>> c7bb80d dependencies: '@types/mdast': 4.0.4 mdast-util-directive: 3.1.0 @@ -4432,8 +6282,13 @@ snapshots: remark-parse@11.0.0: dependencies: '@types/mdast': 4.0.4 +<<<<<<< HEAD mdast-util-from-markdown: 2.0.2 micromark-util-types: 2.0.2 +======= + mdast-util-from-markdown: 2.0.0 + micromark-util-types: 2.0.0 +>>>>>>> c7bb80d unified: 11.0.5 transitivePeerDependencies: - supports-color @@ -4442,7 +6297,19 @@ snapshots: dependencies: '@types/hast': 3.0.4 '@types/mdast': 4.0.4 +<<<<<<< HEAD mdast-util-to-hast: 13.2.0 +======= + mdast-util-to-hast: 13.0.2 + unified: 11.0.5 + vfile: 6.0.3 + + remark-rehype@11.1.1: + dependencies: + '@types/hast': 3.0.4 + '@types/mdast': 4.0.4 + mdast-util-to-hast: 13.0.2 +>>>>>>> c7bb80d unified: 11.0.5 vfile: 6.0.3 @@ -4459,8 +6326,11 @@ snapshots: mdast-util-to-markdown: 2.1.2 unified: 11.0.5 +<<<<<<< HEAD restructure@3.0.2: {} +======= +>>>>>>> c7bb80d retext-latin@4.0.0: dependencies: '@types/nlcst': 2.0.3 @@ -4486,6 +6356,7 @@ snapshots: retext-stringify: 4.0.0 unified: 11.0.5 +<<<<<<< HEAD rollup@4.50.2: dependencies: '@types/estree': 1.0.8 @@ -4511,15 +6382,52 @@ snapshots: '@rollup/rollup-win32-arm64-msvc': 4.50.2 '@rollup/rollup-win32-ia32-msvc': 4.50.2 '@rollup/rollup-win32-x64-msvc': 4.50.2 +======= + reusify@1.0.4: {} + + rollup@4.32.1: + dependencies: + '@types/estree': 1.0.6 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.32.1 + '@rollup/rollup-android-arm64': 4.32.1 + '@rollup/rollup-darwin-arm64': 4.32.1 + '@rollup/rollup-darwin-x64': 4.32.1 + '@rollup/rollup-freebsd-arm64': 4.32.1 + '@rollup/rollup-freebsd-x64': 4.32.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.32.1 + '@rollup/rollup-linux-arm-musleabihf': 4.32.1 + '@rollup/rollup-linux-arm64-gnu': 4.32.1 + '@rollup/rollup-linux-arm64-musl': 4.32.1 + '@rollup/rollup-linux-loongarch64-gnu': 4.32.1 + '@rollup/rollup-linux-powerpc64le-gnu': 4.32.1 + '@rollup/rollup-linux-riscv64-gnu': 4.32.1 + '@rollup/rollup-linux-s390x-gnu': 4.32.1 + '@rollup/rollup-linux-x64-gnu': 4.32.1 + '@rollup/rollup-linux-x64-musl': 4.32.1 + '@rollup/rollup-win32-arm64-msvc': 4.32.1 + '@rollup/rollup-win32-ia32-msvc': 4.32.1 + '@rollup/rollup-win32-x64-msvc': 4.32.1 +>>>>>>> c7bb80d fsevents: 2.3.3 safe-buffer@5.2.1: {} sax@1.4.1: {} +<<<<<<< HEAD semver@7.7.2: {} sharp@0.32.6: +======= + semver@7.5.4: + dependencies: + lru-cache: 6.0.0 + + semver@7.6.3: {} + + sharp@0.32.3: +>>>>>>> c7bb80d dependencies: color: 4.2.3 detect-libc: 2.1.0 @@ -4563,6 +6471,7 @@ snapshots: '@img/sharp-win32-x64': 0.34.3 optional: true +<<<<<<< HEAD shiki@1.29.2: dependencies: '@shikijs/core': 1.29.2 @@ -4585,6 +6494,19 @@ snapshots: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 +======= + shiki@1.29.1: + dependencies: + '@shikijs/core': 1.29.1 + '@shikijs/engine-javascript': 1.29.1 + '@shikijs/engine-oniguruma': 1.29.1 + '@shikijs/langs': 1.29.1 + '@shikijs/themes': 1.29.1 + '@shikijs/types': 1.29.1 + '@shikijs/vscode-textmate': 10.0.1 + '@types/hast': 3.0.4 + +>>>>>>> c7bb80d simple-concat@1.0.1: {} simple-get@4.0.1: @@ -4614,6 +6536,7 @@ snapshots: space-separated-tokens@2.0.2: {} +<<<<<<< HEAD starlight-llms-txt@0.4.1(@astrojs/starlight@0.31.1(astro@5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2)))(astro@5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2)): dependencies: '@astrojs/mdx': 4.3.5(astro@5.13.7(@types/node@24.5.0)(rollup@4.50.2)(typescript@5.9.2)) @@ -4627,6 +6550,23 @@ snapshots: rehype-parse: 9.0.1 rehype-remark: 10.0.1 remark-gfm: 4.0.1 +======= + sprintf-js@1.0.3: {} + + starlight-llms-txt@0.4.0(@astrojs/starlight@0.31.1(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)))(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)): + dependencies: + '@astrojs/mdx': 4.0.7(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)) + '@astrojs/starlight': 0.31.1(astro@5.1.10(rollup@4.32.1)(typescript@5.5.4)) + '@types/hast': 3.0.4 + '@types/micromatch': 4.0.9 + astro: 5.1.10(rollup@4.32.1)(typescript@5.5.4) + github-slugger: 2.0.0 + hast-util-select: 6.0.3 + micromatch: 4.0.8 + rehype-parse: 9.0.1 + rehype-remark: 10.0.0 + remark-gfm: 4.0.0 +>>>>>>> c7bb80d remark-stringify: 11.0.0 unified: 11.0.5 unist-util-remove: 4.0.0 @@ -4671,7 +6611,13 @@ snapshots: strip-ansi@7.1.2: dependencies: +<<<<<<< HEAD ansi-regex: 6.2.2 +======= + ansi-regex: 6.0.1 + + strip-bom@3.0.0: {} +>>>>>>> c7bb80d strip-json-comments@2.0.1: {} @@ -4683,7 +6629,11 @@ snapshots: dependencies: inline-style-parser: 0.2.4 +<<<<<<< HEAD tar-fs@2.1.4: +======= + tar-fs@2.1.1: +>>>>>>> c7bb80d dependencies: chownr: 1.1.4 mkdirp-classic: 0.5.3 @@ -4717,11 +6667,15 @@ snapshots: transitivePeerDependencies: - react-native-b4a +<<<<<<< HEAD text-decoder@1.2.3: dependencies: b4a: 1.7.1 transitivePeerDependencies: - react-native-b4a +======= + tinyexec@0.3.2: {} +>>>>>>> c7bb80d tiny-inflate@1.0.3: {} @@ -4741,10 +6695,17 @@ snapshots: trim-lines@3.0.1: {} trim-trailing-lines@2.1.0: {} +<<<<<<< HEAD trough@2.2.0: {} tsconfck@3.1.6(typescript@5.9.2): +======= + + trough@2.1.0: {} + + tsconfck@3.1.4(typescript@5.5.4): +>>>>>>> c7bb80d optionalDependencies: typescript: 5.9.2 @@ -4754,7 +6715,11 @@ snapshots: dependencies: safe-buffer: 5.2.1 +<<<<<<< HEAD type-fest@4.41.0: {} +======= + type-fest@4.33.0: {} +>>>>>>> c7bb80d typescript@5.9.2: {} @@ -4776,6 +6741,20 @@ snapshots: pako: 0.2.9 tiny-inflate: 1.0.3 + ufo@1.5.4: {} + + ultrahtml@1.5.3: {} + + uncrypto@0.1.3: {} + + unenv@1.10.0: + dependencies: + consola: 3.4.0 + defu: 6.1.4 + mime: 3.0.0 + node-fetch-native: 1.6.6 + pathe: 1.1.2 + unified@11.0.5: dependencies: '@types/unist': 3.0.3 @@ -4829,7 +6808,11 @@ snapshots: unist-util-remove@4.0.0: dependencies: +<<<<<<< HEAD '@types/unist': 3.0.3 +======= + '@types/unist': 3.0.1 +>>>>>>> c7bb80d unist-util-is: 6.0.0 unist-util-visit-parents: 6.0.1 @@ -4867,6 +6850,7 @@ snapshots: unist-util-is: 6.0.0 unist-util-visit-parents: 6.0.1 +<<<<<<< HEAD unstorage@1.17.1: dependencies: anymatch: 3.1.3 @@ -4877,6 +6861,18 @@ snapshots: node-fetch-native: 1.6.7 ofetch: 1.4.1 ufo: 1.6.1 +======= + unstorage@1.14.4: + dependencies: + anymatch: 3.1.3 + chokidar: 3.6.0 + destr: 2.0.3 + h3: 1.14.0 + lru-cache: 10.4.3 + node-fetch-native: 1.6.6 + ofetch: 1.4.1 + ufo: 1.5.4 +>>>>>>> c7bb80d util-deprecate@1.0.2: {} @@ -4912,6 +6908,7 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.3 +<<<<<<< HEAD vite@6.3.6(@types/node@24.5.0): dependencies: esbuild: 0.25.9 @@ -4920,13 +6917,26 @@ snapshots: postcss: 8.5.6 rollup: 4.50.2 tinyglobby: 0.2.15 +======= + vite@6.0.11: + dependencies: + esbuild: 0.24.2 + postcss: 8.5.1 + rollup: 4.32.1 +>>>>>>> c7bb80d optionalDependencies: '@types/node': 24.5.0 fsevents: 2.3.3 +<<<<<<< HEAD vitefu@1.1.1(vite@6.3.6(@types/node@24.5.0)): optionalDependencies: vite: 6.3.6(@types/node@24.5.0) +======= + vitefu@1.0.5(vite@6.0.11): + optionalDependencies: + vite: 6.0.11 +>>>>>>> c7bb80d web-namespaces@2.0.1: {} @@ -4943,20 +6953,38 @@ snapshots: dependencies: string-width: 7.2.0 +<<<<<<< HEAD wrap-ansi@9.0.2: dependencies: ansi-styles: 6.2.3 string-width: 7.2.0 strip-ansi: 7.1.2 +======= + widest-line@5.0.0: + dependencies: + string-width: 7.2.0 + + wrap-ansi@9.0.0: + dependencies: + ansi-styles: 6.2.1 + string-width: 7.2.0 + strip-ansi: 7.1.0 +>>>>>>> c7bb80d wrappy@1.0.2: {} xxhash-wasm@1.1.0: {} +<<<<<<< HEAD +======= + + yallist@4.0.0: {} +>>>>>>> c7bb80d yargs-parser@21.1.1: {} yocto-queue@1.2.1: {} +<<<<<<< HEAD yocto-spinner@0.2.3: dependencies: yoctocolors: 2.1.2 @@ -4966,6 +6994,22 @@ snapshots: zod-to-json-schema@3.24.6(zod@3.25.76): dependencies: zod: 3.25.76 +======= + yocto-spinner@0.1.2: + dependencies: + yoctocolors: 2.1.1 + + yoctocolors@2.1.1: {} + + zod-to-json-schema@3.24.1(zod@3.24.1): + dependencies: + zod: 3.24.1 + + zod-to-ts@1.2.0(typescript@5.5.4)(zod@3.24.1): + dependencies: + typescript: 5.5.4 + zod: 3.24.1 +>>>>>>> c7bb80d zod-to-ts@1.2.0(typescript@5.9.2)(zod@3.25.76): dependencies: @@ -4974,4 +7018,6 @@ snapshots: zod@3.25.76: {} + zod@3.24.1: {} + zwitch@2.0.4: {} diff --git a/docs/public/reviews/aman.jpg b/docs/public/reviews/aman.jpg new file mode 100644 index 000000000..5acb5a711 Binary files /dev/null and b/docs/public/reviews/aman.jpg differ diff --git a/docs/public/reviews/brandon.png b/docs/public/reviews/brandon.png new file mode 100644 index 000000000..23a863aec Binary files /dev/null and b/docs/public/reviews/brandon.png differ diff --git a/docs/public/reviews/kawtar.jpg b/docs/public/reviews/kawtar.jpg new file mode 100644 index 000000000..2b3e2b830 Binary files /dev/null and b/docs/public/reviews/kawtar.jpg differ diff --git a/docs/public/reviews/simon.jpg b/docs/public/reviews/simon.jpg new file mode 100644 index 000000000..6d55c935e Binary files /dev/null and b/docs/public/reviews/simon.jpg differ diff --git a/docs/public/reviews/yuri.jpeg b/docs/public/reviews/yuri.jpeg new file mode 100644 index 000000000..bbf5ec930 Binary files /dev/null and b/docs/public/reviews/yuri.jpeg differ diff --git a/docs/src/components/reviews.astro b/docs/src/components/reviews.astro new file mode 100644 index 000000000..64a305ba3 --- /dev/null +++ b/docs/src/components/reviews.astro @@ -0,0 +1,189 @@ +--- +interface Review { + name: string; + role: string; + content: string; + image: string; +} + +const reviews: Review[] = [ + { + name: 'Aman Mittal', + role: 'Docs Maintainer @Expo', + content: `One of the best starter apps that feel complete to get started creating your Expo and React Native app. It's rare to see a project keeping up with the latest developments in the React Native world in a fast-changing environment, production-ready at the same time, and with such clear documentation around it.
Hats off to the Obytes team for creating it and actively maintaining it!`, + image: '/aman.jpg', + }, + { + name: 'Yuri P. Baumgartner', + role: 'React Native Developer', + content: `The best React Native starter project ever! 🔥
I'm a React Native developer with more than 5 years of experience and I've seen a lot of React Native projects, templates and boilerplates but this is the best one. Here we have all of the steps to build an app from scratch to production.
The section that I really love is the Environment Variables, you make the really great way to handling this, guys!
Thank u all 🩶`, + image: '/yuri.jpeg', + }, + + { + name: 'Simon', + role: 'Founder @Galaxies_dev', + content: + 'This template combines all the latest React and React Native best practices in one powerful starter. Combined with additional GitHub actions to build your app, this is one of the most future-proof React Native templates - and it’s even free!', + image: 'simon.jpg', + }, + { + name: 'Kawtar CHOUBARI', + role: 'React/React Native Developer', + content: + 'This boilerplate has everything needed to build a robust mobile app. It saves a lot of time and I highly recommend 👌', + image: '/kawtar.jpg', + }, + { + name: 'Brandon Eichhorn', + role: 'Developer', + content: 'You guys are life savers!', + image: '/brandon.png', + }, +]; +--- + +
+

Trusted by React Native Developers Worldwide

+

+ Developers love our starter! Check out what they're saying: +

+
+ { + reviews.map((review) => ( +
+ + + +
+ +
+
+ {review.name} +

+ {review.name} + {review.role} +

+
+
+ )) + } +
+ + Love the template? Let us know ⭐️ + +
+ + diff --git a/docs/src/content/docs/faq.md b/docs/src/content/docs/faq.md index 475bd2c71..69f91de5e 100644 --- a/docs/src/content/docs/faq.md +++ b/docs/src/content/docs/faq.md @@ -40,7 +40,11 @@ Still hesitating? Check out this [article](https://reactnative.dev/blog/2024/06/ ### Who is behind the starter kit? +<<<<<<< HEAD This starter kit is maintained by the [Obytes mobile tribe team](https://www.obytes.com/team) since 2021. At Rootstrap we've started using it during 2024. We actively use it for our projects and make slight modifications to better adjust to our workflow, experience and projects. The template is open-source, released under the MIT license, ensuring flexibility for users. Our commitment to this template is ongoing; we will continue to sync it with the Obytes starter kit, maintain it and improve it as long as it remains a core part of our internal development process. +======= +This starter kit has been maintained by the [Obytes mobile tribe team](https://www.obytes.com/team) since 2021. We actively use it for our internal projects and are excited to share it with the amazing React Native / Expo community. The project is open-source, released under the MIT license, ensuring flexibility for users. Our commitment to this starter kit is ongoing; we will continue to maintain and improve it as long as it remains a core part of our internal development process. We welcome contributions and feedback from the community to help make this starter kit even better. +>>>>>>> c7bb80d ### Can you include X feature or library? diff --git a/docs/src/content/docs/index.mdx b/docs/src/content/docs/index.mdx index 5fc3647f8..e08e5785a 100644 --- a/docs/src/content/docs/index.mdx +++ b/docs/src/content/docs/index.mdx @@ -13,8 +13,13 @@ hero: link: /react-native-template/overview icon: right-arrow variant: primary +<<<<<<< HEAD - text: View on GitHub link: https://github.com/rootstrap/react-native-template +======= + - text: Hire Us + link: https://obytes.com/contact?utm_source=starter.obytes.com +>>>>>>> c7bb80d icon: external variant: secondary --- @@ -22,6 +27,7 @@ hero: import { Card, CardGrid } from '@astrojs/starlight/components'; import GithubStar from '../../components/GithubStar.astro'; import About from '../../components/about.astro'; +import Reviews from '../../components/reviews.astro'; @@ -74,10 +80,20 @@ import About from '../../components/about.astro'; +<<<<<<< HEAD \ The **Rootstrap React Native Template** is built on the foundation of the Obytes React Native template, incorporating its core structure and functionality. It has been enhanced with specific changes to match our development practices, offering a more customized and efficient solution for our projects. \ [Contact Rootstrap](https://rootstrap.com/contact) +======= + + + + +In addition to maintaining this starter kit, we provide expertise in custom projects and app development. If you're looking for experienced and reliable developers to bring your app vision to life, reach out to us. Let's discuss your project and explore how we can help you achieve your goals. + +[Hire Us](https://obytes.com/contact?utm_source=starter.obytes.com) +>>>>>>> c7bb80d diff --git a/docs/src/content/docs/ui-and-theme/components.mdx b/docs/src/content/docs/ui-and-theme/components.mdx index cdf737d44..d9410505a 100644 --- a/docs/src/content/docs/ui-and-theme/components.mdx +++ b/docs/src/content/docs/ui-and-theme/components.mdx @@ -56,6 +56,10 @@ We also provide an `EmptyList` component that you can use to display a message w **Use Case** ```tsx +<<<<<<< HEAD +======= +import * as React from 'react'; +>>>>>>> c7bb80d import { List, EmptyList, Text } from '@/components/ui'; const MyComponent = () => { @@ -84,6 +88,10 @@ The `cssInterop` function from `nativewind` is used to apply styling and, in thi **Use Case** ```tsx +<<<<<<< HEAD +======= +import * as React from 'react'; +>>>>>>> c7bb80d import { Image } from '@/components/ui'; const MyComponent = () => { @@ -181,6 +189,10 @@ Read more about Handling Forms [here](../forms/). **Use Case** ```tsx +<<<<<<< HEAD +======= +import * as React from 'react'; +>>>>>>> c7bb80d import { Input, View } from '@/components/ui'; const MyComponent = () => { @@ -211,6 +223,10 @@ Based on your needs, you can use the `Modal` if you don't have a fixed height fo **Use Case** ```tsx +<<<<<<< HEAD +======= +import * as React from 'react'; +>>>>>>> c7bb80d import { Modal, useModal, View, Button, Text } from '@/components/ui'; const MyComponent = () => { diff --git a/eas.json b/eas.json index 2a8bf7e36..1420c8c8c 100644 --- a/eas.json +++ b/eas.json @@ -1,7 +1,11 @@ { "cli": { +<<<<<<< HEAD "version": ">= 3.8.1", "appVersionSource": "remote" +======= + "version": ">= 3.8.1" +>>>>>>> c7bb80d }, "build": { "production": { @@ -19,14 +23,22 @@ "env": { "EXPO_NO_DOTENV": "1", "APP_ENV": "production", +<<<<<<< HEAD "FLIPPER_DISABLE": "1", "EAS_NO_DOCTOR": "1" +======= + "FLIPPER_DISABLE": "1" +>>>>>>> c7bb80d } }, "staging": { "autoIncrement": true, "channel": "staging", +<<<<<<< HEAD "distribution": "store", +======= + "distribution": "internal", +>>>>>>> c7bb80d "pnpm": "9.12.3", "ios": { "image": "latest" @@ -38,6 +50,7 @@ "env": { "APP_ENV": "staging", "EXPO_NO_DOTENV": "1", +<<<<<<< HEAD "FLIPPER_DISABLE": "1", "EAS_NO_DOCTOR": "1" } @@ -59,12 +72,19 @@ "EXPO_NO_DOTENV": "1", "FLIPPER_DISABLE": "1", "EAS_NO_DOCTOR": "1" +======= + "FLIPPER_DISABLE": "1" +>>>>>>> c7bb80d } }, "development": { "autoIncrement": true, "developmentClient": true, +<<<<<<< HEAD "distribution": "store", +======= + "distribution": "internal", +>>>>>>> c7bb80d "pnpm": "9.12.3", "ios": { "image": "latest" @@ -75,10 +95,29 @@ }, "env": { "APP_ENV": "development", +<<<<<<< HEAD "EXPO_NO_DOTENV": "1", "EAS_NO_DOCTOR": "1" }, "channel": "development" +======= + "EXPO_NO_DOTENV": "1" + } + }, + "simulator": { + "pnpm": "9.12.3", + "ios": { + "simulator": true, + "image": "latest" + }, + "android": { + "image": "latest" + }, + "env": { + "APP_ENV": "development", + "EXPO_NO_DOTENV": "1" + } +>>>>>>> c7bb80d } }, "submit": { diff --git a/env.js b/env.js index 29bea2ec5..75e90cb29 100644 --- a/env.js +++ b/env.js @@ -17,6 +17,7 @@ const z = require('zod'); const packageJSON = require('./package.json'); const path = require('path'); +<<<<<<< HEAD const APP_ENV = /** @type {z.infer['APP_ENV']} */ @@ -66,6 +67,11 @@ const easEnvironmentFilePath = environmentFiles[APP_ENV]; const localEnvironmentFilePath = path.resolve(__dirname, `.env.${APP_ENV}`); const envPath = isEASBuild ? easEnvironmentFilePath : localEnvironmentFilePath; +======= +const APP_ENV = process.env.APP_ENV ?? 'development'; +// eslint-disable-next-line no-undef +const envPath = path.resolve(__dirname, `.env.${APP_ENV}`); +>>>>>>> c7bb80d require('dotenv').config({ path: envPath, diff --git a/eslint.config.mjs b/eslint.config.mjs index b61b744b4..a4e938129 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -4,11 +4,17 @@ import { fileURLToPath } from 'node:url'; import { defineConfig, globalIgnores } from 'eslint/config'; import expoConfig from 'eslint-config-expo/flat.js'; import i18nJsonPlugin from 'eslint-plugin-i18n-json'; +<<<<<<< HEAD import pluginJest from 'eslint-plugin-jest'; import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'; import reactCompiler from 'eslint-plugin-react-compiler'; import simpleImportSort from 'eslint-plugin-simple-import-sort'; import sonarjs from 'eslint-plugin-sonarjs'; +======= +import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'; +import reactCompiler from 'eslint-plugin-react-compiler'; +import simpleImportSort from 'eslint-plugin-simple-import-sort'; +>>>>>>> c7bb80d import tailwind from 'eslint-plugin-tailwindcss'; import testingLibrary from 'eslint-plugin-testing-library'; // eslint-disable-next-line import/no-named-as-default, import/no-named-as-default-member, import/namespace @@ -32,10 +38,13 @@ export default defineConfig([ 'docs/', 'cli/', 'expo-env.d.ts', +<<<<<<< HEAD '*.config.js', 'lint-staged.config.js', 'i18next-syntax-validation.js', 'env.js', +======= +>>>>>>> c7bb80d ]), expoConfig, eslintPluginPrettierRecommended, @@ -46,11 +55,16 @@ export default defineConfig([ 'simple-import-sort': simpleImportSort, unicorn: eslintPluginUnicorn, 'unused-imports': unusedImports, +<<<<<<< HEAD sonarjs, jest: pluginJest, }, rules: { 'import/no-duplicates': 'error', +======= + }, + rules: { +>>>>>>> c7bb80d 'max-params': ['error', 3], 'max-lines-per-function': ['error', 70], 'tailwindcss/classnames-order': [ @@ -64,12 +78,15 @@ export default defineConfig([ 'react/no-inline-styles': 'off', 'react/destructuring-assignment': 'off', 'react/require-default-props': 'off', +<<<<<<< HEAD 'react/jsx-fragments': ['error', 'syntax'], 'react/jsx-no-useless-fragment': 'error', 'react/no-children-prop': ['error', { allowFunctions: true }], 'no-nested-ternary': 'error', 'no-unneeded-ternary': 'error', 'prefer-template': 'error', +======= +>>>>>>> c7bb80d 'unicorn/filename-case': [ 'error', { @@ -88,6 +105,7 @@ export default defineConfig([ caughtErrorsIgnorePattern: '^_', }, ], +<<<<<<< HEAD curly: [2, 'all'], 'object-shorthand': 'error', 'arrow-body-style': ['error', 'as-needed'], @@ -103,16 +121,26 @@ export default defineConfig([ files: ['**/__mocks__/**'], rules: { '@typescript-eslint/no-require-imports': 'off', +======= + 'import/prefer-default-export': 'off', + 'import/no-cycle': ['error', { maxDepth: '∞' }], + 'prettier/prettier': ['error', { ignores: ['expo-env.d.ts'] }], +>>>>>>> c7bb80d }, }, { files: ['**/*.ts', '**/*.tsx'], languageOptions: { +<<<<<<< HEAD parser, +======= + parser: parser, +>>>>>>> c7bb80d parserOptions: { project: './tsconfig.json', sourceType: 'module', }, +<<<<<<< HEAD globals: pluginJest.environments.globals.globals, }, rules: { @@ -132,6 +160,14 @@ export default defineConfig([ ], '@typescript-eslint/consistent-type-imports': [ 'error', +======= + }, + rules: { + ...configs.recommended.rules, + '@typescript-eslint/comma-dangle': 'off', + '@typescript-eslint/consistent-type-imports': [ + 'warn', +>>>>>>> c7bb80d { prefer: 'type-imports', fixStyle: 'inline-type-imports', @@ -149,13 +185,20 @@ export default defineConfig([ }, rules: { ...i18nJsonPlugin.configs.recommended.rules, +<<<<<<< HEAD '@typescript-eslint/ban-types': 'off', +======= +>>>>>>> c7bb80d 'i18n-json/valid-message-syntax': [ 2, { syntax: path.resolve( __dirname, +<<<<<<< HEAD './scripts/i18next-syntax-validation.js', +======= + './scripts/i18next-syntax-validation.js' +>>>>>>> c7bb80d ), }, ], diff --git a/jest.config.js b/jest.config.js index e221ed10e..d6c177330 100644 --- a/jest.config.js +++ b/jest.config.js @@ -14,11 +14,14 @@ module.exports = { moduleFileExtensions: ['js', 'ts', 'tsx'], transformIgnorePatterns: [ `node_modules/(?!(?:.pnpm/)?((jest-)?react-native|@react-native(-community)?|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@unimodules/.*|unimodules|@sentry/.*|native-base|react-native-svg))`, +<<<<<<< HEAD ], coverageReporters: [ 'json-summary', ['text', { file: 'coverage.txt' }], 'lcov', +======= +>>>>>>> c7bb80d ], reporters: [ 'default', diff --git a/package.json b/package.json index 0cc532b19..6ce5097e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,11 @@ { +<<<<<<< HEAD "name": "react-native-template", "version": "1.8.0", +======= + "name": "obytesapp", + "version": "8.0.0", +>>>>>>> c7bb80d "private": true, "main": "expo-router/entry", "scripts": { @@ -10,6 +15,7 @@ "prebuild:development": "cross-env APP_ENV=development pnpm run prebuild", "android": "cross-env EXPO_NO_DOTENV=1 expo run:android", "ios": "cross-env EXPO_NO_DOTENV=1 expo run:ios", +<<<<<<< HEAD "web": "cross-env EXPO_NO_DOTENV=1 expo start --web --reset-cache", "build:development:android": "cross-env APP_ENV=development EXPO_NO_DOTENV=1 eas build --profile development --platform android ", "build:development:ios": "cross-env APP_ENV=development EXPO_NO_DOTENV=1 eas build --profile development --platform ios", @@ -24,8 +30,15 @@ "build:qa:ios": "cross-env APP_ENV=qa EXPO_NO_DOTENV=1 eas build --profile qa --platform ios", "build:qa:web": "cross-env APP_ENV=qa EXPO_NO_DOTENV=1 expo export -c --platform web", "submit:qa:mobile": "cross-env APP_ENV=qa eas submit --profile qa", +======= + "web": "cross-env EXPO_NO_DOTENV=1 expo start --web", + "xcode": "xed -b ios", + "doctor": "npx expo-doctor@latest", + "preinstall": "npx only-allow pnpm", +>>>>>>> c7bb80d "start:staging": "cross-env APP_ENV=staging pnpm run start", "prebuild:staging": "cross-env APP_ENV=staging pnpm run prebuild", + "prebuild:development": "cross-env APP_ENV=development pnpm run prebuild", "android:staging": "cross-env APP_ENV=staging pnpm run android", "ios:staging": "cross-env APP_ENV=staging pnpm run ios", "web:staging": "cross-env APP_ENV=staging pnpm run web", @@ -64,6 +77,7 @@ "@expo/metro-runtime": "^5.0.4", "@gorhom/bottom-sheet": "^5.0.5", "@hookform/resolvers": "^3.9.0", +<<<<<<< HEAD "@lukemorales/query-key-factory": "^1.3.4", "@shopify/flash-list": "1.7.6", "@tanstack/react-query": "^5.52.1", @@ -83,6 +97,24 @@ "expo-splash-screen": "~0.30.10", "expo-status-bar": "~2.2.3", "expo-system-ui": "~5.0.11", +======= + "@shopify/flash-list": "1.7.6", + "@tanstack/react-query": "^5.52.1", + "app-icon-badge": "^0.1.2", + "axios": "^1.7.5", + "expo": "~53.0.12", + "expo-constants": "~17.1.6", + "expo-crypto": "^14.1.5", + "expo-dev-client": "~5.2.1", + "expo-font": "~13.3.1", + "expo-image": "~2.3.0", + "expo-linking": "~7.1.5", + "expo-localization": "~16.1.5", + "expo-router": "~5.1.0", + "expo-splash-screen": "~0.30.9", + "expo-status-bar": "~2.2.3", + "expo-system-ui": "~5.0.9", +>>>>>>> c7bb80d "i18next": "^23.14.0", "lodash.memoize": "^4.1.2", "moti": "^0.29.0", @@ -92,7 +124,11 @@ "react-error-boundary": "^4.0.13", "react-hook-form": "^7.53.0", "react-i18next": "^15.0.1", +<<<<<<< HEAD "react-native": "0.79.5", +======= + "react-native": "0.79.4", +>>>>>>> c7bb80d "react-native-edge-to-edge": "^1.6.0", "react-native-flash-message": "^0.4.2", "react-native-gesture-handler": "~2.24.0", @@ -105,7 +141,10 @@ "react-native-svg": "~15.11.2", "react-native-url-polyfill": "^2.0.0", "react-native-web": "~0.20.0", +<<<<<<< HEAD "react-native-webview": "13.13.5", +======= +>>>>>>> c7bb80d "react-query-kit": "^3.3.0", "tailwind-variants": "^0.2.1", "zod": "^3.23.8", @@ -119,7 +158,10 @@ "@eslint/eslintrc": "^3.3.1", "@eslint/js": "^9.28.0", "@expo/config": "~11.0.10", +<<<<<<< HEAD "@tanstack/eslint-plugin-query": "^5.62.1", +======= +>>>>>>> c7bb80d "@testing-library/jest-dom": "^6.5.0", "@testing-library/react-native": "^12.7.2", "@types/i18n-js": "^3.8.9", @@ -138,12 +180,18 @@ "eslint-import-resolver-typescript": "^4.4.3", "eslint-plugin-i18n-json": "^4.0.1", "eslint-plugin-import": "^2.31.0", +<<<<<<< HEAD "eslint-plugin-jest": "^28.8.3", "eslint-plugin-prettier": "^5.4.1", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-compiler": "19.1.0-rc.2", "eslint-plugin-simple-import-sort": "^12.1.1", "eslint-plugin-sonarjs": "^1.0.4", +======= + "eslint-plugin-prettier": "^5.4.1", + "eslint-plugin-react-compiler": "19.1.0-rc.2", + "eslint-plugin-simple-import-sort": "^12.1.1", +>>>>>>> c7bb80d "eslint-plugin-tailwindcss": "^3.18.0", "eslint-plugin-testing-library": "^7.5.2", "eslint-plugin-unicorn": "^59.0.1", @@ -151,7 +199,11 @@ "husky": "^9.1.5", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", +<<<<<<< HEAD "jest-expo": "~53.0.10", +======= + "jest-expo": "~53.0.7", +>>>>>>> c7bb80d "jest-junit": "^16.0.0", "lint-staged": "^15.2.9", "np": "^10.0.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2c6fff4f1..1a1548a6b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,6 +10,7 @@ importers: dependencies: '@expo/metro-runtime': specifier: ^5.0.4 +<<<<<<< HEAD version: 5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)) '@gorhom/bottom-sheet': specifier: ^5.0.5 @@ -29,6 +30,21 @@ importers: '@testing-library/react-hooks': specifier: ^8.0.1 version: 8.0.1(@types/react@19.0.14)(react-dom@19.0.0(react@19.0.0))(react-test-renderer@19.0.0(react@19.0.0))(react@19.0.0) +======= + version: 5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + '@gorhom/bottom-sheet': + specifier: ^5.0.5 + version: 5.0.5(@types/react@19.0.14)(react-native-gesture-handler@2.24.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + '@hookform/resolvers': + specifier: ^3.9.0 + version: 3.9.0(react-hook-form@7.53.0(react@19.0.0)) + '@shopify/flash-list': + specifier: 1.7.6 + version: 1.7.6(@babel/runtime@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + '@tanstack/react-query': + specifier: ^5.52.1 + version: 5.52.1(react@19.0.0) +>>>>>>> c7bb80d app-icon-badge: specifier: ^0.1.2 version: 0.1.2 @@ -39,6 +55,7 @@ importers: specifier: ^1.11.13 version: 1.11.18 expo: +<<<<<<< HEAD specifier: ~53.0.22 version: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) expo-constants: @@ -74,6 +91,43 @@ importers: expo-system-ui: specifier: ~5.0.11 version: 5.0.11(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-web@0.20.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)) +======= + specifier: ~53.0.12 + version: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-constants: + specifier: ~17.1.6 + version: 17.1.6(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + expo-crypto: + specifier: ^14.1.5 + version: 14.1.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + expo-dev-client: + specifier: ~5.2.1 + version: 5.2.1(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + expo-font: + specifier: ~13.3.1 + version: 13.3.1(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0) + expo-image: + specifier: ~2.3.0 + version: 2.3.0(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-web@0.20.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-linking: + specifier: ~7.1.5 + version: 7.1.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-localization: + specifier: ~16.1.5 + version: 16.1.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0) + expo-router: + specifier: ~5.1.0 + version: 5.1.0(7ec05cbd1f45884dfc25001ff0a5198d) + expo-splash-screen: + specifier: ~0.30.9 + version: 0.30.9(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + expo-status-bar: + specifier: ~2.2.3 + version: 2.2.3(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-system-ui: + specifier: ~5.0.9 + version: 5.0.9(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-web@0.20.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) +>>>>>>> c7bb80d i18next: specifier: ^23.14.0 version: 23.14.0 @@ -82,10 +136,17 @@ importers: version: 4.1.2 moti: specifier: ^0.29.0 +<<<<<<< HEAD version: 0.29.0(react-dom@19.0.0(react@19.0.0))(react-native-reanimated@3.17.5(@babel/core@7.28.4)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0) nativewind: specifier: ^4.1.21 version: 4.1.21(react-native-reanimated@3.17.5(@babel/core@7.28.4)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-svg@15.11.2(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(tailwindcss@3.4.4) +======= + version: 0.29.0(react-dom@19.0.0(react@19.0.0))(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0) + nativewind: + specifier: ^4.1.21 + version: 4.1.21(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-svg@15.11.2(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(tailwindcss@3.4.4) +>>>>>>> c7bb80d react: specifier: 19.0.0 version: 19.0.0 @@ -100,6 +161,7 @@ importers: version: 7.53.0(react@19.0.0) react-i18next: specifier: ^15.0.1 +<<<<<<< HEAD version: 15.0.1(i18next@23.14.0)(react-dom@19.0.0(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) react-native: specifier: 0.79.5 @@ -143,6 +205,48 @@ importers: react-native-webview: specifier: 13.13.5 version: 13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + version: 15.0.1(i18next@23.14.0)(react-dom@19.0.0(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native: + specifier: 0.79.4 + version: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-edge-to-edge: + specifier: ^1.6.0 + version: 1.6.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-flash-message: + specifier: ^0.4.2 + version: 0.4.2(prop-types@15.8.1)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-gesture-handler: + specifier: ~2.24.0 + version: 2.24.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-keyboard-controller: + specifier: ^1.17.4 + version: 1.17.4(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-mmkv: + specifier: ~3.1.0 + version: 3.1.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-reanimated: + specifier: ~3.17.5 + version: 3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-restart: + specifier: 0.0.27 + version: 0.0.27(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-safe-area-context: + specifier: 5.4.0 + version: 5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-screens: + specifier: ^4.11.1 + version: 4.11.1(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-svg: + specifier: ~15.11.2 + version: 15.11.2(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-url-polyfill: + specifier: ^2.0.0 + version: 2.0.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + react-native-web: + specifier: ~0.20.0 + version: 0.20.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) +>>>>>>> c7bb80d react-query-kit: specifier: ^3.3.0 version: 3.3.0(@tanstack/react-query@5.52.1(react@19.0.0)) @@ -154,11 +258,19 @@ importers: version: 3.23.8 zustand: specifier: ^5.0.5 +<<<<<<< HEAD version: 5.0.8(@types/react@19.0.14)(react@19.0.0)(use-sync-external-store@1.5.0(react@19.0.0)) devDependencies: '@babel/core': specifier: ^7.26.0 version: 7.28.4 +======= + version: 5.0.5(@types/react@19.0.14)(react@19.0.0)(use-sync-external-store@1.5.0(react@19.0.0)) + devDependencies: + '@babel/core': + specifier: ^7.26.0 + version: 7.26.0 +>>>>>>> c7bb80d '@commitlint/cli': specifier: ^19.2.2 version: 19.2.2(@types/node@22.9.1)(typescript@5.8.3) @@ -167,12 +279,17 @@ importers: version: 19.2.2 '@dev-plugins/react-query': specifier: ^0.0.7 +<<<<<<< HEAD version: 0.0.7(@tanstack/react-query@5.52.1(react@19.0.0))(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) +======= + version: 0.0.7(@tanstack/react-query@5.52.1(react@19.0.0))(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) +>>>>>>> c7bb80d '@eslint/eslintrc': specifier: ^3.3.1 version: 3.3.1 '@eslint/js': specifier: ^9.28.0 +<<<<<<< HEAD version: 9.35.0 '@expo/config': specifier: ~11.0.10 @@ -180,12 +297,22 @@ importers: '@tanstack/eslint-plugin-query': specifier: ^5.62.1 version: 5.89.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) +======= + version: 9.29.0 + '@expo/config': + specifier: ~11.0.10 + version: 11.0.10 +>>>>>>> c7bb80d '@testing-library/jest-dom': specifier: ^6.5.0 version: 6.5.0 '@testing-library/react-native': specifier: ^12.7.2 +<<<<<<< HEAD version: 12.7.2(jest@29.7.0(@types/node@22.9.1))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react-test-renderer@19.0.0(react@19.0.0))(react@19.0.0) +======= + version: 12.7.2(jest@29.7.0(@types/node@22.9.1))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react-test-renderer@19.0.0(react@19.0.0))(react@19.0.0) +>>>>>>> c7bb80d '@types/i18n-js': specifier: ^3.8.9 version: 3.8.9 @@ -203,10 +330,17 @@ importers: version: 19.0.14 '@typescript-eslint/eslint-plugin': specifier: ^8.34.0 +<<<<<<< HEAD version: 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) '@typescript-eslint/parser': specifier: ^8.34.0 version: 8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) +======= + version: 8.34.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/parser': + specifier: ^8.34.0 + version: 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) +>>>>>>> c7bb80d babel-plugin-module-resolver: specifier: ^5.0.2 version: 5.0.2 @@ -218,6 +352,7 @@ importers: version: 16.4.5 eslint: specifier: ^9.28.0 +<<<<<<< HEAD version: 9.35.0(jiti@1.21.6) eslint-config-expo: specifier: ^9.2.0 @@ -264,6 +399,45 @@ importers: eslint-plugin-unused-imports: specifier: ^4.1.4 version: 4.2.0(@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.35.0(jiti@1.21.6)) +======= + version: 9.29.0(jiti@1.21.6) + eslint-config-expo: + specifier: ^9.2.0 + version: 9.2.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint-config-prettier: + specifier: ^10.1.5 + version: 10.1.5(eslint@9.29.0(jiti@1.21.6)) + eslint-import-resolver-typescript: + specifier: ^4.4.3 + version: 4.4.3(eslint-plugin-import@2.31.0)(eslint@9.29.0(jiti@1.21.6)) + eslint-plugin-i18n-json: + specifier: ^4.0.1 + version: 4.0.1(eslint@9.29.0(jiti@1.21.6)) + eslint-plugin-import: + specifier: ^2.31.0 + version: 2.31.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@4.4.3)(eslint@9.29.0(jiti@1.21.6)) + eslint-plugin-prettier: + specifier: ^5.4.1 + version: 5.4.1(@types/eslint@9.6.1)(eslint-config-prettier@10.1.5(eslint@9.29.0(jiti@1.21.6)))(eslint@9.29.0(jiti@1.21.6))(prettier@3.3.3) + eslint-plugin-react-compiler: + specifier: 19.1.0-rc.2 + version: 19.1.0-rc.2(eslint@9.29.0(jiti@1.21.6)) + eslint-plugin-simple-import-sort: + specifier: ^12.1.1 + version: 12.1.1(eslint@9.29.0(jiti@1.21.6)) + eslint-plugin-tailwindcss: + specifier: ^3.18.0 + version: 3.18.0(tailwindcss@3.4.4) + eslint-plugin-testing-library: + specifier: ^7.5.2 + version: 7.5.3(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint-plugin-unicorn: + specifier: ^59.0.1 + version: 59.0.1(eslint@9.29.0(jiti@1.21.6)) + eslint-plugin-unused-imports: + specifier: ^4.1.4 + version: 4.1.4(@typescript-eslint/eslint-plugin@8.34.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.29.0(jiti@1.21.6)) +>>>>>>> c7bb80d husky: specifier: ^9.1.5 version: 9.1.5 @@ -274,8 +448,13 @@ importers: specifier: ^29.7.0 version: 29.7.0 jest-expo: +<<<<<<< HEAD specifier: ~53.0.10 version: 53.0.10(@babel/core@7.28.4)(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(jest@29.7.0(@types/node@22.9.1))(react-dom@19.0.0(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(webpack@5.96.1) +======= + specifier: ~53.0.7 + version: 53.0.7(@babel/core@7.26.0)(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(jest@29.7.0(@types/node@22.9.1))(react-dom@19.0.0(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(webpack@5.96.1) +>>>>>>> c7bb80d jest-junit: specifier: ^16.0.0 version: 16.0.0 @@ -293,13 +472,21 @@ importers: version: 3.4.4 ts-jest: specifier: ^29.1.2 +<<<<<<< HEAD version: 29.4.2(@babel/core@7.28.4)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.4))(jest-util@29.7.0)(jest@29.7.0(@types/node@22.9.1))(typescript@5.8.3) +======= + version: 29.1.2(@babel/core@7.26.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.9.1))(typescript@5.8.3) +>>>>>>> c7bb80d typescript: specifier: ^5.8.3 version: 5.8.3 typescript-eslint: specifier: ^8.34.0 +<<<<<<< HEAD version: 8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) +======= + version: 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) +>>>>>>> c7bb80d packages: @@ -321,6 +508,7 @@ packages: '@babel/code-frame@7.10.4': resolution: {integrity: sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==} +<<<<<<< HEAD '@babel/code-frame@7.27.1': resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==} engines: {node: '>=6.9.0'} @@ -347,16 +535,50 @@ packages: '@babel/helper-create-class-features-plugin@7.28.3': resolution: {integrity: sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==} +======= + '@babel/code-frame@7.26.2': + resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} + engines: {node: '>=6.9.0'} + + '@babel/compat-data@7.26.2': + resolution: {integrity: sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==} + engines: {node: '>=6.9.0'} + + '@babel/core@7.26.0': + resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==} + engines: {node: '>=6.9.0'} + + '@babel/generator@7.26.2': + resolution: {integrity: sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==} + engines: {node: '>=6.9.0'} + + '@babel/helper-annotate-as-pure@7.25.9': + resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==} + engines: {node: '>=6.9.0'} + + '@babel/helper-compilation-targets@7.25.9': + resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==} + engines: {node: '>=6.9.0'} + + '@babel/helper-create-class-features-plugin@7.25.9': + resolution: {integrity: sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 +<<<<<<< HEAD '@babel/helper-create-regexp-features-plugin@7.27.1': resolution: {integrity: sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==} +======= + '@babel/helper-create-regexp-features-plugin@7.25.9': + resolution: {integrity: sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 +<<<<<<< HEAD '@babel/helper-define-polyfill-provider@0.6.5': resolution: {integrity: sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==} peerDependencies: @@ -380,10 +602,28 @@ packages: '@babel/helper-module-transforms@7.28.3': resolution: {integrity: sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==} +======= + '@babel/helper-define-polyfill-provider@0.6.3': + resolution: {integrity: sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==} + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + + '@babel/helper-member-expression-to-functions@7.25.9': + resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==} + engines: {node: '>=6.9.0'} + + '@babel/helper-module-imports@7.25.9': + resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==} + engines: {node: '>=6.9.0'} + + '@babel/helper-module-transforms@7.26.0': + resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 +<<<<<<< HEAD '@babel/helper-optimise-call-expression@7.27.1': resolution: {integrity: sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==} engines: {node: '>=6.9.0'} @@ -394,16 +634,34 @@ packages: '@babel/helper-remap-async-to-generator@7.27.1': resolution: {integrity: sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==} +======= + '@babel/helper-optimise-call-expression@7.25.9': + resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==} + engines: {node: '>=6.9.0'} + + '@babel/helper-plugin-utils@7.25.9': + resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==} + engines: {node: '>=6.9.0'} + + '@babel/helper-remap-async-to-generator@7.25.9': + resolution: {integrity: sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 +<<<<<<< HEAD '@babel/helper-replace-supers@7.27.1': resolution: {integrity: sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==} +======= + '@babel/helper-replace-supers@7.25.9': + resolution: {integrity: sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 +<<<<<<< HEAD '@babel/helper-skip-transparent-expression-wrappers@7.27.1': resolution: {integrity: sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==} engines: {node: '>=6.9.0'} @@ -430,12 +688,41 @@ packages: '@babel/helpers@7.28.4': resolution: {integrity: sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==} +======= + '@babel/helper-simple-access@7.25.9': + resolution: {integrity: sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==} + engines: {node: '>=6.9.0'} + + '@babel/helper-skip-transparent-expression-wrappers@7.25.9': + resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==} + engines: {node: '>=6.9.0'} + + '@babel/helper-string-parser@7.25.9': + resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} + engines: {node: '>=6.9.0'} + + '@babel/helper-validator-identifier@7.25.9': + resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} + engines: {node: '>=6.9.0'} + + '@babel/helper-validator-option@7.25.9': + resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==} + engines: {node: '>=6.9.0'} + + '@babel/helper-wrap-function@7.25.9': + resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==} + engines: {node: '>=6.9.0'} + + '@babel/helpers@7.26.0': + resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} '@babel/highlight@7.25.9': resolution: {integrity: sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==} engines: {node: '>=6.9.0'} +<<<<<<< HEAD '@babel/parser@7.28.4': resolution: {integrity: sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==} engines: {node: '>=6.0.0'} @@ -443,12 +730,26 @@ packages: '@babel/plugin-proposal-decorators@7.28.0': resolution: {integrity: sha512-zOiZqvANjWDUaUS9xMxbMcK/Zccztbe/6ikvUXaG9nsPH3w6qh5UaPGAnirI/WhIbZ8m3OHU0ReyPrknG+ZKeg==} +======= + '@babel/parser@7.26.2': + resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==} + engines: {node: '>=6.0.0'} + hasBin: true + + '@babel/plugin-proposal-decorators@7.25.9': + resolution: {integrity: sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-proposal-export-default-from@7.27.1': resolution: {integrity: sha512-hjlsMBl1aJc5lp8MoCDEZCiYzlgdRAShOjAfRw6X+GlpLpUPU7c3XNLsKFZbQk/1cRzBlJ7CXg3xJAJMrFa1Uw==} +======= + '@babel/plugin-proposal-export-default-from@7.25.9': + resolution: {integrity: sha512-ykqgwNfSnNOB+C8fV5X4mG3AVmvu+WVxcaU9xHHtBb7PCrPeweMmPjGsn8eMaeJg6SJuoUuZENeeSWaarWqonQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -481,8 +782,13 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-syntax-decorators@7.27.1': resolution: {integrity: sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==} +======= + '@babel/plugin-syntax-decorators@7.25.9': + resolution: {integrity: sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -492,20 +798,35 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-syntax-export-default-from@7.27.1': resolution: {integrity: sha512-eBC/3KSekshx19+N40MzjWqJd7KTEdOoLesAfa4IDFI8eRz5a47i5Oszus6zG/cwIXN63YhgLOMSSNJx49sENg==} +======= + '@babel/plugin-syntax-export-default-from@7.25.9': + resolution: {integrity: sha512-9MhJ/SMTsVqsd69GyQg89lYR4o9T+oDGv5F6IsigxxqFVOyR/IflDLYP8WDI1l8fkhNGGktqkvL5qwNCtGEpgQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-syntax-flow@7.27.1': resolution: {integrity: sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==} +======= + '@babel/plugin-syntax-flow@7.26.0': + resolution: {integrity: sha512-B+O2DnPc0iG+YXFqOxv2WNuNU97ToWjOomUQ78DouOENWUaM5sVrmet9mcomUGQFwpJd//gvUagXBSdzO1fRKg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-syntax-import-attributes@7.27.1': resolution: {integrity: sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==} +======= + '@babel/plugin-syntax-import-attributes@7.26.0': + resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -520,8 +841,13 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-syntax-jsx@7.27.1': resolution: {integrity: sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==} +======= + '@babel/plugin-syntax-jsx@7.25.9': + resolution: {integrity: sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -568,248 +894,453 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-syntax-typescript@7.27.1': resolution: {integrity: sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==} +======= + '@babel/plugin-syntax-typescript@7.25.9': + resolution: {integrity: sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-arrow-functions@7.27.1': resolution: {integrity: sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==} +======= + '@babel/plugin-transform-arrow-functions@7.25.9': + resolution: {integrity: sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-async-generator-functions@7.28.0': resolution: {integrity: sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==} +======= + '@babel/plugin-transform-async-generator-functions@7.25.9': + resolution: {integrity: sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-async-to-generator@7.27.1': resolution: {integrity: sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==} +======= + '@babel/plugin-transform-async-to-generator@7.25.9': + resolution: {integrity: sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-block-scoping@7.28.4': resolution: {integrity: sha512-1yxmvN0MJHOhPVmAsmoW5liWwoILobu/d/ShymZmj867bAdxGbehIrew1DuLpw2Ukv+qDSSPQdYW1dLNE7t11A==} +======= + '@babel/plugin-transform-block-scoping@7.25.9': + resolution: {integrity: sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-class-properties@7.27.1': resolution: {integrity: sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==} +======= + '@babel/plugin-transform-class-properties@7.25.9': + resolution: {integrity: sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-classes@7.28.4': resolution: {integrity: sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==} +======= + '@babel/plugin-transform-classes@7.25.9': + resolution: {integrity: sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-computed-properties@7.27.1': resolution: {integrity: sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==} +======= + '@babel/plugin-transform-computed-properties@7.25.9': + resolution: {integrity: sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-destructuring@7.28.0': resolution: {integrity: sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==} +======= + '@babel/plugin-transform-destructuring@7.25.9': + resolution: {integrity: sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-export-namespace-from@7.27.1': resolution: {integrity: sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==} +======= + '@babel/plugin-transform-export-namespace-from@7.25.9': + resolution: {integrity: sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-flow-strip-types@7.27.1': resolution: {integrity: sha512-G5eDKsu50udECw7DL2AcsysXiQyB7Nfg521t2OAJ4tbfTJ27doHLeF/vlI1NZGlLdbb/v+ibvtL1YBQqYOwJGg==} +======= + '@babel/plugin-transform-flow-strip-types@7.25.9': + resolution: {integrity: sha512-/VVukELzPDdci7UUsWQaSkhgnjIWXnIyRpM02ldxaVoFK96c41So8JcKT3m0gYjyv7j5FNPGS5vfELrWalkbDA==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-for-of@7.27.1': resolution: {integrity: sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==} +======= + '@babel/plugin-transform-for-of@7.25.9': + resolution: {integrity: sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-function-name@7.27.1': resolution: {integrity: sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==} +======= + '@babel/plugin-transform-function-name@7.25.9': + resolution: {integrity: sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-literals@7.27.1': resolution: {integrity: sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==} +======= + '@babel/plugin-transform-literals@7.25.9': + resolution: {integrity: sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-logical-assignment-operators@7.27.1': resolution: {integrity: sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==} +======= + '@babel/plugin-transform-logical-assignment-operators@7.25.9': + resolution: {integrity: sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-modules-commonjs@7.27.1': resolution: {integrity: sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==} +======= + '@babel/plugin-transform-modules-commonjs@7.25.9': + resolution: {integrity: sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-named-capturing-groups-regex@7.27.1': resolution: {integrity: sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==} +======= + '@babel/plugin-transform-named-capturing-groups-regex@7.25.9': + resolution: {integrity: sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 +<<<<<<< HEAD '@babel/plugin-transform-nullish-coalescing-operator@7.27.1': resolution: {integrity: sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==} +======= + '@babel/plugin-transform-nullish-coalescing-operator@7.25.9': + resolution: {integrity: sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-numeric-separator@7.27.1': resolution: {integrity: sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==} +======= + '@babel/plugin-transform-numeric-separator@7.25.9': + resolution: {integrity: sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-object-rest-spread@7.28.4': resolution: {integrity: sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==} +======= + '@babel/plugin-transform-object-rest-spread@7.25.9': + resolution: {integrity: sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-optional-catch-binding@7.27.1': resolution: {integrity: sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==} +======= + '@babel/plugin-transform-optional-catch-binding@7.25.9': + resolution: {integrity: sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-optional-chaining@7.27.1': resolution: {integrity: sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==} +======= + '@babel/plugin-transform-optional-chaining@7.25.9': + resolution: {integrity: sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-parameters@7.27.7': resolution: {integrity: sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==} +======= + '@babel/plugin-transform-parameters@7.25.9': + resolution: {integrity: sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-private-methods@7.27.1': resolution: {integrity: sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==} +======= + '@babel/plugin-transform-private-methods@7.25.9': + resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-private-property-in-object@7.27.1': resolution: {integrity: sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==} +======= + '@babel/plugin-transform-private-property-in-object@7.25.9': + resolution: {integrity: sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-react-display-name@7.28.0': resolution: {integrity: sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==} +======= + '@babel/plugin-transform-react-display-name@7.25.9': + resolution: {integrity: sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-react-jsx-development@7.27.1': resolution: {integrity: sha512-ykDdF5yI4f1WrAolLqeF3hmYU12j9ntLQl/AOG1HAS21jxyg1Q0/J/tpREuYLfatGdGmXp/3yS0ZA76kOlVq9Q==} +======= + '@babel/plugin-transform-react-jsx-development@7.25.9': + resolution: {integrity: sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-react-jsx-self@7.27.1': resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==} +======= + '@babel/plugin-transform-react-jsx-self@7.25.9': + resolution: {integrity: sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-react-jsx-source@7.27.1': resolution: {integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==} +======= + '@babel/plugin-transform-react-jsx-source@7.25.9': + resolution: {integrity: sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-react-jsx@7.27.1': resolution: {integrity: sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==} +======= + '@babel/plugin-transform-react-jsx@7.25.9': + resolution: {integrity: sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-react-pure-annotations@7.27.1': resolution: {integrity: sha512-JfuinvDOsD9FVMTHpzA/pBLisxpv1aSf+OIV8lgH3MuWrks19R27e6a6DipIg4aX1Zm9Wpb04p8wljfKrVSnPA==} +======= + '@babel/plugin-transform-react-pure-annotations@7.25.9': + resolution: {integrity: sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-regenerator@7.28.4': resolution: {integrity: sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==} +======= + '@babel/plugin-transform-regenerator@7.25.9': + resolution: {integrity: sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-runtime@7.28.3': resolution: {integrity: sha512-Y6ab1kGqZ0u42Zv/4a7l0l72n9DKP/MKoKWaUSBylrhNZO2prYuqFOLbn5aW5SIFXwSH93yfjbgllL8lxuGKLg==} +======= + '@babel/plugin-transform-runtime@7.25.9': + resolution: {integrity: sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-shorthand-properties@7.27.1': resolution: {integrity: sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==} +======= + '@babel/plugin-transform-shorthand-properties@7.25.9': + resolution: {integrity: sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-spread@7.27.1': resolution: {integrity: sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==} +======= + '@babel/plugin-transform-spread@7.25.9': + resolution: {integrity: sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-sticky-regex@7.27.1': resolution: {integrity: sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==} +======= + '@babel/plugin-transform-sticky-regex@7.25.9': + resolution: {integrity: sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-template-literals@7.27.1': resolution: {integrity: sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==} +======= + '@babel/plugin-transform-template-literals@7.25.9': + resolution: {integrity: sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-typescript@7.28.0': resolution: {integrity: sha512-4AEiDEBPIZvLQaWlc9liCavE0xRM0dNca41WtBeM3jgFptfUOSG9z0uteLhq6+3rq+WB6jIvUwKDTpXEHPJ2Vg==} +======= + '@babel/plugin-transform-typescript@7.25.9': + resolution: {integrity: sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/plugin-transform-unicode-regex@7.27.1': resolution: {integrity: sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==} +======= + '@babel/plugin-transform-unicode-regex@7.25.9': + resolution: {integrity: sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/preset-react@7.27.1': resolution: {integrity: sha512-oJHWh2gLhU9dW9HHr42q0cI0/iHHXTLGe39qvpAZZzagHy0MzYLCnCVV0symeRvzmjHyVU7mw2K06E6u/JwbhA==} +======= + '@babel/preset-react@7.25.9': + resolution: {integrity: sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD '@babel/preset-typescript@7.27.1': resolution: {integrity: sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==} +======= + '@babel/preset-typescript@7.26.0': + resolution: {integrity: sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -822,6 +1353,7 @@ packages: resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==} engines: {node: '>=6.9.0'} +<<<<<<< HEAD '@babel/template@7.27.2': resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} engines: {node: '>=6.9.0'} @@ -840,6 +1372,14 @@ packages: '@babel/types@7.28.4': resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==} +======= + '@babel/traverse@7.25.9': + resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==} + engines: {node: '>=6.9.0'} + + '@babel/types@7.26.0': + resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==} +>>>>>>> c7bb80d engines: {node: '>=6.9.0'} '@bcoe/v8-coverage@0.2.3': @@ -924,6 +1464,7 @@ packages: resolution: {integrity: sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==} engines: {node: '>=0.8.0'} +<<<<<<< HEAD '@emnapi/core@1.5.0': resolution: {integrity: sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==} @@ -932,6 +1473,16 @@ packages: '@emnapi/wasi-threads@1.1.0': resolution: {integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==} +======= + '@emnapi/core@1.4.3': + resolution: {integrity: sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==} + + '@emnapi/runtime@1.4.3': + resolution: {integrity: sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==} + + '@emnapi/wasi-threads@1.0.2': + resolution: {integrity: sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==} +>>>>>>> c7bb80d '@emotion/is-prop-valid@0.8.8': resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==} @@ -939,38 +1490,75 @@ packages: '@emotion/memoize@0.7.4': resolution: {integrity: sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==} +<<<<<<< HEAD '@eslint-community/eslint-utils@4.9.0': resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==} +======= + '@eslint-community/eslint-utils@4.4.1': + resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} +>>>>>>> c7bb80d + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + +<<<<<<< HEAD +======= + '@eslint-community/eslint-utils@4.7.0': + resolution: {integrity: sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 +>>>>>>> c7bb80d '@eslint-community/regexpp@4.12.1': resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} +<<<<<<< HEAD '@eslint/config-array@0.21.0': resolution: {integrity: sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/config-helpers@0.3.1': resolution: {integrity: sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==} +======= + '@eslint/config-array@0.20.1': + resolution: {integrity: sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/config-helpers@0.2.3': + resolution: {integrity: sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==} +>>>>>>> c7bb80d engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/core@0.13.0': resolution: {integrity: sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} +<<<<<<< HEAD '@eslint/core@0.15.2': resolution: {integrity: sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==} +======= + '@eslint/core@0.14.0': + resolution: {integrity: sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/core@0.15.0': + resolution: {integrity: sha512-b7ePw78tEWWkpgZCDYkbqDOP8dmM6qe+AOC6iuJqlq1R/0ahMAeH3qynpnqKFGkMltrp44ohV4ubGyvLX28tzw==} +>>>>>>> c7bb80d engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/eslintrc@3.3.1': resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} +<<<<<<< HEAD '@eslint/js@9.35.0': resolution: {integrity: sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw==} +======= + '@eslint/js@9.29.0': + resolution: {integrity: sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==} +>>>>>>> c7bb80d engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/object-schema@2.1.6': @@ -981,17 +1569,27 @@ packages: resolution: {integrity: sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} +<<<<<<< HEAD '@eslint/plugin-kit@0.3.5': resolution: {integrity: sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@expo/cli@0.24.21': resolution: {integrity: sha512-DT6K9vgFHqqWL/19mU1ofRcPoO1pn4qmgi76GtuiNU4tbBe/02mRHwFsQw7qRfFAT28If5e/wiwVozgSuZVL8g==} +======= + '@eslint/plugin-kit@0.3.2': + resolution: {integrity: sha512-4SaFZCNfJqvk/kenHpI8xvN42DMaoycy4PzKc5otHxRswww1kAt82OlBuwRVLofCACCTZEcla2Ydxv8scMXaTg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@expo/cli@0.24.15': + resolution: {integrity: sha512-RDZS30OSnbXkSPnBXdyPL29KbltjOmegE23bZZDiGV23WOReWcPgRc5U7Fd8eLPhtRjHBKlBpNJMTed5Ntr/uw==} +>>>>>>> c7bb80d hasBin: true '@expo/code-signing-certificates@0.0.5': resolution: {integrity: sha512-BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw==} +<<<<<<< HEAD '@expo/config-plugins@10.1.2': resolution: {integrity: sha512-IMYCxBOcnuFStuK0Ay+FzEIBKrwW8OVUMc65+v0+i7YFIIe8aL342l7T4F8lR4oCfhXn7d6M5QPgXvjtc/gAcw==} @@ -1000,10 +1598,24 @@ packages: '@expo/config@11.0.13': resolution: {integrity: sha512-TnGb4u/zUZetpav9sx/3fWK71oCPaOjZHoVED9NaEncktAd0Eonhq5NUghiJmkUGt3gGSjRAEBXiBbbY9/B1LA==} +======= + '@expo/config-plugins@10.0.2': + resolution: {integrity: sha512-TzUn3pPdpwCS0yYaSlZOClgDmCX8N4I2lfgitX5oStqmvpPtB+vqtdyqsVM02fQ2tlJIAqwBW+NHaHqqy8Jv7g==} + + '@expo/config-plugins@10.0.3': + resolution: {integrity: sha512-fjCckkde67pSDf48x7wRuPsgQVIqlDwN7NlOk9/DFgQ1hCH0L5pGqoSmikA1vtAyiA83MOTpkGl3F3wyATyUog==} + + '@expo/config-types@53.0.4': + resolution: {integrity: sha512-0s+9vFx83WIToEr0Iwy4CcmiUXa5BgwBmEjylBB2eojX5XAMm9mJvw9KpjAb8m7zq2G0Q6bRbeufkzgbipuNQg==} + + '@expo/config@11.0.10': + resolution: {integrity: sha512-8S8Krr/c5lnl0eF03tA2UGY9rGBhZcbWKz2UWw5dpL/+zstwUmog8oyuuC8aRcn7GiTQLlbBkxcMeT8sOGlhbA==} +>>>>>>> c7bb80d '@expo/devcert@1.1.4': resolution: {integrity: sha512-fqBODr8c72+gBSX5Ty3SIzaY4bXainlpab78+vEYEKL3fXmsOswMLf0+KE36mUEAa36BYabX7K3EiXOXX5OPMw==} +<<<<<<< HEAD '@expo/env@1.0.7': resolution: {integrity: sha512-qSTEnwvuYJ3umapO9XJtrb1fAqiPlmUUg78N0IZXXGwQRt+bkp0OBls+Y5Mxw/Owj8waAM0Z3huKKskRADR5ow==} @@ -1022,12 +1634,30 @@ packages: '@expo/metro-config@0.20.17': resolution: {integrity: sha512-lpntF2UZn5bTwrPK6guUv00Xv3X9mkN3YYla+IhEHiYXWyG7WKOtDU0U4KR8h3ubkZ6SPH3snDyRyAzMsWtZFA==} +======= + '@expo/env@1.0.5': + resolution: {integrity: sha512-dtEZ4CAMaVrFu2+tezhU3FoGWtbzQl50xV+rNJE5lYVRjUflWiZkVHlHkWUlPAwDPifLy4TuissVfScGGPWR5g==} + + '@expo/fingerprint@0.13.1': + resolution: {integrity: sha512-MgZ5uIvvwAnjWeQoj4D3RnBXjD1GNOpCvhp2jtZWdQ8yEokhDEJGoHjsMT8/NCB5m2fqP5sv2V5nPzC7CN1YjQ==} + hasBin: true + + '@expo/image-utils@0.7.4': + resolution: {integrity: sha512-LcZ82EJy/t/a1avwIboeZbO6hlw8CvsIRh2k6SWPcAOvW0RqynyKFzUJsvnjWlhUzfBEn4oI7y/Pu5Xkw3KkkA==} + + '@expo/json-file@9.1.4': + resolution: {integrity: sha512-7Bv86X27fPERGhw8aJEZvRcH9sk+9BenDnEmrI3ZpywKodYSBgc8lX9Y32faNVQ/p0YbDK9zdJ0BfAKNAOyi0A==} + + '@expo/metro-config@0.20.15': + resolution: {integrity: sha512-m8i58IQ7I8iOdVRfOhFmhPMHuhgeTVfQp1+mxW7URqPZaeVbuDVktPqOiNoHraKBoGPLKMUSsD+qdUuJVL3wMg==} +>>>>>>> c7bb80d '@expo/metro-runtime@5.0.4': resolution: {integrity: sha512-r694MeO+7Vi8IwOsDIDzH/Q5RPMt1kUDYbiTJwnO15nIqiDwlE8HU55UlRhffKZy6s5FmxQsZ8HA+T8DqUW8cQ==} peerDependencies: react-native: '*' +<<<<<<< HEAD '@expo/osascript@2.3.7': resolution: {integrity: sha512-IClSOXxR0YUFxIriUJVqyYki7lLMIHrrzOaP01yxAL1G8pj2DWV5eW1y5jSzIcIfSCNhtGsshGd1tU/AYup5iQ==} engines: {node: '>=12'} @@ -1043,12 +1673,34 @@ packages: '@expo/schema-utils@0.1.7': resolution: {integrity: sha512-jWHoSuwRb5ZczjahrychMJ3GWZu54jK9ulNdh1d4OzAEq672K9E5yOlnlBsfIHWHGzUAT+0CL7Yt1INiXTz68g==} +======= + '@expo/osascript@2.2.4': + resolution: {integrity: sha512-Q+Oyj+1pdRiHHpev9YjqfMZzByFH8UhKvSszxa0acTveijjDhQgWrq4e9T/cchBHi0GWZpGczWyiyJkk1wM1dg==} + engines: {node: '>=12'} + + '@expo/package-manager@1.8.4': + resolution: {integrity: sha512-8H8tLga/NS3iS7QaX/NneRPqbObnHvVCfMCo0ShudreOFmvmgqhYjRlkZTRstSyFqefai8ONaT4VmnLHneRYYg==} + + '@expo/plist@0.3.4': + resolution: {integrity: sha512-MhBLaUJNe9FQDDU2xhSNS4SAolr6K2wuyi4+A79vYuXLkAoICsbTwcGEQJN5jPY6D9izO/jsXh5k0h+mIWQMdw==} + + '@expo/prebuild-config@9.0.6': + resolution: {integrity: sha512-HDTdlMkTQZ95rd6EpvuLM+xkZV03yGLc38FqI37qKFLJtUN1WnYVaWsuXKoljd1OrVEVsHe6CfqKwaPZ52D56Q==} + + '@expo/prebuild-config@9.0.7': + resolution: {integrity: sha512-1w5MBp6NdF51gPGp0HsCZt0QC82hZWo37wI9HfxhdQF/sN/92Mh4t30vaY7gjHe71T5QNyab00oxZH/wP0MDgQ==} +>>>>>>> c7bb80d '@expo/sdk-runtime-versions@1.0.0': resolution: {integrity: sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ==} +<<<<<<< HEAD '@expo/server@0.6.3': resolution: {integrity: sha512-Ea7NJn9Xk1fe4YeJ86rObHSv/bm3u/6WiQPXEqXJ2GrfYpVab2Swoh9/PnSM3KjR64JAgKjArDn1HiPjITCfHA==} +======= + '@expo/server@0.6.2': + resolution: {integrity: sha512-ko+dq+1WEC126/iGVv3g+ChFCs9wGyKtGlnYphwrOQbFBBqX19sn6UV0oUks6UdhD+MyzUv+w/TOdktdcI0Cgg==} +>>>>>>> c7bb80d '@expo/spawn-async@1.7.2': resolution: {integrity: sha512-QdWi16+CHB9JYP7gma19OVVg0BFkvU8zNj9GjWorYI8Iv8FUxjOCcYRuAmX4s/h91e4e7BPsskc8cSrZYho9Ew==} @@ -1109,18 +1761,34 @@ packages: resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} +<<<<<<< HEAD '@humanfs/node@0.16.7': resolution: {integrity: sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==} +======= + '@humanfs/node@0.16.6': + resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==} +>>>>>>> c7bb80d engines: {node: '>=18.18.0'} '@humanwhocodes/module-importer@1.0.1': resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} engines: {node: '>=12.22'} +<<<<<<< HEAD + '@humanwhocodes/retry@0.4.3': + resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==} + engines: {node: '>=18.18'} + +======= + '@humanwhocodes/retry@0.3.1': + resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==} + engines: {node: '>=18.18'} + '@humanwhocodes/retry@0.4.3': resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==} engines: {node: '>=18.18'} +>>>>>>> c7bb80d '@inquirer/figures@1.0.8': resolution: {integrity: sha512-tKd+jsmhq21AP1LhexC0pPwsCxEhGgAkg28byjJAd+xhmIs8LUX8JbUc3vBf3PhLxWiB5EvyBE5X7JSPAqMAqg==} engines: {node: '>=18'} @@ -1407,6 +2075,7 @@ packages: '@jridgewell/trace-mapping@0.3.25': resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} +<<<<<<< HEAD '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} @@ -1417,6 +2086,8 @@ packages: '@tanstack/query-core': '>= 4.0.0' '@tanstack/react-query': '>= 4.0.0' +======= +>>>>>>> c7bb80d '@motionone/animation@10.18.0': resolution: {integrity: sha512-9z2p5GFGCm0gBsZbi8rVMOAJCtw1WqBTIPw3ozk06gDvZInBPIsQcHgYogEJ4yuHJ+akuW8g1SEIOpTOvYs8hw==} @@ -1435,8 +2106,13 @@ packages: '@motionone/utils@10.18.0': resolution: {integrity: sha512-3XVF7sgyTSI2KWvTf6uLlBJ5iAgRgmvp3bpuOiQJvInd4nZ19ET8lX5unn30SlmRH7hXbBbH+Gxd0m0klJ3Xtw==} +<<<<<<< HEAD '@napi-rs/wasm-runtime@0.2.12': resolution: {integrity: sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==} +======= + '@napi-rs/wasm-runtime@0.2.11': + resolution: {integrity: sha512-9DPkXtvHydrcOsopiYpUgPHpmj0HWZKMUnL2dZqpvC42lsratuBG06V5ipyno0fUek5VlFsNQ+AcFATSrJXgMA==} +>>>>>>> c7bb80d '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} @@ -1458,8 +2134,13 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} +<<<<<<< HEAD '@pkgr/core@0.2.9': resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==} +======= + '@pkgr/core@0.2.7': + resolution: {integrity: sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==} +>>>>>>> c7bb80d engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} '@pnpm/config.env-replace@1.1.0': @@ -1492,6 +2173,7 @@ packages: '@types/react': optional: true +<<<<<<< HEAD '@react-native/assets-registry@0.79.5': resolution: {integrity: sha512-N4Kt1cKxO5zgM/BLiyzuuDNquZPiIgfktEQ6TqJ/4nKA8zr4e8KJgU6Tb2eleihDO4E24HmkvGc73naybKRz/w==} engines: {node: '>=18'} @@ -1502,16 +2184,34 @@ packages: '@react-native/babel-preset@0.79.6': resolution: {integrity: sha512-H+FRO+r2Ql6b5IwfE0E7D52JhkxjeGSBSUpCXAI5zQ60zSBJ54Hwh2bBJOohXWl4J+C7gKYSAd2JHMUETu+c/A==} +======= + '@react-native/assets-registry@0.79.4': + resolution: {integrity: sha512-7PjHNRtYlc36B7P1PHme8ZV0ZJ/xsA/LvMoXe6EX++t7tSPJ8iYCMBryZhcdnztgce73b94Hfx6TTGbLF+xtUg==} + engines: {node: '>=18'} + + '@react-native/babel-plugin-codegen@0.79.4': + resolution: {integrity: sha512-quhytIlDedR3ircRwifa22CaWVUVnkxccrrgztroCZaemSJM+HLurKJrjKWm0J5jV9ed+d+9Qyb1YB0syTHDjg==} + engines: {node: '>=18'} + + '@react-native/babel-preset@0.79.4': + resolution: {integrity: sha512-El9JvYKiNfnkQ3qR7zJvvRdP3DX2i4BGYlIricWQishI3gWAfm88FQYFC2CcGoMQWJQEPN4jnDMpoISAJDEN4g==} +>>>>>>> c7bb80d engines: {node: '>=18'} peerDependencies: '@babel/core': '*' +<<<<<<< HEAD '@react-native/codegen@0.79.5': resolution: {integrity: sha512-FO5U1R525A1IFpJjy+KVznEinAgcs3u7IbnbRJUG9IH/MBXi2lEU2LtN+JarJ81MCfW4V2p0pg6t/3RGHFRrlQ==} +======= + '@react-native/codegen@0.79.4': + resolution: {integrity: sha512-K0moZDTJtqZqSs+u9tnDPSxNsdxi5irq8Nu4mzzOYlJTVNGy5H9BiIDg/NeKGfjAdo43yTDoaPSbUCvVV8cgIw==} +>>>>>>> c7bb80d engines: {node: '>=18'} peerDependencies: '@babel/core': '*' +<<<<<<< HEAD '@react-native/codegen@0.79.6': resolution: {integrity: sha512-iRBX8Lgbqypwnfba7s6opeUwVyaR23mowh9ILw7EcT2oLz3RqMmjJdrbVpWhGSMGq2qkPfqAH7bhO8C7O+xfjQ==} engines: {node: '>=18'} @@ -1522,11 +2222,18 @@ packages: resolution: {integrity: sha512-ApLO1ARS8JnQglqS3JAHk0jrvB+zNW3dvNJyXPZPoygBpZVbf8sjvqeBiaEYpn8ETbFWddebC4HoQelDndnrrA==} engines: {node: '>=18'} peerDependencies: +======= + '@react-native/community-cli-plugin@0.79.4': + resolution: {integrity: sha512-lx1RXEJwU9Tcs2B2uiDZBa6yghU6m6STvwYqHbJlFZyNN1k3JRa9j0/CDu+0fCFacIn7rEfZpb4UWi5YhsHpQg==} + engines: {node: '>=18'} + peerDependencies: +>>>>>>> c7bb80d '@react-native-community/cli': '*' peerDependenciesMeta: '@react-native-community/cli': optional: true +<<<<<<< HEAD '@react-native/debugger-frontend@0.79.5': resolution: {integrity: sha512-WQ49TRpCwhgUYo5/n+6GGykXmnumpOkl4Lr2l2o2buWU9qPOwoiBqJAtmWEXsAug4ciw3eLiVfthn5ufs0VB0A==} engines: {node: '>=18'} @@ -1549,11 +2256,28 @@ packages: '@react-native/js-polyfills@0.79.5': resolution: {integrity: sha512-a2wsFlIhvd9ZqCD5KPRsbCQmbZi6KxhRN++jrqG0FUTEV5vY7MvjjUqDILwJd2ZBZsf7uiDuClCcKqA+EEdbvw==} +======= + '@react-native/debugger-frontend@0.79.4': + resolution: {integrity: sha512-Gg4LhxHIK86Bi2RiT1rbFAB6fuwANRsaZJ1sFZ1OZEMQEx6stEnzaIrmfgzcv4z0bTQdQ8lzCrpsz0qtdaD4eA==} + engines: {node: '>=18'} + + '@react-native/dev-middleware@0.79.4': + resolution: {integrity: sha512-OWRDNkgrFEo+OSC5QKfiiBmGXKoU8gmIABK8rj2PkgwisFQ/22p7MzE5b6oB2lxWaeJT7jBX5KVniNqO46VhHA==} + engines: {node: '>=18'} + + '@react-native/gradle-plugin@0.79.4': + resolution: {integrity: sha512-Gv5ryy23k7Sib2xVgqw65GTryg9YTij6URcMul5cI7LRcW0Aa1/FPb26l388P4oeNGNdDoAkkS+CuCWNunRuWg==} + engines: {node: '>=18'} + + '@react-native/js-polyfills@0.79.4': + resolution: {integrity: sha512-VyKPo/l9zP4+oXpQHrJq4vNOtxF7F5IMdQmceNzTnRpybRvGGgO/9jYu9mdmdKRO2KpQEc5dB4W2rYhVKdGNKg==} +>>>>>>> c7bb80d engines: {node: '>=18'} '@react-native/normalize-colors@0.74.88': resolution: {integrity: sha512-He5oTwPBxvXrxJ91dZzpxR7P+VYmc9IkJfhuH8zUiU50ckrt+xWNjtVugPdUv4LuVjmZ36Vk2EX8bl1gVn2dVA==} +<<<<<<< HEAD '@react-native/normalize-colors@0.79.5': resolution: {integrity: sha512-nGXMNMclZgzLUxijQQ38Dm3IAEhgxuySAWQHnljFtfB0JdaMwpe0Ox9H7Tp2OgrEA+EMEv+Od9ElKlHwGKmmvQ==} @@ -1562,6 +2286,16 @@ packages: '@react-native/virtualized-lists@0.79.5': resolution: {integrity: sha512-EUPM2rfGNO4cbI3olAbhPkIt3q7MapwCwAJBzUfWlZ/pu0PRNOnMQ1IvaXTf3TpeozXV52K1OdprLEI/kI5eUA==} +======= + '@react-native/normalize-colors@0.79.2': + resolution: {integrity: sha512-+b+GNrupWrWw1okHnEENz63j7NSMqhKeFMOyzYLBwKcprG8fqJQhDIGXfizKdxeIa5NnGSAevKL1Ev1zJ56X8w==} + + '@react-native/normalize-colors@0.79.4': + resolution: {integrity: sha512-247/8pHghbYY2wKjJpUsY6ZNbWcdUa5j5517LZMn6pXrbSSgWuj3JA4OYibNnocCHBaVrt+3R8XC3VEJqLlHFg==} + + '@react-native/virtualized-lists@0.79.4': + resolution: {integrity: sha512-0Mdcox6e5PTonuM1WIo3ks7MBAa3IDzj0pKnE5xAwSgQ0DJW2P5dYf+KjWmpkE+Yb0w41ZbtXPhKq+U2JJ6C/Q==} +>>>>>>> c7bb80d engines: {node: '>=18'} peerDependencies: '@types/react': ^19.0.0 @@ -1580,8 +2314,13 @@ packages: react-native-safe-area-context: '>= 4.0.0' react-native-screens: '>= 4.0.0' +<<<<<<< HEAD '@react-navigation/core@7.12.4': resolution: {integrity: sha512-xLFho76FA7v500XID5z/8YfGTvjQPw7/fXsq4BIrVSqetNe/o/v+KAocEw4ots6kyv3XvSTyiWKh2g3pN6xZ9Q==} +======= + '@react-navigation/core@7.10.1': + resolution: {integrity: sha512-6+bdalOqfDzc968s3Xz7VaUpPzMKzVay48dW+C/cd6sga01Iqjp4XAzQ7FNHdT7wgJYdvZaBOAlyvnok0OsFZw==} +>>>>>>> c7bb80d peerDependencies: react: '>= 18.2.0' @@ -1612,8 +2351,13 @@ packages: react: '>= 18.2.0' react-native: '*' +<<<<<<< HEAD '@react-navigation/routers@7.5.1': resolution: {integrity: sha512-pxipMW/iEBSUrjxz2cDD7fNwkqR4xoi0E/PcfTQGCcdJwLoaxzab5kSadBLj1MTJyT0YRrOXL9umHpXtp+Dv4w==} +======= + '@react-navigation/routers@7.4.1': + resolution: {integrity: sha512-42mZrMzQ0LfKxUb5OHIurYrPYyRsXFLolucILrvm21f0O40Sw0Ufh1bnn/jRqnxZZu7wvpUGIGYM8nS9zVE1Aw==} +>>>>>>> c7bb80d '@rtsao/scc@1.1.0': resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==} @@ -1646,6 +2390,7 @@ packages: '@sinonjs/fake-timers@10.3.0': resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==} +<<<<<<< HEAD '@tanstack/eslint-plugin-query@5.89.0': resolution: {integrity: sha512-vz8TEuw9GO0xXIdreMpcofvOY17T3cjgob9bSFln8yQsKsbsUvtpvV3F8pVC3tZEDq0IwO++3/e0/+7YKEarNA==} peerDependencies: @@ -1654,6 +2399,11 @@ packages: '@tanstack/query-core@5.52.0': resolution: {integrity: sha512-U1DOEgltjUwalN6uWYTewSnA14b+tE7lSylOiASKCAO61ENJeCq9VVD/TXHA6O5u9+6v5+UgGYBSccTKDoyMqw==} +======= + '@tanstack/query-core@5.52.0': + resolution: {integrity: sha512-U1DOEgltjUwalN6uWYTewSnA14b+tE7lSylOiASKCAO61ENJeCq9VVD/TXHA6O5u9+6v5+UgGYBSccTKDoyMqw==} + +>>>>>>> c7bb80d '@tanstack/react-query@5.52.1': resolution: {integrity: sha512-soyn4dNIUZ8US8NaPVXv06gkZFHaZnPfKWPDjRJjFRW3Y7WZ0jx72eT6zhw3VQlkMPysmXye8l35ewPHspKgbQ==} peerDependencies: @@ -1697,8 +2447,13 @@ packages: resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==} engines: {node: '>= 10'} +<<<<<<< HEAD '@tybys/wasm-util@0.10.1': resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} +======= + '@tybys/wasm-util@0.9.0': + resolution: {integrity: sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==} +>>>>>>> c7bb80d '@types/babel__core@7.20.5': resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==} @@ -1787,6 +2542,7 @@ packages: '@types/yargs@17.0.33': resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==} +<<<<<<< HEAD '@typescript-eslint/eslint-plugin@8.44.0': resolution: {integrity: sha512-EGDAOGX+uwwekcS0iyxVDmRV9HX6FLSM5kzrAToLTsr9OWCIKG/y3lQheCq18yZ5Xh78rRKJiEpP0ZaCs4ryOQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -1938,65 +2694,218 @@ packages: '@unrs/resolver-binding-win32-x64-msvc@1.11.1': resolution: {integrity: sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==} - cpu: [x64] - os: [win32] +======= + '@typescript-eslint/eslint-plugin@8.34.0': + resolution: {integrity: sha512-QXwAlHlbcAwNlEEMKQS2RCgJsgXrTJdjXT08xEgbPFa2yYQgVjBymxP5DrfrE7X7iodSzd9qBUHUycdyVJTW1w==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + '@typescript-eslint/parser': ^8.34.0 + eslint: ^8.57.0 || ^9.0.0 + typescript: '>=4.8.4 <5.9.0' - '@urql/core@5.0.8': - resolution: {integrity: sha512-1GOnUw7/a9bzkcM0+U8U5MmxW2A7FE5YquuEmcJzTtW5tIs2EoS4F2ITpuKBjRBbyRjZgO860nWFPo1m4JImGA==} + '@typescript-eslint/parser@8.34.0': + resolution: {integrity: sha512-vxXJV1hVFx3IXz/oy2sICsJukaBrtDEQSBiV48/YIV5KWjX1dO+bcIr/kCPrW6weKXvsaGKFNlwH0v2eYdRRbA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: '>=4.8.4 <5.9.0' - '@urql/exchange-retry@1.3.0': - resolution: {integrity: sha512-FLt+d81gP4oiHah4hWFDApimc+/xABWMU1AMYsZ1PVB0L0YPtrMCjbOp9WMM7hBzy4gbTDrG24sio0dCfSh/HQ==} + '@typescript-eslint/project-service@8.34.0': + resolution: {integrity: sha512-iEgDALRf970/B2YExmtPMPF54NenZUf4xpL3wsCRx/lgjz6ul/l13R81ozP/ZNuXfnLCS+oPmG7JIxfdNYKELw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@urql/core': ^5.0.0 + typescript: '>=4.8.4 <5.9.0' - '@webassemblyjs/ast@1.14.1': - resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==} + '@typescript-eslint/scope-manager@8.34.0': + resolution: {integrity: sha512-9Ac0X8WiLykl0aj1oYQNcLZjHgBojT6cW68yAgZ19letYu+Hxd0rE0veI1XznSSst1X5lwnxhPbVdwjDRIomRw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@webassemblyjs/floating-point-hex-parser@1.13.2': - resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==} + '@typescript-eslint/tsconfig-utils@8.34.0': + resolution: {integrity: sha512-+W9VYHKFIzA5cBeooqQxqNriAP0QeQ7xTiDuIOr71hzgffm3EL2hxwWBIIj4GuofIbKxGNarpKqIq6Q6YrShOA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <5.9.0' - '@webassemblyjs/helper-api-error@1.13.2': - resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==} + '@typescript-eslint/type-utils@8.34.0': + resolution: {integrity: sha512-n7zSmOcUVhcRYC75W2pnPpbO1iwhJY3NLoHEtbJwJSNlVAZuwqu05zY3f3s2SDWWDSo9FdN5szqc73DCtDObAg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: '>=4.8.4 <5.9.0' - '@webassemblyjs/helper-buffer@1.14.1': - resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==} + '@typescript-eslint/types@8.34.0': + resolution: {integrity: sha512-9V24k/paICYPniajHfJ4cuAWETnt7Ssy+R0Rbcqo5sSFr3QEZ/8TSoUi9XeXVBGXCaLtwTOKSLGcInCAvyZeMA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@webassemblyjs/helper-numbers@1.13.2': - resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==} + '@typescript-eslint/typescript-estree@8.34.0': + resolution: {integrity: sha512-rOi4KZxI7E0+BMqG7emPSK1bB4RICCpF7QD3KCLXn9ZvWoESsOMlHyZPAHyG04ujVplPaHbmEvs34m+wjgtVtg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <5.9.0' - '@webassemblyjs/helper-wasm-bytecode@1.13.2': - resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==} + '@typescript-eslint/utils@8.34.0': + resolution: {integrity: sha512-8L4tWatGchV9A1cKbjaavS6mwYwp39jql8xUmIIKJdm+qiaeHy5KMKlBrf30akXAWBzn2SqKsNOtSENWUwg7XQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: '>=4.8.4 <5.9.0' - '@webassemblyjs/helper-wasm-section@1.14.1': - resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==} + '@typescript-eslint/visitor-keys@8.34.0': + resolution: {integrity: sha512-qHV7pW7E85A0x6qyrFn+O+q1k1p3tQCsqIZ1KZ5ESLXY57aTvUd3/a4rdPTeXisvhXn2VQG0VSKUqs8KHF2zcA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@webassemblyjs/ieee754@1.13.2': - resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==} + '@unrs/resolver-binding-android-arm-eabi@1.9.0': + resolution: {integrity: sha512-h1T2c2Di49ekF2TE8ZCoJkb+jwETKUIPDJ/nO3tJBKlLFPu+fyd93f0rGP/BvArKx2k2HlRM4kqkNarj3dvZlg==} + cpu: [arm] + os: [android] - '@webassemblyjs/leb128@1.13.2': - resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==} + '@unrs/resolver-binding-android-arm64@1.9.0': + resolution: {integrity: sha512-sG1NHtgXtX8owEkJ11yn34vt0Xqzi3k9TJ8zppDmyG8GZV4kVWw44FHwKwHeEFl07uKPeC4ZoyuQaGh5ruJYPA==} + cpu: [arm64] + os: [android] - '@webassemblyjs/utf8@1.13.2': - resolution: {integrity: sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==} + '@unrs/resolver-binding-darwin-arm64@1.9.0': + resolution: {integrity: sha512-nJ9z47kfFnCxN1z/oYZS7HSNsFh43y2asePzTEZpEvK7kGyuShSl3RRXnm/1QaqFL+iP+BjMwuB+DYUymOkA5A==} + cpu: [arm64] + os: [darwin] - '@webassemblyjs/wasm-edit@1.14.1': - resolution: {integrity: sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==} + '@unrs/resolver-binding-darwin-x64@1.9.0': + resolution: {integrity: sha512-TK+UA1TTa0qS53rjWn7cVlEKVGz2B6JYe0C++TdQjvWYIyx83ruwh0wd4LRxYBM5HeuAzXcylA9BH2trARXJTw==} + cpu: [x64] + os: [darwin] - '@webassemblyjs/wasm-gen@1.14.1': - resolution: {integrity: sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==} + '@unrs/resolver-binding-freebsd-x64@1.9.0': + resolution: {integrity: sha512-6uZwzMRFcD7CcCd0vz3Hp+9qIL2jseE/bx3ZjaLwn8t714nYGwiE84WpaMCYjU+IQET8Vu/+BNAGtYD7BG/0yA==} + cpu: [x64] + os: [freebsd] - '@webassemblyjs/wasm-opt@1.14.1': - resolution: {integrity: sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==} + '@unrs/resolver-binding-linux-arm-gnueabihf@1.9.0': + resolution: {integrity: sha512-bPUBksQfrgcfv2+mm+AZinaKq8LCFvt5PThYqRotqSuuZK1TVKkhbVMS/jvSRfYl7jr3AoZLYbDkItxgqMKRkg==} + cpu: [arm] + os: [linux] - '@webassemblyjs/wasm-parser@1.14.1': - resolution: {integrity: sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==} + '@unrs/resolver-binding-linux-arm-musleabihf@1.9.0': + resolution: {integrity: sha512-uT6E7UBIrTdCsFQ+y0tQd3g5oudmrS/hds5pbU3h4s2t/1vsGWbbSKhBSCD9mcqaqkBwoqlECpUrRJCmldl8PA==} + cpu: [arm] + os: [linux] - '@webassemblyjs/wast-printer@1.14.1': - resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==} + '@unrs/resolver-binding-linux-arm64-gnu@1.9.0': + resolution: {integrity: sha512-vdqBh911wc5awE2bX2zx3eflbyv8U9xbE/jVKAm425eRoOVv/VseGZsqi3A3SykckSpF4wSROkbQPvbQFn8EsA==} + cpu: [arm64] + os: [linux] - '@xmldom/xmldom@0.8.10': - resolution: {integrity: sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==} - engines: {node: '>=10.0.0'} + '@unrs/resolver-binding-linux-arm64-musl@1.9.0': + resolution: {integrity: sha512-/8JFZ/SnuDr1lLEVsxsuVwrsGquTvT51RZGvyDB/dOK3oYK2UqeXzgeyq6Otp8FZXQcEYqJwxb9v+gtdXn03eQ==} + cpu: [arm64] + os: [linux] + + '@unrs/resolver-binding-linux-ppc64-gnu@1.9.0': + resolution: {integrity: sha512-FkJjybtrl+rajTw4loI3L6YqSOpeZfDls4SstL/5lsP2bka9TiHUjgMBjygeZEis1oC8LfJTS8FSgpKPaQx2tQ==} + cpu: [ppc64] + os: [linux] + + '@unrs/resolver-binding-linux-riscv64-gnu@1.9.0': + resolution: {integrity: sha512-w/NZfHNeDusbqSZ8r/hp8iL4S39h4+vQMc9/vvzuIKMWKppyUGKm3IST0Qv0aOZ1rzIbl9SrDeIqK86ZpUK37w==} + cpu: [riscv64] + os: [linux] + + '@unrs/resolver-binding-linux-riscv64-musl@1.9.0': + resolution: {integrity: sha512-bEPBosut8/8KQbUixPry8zg/fOzVOWyvwzOfz0C0Rw6dp+wIBseyiHKjkcSyZKv/98edrbMknBaMNJfA/UEdqw==} + cpu: [riscv64] + os: [linux] + + '@unrs/resolver-binding-linux-s390x-gnu@1.9.0': + resolution: {integrity: sha512-LDtMT7moE3gK753gG4pc31AAqGUC86j3AplaFusc717EUGF9ZFJ356sdQzzZzkBk1XzMdxFyZ4f/i35NKM/lFA==} + cpu: [s390x] + os: [linux] + + '@unrs/resolver-binding-linux-x64-gnu@1.9.0': + resolution: {integrity: sha512-WmFd5KINHIXj8o1mPaT8QRjA9HgSXhN1gl9Da4IZihARihEnOylu4co7i/yeaIpcfsI6sYs33cNZKyHYDh0lrA==} + cpu: [x64] + os: [linux] + + '@unrs/resolver-binding-linux-x64-musl@1.9.0': + resolution: {integrity: sha512-CYuXbANW+WgzVRIl8/QvZmDaZxrqvOldOwlbUjIM4pQ46FJ0W5cinJ/Ghwa/Ng1ZPMJMk1VFdsD/XwmCGIXBWg==} + cpu: [x64] + os: [linux] + + '@unrs/resolver-binding-wasm32-wasi@1.9.0': + resolution: {integrity: sha512-6Rp2WH0OoitMYR57Z6VE8Y6corX8C6QEMWLgOV6qXiJIeZ1F9WGXY/yQ8yDC4iTraotyLOeJ2Asea0urWj2fKQ==} + engines: {node: '>=14.0.0'} + cpu: [wasm32] + + '@unrs/resolver-binding-win32-arm64-msvc@1.9.0': + resolution: {integrity: sha512-rknkrTRuvujprrbPmGeHi8wYWxmNVlBoNW8+4XF2hXUnASOjmuC9FNF1tGbDiRQWn264q9U/oGtixyO3BT8adQ==} + cpu: [arm64] + os: [win32] + + '@unrs/resolver-binding-win32-ia32-msvc@1.9.0': + resolution: {integrity: sha512-Ceymm+iBl+bgAICtgiHyMLz6hjxmLJKqBim8tDzpX61wpZOx2bPK6Gjuor7I2RiUynVjvvkoRIkrPyMwzBzF3A==} + cpu: [ia32] + os: [win32] + + '@unrs/resolver-binding-win32-x64-msvc@1.9.0': + resolution: {integrity: sha512-k59o9ZyeyS0hAlcaKFezYSH2agQeRFEB7KoQLXl3Nb3rgkqT1NY9Vwy+SqODiLmYnEjxWJVRE/yq2jFVqdIxZw==} +>>>>>>> c7bb80d + cpu: [x64] + os: [win32] + + '@urql/core@5.0.8': + resolution: {integrity: sha512-1GOnUw7/a9bzkcM0+U8U5MmxW2A7FE5YquuEmcJzTtW5tIs2EoS4F2ITpuKBjRBbyRjZgO860nWFPo1m4JImGA==} + + '@urql/exchange-retry@1.3.0': + resolution: {integrity: sha512-FLt+d81gP4oiHah4hWFDApimc+/xABWMU1AMYsZ1PVB0L0YPtrMCjbOp9WMM7hBzy4gbTDrG24sio0dCfSh/HQ==} + peerDependencies: + '@urql/core': ^5.0.0 + + '@webassemblyjs/ast@1.14.1': + resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==} + + '@webassemblyjs/floating-point-hex-parser@1.13.2': + resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==} + + '@webassemblyjs/helper-api-error@1.13.2': + resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==} + + '@webassemblyjs/helper-buffer@1.14.1': + resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==} + + '@webassemblyjs/helper-numbers@1.13.2': + resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==} + + '@webassemblyjs/helper-wasm-bytecode@1.13.2': + resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==} + + '@webassemblyjs/helper-wasm-section@1.14.1': + resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==} + + '@webassemblyjs/ieee754@1.13.2': + resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==} + + '@webassemblyjs/leb128@1.13.2': + resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==} + + '@webassemblyjs/utf8@1.13.2': + resolution: {integrity: sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==} + + '@webassemblyjs/wasm-edit@1.14.1': + resolution: {integrity: sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==} + + '@webassemblyjs/wasm-gen@1.14.1': + resolution: {integrity: sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==} + + '@webassemblyjs/wasm-opt@1.14.1': + resolution: {integrity: sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==} + + '@webassemblyjs/wasm-parser@1.14.1': + resolution: {integrity: sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==} + + '@webassemblyjs/wast-printer@1.14.1': + resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==} + + '@xmldom/xmldom@0.8.10': + resolution: {integrity: sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==} + engines: {node: '>=10.0.0'} '@xtuc/ieee754@1.2.0': resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} @@ -2050,19 +2959,41 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} +<<<<<<< HEAD agent-base@7.1.4: resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==} +======= + agent-base@7.1.3: + resolution: {integrity: sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==} +>>>>>>> c7bb80d engines: {node: '>= 14'} aggregate-error@4.0.1: resolution: {integrity: sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==} engines: {node: '>=12'} + ajv-keywords@3.5.2: + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: +<<<<<<< HEAD + ajv: ^6.9.1 +======= + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + ajv-keywords@3.5.2: resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} peerDependencies: ajv: ^6.9.1 + ajv-keywords@5.1.0: + resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} + peerDependencies: + ajv: ^8.8.2 +>>>>>>> c7bb80d + ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} @@ -2184,6 +3115,10 @@ packages: resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==} engines: {node: '>= 0.4'} + array-buffer-byte-length@1.0.2: + resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==} + engines: {node: '>= 0.4'} + array-ify@1.0.0: resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==} @@ -2210,6 +3145,10 @@ packages: resolution: {integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==} engines: {node: '>= 0.4'} + array.prototype.flatmap@1.3.3: + resolution: {integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==} + engines: {node: '>= 0.4'} + array.prototype.tosorted@1.1.4: resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==} engines: {node: '>= 0.4'} @@ -2218,6 +3157,10 @@ packages: resolution: {integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==} engines: {node: '>= 0.4'} + arraybuffer.prototype.slice@1.0.4: + resolution: {integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==} + engines: {node: '>= 0.4'} + asap@2.0.6: resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==} @@ -2254,8 +3197,13 @@ packages: babel-plugin-module-resolver@5.0.2: resolution: {integrity: sha512-9KtaCazHee2xc0ibfqsDeamwDps6FZNo5S0Q81dUqEuFzVwPhcT4J5jOqIVvgCA3Q/wO9hKYxN/Ds3tIsp5ygg==} +<<<<<<< HEAD babel-plugin-polyfill-corejs2@0.4.14: resolution: {integrity: sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==} +======= + babel-plugin-polyfill-corejs2@0.4.12: + resolution: {integrity: sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==} +>>>>>>> c7bb80d peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 @@ -2264,8 +3212,13 @@ packages: peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 +<<<<<<< HEAD babel-plugin-polyfill-regenerator@0.6.5: resolution: {integrity: sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==} +======= + babel-plugin-polyfill-regenerator@0.6.3: + resolution: {integrity: sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==} +>>>>>>> c7bb80d peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 @@ -2283,8 +3236,13 @@ packages: peerDependencies: '@babel/core': ^7.0.0 || ^8.0.0-0 +<<<<<<< HEAD babel-preset-expo@13.2.4: resolution: {integrity: sha512-3IKORo3KR+4qtLdCkZNDj8KeA43oBn7RRQejFGWfiZgu/NeaRUSri8YwYjZqybm7hn3nmMv9OLahlvXBX23o5Q==} +======= + babel-preset-expo@13.2.1: + resolution: {integrity: sha512-Ol3w0uLJNQ5tDfCf4L+IDTDMgJkVMQHhvYqMxs18Ib0DcaBQIfE8mneSSk7FcuI6FS0phw/rZhoEquQh1/Q3wA==} +>>>>>>> c7bb80d peerDependencies: babel-plugin-react-compiler: ^19.0.0-beta-e993439-20250405 peerDependenciesMeta: @@ -2358,8 +3316,13 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true +<<<<<<< HEAD browserslist@4.26.2: resolution: {integrity: sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==} +======= + browserslist@4.25.0: + resolution: {integrity: sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==} +>>>>>>> c7bb80d engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true @@ -2404,6 +3367,14 @@ packages: resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==} engines: {node: '>= 0.4'} + call-bind@1.0.8: + resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==} + engines: {node: '>= 0.4'} + + call-bound@1.0.4: + resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==} + engines: {node: '>= 0.4'} + caller-callsite@2.0.0: resolution: {integrity: sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==} engines: {node: '>=4'} @@ -2439,8 +3410,13 @@ packages: caniuse-lite@1.0.30001680: resolution: {integrity: sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==} +<<<<<<< HEAD caniuse-lite@1.0.30001743: resolution: {integrity: sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==} +======= + caniuse-lite@1.0.30001723: + resolution: {integrity: sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==} +>>>>>>> c7bb80d centra@2.7.0: resolution: {integrity: sha512-PbFMgMSrmgx6uxCdm57RUos9Tc3fclMvhLSATYN39XsDV29B89zZ3KA89jmY0vwSGazyU+uerqwa6t+KaodPcg==} @@ -2507,8 +3483,13 @@ packages: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} +<<<<<<< HEAD ci-info@4.3.0: resolution: {integrity: sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==} +======= + ci-info@4.2.0: + resolution: {integrity: sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==} +>>>>>>> c7bb80d engines: {node: '>=8'} cjs-module-lexer@1.4.1: @@ -2781,10 +3762,31 @@ packages: resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==} engines: {node: '>= 0.4'} +<<<<<<< HEAD + data-view-byte-length@1.0.2: + resolution: {integrity: sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==} + engines: {node: '>= 0.4'} + + data-view-byte-offset@1.0.1: + resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==} +======= + data-view-buffer@1.0.2: + resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==} + engines: {node: '>= 0.4'} + + data-view-byte-length@1.0.1: + resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==} + engines: {node: '>= 0.4'} + data-view-byte-length@1.0.2: resolution: {integrity: sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==} engines: {node: '>= 0.4'} + data-view-byte-offset@1.0.0: + resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + data-view-byte-offset@1.0.1: resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==} engines: {node: '>= 0.4'} @@ -2792,9 +3794,12 @@ packages: date-fns@1.30.1: resolution: {integrity: sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==} +<<<<<<< HEAD dayjs@1.11.18: resolution: {integrity: sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==} +======= +>>>>>>> c7bb80d debug@2.6.9: resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} peerDependencies: @@ -2820,8 +3825,13 @@ packages: supports-color: optional: true +<<<<<<< HEAD debug@4.4.3: resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} +======= + debug@4.4.1: + resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==} +>>>>>>> c7bb80d engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -2982,8 +3992,13 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} +<<<<<<< HEAD electron-to-chromium@1.5.218: resolution: {integrity: sha512-uwwdN0TUHs8u6iRgN8vKeWZMRll4gBkz+QMqdS7DDe49uiK68/UX92lFb61oiFPrpYZNeZIqa4bA7O6Aiasnzg==} +======= + electron-to-chromium@1.5.167: + resolution: {integrity: sha512-LxcRvnYO5ez2bMOFpbuuVuAI5QNeY1ncVytE/KXaL6ZNfzX1yPlAO0nSOyIHx2fVAuUprMqPs/TdVhUFZy7SIQ==} +>>>>>>> c7bb80d electron-to-chromium@1.5.63: resolution: {integrity: sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA==} @@ -3042,6 +4057,13 @@ packages: error-stack-parser@2.1.4: resolution: {integrity: sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==} +<<<<<<< HEAD +======= + es-abstract@1.23.5: + resolution: {integrity: sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==} + engines: {node: '>= 0.4'} + +>>>>>>> c7bb80d es-abstract@1.24.0: resolution: {integrity: sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==} engines: {node: '>= 0.4'} @@ -3050,6 +4072,10 @@ packages: resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==} engines: {node: '>= 0.4'} + es-define-property@1.0.1: + resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==} + engines: {node: '>= 0.4'} + es-errors@1.3.0: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} @@ -3061,10 +4087,27 @@ packages: es-module-lexer@1.5.4: resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==} +<<<<<<< HEAD + es-object-atoms@1.1.1: + resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} + engines: {node: '>= 0.4'} + + es-set-tostringtag@2.1.0: + resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==} +======= + es-object-atoms@1.0.0: + resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} + engines: {node: '>= 0.4'} + es-object-atoms@1.1.1: resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} engines: {node: '>= 0.4'} + es-set-tostringtag@2.0.3: + resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + es-set-tostringtag@2.1.0: resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==} engines: {node: '>= 0.4'} @@ -3076,6 +4119,13 @@ packages: resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==} engines: {node: '>= 0.4'} +<<<<<<< HEAD +======= + es-to-primitive@1.3.0: + resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==} + engines: {node: '>= 0.4'} + +>>>>>>> c7bb80d escalade@3.2.0: resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} engines: {node: '>=6'} @@ -3113,14 +4163,24 @@ packages: peerDependencies: eslint: '>=8.10' +<<<<<<< HEAD eslint-config-prettier@10.1.8: resolution: {integrity: sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==} +======= + eslint-config-prettier@10.1.5: + resolution: {integrity: sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==} +>>>>>>> c7bb80d hasBin: true peerDependencies: eslint: '>=7.0.0' +<<<<<<< HEAD eslint-import-context@0.1.9: resolution: {integrity: sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==} +======= + eslint-import-context@0.1.8: + resolution: {integrity: sha512-bq+F7nyc65sKpZGT09dY0S0QrOnQtuDVIfyTGQ8uuvtMIF7oHp6CEP3mouN0rrnYF3Jqo6Ke0BfU/5wASZue1w==} +>>>>>>> c7bb80d engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} peerDependencies: unrs-resolver: ^1.0.0 @@ -3144,8 +4204,13 @@ packages: eslint-plugin-import-x: optional: true +<<<<<<< HEAD eslint-import-resolver-typescript@4.4.4: resolution: {integrity: sha512-1iM2zeBvrYmUNTj2vSC/90JTHDth+dfOfiNKkxApWRsTJYNrc8rOdxxIf5vazX+BiAXTeOT0UvWpGI/7qIWQOw==} +======= + eslint-import-resolver-typescript@4.4.3: + resolution: {integrity: sha512-elVDn1eWKFrWlzxlWl9xMt8LltjKl161Ix50JFC50tHXI5/TRP32SNEqlJ/bo/HV+g7Rou/tlPQU2AcRtIhrOg==} +>>>>>>> c7bb80d engines: {node: ^16.17.0 || >=18.6.0} peerDependencies: eslint: '*' @@ -3200,6 +4265,7 @@ packages: '@typescript-eslint/parser': optional: true +<<<<<<< HEAD eslint-plugin-jest@28.14.0: resolution: {integrity: sha512-P9s/qXSMTpRTerE2FQ0qJet2gKbcGyFTPAJipoKxmWqR6uuFqIqk8FuEfg5yBieOezVrEfAMZrEwJ6yEp+1MFQ==} engines: {node: ^16.10.0 || ^18.12.0 || >=20.0.0} @@ -3215,6 +4281,10 @@ packages: eslint-plugin-prettier@5.5.4: resolution: {integrity: sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==} +======= + eslint-plugin-prettier@5.4.1: + resolution: {integrity: sha512-9dF+KuU/Ilkq27A8idRP7N2DH8iUR6qXcjF3FR2wETY21PZdBrIjwCau8oboyGj9b7etWmTGEeM8e7oOed6ZWg==} +>>>>>>> c7bb80d engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: '@types/eslint': '>=8.0.0' @@ -3250,6 +4320,7 @@ packages: peerDependencies: eslint: '>=5.0.0' +<<<<<<< HEAD eslint-plugin-sonarjs@1.0.4: resolution: {integrity: sha512-jF0eGCUsq/HzMub4ExAyD8x1oEgjOyB9XVytYGyWgSFvdiJQJp6IuP7RmtauCf06o6N/kZErh+zW4b10y1WZ+Q==} engines: {node: '>=16'} @@ -3258,12 +4329,21 @@ packages: eslint-plugin-tailwindcss@3.18.2: resolution: {integrity: sha512-QbkMLDC/OkkjFQ1iz/5jkMdHfiMu/uwujUHLAJK5iwNHD8RTxVTlsUezE0toTZ6VhybNBsk+gYGPDq2agfeRNA==} +======= + eslint-plugin-tailwindcss@3.18.0: + resolution: {integrity: sha512-PQDU4ZMzFH0eb2DrfHPpbgo87Zgg2EXSMOj1NSfzdZm+aJzpuwGerfowMIaVehSREEa0idbf/eoNYAOHSJoDAQ==} +>>>>>>> c7bb80d engines: {node: '>=18.12.0'} peerDependencies: tailwindcss: ^3.4.0 +<<<<<<< HEAD eslint-plugin-testing-library@7.8.0: resolution: {integrity: sha512-zmu9xtpULN5KCtJBABBmXK3jfKZej2ZJ6QzCX4MtywP3UTJ7yn/Zful8Kn5mUiOCxX6KBt0to3OZf7Usuhtvfg==} +======= + eslint-plugin-testing-library@7.5.3: + resolution: {integrity: sha512-sZk5hIrx0p1ehvdS2qHefKwXHiEysiQN+FMGCzES6xRNUgwI3q4KdWMeAwpPDP9u0RDkNzJpebRUnNch1sJh+A==} +>>>>>>> c7bb80d engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0, pnpm: ^9.14.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -3274,8 +4354,13 @@ packages: peerDependencies: eslint: '>=9.22.0' +<<<<<<< HEAD eslint-plugin-unused-imports@4.2.0: resolution: {integrity: sha512-hLbJ2/wnjKq4kGA9AUaExVFIbNzyxYdVo49QZmKCnhk5pc9wcYRbfgLHvWJ8tnsdcseGhoUAddm9gn/lt+d74w==} +======= + eslint-plugin-unused-imports@4.1.4: + resolution: {integrity: sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==} +>>>>>>> c7bb80d peerDependencies: '@typescript-eslint/eslint-plugin': ^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0 eslint: ^9.0.0 || ^8.0.0 @@ -3299,8 +4384,13 @@ packages: resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} +<<<<<<< HEAD eslint@9.35.0: resolution: {integrity: sha512-QePbBFMJFjgmlE+cXAlbHZbHpdFVS2E/6vzCy7aKlebddvl1vadiC4JFV5u/wqTkNUwEV8WrQi257jf5f06hrg==} +======= + eslint@9.29.0: + resolution: {integrity: sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==} +>>>>>>> c7bb80d engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true peerDependencies: @@ -3379,15 +4469,25 @@ packages: resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} +<<<<<<< HEAD expo-asset@11.1.7: resolution: {integrity: sha512-b5P8GpjUh08fRCf6m5XPVAh7ra42cQrHBIMgH2UXP+xsj4Wufl6pLy6jRF5w6U7DranUMbsXm8TOyq4EHy7ADg==} +======= + expo-asset@11.1.5: + resolution: {integrity: sha512-GEQDCqC25uDBoXHEnXeBuwpeXvI+3fRGvtzwwt0ZKKzWaN+TgeF8H7c76p3Zi4DfBMFDcduM0CmOvJX+yCCLUQ==} +>>>>>>> c7bb80d peerDependencies: expo: '*' react: '*' react-native: '*' +<<<<<<< HEAD expo-constants@17.1.7: resolution: {integrity: sha512-byBjGsJ6T6FrLlhOBxw4EaiMXrZEn/MlUYIj/JAd+FS7ll5X/S4qVRbIimSJtdW47hXMq0zxPfJX6njtA56hHA==} +======= + expo-constants@17.1.6: + resolution: {integrity: sha512-q5mLvJiLtPcaZ7t2diSOlQ2AyxIO8YMVEJsEfI/ExkGj15JrflNQ7CALEW6IF/uNae/76qI/XcjEuuAyjdaCNw==} +>>>>>>> c7bb80d peerDependencies: expo: '*' react-native: '*' @@ -3397,6 +4497,7 @@ packages: peerDependencies: expo: '*' +<<<<<<< HEAD expo-dev-client@5.2.4: resolution: {integrity: sha512-s/N/nK5LPo0QZJpV4aPijxyrzV4O49S3dN8D2fljqrX2WwFZzWwFO6dX1elPbTmddxumdcpczsdUPY+Ms8g43g==} peerDependencies: @@ -3404,6 +4505,15 @@ packages: expo-dev-launcher@5.1.16: resolution: {integrity: sha512-tbCske9pvbozaEblyxoyo/97D6od9Ma4yAuyUnXtRET1CKAPKYS+c4fiZ+I3B4qtpZwN3JNFUjG3oateN0y6Hg==} +======= + expo-dev-client@5.2.1: + resolution: {integrity: sha512-SzrHvXeyTGawzc/7ZIHFmaUYiCeRJagL9bJo/yTPmxdycFFOOdLs1FNMFXyYhB6YY4u5EKTCO6g1fug+0GV9sQ==} + peerDependencies: + expo: '*' + + expo-dev-launcher@5.1.13: + resolution: {integrity: sha512-EAxkI0MOZk1E9tkk+QpyDhqlCjUqAr8q+mobcC3ZJIIi7KejhaQlGVlF1kUUITsYLvFvbT8egRgrsMO57T6uDA==} +>>>>>>> c7bb80d peerDependencies: expo: '*' @@ -3412,6 +4522,7 @@ packages: peerDependencies: expo: '*' +<<<<<<< HEAD expo-dev-menu@6.1.14: resolution: {integrity: sha512-yonNMg2GHJZtuisVowdl1iQjZfYP85r1D1IO+ar9D9zlrBPBJhq2XEju52jd1rDmDkmDuEhBSbPNhzIcsBNiPg==} peerDependencies: @@ -3419,18 +4530,37 @@ packages: expo-file-system@18.1.11: resolution: {integrity: sha512-HJw/m0nVOKeqeRjPjGdvm+zBi5/NxcdPf8M8P3G2JFvH5Z8vBWqVDic2O58jnT1OFEy0XXzoH9UqFu7cHg9DTQ==} +======= + expo-dev-menu@6.1.12: + resolution: {integrity: sha512-Bz8yjZ6a+u7ZrZWzfn3aCgBwAX+QB0ktQyV7QMS5/agyesKiqM43+VdwNQqrm8w9tS8HZ2sf6RTvdek8YgOEHg==} + peerDependencies: + expo: '*' + + expo-file-system@18.1.10: + resolution: {integrity: sha512-SyaWg+HitScLuyEeSG9gMSDT0hIxbM9jiZjSBP9l9zMnwZjmQwsusE6+7qGiddxJzdOhTP4YGUfvEzeeS0YL3Q==} +>>>>>>> c7bb80d peerDependencies: expo: '*' react-native: '*' +<<<<<<< HEAD expo-font@13.3.2: resolution: {integrity: sha512-wUlMdpqURmQ/CNKK/+BIHkDA5nGjMqNlYmW0pJFXY/KE/OG80Qcavdu2sHsL4efAIiNGvYdBS10WztuQYU4X0A==} +======= + expo-font@13.3.1: + resolution: {integrity: sha512-d+xrHYvSM9WB42wj8vP9OOFWyxed5R1evphfDb6zYBmC1dA9Hf89FpT7TNFtj2Bk3clTnpmVqQTCYbbA2P3CLg==} +>>>>>>> c7bb80d peerDependencies: expo: '*' react: '*' +<<<<<<< HEAD expo-image@2.4.0: resolution: {integrity: sha512-TQ/LvrtJ9JBr+Tf198CAqflxcvdhuj7P24n0LQ1jHaWIVA7Z+zYKbYHnSMPSDMul/y0U46Z5bFLbiZiSidgcNw==} +======= + expo-image@2.3.0: + resolution: {integrity: sha512-muL8OSbgCskQJsyqenKPNULWXwRm5BY2ruS6WMo/EzFyI3iXI/0mXgb2J/NXUa8xCEYxSyoGkGZFyCBvGY1ofA==} +>>>>>>> c7bb80d peerDependencies: expo: '*' react: '*' @@ -3449,18 +4579,29 @@ packages: expo: '*' react: '*' +<<<<<<< HEAD expo-linking@7.1.7: resolution: {integrity: sha512-ZJaH1RIch2G/M3hx2QJdlrKbYFUTOjVVW4g39hfxrE5bPX9xhZUYXqxqQtzMNl1ylAevw9JkgEfWbBWddbZ3UA==} +======= + expo-linking@7.1.5: + resolution: {integrity: sha512-8g20zOpROW78bF+bLI4a3ZWj4ntLgM0rCewKycPL0jk9WGvBrBtFtwwADJgOiV1EurNp3lcquerXGlWS+SOQyA==} +>>>>>>> c7bb80d peerDependencies: react: '*' react-native: '*' +<<<<<<< HEAD expo-localization@16.1.6: resolution: {integrity: sha512-v4HwNzs8QvyKHwl40MvETNEKr77v1o9/eVC8WCBY++DIlBAvonHyJe2R9CfqpZbC4Tlpl7XV+07nLXc8O5PQsA==} +======= + expo-localization@16.1.5: + resolution: {integrity: sha512-dymvf0S11afyMeRbnoXd2iWWzFYwg21jHTnLBO/7ObNO1rKlYpus0ghVDnh+sJFV2u7s518e/JTcAqNR69EZkw==} +>>>>>>> c7bb80d peerDependencies: expo: '*' react: '*' +<<<<<<< HEAD expo-manifests@0.16.6: resolution: {integrity: sha512-1A+do6/mLUWF9xd3uCrlXr9QFDbjbfqAYmUy8UDLOjof1lMrOhyeC4Yi6WexA/A8dhZEpIxSMCKfn7G4aHAh4w==} peerDependencies: @@ -3475,6 +4616,22 @@ packages: expo-router@5.1.6: resolution: {integrity: sha512-Tc7QFurWqLItrHvbL2TB4OLq8WA4y8fCXPkRG+q9zP4Lk4xKIDskO7/8ff3+XAOHJB5Z8GHn5IhXv4Ik89SVUA==} +======= + expo-manifests@0.16.5: + resolution: {integrity: sha512-zLUeJogn2C7qOE75Zz7jcmJorMfIbSRR35ctspN0OK/Hq/+PAAptA8p9jNVC8xp/91uP9uI8f3xPhh+A11eR2A==} + peerDependencies: + expo: '*' + + expo-modules-autolinking@2.1.12: + resolution: {integrity: sha512-rW5YSW66pUx1nLqn7TO0eWRnP4LDvySW1Tom0wjexk3Tx/upg9LYE5tva7p5AX/cdFfiZcEqPcOxP4RyT++Xlg==} + hasBin: true + + expo-modules-core@2.4.0: + resolution: {integrity: sha512-Ko5eHBdvuMykjw9P9C9PF54/wBSsGOxaOjx92I5BwgKvEmUwN3UrXFV4CXzlLVbLfSYUQaLcB220xmPfgvT7Fg==} + + expo-router@5.1.0: + resolution: {integrity: sha512-mnKpw35W6kKPpZm+ZxQei6HGUx2JO3znzqJZInzqrTZMgfAcHGgvP9AQFjg/Qi/Qy1CxunB9aQnqE9JPbSwbpw==} +>>>>>>> c7bb80d peerDependencies: '@react-navigation/drawer': ^7.3.9 '@testing-library/jest-native': '*' @@ -3492,8 +4649,13 @@ packages: react-native-reanimated: optional: true +<<<<<<< HEAD expo-splash-screen@0.30.10: resolution: {integrity: sha512-Tt9va/sLENQDQYeOQ6cdLdGvTZ644KR3YG9aRlnpcs2/beYjOX1LHT510EGzVN9ljUTg+1ebEo5GGt2arYtPjw==} +======= + expo-splash-screen@0.30.9: + resolution: {integrity: sha512-curHUaZxUTZ2dWvz32ao3xPv5mJr1LBqn5V8xm/IULAehB9RGCn8iKiROMN1PYebSG+56vPMuJmBm9P+ayvJpA==} +>>>>>>> c7bb80d peerDependencies: expo: '*' @@ -3503,8 +4665,13 @@ packages: react: '*' react-native: '*' +<<<<<<< HEAD expo-system-ui@5.0.11: resolution: {integrity: sha512-PG5VdaG5cwBe1Rj02mJdnsihKl9Iw/w/a6+qh2mH3f2K/IvQ+Hf7aG2kavSADtkGNCNj7CEIg7Rn4DQz/SE5rQ==} +======= + expo-system-ui@5.0.9: + resolution: {integrity: sha512-behQ4uP384++U9GjgXmyEno1Z8raN1/tZv7ZJhYkQkRj1g2xXvNltXN/PDRcOm/wCNqStVhDpYo2OOQm5E5/lQ==} +>>>>>>> c7bb80d peerDependencies: expo: '*' react-native: '*' @@ -3518,8 +4685,13 @@ packages: peerDependencies: expo: '*' +<<<<<<< HEAD expo@53.0.22: resolution: {integrity: sha512-sJ2I4W/e5iiM4u/wYCe3qmW4D7WPCRqByPDD0hJcdYNdjc9HFFFdO4OAudZVyC/MmtoWZEIH5kTJP1cw9FjzYA==} +======= + expo@53.0.12: + resolution: {integrity: sha512-dtmED749hkxDWCcvtD++tb8bAm3Twv8qnUOXzVyXA5owNG0mwDIz0HveJTpWK1UzkY4HcTVRezDf0tflZJ+JXQ==} +>>>>>>> c7bb80d hasBin: true peerDependencies: '@expo/dom-webview': '*' @@ -3573,9 +4745,14 @@ packages: fbjs@3.0.5: resolution: {integrity: sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==} +<<<<<<< HEAD fdir@6.5.0: resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} engines: {node: '>=12.0.0'} +======= + fdir@6.4.6: + resolution: {integrity: sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==} +>>>>>>> c7bb80d peerDependencies: picomatch: ^3 || ^4 peerDependenciesMeta: @@ -3667,6 +4844,10 @@ packages: resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==} engines: {node: '>= 0.4'} + for-each@0.3.5: + resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==} + engines: {node: '>= 0.4'} + foreground-child@3.3.0: resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==} engines: {node: '>=14'} @@ -3707,6 +4888,10 @@ packages: resolution: {integrity: sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==} engines: {node: '>= 0.4'} + function.prototype.name@1.1.8: + resolution: {integrity: sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==} + engines: {node: '>= 0.4'} + functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} @@ -3726,6 +4911,10 @@ packages: resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} engines: {node: '>= 0.4'} + get-intrinsic@1.3.0: + resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} + engines: {node: '>= 0.4'} + get-package-type@0.1.0: resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} engines: {node: '>=8.0.0'} @@ -3750,11 +4939,27 @@ packages: resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==} engines: {node: '>= 0.4'} +<<<<<<< HEAD + get-tsconfig@4.10.1: + resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==} +======= + get-symbol-description@1.1.0: + resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==} + engines: {node: '>= 0.4'} + get-tsconfig@4.10.1: resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==} get-tsconfig@4.8.1: resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==} +>>>>>>> c7bb80d + + get-tsconfig@4.8.1: + resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==} + + getenv@2.0.0: + resolution: {integrity: sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ==} + engines: {node: '>=6'} getenv@2.0.0: resolution: {integrity: sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ==} @@ -3809,8 +5014,13 @@ packages: resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} engines: {node: '>=18'} +<<<<<<< HEAD globals@16.4.0: resolution: {integrity: sha512-ob/2LcVVaVGCYN+r14cnwnoDPUufjiYgSqRhiFD0Q1iI4Odora5RE8Iv1D24hAz5oMophRGkGz+yuvQmmUMnMw==} +======= + globals@16.2.0: + resolution: {integrity: sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==} +>>>>>>> c7bb80d engines: {node: '>=18'} globalthis@1.0.4: @@ -3825,6 +5035,10 @@ packages: resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} engines: {node: '>= 0.4'} + gopd@1.2.0: + resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} + engines: {node: '>= 0.4'} + graceful-fs@4.2.10: resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} @@ -3834,11 +5048,14 @@ packages: graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} +<<<<<<< HEAD handlebars@4.7.8: resolution: {integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==} engines: {node: '>=0.4.7'} hasBin: true +======= +>>>>>>> c7bb80d has-ansi@2.0.0: resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==} engines: {node: '>=0.10.0'} @@ -3865,6 +5082,19 @@ packages: resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==} engines: {node: '>= 0.4'} +<<<<<<< HEAD + has-symbols@1.1.0: + resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} +======= + has-proto@1.2.0: + resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==} + engines: {node: '>= 0.4'} + + has-symbols@1.0.3: + resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + has-symbols@1.1.0: resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} engines: {node: '>= 0.4'} @@ -3880,14 +5110,24 @@ packages: hermes-estree@0.25.1: resolution: {integrity: sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==} +<<<<<<< HEAD hermes-estree@0.29.1: resolution: {integrity: sha512-jl+x31n4/w+wEqm0I2r4CMimukLbLQEYpisys5oCre611CI5fc9TxhqkBBCJ1edDG4Kza0f7CgNz8xVMLZQOmQ==} +======= + hermes-estree@0.28.1: + resolution: {integrity: sha512-w3nxl/RGM7LBae0v8LH2o36+8VqwOZGv9rX1wyoWT6YaKZLqpJZ0YQ5P0LVr3tuRpf7vCx0iIG4i/VmBJejxTQ==} +>>>>>>> c7bb80d hermes-parser@0.25.1: resolution: {integrity: sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==} +<<<<<<< HEAD hermes-parser@0.29.1: resolution: {integrity: sha512-xBHWmUtRC5e/UL0tI7Ivt2riA/YBq9+SiYFU7C1oBa/j2jYGlIF9043oak1F47ihuDIxQ5nbsKueYJDRY02UgA==} +======= + hermes-parser@0.28.1: + resolution: {integrity: sha512-nf8o+hE8g7UJWParnccljHumE9Vlq8F7MqIdeahl+4x0tvCUJYRrT0L7h0MMg/X9YJmkNwsfbaNNrzPtFXOscg==} +>>>>>>> c7bb80d hey-listen@1.0.8: resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==} @@ -4043,6 +5283,15 @@ packages: resolution: {integrity: sha512-LJKFHCSeIRq9hanN14IlOtPSTe3lNES7TYDTE2xxdAy1LS5rYphajK1qtwvj3YmQXvvk0U2Vbmcni8P9EIQW9w==} engines: {node: '>=18'} +<<<<<<< HEAD + internal-slot@1.1.0: + resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==} +======= + internal-slot@1.0.7: + resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + internal-slot@1.1.0: resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==} engines: {node: '>= 0.4'} @@ -4054,6 +5303,15 @@ packages: resolution: {integrity: sha512-kniTIJmaZYiwa17eTtWIfm0K342seyugl6vuC8DiiyiRAJWAVlLkqGCI0Im0neo0TkXw+pRcKaBPRdcKHnQJ6Q==} engines: {node: '>=0.10.0'} +<<<<<<< HEAD + is-array-buffer@3.0.5: + resolution: {integrity: sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==} +======= + is-array-buffer@3.0.4: + resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + is-array-buffer@3.0.5: resolution: {integrity: sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==} engines: {node: '>= 0.4'} @@ -4072,6 +5330,10 @@ packages: resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==} engines: {node: '>= 0.4'} + is-bigint@1.1.0: + resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==} + engines: {node: '>= 0.4'} + is-binary-path@2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} @@ -4080,6 +5342,19 @@ packages: resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==} engines: {node: '>= 0.4'} +<<<<<<< HEAD + is-builtin-module@5.0.0: + resolution: {integrity: sha512-f4RqJKBUe5rQkJ2eJEJBXSticB3hGbN9j0yxxMQFqIW89Jp9WYFtzfTcRlstDKVUTRzSOTLKRfO9vIztenwtxA==} + engines: {node: '>=18.20'} + + is-bun-module@1.2.1: + resolution: {integrity: sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==} + +======= + is-boolean-object@1.2.2: + resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==} + engines: {node: '>= 0.4'} + is-builtin-module@5.0.0: resolution: {integrity: sha512-f4RqJKBUe5rQkJ2eJEJBXSticB3hGbN9j0yxxMQFqIW89Jp9WYFtzfTcRlstDKVUTRzSOTLKRfO9vIztenwtxA==} engines: {node: '>=18.20'} @@ -4087,6 +5362,7 @@ packages: is-bun-module@1.2.1: resolution: {integrity: sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==} +>>>>>>> c7bb80d is-bun-module@2.0.0: resolution: {integrity: sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==} @@ -4106,6 +5382,15 @@ packages: resolution: {integrity: sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==} engines: {node: '>= 0.4'} +<<<<<<< HEAD + is-date-object@1.1.0: + resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==} +======= + is-date-object@1.0.5: + resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + is-date-object@1.1.0: resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==} engines: {node: '>= 0.4'} @@ -4132,6 +5417,10 @@ packages: resolution: {integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==} engines: {node: '>= 0.4'} + is-finalizationregistry@1.1.1: + resolution: {integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==} + engines: {node: '>= 0.4'} + is-fullwidth-code-point@1.0.0: resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==} engines: {node: '>=0.10.0'} @@ -4205,6 +5494,10 @@ packages: resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==} engines: {node: '>= 0.4'} + is-number-object@1.1.1: + resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==} + engines: {node: '>= 0.4'} + is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} @@ -4235,6 +5528,10 @@ packages: resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==} engines: {node: '>= 0.4'} + is-regex@1.2.1: + resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==} + engines: {node: '>= 0.4'} + is-scoped@3.0.0: resolution: {integrity: sha512-ezxLUq30kiTvP0w/5n9tj4qTOKlrA07Oty1hwTQ+lcqw11x6uc8sp7VRb2OVGRzKfCHZ2A22T5Zsau/Q2Akb0g==} engines: {node: '>=12'} @@ -4247,6 +5544,10 @@ packages: resolution: {integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==} engines: {node: '>= 0.4'} + is-shared-array-buffer@1.0.4: + resolution: {integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==} + engines: {node: '>= 0.4'} + is-stream@1.1.0: resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==} engines: {node: '>=0.10.0'} @@ -4263,6 +5564,19 @@ packages: resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==} engines: {node: '>= 0.4'} +<<<<<<< HEAD + is-symbol@1.1.1: + resolution: {integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==} +======= + is-string@1.1.1: + resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==} + engines: {node: '>= 0.4'} + + is-symbol@1.0.4: + resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + is-symbol@1.1.1: resolution: {integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==} engines: {node: '>= 0.4'} @@ -4275,6 +5589,10 @@ packages: resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==} engines: {node: '>= 0.4'} + is-typed-array@1.1.15: + resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==} + engines: {node: '>= 0.4'} + is-unicode-supported@0.1.0: resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} engines: {node: '>=10'} @@ -4295,8 +5613,12 @@ packages: resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==} engines: {node: '>= 0.4'} - is-weakset@2.0.3: - resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==} + is-weakref@1.1.1: + resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==} + engines: {node: '>= 0.4'} + + is-weakset@2.0.3: + resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==} engines: {node: '>= 0.4'} is-wsl@2.2.0: @@ -4409,8 +5731,13 @@ packages: resolution: {integrity: sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} +<<<<<<< HEAD jest-expo@53.0.10: resolution: {integrity: sha512-J6vGCNOImXxUXv0c70J2hMlGSHTIyVwCviezMtnZeg966lzshESJhLxQatuvA8r7nJ2riffQgM3cWvL+/Hdewg==} +======= + jest-expo@53.0.7: + resolution: {integrity: sha512-Uiu3ES0sWbsxpifQuBzXMI1/N9JygfJfwEby/Qw/OPndIQ1YeeIQqkbP52xn6UhdSM4qYQiteX3EjY8TfrZIoA==} +>>>>>>> c7bb80d hasBin: true peerDependencies: expo: '*' @@ -4876,6 +6203,7 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} +<<<<<<< HEAD metro-babel-transformer@0.82.5: resolution: {integrity: sha512-W/scFDnwJXSccJYnOFdGiYr9srhbHPdxX9TvvACOFsIXdLilh3XuxQl/wXW6jEJfgIb0jTvoTlwwrqvuwymr6Q==} engines: {node: '>=18.18'} @@ -4931,6 +6259,63 @@ packages: metro@0.82.5: resolution: {integrity: sha512-8oAXxL7do8QckID/WZEKaIFuQJFUTLzfVcC48ghkHhNK2RGuQq8Xvf4AVd+TUA0SZtX0q8TGNXZ/eba1ckeGCg==} +======= + metro-babel-transformer@0.82.4: + resolution: {integrity: sha512-4juJahGRb1gmNbQq48lNinB6WFNfb6m0BQqi/RQibEltNiqTCxew/dBspI2EWA4xVCd3mQWGfw0TML4KurQZnQ==} + engines: {node: '>=18.18'} + + metro-cache-key@0.82.4: + resolution: {integrity: sha512-2JCTqcpF+f2OghOpe/+x+JywfzDkrHdAqinPFWmK2ezNAU/qX0jBFaTETogPibFivxZJil37w9Yp6syX8rFUng==} + engines: {node: '>=18.18'} + + metro-cache@0.82.4: + resolution: {integrity: sha512-vX0ylSMGtORKiZ4G8uP6fgfPdDiCWvLZUGZ5zIblSGylOX6JYhvExl0Zg4UA9pix/SSQu5Pnp9vdODMFsNIxhw==} + engines: {node: '>=18.18'} + + metro-config@0.82.4: + resolution: {integrity: sha512-Ki3Wumr3hKHGDS7RrHsygmmRNc/PCJrvkLn0+BWWxmbOmOcMMJDSmSI+WRlT8jd5VPZFxIi4wg+sAt5yBXAK0g==} + engines: {node: '>=18.18'} + + metro-core@0.82.4: + resolution: {integrity: sha512-Xo4ozbxPg2vfgJGCgXZ8sVhC2M0lhTqD+tsKO2q9aelq/dCjnnSb26xZKcQO80CQOQUL7e3QWB7pLFGPjZm31A==} + engines: {node: '>=18.18'} + + metro-file-map@0.82.4: + resolution: {integrity: sha512-eO7HD1O3aeNsbEe6NBZvx1lLJUrxgyATjnDmb7bm4eyF6yWOQot9XVtxTDLNifECuvsZ4jzRiTInrbmIHkTdGA==} + engines: {node: '>=18.18'} + + metro-minify-terser@0.82.4: + resolution: {integrity: sha512-W79Mi6BUwWVaM8Mc5XepcqkG+TSsCyyo//dmTsgYfJcsmReQorRFodil3bbJInETvjzdnS1mCsUo9pllNjT1Hg==} + engines: {node: '>=18.18'} + + metro-resolver@0.82.4: + resolution: {integrity: sha512-uWoHzOBGQTPT5PjippB8rRT3iI9CTgFA9tRiLMzrseA5o7YAlgvfTdY9vFk2qyk3lW3aQfFKWkmqENryPRpu+Q==} + engines: {node: '>=18.18'} + + metro-runtime@0.82.4: + resolution: {integrity: sha512-vVyFO7H+eLXRV2E7YAUYA7aMGBECGagqxmFvC2hmErS7oq90BbPVENfAHbUWq1vWH+MRiivoRxdxlN8gBoF/dw==} + engines: {node: '>=18.18'} + + metro-source-map@0.82.4: + resolution: {integrity: sha512-9jzDQJ0FPas1FuQFtwmBHsez2BfhFNufMowbOMeG3ZaFvzeziE8A0aJwILDS3U+V5039ssCQFiQeqDgENWvquA==} + engines: {node: '>=18.18'} + + metro-symbolicate@0.82.4: + resolution: {integrity: sha512-LwEwAtdsx7z8rYjxjpLWxuFa2U0J6TS6ljlQM4WAATKa4uzV8unmnRuN2iNBWTmRqgNR77mzmI2vhwD4QSCo+w==} + engines: {node: '>=18.18'} + hasBin: true + + metro-transform-plugins@0.82.4: + resolution: {integrity: sha512-NoWQRPHupVpnDgYguiEcm7YwDhnqW02iWWQjO2O8NsNP09rEMSq99nPjARWfukN7+KDh6YjLvTIN20mj3dk9kw==} + engines: {node: '>=18.18'} + + metro-transform-worker@0.82.4: + resolution: {integrity: sha512-kPI7Ad/tdAnI9PY4T+2H0cdgGeSWWdiPRKuytI806UcN4VhFL6OmYa19/4abYVYF+Cd2jo57CDuwbaxRfmXDhw==} + engines: {node: '>=18.18'} + + metro@0.82.4: + resolution: {integrity: sha512-/gFmw3ux9CPG5WUmygY35hpyno28zi/7OUn6+OFfbweA8l0B+PPqXXLr0/T6cf5nclCcH0d22o+02fICaShVxw==} +>>>>>>> c7bb80d engines: {node: '>=18.18'} hasBin: true @@ -5057,8 +6442,13 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true +<<<<<<< HEAD napi-postinstall@0.3.3: resolution: {integrity: sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==} +======= + napi-postinstall@0.2.4: + resolution: {integrity: sha512-ZEzHJwBhZ8qQSbknHqYcdtQVr8zUgGyM/q6h6qAyhtyVMNrSgDhrC4disf03dYW0e+czXyLnZINnCTEkWy0eJg==} +>>>>>>> c7bb80d engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} hasBin: true @@ -5108,8 +6498,13 @@ packages: node-releases@2.0.18: resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} +<<<<<<< HEAD node-releases@2.0.21: resolution: {integrity: sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==} +======= + node-releases@2.0.19: + resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} +>>>>>>> c7bb80d normalize-package-data@6.0.2: resolution: {integrity: sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==} @@ -5153,8 +6548,13 @@ packages: nwsapi@2.2.13: resolution: {integrity: sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ==} +<<<<<<< HEAD ob1@0.82.5: resolution: {integrity: sha512-QyQQ6e66f+Ut/qUVjEce0E/wux5nAGLXYZDn1jr15JWstHsCH3l6VVrg8NKDptW9NEiBXKOJeGF/ydxeSDF3IQ==} +======= + ob1@0.82.4: + resolution: {integrity: sha512-n9S8e4l5TvkrequEAMDidl4yXesruWTNTzVkeaHSGywoTOIwTzZzKw7Z670H3eaXDZui5MJXjWGNzYowVZIxCA==} +>>>>>>> c7bb80d engines: {node: '>=18.18'} object-assign@4.1.1: @@ -5165,6 +6565,13 @@ packages: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} engines: {node: '>= 6'} +<<<<<<< HEAD +======= + object-inspect@1.13.3: + resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==} + engines: {node: '>= 0.4'} + +>>>>>>> c7bb80d object-inspect@1.13.4: resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==} engines: {node: '>= 0.4'} @@ -5177,6 +6584,13 @@ packages: resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==} engines: {node: '>= 0.4'} +<<<<<<< HEAD +======= + object.assign@4.1.7: + resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==} + engines: {node: '>= 0.4'} + +>>>>>>> c7bb80d object.entries@1.1.9: resolution: {integrity: sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==} engines: {node: '>= 0.4'} @@ -5193,6 +6607,10 @@ packages: resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==} engines: {node: '>= 0.4'} + object.values@1.2.1: + resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==} + engines: {node: '>= 0.4'} + omggif@1.0.10: resolution: {integrity: sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==} @@ -5421,8 +6839,13 @@ packages: resolution: {integrity: sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==} engines: {node: '>=10'} +<<<<<<< HEAD picomatch@4.0.3: resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} +======= + picomatch@4.0.2: + resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} +>>>>>>> c7bb80d engines: {node: '>=12'} pidtree@0.6.0: @@ -5619,19 +7042,27 @@ packages: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} hasBin: true +<<<<<<< HEAD react-devtools-core@6.1.5: resolution: {integrity: sha512-ePrwPfxAnB+7hgnEr8vpKxL9cmnp7F322t8oqcPshbIQQhDKgFDW4tjhF2wjVbdXF9O/nyuy3sQWd9JGpiLPvA==} +======= + react-devtools-core@6.1.2: + resolution: {integrity: sha512-ldFwzufLletzCikNJVYaxlxMLu7swJ3T2VrGfzXlMsVhZhPDKXA38DEROidaYZVgMAmQnIjymrmqto5pyfrwPA==} +>>>>>>> c7bb80d react-dom@19.0.0: resolution: {integrity: sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==} peerDependencies: react: ^19.0.0 +<<<<<<< HEAD react-error-boundary@3.1.4: resolution: {integrity: sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==} engines: {node: '>=10', npm: '>=6'} peerDependencies: react: '>=16.13.1' +======= +>>>>>>> c7bb80d react-error-boundary@4.0.13: resolution: {integrity: sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==} @@ -5672,8 +7103,13 @@ packages: react-is@18.3.1: resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} +<<<<<<< HEAD react-is@19.1.1: resolution: {integrity: sha512-tr41fA15Vn8p4X9ntI+yCyeGSf1TlYaY5vlTZfQmeLBrFo3psOPX6HhTDnFNL9uj3EhP0KAQ80cugCl4b4BERA==} +======= + react-is@19.1.0: + resolution: {integrity: sha512-Oe56aUPnkHyyDxxkvqtd7KkdQP5uIUfHxd5XTb3wE9d/kRnZLmKbDB0GWk919tdQ+mxxPtG6EAs6RMT6i1qtHg==} +>>>>>>> c7bb80d react-native-css-interop@0.1.20: resolution: {integrity: sha512-afFcrXkFEv35pkMgc9R5k79d6KyZpTtDgci0tM9NTs76/0NZcQu2YuEXoC1r4Efg/2PsWI/1/GJKVXww7RQNDg==} @@ -5782,6 +7218,7 @@ packages: react: ^18.0.0 || ^19.0.0 react-dom: ^18.0.0 || ^19.0.0 +<<<<<<< HEAD react-native-webview@13.13.5: resolution: {integrity: sha512-MfC2B+woL4Hlj2WCzcb1USySKk+SteXnUKmKktOk/H/AQy5+LuVdkPKm8SknJ0/RxaxhZ48WBoTRGaqgR137hw==} peerDependencies: @@ -5790,6 +7227,10 @@ packages: react-native@0.79.5: resolution: {integrity: sha512-jVihwsE4mWEHZ9HkO1J2eUZSwHyDByZOqthwnGrVZCh6kTQBCm4v8dicsyDa6p0fpWNE5KicTcpX/XXl0ASJFg==} +======= + react-native@0.79.4: + resolution: {integrity: sha512-CfxYMuszvnO/33Q5rB//7cU1u9P8rSOvzhE2053Phdb8+6bof9NLayCllU2nmPrm8n9o6RU1Fz5H0yquLQ0DAw==} +>>>>>>> c7bb80d engines: {node: '>=18'} hasBin: true peerDependencies: @@ -5863,10 +7304,21 @@ packages: reflect.getprototypeof@1.0.10: resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==} +<<<<<<< HEAD engines: {node: '>= 0.4'} regenerate-unicode-properties@10.2.2: resolution: {integrity: sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==} +======= + engines: {node: '>= 0.4'} + + reflect.getprototypeof@1.0.6: + resolution: {integrity: sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==} + engines: {node: '>= 0.4'} + + regenerate-unicode-properties@10.2.0: + resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==} +>>>>>>> c7bb80d engines: {node: '>=4'} regenerate@1.4.2: @@ -5882,12 +7334,25 @@ packages: resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==} hasBin: true +<<<<<<< HEAD regexp.prototype.flags@1.5.4: resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==} engines: {node: '>= 0.4'} regexpu-core@6.3.1: resolution: {integrity: sha512-DzcswPr252wEr7Qz8AyAVbfyBDKLoYp6eRA1We2Fa9qirRFSdtkP5sHr3yglDKy2BbA0fd2T+j/CUSKes3FeVQ==} +======= + regexp.prototype.flags@1.5.3: + resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==} + engines: {node: '>= 0.4'} + + regexp.prototype.flags@1.5.4: + resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==} + engines: {node: '>= 0.4'} + + regexpu-core@6.1.1: + resolution: {integrity: sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==} +>>>>>>> c7bb80d engines: {node: '>=4'} registry-auth-token@5.0.2: @@ -5901,10 +7366,21 @@ packages: regjsgen@0.8.0: resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==} +<<<<<<< HEAD + regjsparser@0.12.0: + resolution: {integrity: sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==} + hasBin: true + +======= + regjsparser@0.11.2: + resolution: {integrity: sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==} + hasBin: true + regjsparser@0.12.0: resolution: {integrity: sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==} hasBin: true +>>>>>>> c7bb80d repeat-string@1.6.1: resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==} engines: {node: '>=0.10'} @@ -5957,11 +7433,14 @@ packages: resolution: {integrity: sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==} engines: {node: '>=10'} +<<<<<<< HEAD resolve@1.22.10: resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} engines: {node: '>= 0.4'} hasBin: true +======= +>>>>>>> c7bb80d resolve@1.22.8: resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} hasBin: true @@ -6026,11 +7505,25 @@ packages: resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==} engines: {node: '>=0.4'} +<<<<<<< HEAD +======= + safe-array-concat@1.1.3: + resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==} + engines: {node: '>=0.4'} + +>>>>>>> c7bb80d safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} safe-push-apply@1.0.0: resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==} +<<<<<<< HEAD +======= + engines: {node: '>= 0.4'} + + safe-regex-test@1.0.3: + resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==} +>>>>>>> c7bb80d engines: {node: '>= 0.4'} safe-regex-test@1.1.0: @@ -6053,6 +7546,13 @@ packages: schema-utils@3.3.0: resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==} engines: {node: '>= 10.13.0'} +<<<<<<< HEAD +======= + + schema-utils@4.2.0: + resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==} + engines: {node: '>= 12.13.0'} +>>>>>>> c7bb80d scoped-regex@3.0.0: resolution: {integrity: sha512-yEsN6TuxZhZ1Tl9iB81frTNS292m0I/IG7+w8lTvfcJQP2x3vnpOoevjBoE3Np5A6KnZM2+RtVenihj9t6NiYg==} @@ -6138,6 +7638,15 @@ packages: resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==} engines: {node: '>= 0.4'} +<<<<<<< HEAD + side-channel@1.1.0: + resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==} +======= + side-channel@1.0.6: + resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + side-channel@1.1.0: resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==} engines: {node: '>= 0.4'} @@ -6231,8 +7740,13 @@ packages: sprintf-js@1.0.3: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} +<<<<<<< HEAD stable-hash-x@0.2.0: resolution: {integrity: sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==} +======= + stable-hash-x@0.1.1: + resolution: {integrity: sha512-l0x1D6vhnsNUGPFVDx45eif0y6eedVC8nm5uACTrVFJFtl2mLRW17aWtVyxFCpn5t94VUPkjU8vSLwIuwwqtJQ==} +>>>>>>> c7bb80d engines: {node: '>=12.0.0'} stack-generator@2.0.10: @@ -6316,6 +7830,17 @@ packages: string.prototype.trim@1.2.10: resolution: {integrity: sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==} +<<<<<<< HEAD +======= + engines: {node: '>= 0.4'} + + string.prototype.trim@1.2.9: + resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + + string.prototype.trimend@1.0.9: + resolution: {integrity: sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==} engines: {node: '>= 0.4'} string.prototype.trimend@1.0.9: @@ -6369,8 +7894,13 @@ packages: resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} engines: {node: '>=8'} +<<<<<<< HEAD strip-indent@4.1.0: resolution: {integrity: sha512-OA95x+JPmL7kc7zCu+e+TeYxEiaIyndRx0OrBcK2QPPH09oAndr2ALvymxWA+Lx1PYYvFUm4O63pRkdJAaW96w==} +======= + strip-indent@4.0.0: + resolution: {integrity: sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==} +>>>>>>> c7bb80d engines: {node: '>=12'} strip-json-comments@2.0.1: @@ -6441,8 +7971,13 @@ packages: symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} +<<<<<<< HEAD synckit@0.11.11: resolution: {integrity: sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==} +======= + synckit@0.11.8: + resolution: {integrity: sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==} +>>>>>>> c7bb80d engines: {node: ^14.18.0 || >=16.0.0} tailwind-merge@2.5.4: @@ -6530,8 +8065,13 @@ packages: tinyexec@0.3.1: resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==} +<<<<<<< HEAD tinyglobby@0.2.15: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} +======= + tinyglobby@0.2.14: + resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==} +>>>>>>> c7bb80d engines: {node: '>=12.0.0'} tmp@0.0.33: @@ -6573,6 +8113,7 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} +<<<<<<< HEAD ts-jest@29.4.2: resolution: {integrity: sha512-pBNOkn4HtuLpNrXTMVRC9b642CBaDnKqWXny4OzuoULT9S7Kf8MMlaRe2veKax12rjf5WcpMBhVPbQurlWGNxA==} engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0} @@ -6582,6 +8123,16 @@ packages: '@jest/transform': ^29.0.0 || ^30.0.0 '@jest/types': ^29.0.0 || ^30.0.0 babel-jest: ^29.0.0 || ^30.0.0 +======= + ts-jest@29.1.2: + resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} + engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.0 <8' + '@jest/types': ^29.0.0 + babel-jest: ^29.0.0 +>>>>>>> c7bb80d esbuild: '*' jest: ^29.0.0 || ^30.0.0 jest-util: ^29.0.0 || ^30.0.0 @@ -6589,16 +8140,17 @@ packages: peerDependenciesMeta: '@babel/core': optional: true - '@jest/transform': - optional: true '@jest/types': optional: true babel-jest: optional: true esbuild: optional: true +<<<<<<< HEAD jest-util: optional: true +======= +>>>>>>> c7bb80d ts-object-utils@0.0.5: resolution: {integrity: sha512-iV0GvHqOmilbIKJsfyfJY9/dNHCs969z3so90dQWsO1eMMozvTpnB1MEaUbb3FYtZTGjv5sIy/xmslEz0Rg2TA==} @@ -6652,6 +8204,7 @@ packages: resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==} engines: {node: '>= 0.4'} +<<<<<<< HEAD typed-array-byte-length@1.0.3: resolution: {integrity: sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==} engines: {node: '>= 0.4'} @@ -6671,6 +8224,43 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' +======= + typed-array-buffer@1.0.3: + resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==} + engines: {node: '>= 0.4'} + + typed-array-byte-length@1.0.1: + resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} + engines: {node: '>= 0.4'} + + typed-array-byte-length@1.0.3: + resolution: {integrity: sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==} + engines: {node: '>= 0.4'} + + typed-array-byte-offset@1.0.2: + resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==} + engines: {node: '>= 0.4'} + + typed-array-byte-offset@1.0.4: + resolution: {integrity: sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==} + engines: {node: '>= 0.4'} + + typed-array-length@1.0.6: + resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} + engines: {node: '>= 0.4'} + + typed-array-length@1.0.7: + resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==} + engines: {node: '>= 0.4'} + + typescript-eslint@8.34.0: + resolution: {integrity: sha512-MRpfN7uYjTrTGigFCt8sRyNqJFhjN0WwZecldaqhWm+wy0gaRt8Edb/3cuUy0zdq2opJWT6iXINKAtewnDOltQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: '>=4.8.4 <5.9.0' + +>>>>>>> c7bb80d typescript@5.8.3: resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==} engines: {node: '>=14.17'} @@ -6692,8 +8282,13 @@ packages: undici-types@6.19.8: resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} +<<<<<<< HEAD undici@6.21.3: resolution: {integrity: sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==} +======= + undici@6.21.0: + resolution: {integrity: sha512-BUgJXc752Kou3oOIuU1i+yZZypyZRqNPW0vqoMPl8VaoalSfeR0D8/t4iAS3yirs79SSMTxTag+ZC86uswv+Cw==} +>>>>>>> c7bb80d engines: {node: '>=18.17'} unicode-canonical-property-names-ecmascript@2.0.1: @@ -6704,8 +8299,13 @@ packages: resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==} engines: {node: '>=4'} +<<<<<<< HEAD unicode-match-property-value-ecmascript@2.2.1: resolution: {integrity: sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==} +======= + unicode-match-property-value-ecmascript@2.2.0: + resolution: {integrity: sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==} +>>>>>>> c7bb80d engines: {node: '>=4'} unicode-property-aliases-ecmascript@2.1.0: @@ -6728,8 +8328,13 @@ packages: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} +<<<<<<< HEAD unrs-resolver@1.11.1: resolution: {integrity: sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==} +======= + unrs-resolver@1.9.0: + resolution: {integrity: sha512-wqaRu4UnzBD2ABTC1kLfBjAqIDZ5YUTr/MLGa7By47JV1bJDSW7jq/ZSLigB7enLe7ubNaJhtnBXgrc/50cEhg==} +>>>>>>> c7bb80d update-browserslist-db@1.1.1: resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==} @@ -6874,6 +8479,19 @@ packages: resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==} engines: {node: '>= 0.4'} +<<<<<<< HEAD + which-builtin-type@1.2.1: + resolution: {integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==} +======= + which-boxed-primitive@1.1.1: + resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==} + engines: {node: '>= 0.4'} + + which-builtin-type@1.1.4: + resolution: {integrity: sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==} +>>>>>>> c7bb80d + engines: {node: '>= 0.4'} + which-builtin-type@1.2.1: resolution: {integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==} engines: {node: '>= 0.4'} @@ -6882,10 +8500,21 @@ packages: resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==} engines: {node: '>= 0.4'} +<<<<<<< HEAD + which-typed-array@1.1.19: + resolution: {integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==} + engines: {node: '>= 0.4'} + +======= + which-typed-array@1.1.15: + resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==} + engines: {node: '>= 0.4'} + which-typed-array@1.1.19: resolution: {integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==} engines: {node: '>= 0.4'} +>>>>>>> c7bb80d which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} @@ -7061,8 +8690,13 @@ packages: zod@3.23.8: resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} +<<<<<<< HEAD zustand@5.0.8: resolution: {integrity: sha512-gyPKpIaxY9XcO2vSMrLbiER7QMAMGOQZVRdJ6Zi782jkbzZygq5GI9nG8g+sMgitRtndwaBSl7uiqC49o1SSiw==} +======= + zustand@5.0.5: + resolution: {integrity: sha512-mILtRfKW9xM47hqxGIxCv12gXusoY/xTSHBYApXozR0HmQv299whhBeeAcRy+KrPPybzosvJBCOmVjq6x12fCg==} +>>>>>>> c7bb80d engines: {node: '>=12.20.0'} peerDependencies: '@types/react': '>=18.0.0' @@ -7091,6 +8725,7 @@ snapshots: dependencies: '@babel/highlight': 7.25.9 +<<<<<<< HEAD '@babel/code-frame@7.27.1': dependencies: '@babel/helper-validator-identifier': 7.27.1 @@ -7111,6 +8746,28 @@ snapshots: '@babel/traverse': 7.28.4 '@babel/types': 7.28.4 '@jridgewell/remapping': 2.3.5 +======= + '@babel/code-frame@7.26.2': + dependencies: + '@babel/helper-validator-identifier': 7.25.9 + js-tokens: 4.0.0 + picocolors: 1.1.1 + + '@babel/compat-data@7.26.2': {} + + '@babel/core@7.26.0': + dependencies: + '@ampproject/remapping': 2.3.0 + '@babel/code-frame': 7.26.2 + '@babel/generator': 7.26.2 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) + '@babel/helpers': 7.26.0 + '@babel/parser': 7.26.2 + '@babel/template': 7.25.9 + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 +>>>>>>> c7bb80d convert-source-map: 2.0.0 debug: 4.3.7 gensync: 1.0.0-beta.2 @@ -7119,6 +8776,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@babel/generator@7.28.3': dependencies: '@babel/parser': 7.28.4 @@ -7135,10 +8793,29 @@ snapshots: dependencies: '@babel/compat-data': 7.28.4 '@babel/helper-validator-option': 7.27.1 +======= + '@babel/generator@7.26.2': + dependencies: + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + jsesc: 3.0.2 + + '@babel/helper-annotate-as-pure@7.25.9': + dependencies: + '@babel/types': 7.26.0 + + '@babel/helper-compilation-targets@7.25.9': + dependencies: + '@babel/compat-data': 7.26.2 + '@babel/helper-validator-option': 7.25.9 +>>>>>>> c7bb80d browserslist: 4.24.2 lru-cache: 5.1.1 semver: 6.3.1 +<<<<<<< HEAD '@babel/helper-create-class-features-plugin@7.28.3(@babel/core@7.28.4)': dependencies: '@babel/core': 7.28.4 @@ -7148,10 +8825,22 @@ snapshots: '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.4) '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 '@babel/traverse': 7.28.4 +======= + '@babel/helper-create-class-features-plugin@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-member-expression-to-functions': 7.25.9 + '@babel/helper-optimise-call-expression': 7.25.9 + '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0) + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 + '@babel/traverse': 7.25.9 +>>>>>>> c7bb80d semver: 6.3.1 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@babel/helper-create-regexp-features-plugin@7.27.1(@babel/core@7.28.4)': dependencies: '@babel/core': 7.28.4 @@ -7165,22 +8854,45 @@ snapshots: '@babel/helper-compilation-targets': 7.27.2 '@babel/helper-plugin-utils': 7.27.1 debug: 4.4.3 +======= + '@babel/helper-create-regexp-features-plugin@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-annotate-as-pure': 7.25.9 + regexpu-core: 6.1.1 + semver: 6.3.1 + + '@babel/helper-define-polyfill-provider@0.6.3(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + debug: 4.4.1 +>>>>>>> c7bb80d lodash.debounce: 4.0.8 resolve: 1.22.10 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@babel/helper-globals@7.28.0': {} '@babel/helper-member-expression-to-functions@7.27.1': dependencies: '@babel/traverse': 7.28.4 '@babel/types': 7.28.4 +======= + '@babel/helper-member-expression-to-functions@7.25.9': + dependencies: + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 +>>>>>>> c7bb80d transitivePeerDependencies: - supports-color '@babel/helper-module-imports@7.25.9': dependencies: +<<<<<<< HEAD '@babel/traverse': 7.28.4 '@babel/types': 7.28.4 transitivePeerDependencies: @@ -7230,11 +8942,63 @@ snapshots: dependencies: '@babel/traverse': 7.28.4 '@babel/types': 7.28.4 +======= + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 + transitivePeerDependencies: + - supports-color + + '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 + '@babel/traverse': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/helper-optimise-call-expression@7.25.9': + dependencies: + '@babel/types': 7.26.0 + + '@babel/helper-plugin-utils@7.25.9': {} + + '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-wrap-function': 7.25.9 + '@babel/traverse': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/helper-replace-supers@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-member-expression-to-functions': 7.25.9 + '@babel/helper-optimise-call-expression': 7.25.9 + '@babel/traverse': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/helper-simple-access@7.25.9': + dependencies: + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 + transitivePeerDependencies: + - supports-color + + '@babel/helper-skip-transparent-expression-wrappers@7.25.9': + dependencies: + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 +>>>>>>> c7bb80d transitivePeerDependencies: - supports-color '@babel/helper-string-parser@7.25.9': {} +<<<<<<< HEAD '@babel/helper-string-parser@7.27.1': {} '@babel/helper-validator-identifier@7.27.1': {} @@ -7257,10 +9021,33 @@ snapshots: '@babel/highlight@7.25.9': dependencies: '@babel/helper-validator-identifier': 7.27.1 +======= + '@babel/helper-validator-identifier@7.25.9': {} + + '@babel/helper-validator-option@7.25.9': {} + + '@babel/helper-wrap-function@7.25.9': + dependencies: + '@babel/template': 7.25.9 + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 + transitivePeerDependencies: + - supports-color + + '@babel/helpers@7.26.0': + dependencies: + '@babel/template': 7.25.9 + '@babel/types': 7.26.0 + + '@babel/highlight@7.25.9': + dependencies: + '@babel/helper-validator-identifier': 7.25.9 +>>>>>>> c7bb80d chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.1.1 +<<<<<<< HEAD '@babel/parser@7.28.4': dependencies: '@babel/types': 7.28.4 @@ -7614,88 +9401,502 @@ snapshots: babel-plugin-polyfill-corejs2: 0.4.14(@babel/core@7.28.4) babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.28.4) babel-plugin-polyfill-regenerator: 0.6.5(@babel/core@7.28.4) - semver: 6.3.1 +======= + '@babel/parser@7.26.2': + dependencies: + '@babel/types': 7.26.0 + + '@babel/plugin-proposal-decorators@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) + '@babel/helper-plugin-utils': 7.25.9 + '@babel/plugin-syntax-decorators': 7.25.9(@babel/core@7.26.0) transitivePeerDependencies: - supports-color - '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.28.4)': + '@babel/plugin-proposal-export-default-from@7.25.9(@babel/core@7.26.0)': dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-spread@7.27.1(@babel/core@7.28.4)': + '@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.26.0)': dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) + '@babel/helper-plugin-utils': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-sticky-regex@7.27.1(@babel/core@7.28.4)': + '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.26.0)': dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-template-literals@7.27.1(@babel/core@7.28.4)': + '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.26.0)': dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-typescript@7.28.0(@babel/core@7.28.4)': + '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.26.0)': dependencies: - '@babel/core': 7.28.4 - '@babel/helper-annotate-as-pure': 7.27.3 - '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.28.4) - '@babel/helper-plugin-utils': 7.27.1 - '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 - '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.4) - transitivePeerDependencies: - - supports-color + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-unicode-regex@7.27.1(@babel/core@7.28.4)': + '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.26.0)': dependencies: - '@babel/core': 7.28.4 - '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4) - '@babel/helper-plugin-utils': 7.27.1 + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/preset-react@7.27.1(@babel/core@7.28.4)': + '@babel/plugin-syntax-decorators@7.25.9(@babel/core@7.26.0)': dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - '@babel/helper-validator-option': 7.27.1 - '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.28.4) - '@babel/plugin-transform-react-jsx': 7.27.1(@babel/core@7.28.4) - '@babel/plugin-transform-react-jsx-development': 7.27.1(@babel/core@7.28.4) - '@babel/plugin-transform-react-pure-annotations': 7.27.1(@babel/core@7.28.4) - transitivePeerDependencies: - - supports-color + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/preset-typescript@7.27.1(@babel/core@7.28.4)': + '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.26.0)': dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - '@babel/helper-validator-option': 7.27.1 - '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.4) - '@babel/plugin-transform-modules-commonjs': 7.27.1(@babel/core@7.28.4) - '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4) - transitivePeerDependencies: - - supports-color + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/runtime@7.26.0': + '@babel/plugin-syntax-export-default-from@7.25.9(@babel/core@7.26.0)': dependencies: - regenerator-runtime: 0.14.1 + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/template@7.25.9': + '@babel/plugin-syntax-flow@7.26.0(@babel/core@7.26.0)': dependencies: - '@babel/code-frame': 7.27.1 - '@babel/parser': 7.28.4 - '@babel/types': 7.28.4 + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/template@7.27.2': + '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.26.0)': dependencies: - '@babel/code-frame': 7.27.1 - '@babel/parser': 7.28.4 - '@babel/types': 7.28.4 + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-jsx@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-syntax-typescript@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-arrow-functions@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-async-generator-functions@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0) + '@babel/traverse': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-async-to-generator@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0) + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-block-scoping@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-class-properties@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) + '@babel/helper-plugin-utils': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-classes@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0) + '@babel/traverse': 7.25.9 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-computed-properties@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/template': 7.25.9 + + '@babel/plugin-transform-destructuring@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-export-namespace-from@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-flow-strip-types@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/plugin-syntax-flow': 7.26.0(@babel/core@7.26.0) + + '@babel/plugin-transform-for-of@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-function-name@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/traverse': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-literals@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-logical-assignment-operators@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-modules-commonjs@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-simple-access': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0) + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-nullish-coalescing-operator@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-numeric-separator@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-object-rest-spread@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0) + + '@babel/plugin-transform-optional-catch-binding@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-optional-chaining@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-parameters@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) + '@babel/helper-plugin-utils': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-private-property-in-object@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) + '@babel/helper-plugin-utils': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-react-display-name@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-react-jsx-development@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.0) + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-react-jsx-self@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-react-jsx-source@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-react-jsx@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0) + '@babel/types': 7.26.0 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-react-pure-annotations@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-regenerator@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + regenerator-transform: 0.15.2 + + '@babel/plugin-transform-runtime@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + babel-plugin-polyfill-corejs2: 0.4.12(@babel/core@7.26.0) + babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.26.0) + babel-plugin-polyfill-regenerator: 0.6.3(@babel/core@7.26.0) +>>>>>>> c7bb80d + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + +<<<<<<< HEAD + '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.28.4)': + dependencies: + '@babel/core': 7.28.4 + '@babel/helper-plugin-utils': 7.27.1 + + '@babel/plugin-transform-spread@7.27.1(@babel/core@7.28.4)': + dependencies: + '@babel/core': 7.28.4 + '@babel/helper-plugin-utils': 7.27.1 + '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-sticky-regex@7.27.1(@babel/core@7.28.4)': + dependencies: + '@babel/core': 7.28.4 + '@babel/helper-plugin-utils': 7.27.1 + + '@babel/plugin-transform-template-literals@7.27.1(@babel/core@7.28.4)': + dependencies: + '@babel/core': 7.28.4 + '@babel/helper-plugin-utils': 7.27.1 + + '@babel/plugin-transform-typescript@7.28.0(@babel/core@7.28.4)': + dependencies: + '@babel/core': 7.28.4 + '@babel/helper-annotate-as-pure': 7.27.3 + '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.28.4) + '@babel/helper-plugin-utils': 7.27.1 + '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 + '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.4) + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-unicode-regex@7.27.1(@babel/core@7.28.4)': + dependencies: + '@babel/core': 7.28.4 + '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.4) + '@babel/helper-plugin-utils': 7.27.1 + + '@babel/preset-react@7.27.1(@babel/core@7.28.4)': + dependencies: + '@babel/core': 7.28.4 + '@babel/helper-plugin-utils': 7.27.1 + '@babel/helper-validator-option': 7.27.1 + '@babel/plugin-transform-react-display-name': 7.28.0(@babel/core@7.28.4) + '@babel/plugin-transform-react-jsx': 7.27.1(@babel/core@7.28.4) + '@babel/plugin-transform-react-jsx-development': 7.27.1(@babel/core@7.28.4) + '@babel/plugin-transform-react-pure-annotations': 7.27.1(@babel/core@7.28.4) + transitivePeerDependencies: + - supports-color + + '@babel/preset-typescript@7.27.1(@babel/core@7.28.4)': + dependencies: + '@babel/core': 7.28.4 + '@babel/helper-plugin-utils': 7.27.1 + '@babel/helper-validator-option': 7.27.1 + '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.4) + '@babel/plugin-transform-modules-commonjs': 7.27.1(@babel/core@7.28.4) + '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4) +======= + '@babel/plugin-transform-shorthand-properties@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-spread@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-sticky-regex@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-template-literals@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-typescript@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0) + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 + '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0) + transitivePeerDependencies: + - supports-color + + '@babel/plugin-transform-unicode-regex@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0) + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/preset-react@7.25.9(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-validator-option': 7.25.9 + '@babel/plugin-transform-react-display-name': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-react-jsx-development': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-react-pure-annotations': 7.25.9(@babel/core@7.26.0) + transitivePeerDependencies: + - supports-color + + '@babel/preset-typescript@7.26.0(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-validator-option': 7.25.9 + '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-modules-commonjs': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-typescript': 7.25.9(@babel/core@7.26.0) +>>>>>>> c7bb80d + transitivePeerDependencies: + - supports-color + + '@babel/runtime@7.26.0': + dependencies: + regenerator-runtime: 0.14.1 + + '@babel/template@7.25.9': + dependencies: +<<<<<<< HEAD + '@babel/code-frame': 7.27.1 + '@babel/parser': 7.28.4 + '@babel/types': 7.28.4 + + '@babel/template@7.27.2': + dependencies: + '@babel/code-frame': 7.27.1 + '@babel/parser': 7.28.4 + '@babel/types': 7.28.4 '@babel/traverse@7.25.9': dependencies: @@ -7705,10 +9906,25 @@ snapshots: '@babel/template': 7.25.9 '@babel/types': 7.28.4 debug: 4.4.3 +======= + '@babel/code-frame': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 + + '@babel/traverse@7.25.9': + dependencies: + '@babel/code-frame': 7.26.2 + '@babel/generator': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/template': 7.25.9 + '@babel/types': 7.26.0 + debug: 4.3.7 +>>>>>>> c7bb80d globals: 11.12.0 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@babel/traverse@7.28.4': dependencies: '@babel/code-frame': 7.27.1 @@ -7730,6 +9946,12 @@ snapshots: dependencies: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.27.1 +======= + '@babel/types@7.26.0': + dependencies: + '@babel/helper-string-parser': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 +>>>>>>> c7bb80d '@bcoe/v8-coverage@0.2.3': {} @@ -7775,7 +9997,11 @@ snapshots: '@commitlint/is-ignored@19.6.0': dependencies: '@commitlint/types': 19.5.0 +<<<<<<< HEAD semver: 7.7.2 +======= + semver: 7.6.3 +>>>>>>> c7bb80d '@commitlint/lint@19.6.0': dependencies: @@ -7843,16 +10069,24 @@ snapshots: '@types/conventional-commits-parser': 5.0.0 chalk: 5.3.0 +<<<<<<< HEAD '@dev-plugins/react-query@0.0.7(@tanstack/react-query@5.52.1(react@19.0.0))(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))': dependencies: '@tanstack/react-query': 5.52.1(react@19.0.0) expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + '@dev-plugins/react-query@0.0.7(@tanstack/react-query@5.52.1(react@19.0.0))(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))': + dependencies: + '@tanstack/react-query': 5.52.1(react@19.0.0) + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +>>>>>>> c7bb80d flatted: 3.3.2 '@egjs/hammerjs@2.0.17': dependencies: '@types/hammerjs': 2.0.46 +<<<<<<< HEAD '@emnapi/core@1.5.0': dependencies: '@emnapi/wasi-threads': 1.1.0 @@ -7860,11 +10094,24 @@ snapshots: optional: true '@emnapi/runtime@1.5.0': +======= + '@emnapi/core@1.4.3': dependencies: + '@emnapi/wasi-threads': 1.0.2 tslib: 2.8.1 optional: true + '@emnapi/runtime@1.4.3': +>>>>>>> c7bb80d + dependencies: + tslib: 2.8.1 + optional: true + +<<<<<<< HEAD '@emnapi/wasi-threads@1.1.0': +======= + '@emnapi/wasi-threads@1.0.2': +>>>>>>> c7bb80d dependencies: tslib: 2.8.1 optional: true @@ -7877,6 +10124,7 @@ snapshots: '@emotion/memoize@0.7.4': optional: true +<<<<<<< HEAD '@eslint-community/eslint-utils@4.9.0(eslint@9.35.0(jiti@1.21.6))': dependencies: eslint: 9.35.0(jiti@1.21.6) @@ -7888,24 +10136,58 @@ snapshots: dependencies: '@eslint/object-schema': 2.1.6 debug: 4.4.3 +======= + '@eslint-community/eslint-utils@4.4.1(eslint@9.29.0(jiti@1.21.6))': + dependencies: + eslint: 9.29.0(jiti@1.21.6) + eslint-visitor-keys: 3.4.3 + + '@eslint-community/eslint-utils@4.7.0(eslint@9.29.0(jiti@1.21.6))': + dependencies: + eslint: 9.29.0(jiti@1.21.6) + eslint-visitor-keys: 3.4.3 + + '@eslint-community/regexpp@4.12.1': {} + + '@eslint/config-array@0.20.1': + dependencies: + '@eslint/object-schema': 2.1.6 + debug: 4.3.7 +>>>>>>> c7bb80d minimatch: 3.1.2 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@eslint/config-helpers@0.3.1': {} +======= + '@eslint/config-helpers@0.2.3': {} +>>>>>>> c7bb80d '@eslint/core@0.13.0': dependencies: '@types/json-schema': 7.0.15 +<<<<<<< HEAD '@eslint/core@0.15.2': +======= + '@eslint/core@0.14.0': + dependencies: + '@types/json-schema': 7.0.15 + + '@eslint/core@0.15.0': +>>>>>>> c7bb80d dependencies: '@types/json-schema': 7.0.15 '@eslint/eslintrc@3.3.1': dependencies: ajv: 6.12.6 +<<<<<<< HEAD debug: 4.4.3 +======= + debug: 4.3.7 +>>>>>>> c7bb80d espree: 10.4.0 globals: 14.0.0 ignore: 5.3.2 @@ -7916,7 +10198,11 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@eslint/js@9.35.0': {} +======= + '@eslint/js@9.29.0': {} +>>>>>>> c7bb80d '@eslint/object-schema@2.1.6': {} @@ -7925,16 +10211,26 @@ snapshots: '@eslint/core': 0.13.0 levn: 0.4.1 +<<<<<<< HEAD '@eslint/plugin-kit@0.3.5': dependencies: '@eslint/core': 0.15.2 levn: 0.4.1 '@expo/cli@0.24.21': +======= + '@eslint/plugin-kit@0.3.2': + dependencies: + '@eslint/core': 0.15.0 + levn: 0.4.1 + + '@expo/cli@0.24.15': +>>>>>>> c7bb80d dependencies: '@0no-co/graphql.web': 1.0.11 '@babel/runtime': 7.26.0 '@expo/code-signing-certificates': 0.0.5 +<<<<<<< HEAD '@expo/config': 11.0.13 '@expo/config-plugins': 10.1.2 '@expo/devcert': 1.1.4 @@ -7951,6 +10247,23 @@ snapshots: '@expo/ws-tunnel': 1.0.4 '@expo/xcpretty': 4.3.1 '@react-native/dev-middleware': 0.79.6 +======= + '@expo/config': 11.0.10 + '@expo/config-plugins': 10.0.3 + '@expo/devcert': 1.1.4 + '@expo/env': 1.0.5 + '@expo/image-utils': 0.7.4 + '@expo/json-file': 9.1.4 + '@expo/metro-config': 0.20.15 + '@expo/osascript': 2.2.4 + '@expo/package-manager': 1.8.4 + '@expo/plist': 0.3.4 + '@expo/prebuild-config': 9.0.7 + '@expo/spawn-async': 1.7.2 + '@expo/ws-tunnel': 1.0.4 + '@expo/xcpretty': 4.3.1 + '@react-native/dev-middleware': 0.79.4 +>>>>>>> c7bb80d '@urql/core': 5.0.8 '@urql/exchange-retry': 1.3.0(@urql/core@5.0.8) accepts: 1.3.8 @@ -7962,7 +10275,11 @@ snapshots: ci-info: 3.9.0 compression: 1.7.5 connect: 3.7.0 +<<<<<<< HEAD debug: 4.4.3 +======= + debug: 4.4.1 +>>>>>>> c7bb80d env-editor: 0.4.2 freeport-async: 2.0.0 getenv: 2.0.0 @@ -7991,7 +10308,11 @@ snapshots: structured-headers: 0.4.1 tar: 7.4.3 terminal-link: 2.1.1 +<<<<<<< HEAD undici: 6.21.3 +======= + undici: 6.21.0 +>>>>>>> c7bb80d wrap-ansi: 7.0.0 ws: 8.18.0 transitivePeerDependencies: @@ -8005,6 +10326,7 @@ snapshots: node-forge: 1.3.1 nullthrows: 1.1.1 +<<<<<<< HEAD '@expo/config-plugins@10.1.2': dependencies: '@expo/config-types': 53.0.5 @@ -8014,6 +10336,17 @@ snapshots: chalk: 4.1.2 debug: 4.4.3 getenv: 2.0.0 +======= + '@expo/config-plugins@10.0.2': + dependencies: + '@expo/config-types': 53.0.4 + '@expo/json-file': 9.1.4 + '@expo/plist': 0.3.4 + '@expo/sdk-runtime-versions': 1.0.0 + chalk: 4.1.2 + debug: 4.3.7 + getenv: 1.0.0 +>>>>>>> c7bb80d glob: 10.4.5 resolve-from: 5.0.0 semver: 7.7.2 @@ -8024,6 +10357,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@expo/config-types@53.0.5': {} '@expo/config@11.0.13': @@ -8034,11 +10368,46 @@ snapshots: '@expo/json-file': 9.1.5 deepmerge: 4.3.1 getenv: 2.0.0 +======= + '@expo/config-plugins@10.0.3': + dependencies: + '@expo/config-types': 53.0.4 + '@expo/json-file': 9.1.4 + '@expo/plist': 0.3.4 + '@expo/sdk-runtime-versions': 1.0.0 + chalk: 4.1.2 + debug: 4.4.1 + getenv: 2.0.0 + glob: 10.4.5 + resolve-from: 5.0.0 + semver: 7.7.2 + slash: 3.0.0 + slugify: 1.6.6 + xcode: 3.0.1 + xml2js: 0.6.0 + transitivePeerDependencies: + - supports-color + + '@expo/config-types@53.0.4': {} + + '@expo/config@11.0.10': + dependencies: + '@babel/code-frame': 7.10.4 + '@expo/config-plugins': 10.0.2 + '@expo/config-types': 53.0.4 + '@expo/json-file': 9.1.4 + deepmerge: 4.3.1 + getenv: 1.0.0 +>>>>>>> c7bb80d glob: 10.4.5 require-from-string: 2.0.2 resolve-from: 5.0.0 resolve-workspace-root: 2.0.0 +<<<<<<< HEAD semver: 7.7.2 +======= + semver: 7.6.3 +>>>>>>> c7bb80d slugify: 1.6.6 sucrase: 3.35.0 transitivePeerDependencies: @@ -8061,6 +10430,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@expo/env@1.0.7': dependencies: chalk: 4.1.2 @@ -8072,11 +10442,28 @@ snapshots: - supports-color '@expo/fingerprint@0.13.4': +======= + '@expo/env@1.0.5': + dependencies: + chalk: 4.1.2 + debug: 4.3.7 + dotenv: 16.4.5 + dotenv-expand: 11.0.7 + getenv: 1.0.0 + transitivePeerDependencies: + - supports-color + + '@expo/fingerprint@0.13.1': +>>>>>>> c7bb80d dependencies: '@expo/spawn-async': 1.7.2 arg: 5.0.2 chalk: 4.1.2 +<<<<<<< HEAD debug: 4.4.3 +======= + debug: 4.4.1 +>>>>>>> c7bb80d find-up: 5.0.0 getenv: 2.0.0 glob: 10.4.5 @@ -8088,6 +10475,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@expo/image-utils@0.7.6': dependencies: '@expo/spawn-async': 1.7.2 @@ -8101,10 +10489,26 @@ snapshots: unique-string: 2.0.0 '@expo/json-file@10.0.7': +======= + '@expo/image-utils@0.7.4': + dependencies: + '@expo/spawn-async': 1.7.2 + chalk: 4.1.2 + getenv: 1.0.0 + jimp-compact: 0.16.1 + parse-png: 2.1.0 + resolve-from: 5.0.0 + semver: 7.6.3 + temp-dir: 2.0.0 + unique-string: 2.0.0 + + '@expo/json-file@9.1.4': +>>>>>>> c7bb80d dependencies: '@babel/code-frame': 7.10.4 json5: 2.2.3 +<<<<<<< HEAD '@expo/json-file@9.1.5': dependencies: '@babel/code-frame': 7.10.4 @@ -8122,6 +10526,20 @@ snapshots: '@expo/spawn-async': 1.7.2 chalk: 4.1.2 debug: 4.4.3 +======= + '@expo/metro-config@0.20.15': + dependencies: + '@babel/core': 7.26.0 + '@babel/generator': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 + '@expo/config': 11.0.10 + '@expo/env': 1.0.5 + '@expo/json-file': 9.1.4 + '@expo/spawn-async': 1.7.2 + chalk: 4.1.2 + debug: 4.4.1 +>>>>>>> c7bb80d dotenv: 16.4.5 dotenv-expand: 11.0.7 getenv: 2.0.0 @@ -8134,30 +10552,49 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))': dependencies: react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) '@expo/osascript@2.3.7': +======= + '@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))': + dependencies: + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + '@expo/osascript@2.2.4': +>>>>>>> c7bb80d dependencies: '@expo/spawn-async': 1.7.2 exec-async: 2.2.0 +<<<<<<< HEAD '@expo/package-manager@1.9.8': dependencies: '@expo/json-file': 10.0.7 +======= + '@expo/package-manager@1.8.4': + dependencies: + '@expo/json-file': 9.1.4 +>>>>>>> c7bb80d '@expo/spawn-async': 1.7.2 chalk: 4.1.2 npm-package-arg: 11.0.3 ora: 3.4.0 resolve-workspace-root: 2.0.0 +<<<<<<< HEAD '@expo/plist@0.3.5': +======= + '@expo/plist@0.3.4': +>>>>>>> c7bb80d dependencies: '@xmldom/xmldom': 0.8.10 base64-js: 1.5.1 xmlbuilder: 15.1.1 +<<<<<<< HEAD '@expo/prebuild-config@9.0.12': dependencies: '@expo/config': 11.0.13 @@ -8167,12 +10604,24 @@ snapshots: '@expo/json-file': 9.1.5 '@react-native/normalize-colors': 0.79.6 debug: 4.4.3 +======= + '@expo/prebuild-config@9.0.6': + dependencies: + '@expo/config': 11.0.10 + '@expo/config-plugins': 10.0.2 + '@expo/config-types': 53.0.4 + '@expo/image-utils': 0.7.4 + '@expo/json-file': 9.1.4 + '@react-native/normalize-colors': 0.79.2 + debug: 4.3.7 +>>>>>>> c7bb80d resolve-from: 5.0.0 semver: 7.7.2 xml2js: 0.6.0 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@expo/schema-utils@0.1.7': {} '@expo/sdk-runtime-versions@1.0.0': {} @@ -8183,6 +10632,31 @@ snapshots: debug: 4.4.3 source-map-support: 0.5.21 undici: 6.21.3 +======= + '@expo/prebuild-config@9.0.7': + dependencies: + '@expo/config': 11.0.10 + '@expo/config-plugins': 10.0.3 + '@expo/config-types': 53.0.4 + '@expo/image-utils': 0.7.4 + '@expo/json-file': 9.1.4 + '@react-native/normalize-colors': 0.79.4 + debug: 4.4.1 + resolve-from: 5.0.0 + semver: 7.7.2 + xml2js: 0.6.0 + transitivePeerDependencies: + - supports-color + + '@expo/sdk-runtime-versions@1.0.0': {} + + '@expo/server@0.6.2': + dependencies: + abort-controller: 3.0.0 + debug: 4.3.7 + source-map-support: 0.5.21 + undici: 6.21.0 +>>>>>>> c7bb80d transitivePeerDependencies: - supports-color @@ -8228,6 +10702,7 @@ snapshots: dependencies: tslib: 2.8.1 +<<<<<<< HEAD '@gorhom/bottom-sheet@5.0.5(@types/react@19.0.14)(react-native-gesture-handler@2.24.0(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-reanimated@3.17.5(@babel/core@7.28.4)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': dependencies: '@gorhom/portal': 1.0.14(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) @@ -8244,6 +10719,24 @@ snapshots: nanoid: 3.3.7 react: 19.0.0 react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) +======= + '@gorhom/bottom-sheet@5.0.5(@types/react@19.0.14)(react-native-gesture-handler@2.24.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': + dependencies: + '@gorhom/portal': 1.0.14(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + invariant: 2.2.4 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-gesture-handler: 2.24.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-reanimated: 3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + optionalDependencies: + '@types/react': 19.0.14 + + '@gorhom/portal@1.0.14(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': + dependencies: + nanoid: 3.3.7 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) +>>>>>>> c7bb80d '@hookform/resolvers@3.9.0(react-hook-form@7.53.0(react@19.0.0))': dependencies: @@ -8251,6 +10744,7 @@ snapshots: '@humanfs/core@0.19.1': {} +<<<<<<< HEAD '@humanfs/node@0.16.7': dependencies: '@humanfs/core': 0.19.1 @@ -8260,6 +10754,19 @@ snapshots: '@humanwhocodes/retry@0.4.3': {} +======= + '@humanfs/node@0.16.6': + dependencies: + '@humanfs/core': 0.19.1 + '@humanwhocodes/retry': 0.3.1 + + '@humanwhocodes/module-importer@1.0.1': {} + + '@humanwhocodes/retry@0.3.1': {} + + '@humanwhocodes/retry@0.4.3': {} + +>>>>>>> c7bb80d '@inquirer/figures@1.0.8': {} '@isaacs/cliui@8.0.2': @@ -8426,7 +10933,11 @@ snapshots: '@jest/transform@29.7.0': dependencies: +<<<<<<< HEAD '@babel/core': 7.28.4 +======= + '@babel/core': 7.26.0 +>>>>>>> c7bb80d '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 babel-plugin-istanbul: 6.1.1 @@ -8701,6 +11212,7 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 +<<<<<<< HEAD '@jridgewell/trace-mapping@0.3.31': dependencies: '@jridgewell/resolve-uri': 3.1.2 @@ -8711,6 +11223,8 @@ snapshots: '@tanstack/query-core': 5.52.0 '@tanstack/react-query': 5.52.1(react@19.0.0) +======= +>>>>>>> c7bb80d '@motionone/animation@10.18.0': dependencies: '@motionone/easing': 10.18.0 @@ -8746,11 +11260,19 @@ snapshots: hey-listen: 1.0.8 tslib: 2.8.1 +<<<<<<< HEAD '@napi-rs/wasm-runtime@0.2.12': dependencies: '@emnapi/core': 1.5.0 '@emnapi/runtime': 1.5.0 '@tybys/wasm-util': 0.10.1 +======= + '@napi-rs/wasm-runtime@0.2.11': + dependencies: + '@emnapi/core': 1.4.3 + '@emnapi/runtime': 1.4.3 + '@tybys/wasm-util': 0.9.0 +>>>>>>> c7bb80d optional: true '@nodelib/fs.scandir@2.1.5': @@ -8770,7 +11292,11 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true +<<<<<<< HEAD '@pkgr/core@0.2.9': {} +======= + '@pkgr/core@0.2.7': {} +>>>>>>> c7bb80d '@pnpm/config.env-replace@1.1.0': {} @@ -8797,16 +11323,26 @@ snapshots: optionalDependencies: '@types/react': 19.0.14 +<<<<<<< HEAD '@react-native/assets-registry@0.79.5': {} '@react-native/babel-plugin-codegen@0.79.6(@babel/core@7.28.4)': dependencies: '@babel/traverse': 7.28.4 '@react-native/codegen': 0.79.6(@babel/core@7.28.4) +======= + '@react-native/assets-registry@0.79.4': {} + + '@react-native/babel-plugin-codegen@0.79.4(@babel/core@7.26.0)': + dependencies: + '@babel/traverse': 7.25.9 + '@react-native/codegen': 0.79.4(@babel/core@7.26.0) +>>>>>>> c7bb80d transitivePeerDependencies: - '@babel/core' - supports-color +<<<<<<< HEAD '@react-native/babel-preset@0.79.6(@babel/core@7.28.4)': dependencies: '@babel/core': 7.28.4 @@ -8853,19 +11389,74 @@ snapshots: '@react-native/babel-plugin-codegen': 0.79.6(@babel/core@7.28.4) babel-plugin-syntax-hermes-parser: 0.25.1 babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.28.4) +======= + '@react-native/babel-preset@0.79.4(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 + '@babel/plugin-proposal-export-default-from': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-export-default-from': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-async-generator-functions': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-async-to-generator': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-block-scoping': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-computed-properties': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-destructuring': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-flow-strip-types': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-for-of': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-function-name': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-literals': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-logical-assignment-operators': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-modules-commonjs': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-nullish-coalescing-operator': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-numeric-separator': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-optional-catch-binding': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-react-display-name': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-regenerator': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-runtime': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-spread': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-sticky-regex': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-typescript': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.26.0) + '@babel/template': 7.25.9 + '@react-native/babel-plugin-codegen': 0.79.4(@babel/core@7.26.0) + babel-plugin-syntax-hermes-parser: 0.25.1 + babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.26.0) +>>>>>>> c7bb80d react-refresh: 0.14.2 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@react-native/codegen@0.79.5(@babel/core@7.28.4)': dependencies: '@babel/core': 7.28.4 +======= + '@react-native/codegen@0.79.4(@babel/core@7.26.0)': + dependencies: + '@babel/core': 7.26.0 +>>>>>>> c7bb80d glob: 7.2.3 hermes-parser: 0.25.1 invariant: 2.2.4 nullthrows: 1.1.1 yargs: 17.7.2 +<<<<<<< HEAD '@react-native/codegen@0.79.6(@babel/core@7.28.4)': dependencies: '@babel/core': 7.28.4 @@ -8885,12 +11476,24 @@ snapshots: metro: 0.82.5 metro-config: 0.82.5 metro-core: 0.82.5 +======= + '@react-native/community-cli-plugin@0.79.4': + dependencies: + '@react-native/dev-middleware': 0.79.4 + chalk: 4.1.2 + debug: 2.6.9 + invariant: 2.2.4 + metro: 0.82.4 + metro-config: 0.82.4 + metro-core: 0.82.4 +>>>>>>> c7bb80d semver: 7.7.2 transitivePeerDependencies: - bufferutil - supports-color - utf-8-validate +<<<<<<< HEAD '@react-native/debugger-frontend@0.79.5': {} '@react-native/debugger-frontend@0.79.6': {} @@ -8899,6 +11502,14 @@ snapshots: dependencies: '@isaacs/ttlcache': 1.4.1 '@react-native/debugger-frontend': 0.79.5 +======= + '@react-native/debugger-frontend@0.79.4': {} + + '@react-native/dev-middleware@0.79.4': + dependencies: + '@isaacs/ttlcache': 1.4.1 + '@react-native/debugger-frontend': 0.79.4 +>>>>>>> c7bb80d chrome-launcher: 0.15.2 chromium-edge-launcher: 0.2.0 connect: 3.7.0 @@ -8913,6 +11524,7 @@ snapshots: - supports-color - utf-8-validate +<<<<<<< HEAD '@react-native/dev-middleware@0.79.6': dependencies: '@isaacs/ttlcache': 1.4.1 @@ -8942,10 +11554,24 @@ snapshots: '@react-native/normalize-colors@0.79.6': {} '@react-native/virtualized-lists@0.79.5(@types/react@19.0.14)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': +======= + '@react-native/gradle-plugin@0.79.4': {} + + '@react-native/js-polyfills@0.79.4': {} + + '@react-native/normalize-colors@0.74.88': {} + + '@react-native/normalize-colors@0.79.2': {} + + '@react-native/normalize-colors@0.79.4': {} + + '@react-native/virtualized-lists@0.79.4(@types/react@19.0.14)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': +>>>>>>> c7bb80d dependencies: invariant: 2.2.4 nullthrows: 1.1.1 react: 19.0.0 +<<<<<<< HEAD react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) optionalDependencies: '@types/react': 19.0.14 @@ -8965,10 +11591,32 @@ snapshots: '@react-navigation/core@7.12.4(react@19.0.0)': dependencies: '@react-navigation/routers': 7.5.1 +======= + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + optionalDependencies: + '@types/react': 19.0.14 + + '@react-navigation/bottom-tabs@7.3.15(@react-navigation/native@7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-screens@4.11.1(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': + dependencies: + '@react-navigation/elements': 2.4.4(@react-navigation/native@7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + '@react-navigation/native': 7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + color: 4.2.3 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-safe-area-context: 5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-screens: 4.11.1(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + transitivePeerDependencies: + - '@react-native-masked-view/masked-view' + + '@react-navigation/core@7.10.1(react@19.0.0)': + dependencies: + '@react-navigation/routers': 7.4.1 +>>>>>>> c7bb80d escape-string-regexp: 4.0.0 nanoid: 3.3.11 query-string: 7.1.3 react: 19.0.0 +<<<<<<< HEAD react-is: 19.1.1 use-latest-callback: 0.2.4(react@19.0.0) use-sync-external-store: 1.5.0(react@19.0.0) @@ -8990,21 +11638,57 @@ snapshots: react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) react-native-safe-area-context: 5.4.0(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) react-native-screens: 4.11.1(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + react-is: 19.1.0 + use-latest-callback: 0.2.4(react@19.0.0) + use-sync-external-store: 1.5.0(react@19.0.0) + + '@react-navigation/elements@2.4.4(@react-navigation/native@7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': + dependencies: + '@react-navigation/native': 7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + color: 4.2.3 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-safe-area-context: 5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + use-latest-callback: 0.2.4(react@19.0.0) + + '@react-navigation/native-stack@7.3.16(@react-navigation/native@7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-screens@4.11.1(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': + dependencies: + '@react-navigation/elements': 2.4.4(@react-navigation/native@7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + '@react-navigation/native': 7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-safe-area-context: 5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-screens: 4.11.1(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +>>>>>>> c7bb80d warn-once: 0.1.1 transitivePeerDependencies: - '@react-native-masked-view/masked-view' +<<<<<<< HEAD '@react-navigation/native@7.1.11(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': dependencies: '@react-navigation/core': 7.12.4(react@19.0.0) +======= + '@react-navigation/native@7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': + dependencies: + '@react-navigation/core': 7.10.1(react@19.0.0) +>>>>>>> c7bb80d escape-string-regexp: 4.0.0 fast-deep-equal: 3.1.3 nanoid: 3.3.11 react: 19.0.0 +<<<<<<< HEAD react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) use-latest-callback: 0.2.4(react@19.0.0) '@react-navigation/routers@7.5.1': +======= + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + use-latest-callback: 0.2.4(react@19.0.0) + + '@react-navigation/routers@7.4.1': +>>>>>>> c7bb80d dependencies: nanoid: 3.3.11 @@ -9018,12 +11702,21 @@ snapshots: transitivePeerDependencies: - zenObservable +<<<<<<< HEAD '@shopify/flash-list@1.7.6(@babel/runtime@7.26.0)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': dependencies: '@babel/runtime': 7.26.0 react: 19.0.0 react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) recyclerlistview: 4.2.3(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + '@shopify/flash-list@1.7.6(@babel/runtime@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)': + dependencies: + '@babel/runtime': 7.26.0 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + recyclerlistview: 4.2.3(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +>>>>>>> c7bb80d tslib: 2.8.1 '@sinclair/typebox@0.27.8': {} @@ -9036,6 +11729,7 @@ snapshots: dependencies: '@sinonjs/commons': 3.0.1 +<<<<<<< HEAD '@tanstack/eslint-plugin-query@5.89.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3)': dependencies: '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) @@ -9048,6 +11742,12 @@ snapshots: '@tanstack/react-query@5.52.1(react@19.0.0)': dependencies: +======= + '@tanstack/query-core@5.52.0': {} + + '@tanstack/react-query@5.52.1(react@19.0.0)': + dependencies: +>>>>>>> c7bb80d '@tanstack/query-core': 5.52.0 react: 19.0.0 @@ -9061,6 +11761,7 @@ snapshots: lodash: 4.17.21 redent: 3.0.0 +<<<<<<< HEAD '@testing-library/react-hooks@8.0.1(@types/react@19.0.14)(react-dom@19.0.0(react@19.0.0))(react-test-renderer@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@babel/runtime': 7.26.0 @@ -9072,11 +11773,18 @@ snapshots: react-test-renderer: 19.0.0(react@19.0.0) '@testing-library/react-native@12.7.2(jest@29.7.0(@types/node@22.9.1))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react-test-renderer@19.0.0(react@19.0.0))(react@19.0.0)': +======= + '@testing-library/react-native@12.7.2(jest@29.7.0(@types/node@22.9.1))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react-test-renderer@19.0.0(react@19.0.0))(react@19.0.0)': +>>>>>>> c7bb80d dependencies: jest-matcher-utils: 29.7.0 pretty-format: 29.7.0 react: 19.0.0 +<<<<<<< HEAD react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) +======= + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) +>>>>>>> c7bb80d react-test-renderer: 19.0.0(react@19.0.0) redent: 3.0.0 optionalDependencies: @@ -9086,21 +11794,31 @@ snapshots: '@tootallnate/once@2.0.0': {} +<<<<<<< HEAD '@tybys/wasm-util@0.10.1': +======= + '@tybys/wasm-util@0.9.0': +>>>>>>> c7bb80d dependencies: tslib: 2.8.1 optional: true '@types/babel__core@7.20.5': dependencies: +<<<<<<< HEAD '@babel/parser': 7.28.4 '@babel/types': 7.28.4 +======= + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 +>>>>>>> c7bb80d '@types/babel__generator': 7.6.8 '@types/babel__template': 7.4.4 '@types/babel__traverse': 7.20.6 '@types/babel__generator@7.6.8': dependencies: +<<<<<<< HEAD '@babel/types': 7.28.4 '@types/babel__template@7.4.4': @@ -9111,6 +11829,18 @@ snapshots: '@types/babel__traverse@7.20.6': dependencies: '@babel/types': 7.28.4 +======= + '@babel/types': 7.26.0 + + '@types/babel__template@7.4.4': + dependencies: + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 + + '@types/babel__traverse@7.20.6': + dependencies: + '@babel/types': 7.26.0 +>>>>>>> c7bb80d '@types/conventional-commits-parser@5.0.0': dependencies: @@ -9191,6 +11921,7 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 +<<<<<<< HEAD '@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3)': dependencies: '@eslint-community/regexpp': 4.12.1 @@ -9200,6 +11931,17 @@ snapshots: '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) '@typescript-eslint/visitor-keys': 8.44.0 eslint: 9.35.0(jiti@1.21.6) +======= + '@typescript-eslint/eslint-plugin@8.34.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@eslint-community/regexpp': 4.12.1 + '@typescript-eslint/parser': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/scope-manager': 8.34.0 + '@typescript-eslint/type-utils': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/utils': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/visitor-keys': 8.34.0 + eslint: 9.29.0(jiti@1.21.6) +>>>>>>> c7bb80d graphemer: 1.4.0 ignore: 7.0.5 natural-compare: 1.4.0 @@ -9208,6 +11950,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3)': dependencies: '@typescript-eslint/scope-manager': 8.44.0 @@ -9216,19 +11959,38 @@ snapshots: '@typescript-eslint/visitor-keys': 8.44.0 debug: 4.4.3 eslint: 9.35.0(jiti@1.21.6) +======= + '@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@typescript-eslint/scope-manager': 8.34.0 + '@typescript-eslint/types': 8.34.0 + '@typescript-eslint/typescript-estree': 8.34.0(typescript@5.8.3) + '@typescript-eslint/visitor-keys': 8.34.0 + debug: 4.3.7 + eslint: 9.29.0(jiti@1.21.6) +>>>>>>> c7bb80d typescript: 5.8.3 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@typescript-eslint/project-service@8.44.0(typescript@5.8.3)': dependencies: '@typescript-eslint/tsconfig-utils': 8.44.0(typescript@5.8.3) '@typescript-eslint/types': 8.44.0 debug: 4.4.3 +======= + '@typescript-eslint/project-service@8.34.0(typescript@5.8.3)': + dependencies: + '@typescript-eslint/tsconfig-utils': 8.34.0(typescript@5.8.3) + '@typescript-eslint/types': 8.34.0 + debug: 4.4.1 +>>>>>>> c7bb80d typescript: 5.8.3 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@typescript-eslint/scope-manager@8.44.0': dependencies: '@typescript-eslint/types': 8.44.0 @@ -9245,11 +12007,29 @@ snapshots: '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) debug: 4.4.3 eslint: 9.35.0(jiti@1.21.6) +======= + '@typescript-eslint/scope-manager@8.34.0': + dependencies: + '@typescript-eslint/types': 8.34.0 + '@typescript-eslint/visitor-keys': 8.34.0 + + '@typescript-eslint/tsconfig-utils@8.34.0(typescript@5.8.3)': + dependencies: + typescript: 5.8.3 + + '@typescript-eslint/type-utils@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@typescript-eslint/typescript-estree': 8.34.0(typescript@5.8.3) + '@typescript-eslint/utils': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + debug: 4.3.7 + eslint: 9.29.0(jiti@1.21.6) +>>>>>>> c7bb80d ts-api-utils: 2.1.0(typescript@5.8.3) typescript: 5.8.3 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@typescript-eslint/types@8.44.0': {} '@typescript-eslint/typescript-estree@8.44.0(typescript@5.8.3)': @@ -9263,11 +12043,27 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.7.2 +======= + '@typescript-eslint/types@8.34.0': {} + + '@typescript-eslint/typescript-estree@8.34.0(typescript@5.8.3)': + dependencies: + '@typescript-eslint/project-service': 8.34.0(typescript@5.8.3) + '@typescript-eslint/tsconfig-utils': 8.34.0(typescript@5.8.3) + '@typescript-eslint/types': 8.34.0 + '@typescript-eslint/visitor-keys': 8.34.0 + debug: 4.3.7 + fast-glob: 3.3.2 + is-glob: 4.0.3 + minimatch: 9.0.5 + semver: 7.6.3 +>>>>>>> c7bb80d ts-api-utils: 2.1.0(typescript@5.8.3) typescript: 5.8.3 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@typescript-eslint/utils@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3)': dependencies: '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@1.21.6)) @@ -9275,10 +12071,20 @@ snapshots: '@typescript-eslint/types': 8.44.0 '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.8.3) eslint: 9.35.0(jiti@1.21.6) +======= + '@typescript-eslint/utils@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@eslint-community/eslint-utils': 4.7.0(eslint@9.29.0(jiti@1.21.6)) + '@typescript-eslint/scope-manager': 8.34.0 + '@typescript-eslint/types': 8.34.0 + '@typescript-eslint/typescript-estree': 8.34.0(typescript@5.8.3) + eslint: 9.29.0(jiti@1.21.6) +>>>>>>> c7bb80d typescript: 5.8.3 transitivePeerDependencies: - supports-color +<<<<<<< HEAD '@typescript-eslint/visitor-keys@8.44.0': dependencies: '@typescript-eslint/types': 8.44.0 @@ -9341,6 +12147,70 @@ snapshots: optional: true '@unrs/resolver-binding-win32-x64-msvc@1.11.1': +======= + '@typescript-eslint/visitor-keys@8.34.0': + dependencies: + '@typescript-eslint/types': 8.34.0 + eslint-visitor-keys: 4.2.1 + + '@unrs/resolver-binding-android-arm-eabi@1.9.0': + optional: true + + '@unrs/resolver-binding-android-arm64@1.9.0': + optional: true + + '@unrs/resolver-binding-darwin-arm64@1.9.0': + optional: true + + '@unrs/resolver-binding-darwin-x64@1.9.0': + optional: true + + '@unrs/resolver-binding-freebsd-x64@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-arm-gnueabihf@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-arm-musleabihf@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-arm64-gnu@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-arm64-musl@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-ppc64-gnu@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-riscv64-gnu@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-riscv64-musl@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-s390x-gnu@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-x64-gnu@1.9.0': + optional: true + + '@unrs/resolver-binding-linux-x64-musl@1.9.0': + optional: true + + '@unrs/resolver-binding-wasm32-wasi@1.9.0': + dependencies: + '@napi-rs/wasm-runtime': 0.2.11 + optional: true + + '@unrs/resolver-binding-win32-arm64-msvc@1.9.0': + optional: true + + '@unrs/resolver-binding-win32-ia32-msvc@1.9.0': + optional: true + + '@unrs/resolver-binding-win32-x64-msvc@1.9.0': +>>>>>>> c7bb80d optional: true '@urql/core@5.0.8': @@ -9464,7 +12334,11 @@ snapshots: acorn-loose@8.4.0: dependencies: +<<<<<<< HEAD acorn: 8.15.0 +======= + acorn: 8.14.0 +>>>>>>> c7bb80d acorn-walk@8.3.4: dependencies: @@ -9476,18 +12350,38 @@ snapshots: agent-base@6.0.2: dependencies: +<<<<<<< HEAD debug: 4.4.3 transitivePeerDependencies: - supports-color agent-base@7.1.4: {} +======= + debug: 4.4.1 + transitivePeerDependencies: + - supports-color + + agent-base@7.1.3: {} +>>>>>>> c7bb80d aggregate-error@4.0.1: dependencies: clean-stack: 4.2.0 indent-string: 5.0.0 +<<<<<<< HEAD ajv-keywords@3.5.2(ajv@6.12.6): +======= + ajv-formats@2.1.1(ajv@8.17.1): + optionalDependencies: + ajv: 8.17.1 + + ajv-keywords@3.5.2(ajv@6.12.6): + dependencies: + ajv: 6.12.6 + + ajv-keywords@5.1.0(ajv@8.17.1): +>>>>>>> c7bb80d dependencies: ajv: 6.12.6 @@ -9593,6 +12487,11 @@ snapshots: aria-query@5.3.2: {} + array-buffer-byte-length@1.0.2: + dependencies: + call-bound: 1.0.4 + is-array-buffer: 3.0.5 + array-buffer-byte-length@1.0.2: dependencies: call-bound: 1.0.4 @@ -9604,10 +12503,17 @@ snapshots: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 +<<<<<<< HEAD es-abstract: 1.24.0 es-object-atoms: 1.1.1 get-intrinsic: 1.3.0 is-string: 1.1.1 +======= + es-abstract: 1.23.5 + es-object-atoms: 1.0.0 + get-intrinsic: 1.2.4 + is-string: 1.0.7 +>>>>>>> c7bb80d array-timsort@1.0.3: {} @@ -9615,7 +12521,11 @@ snapshots: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 +<<<<<<< HEAD es-abstract: 1.24.0 +======= + es-abstract: 1.23.5 +>>>>>>> c7bb80d es-errors: 1.3.0 es-object-atoms: 1.1.1 es-shim-unscopables: 1.0.2 @@ -9624,7 +12534,11 @@ snapshots: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 +<<<<<<< HEAD es-abstract: 1.24.0 +======= + es-abstract: 1.23.5 +>>>>>>> c7bb80d es-errors: 1.3.0 es-object-atoms: 1.1.1 es-shim-unscopables: 1.0.2 @@ -9633,24 +12547,59 @@ snapshots: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 +<<<<<<< HEAD es-abstract: 1.24.0 +======= + es-abstract: 1.23.5 +>>>>>>> c7bb80d es-shim-unscopables: 1.0.2 array.prototype.flatmap@1.3.3: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 +<<<<<<< HEAD + es-abstract: 1.24.0 +======= + es-abstract: 1.23.5 + es-shim-unscopables: 1.0.2 + + array.prototype.flatmap@1.3.3: + dependencies: + call-bind: 1.0.8 + define-properties: 1.2.1 + es-abstract: 1.23.5 +>>>>>>> c7bb80d + es-shim-unscopables: 1.0.2 + + array.prototype.tosorted@1.1.4: + dependencies: + call-bind: 1.0.8 + define-properties: 1.2.1 +<<<<<<< HEAD es-abstract: 1.24.0 +======= + es-abstract: 1.23.5 +>>>>>>> c7bb80d + es-errors: 1.3.0 es-shim-unscopables: 1.0.2 - array.prototype.tosorted@1.1.4: + arraybuffer.prototype.slice@1.0.4: dependencies: + array-buffer-byte-length: 1.0.2 call-bind: 1.0.8 define-properties: 1.2.1 +<<<<<<< HEAD es-abstract: 1.24.0 +======= + es-abstract: 1.23.5 +>>>>>>> c7bb80d es-errors: 1.3.0 - es-shim-unscopables: 1.0.2 + get-intrinsic: 1.3.0 + is-array-buffer: 3.0.5 +<<<<<<< HEAD +======= arraybuffer.prototype.slice@1.0.4: dependencies: array-buffer-byte-length: 1.0.2 @@ -9661,6 +12610,7 @@ snapshots: get-intrinsic: 1.3.0 is-array-buffer: 3.0.5 +>>>>>>> c7bb80d asap@2.0.6: {} async-limiter@1.0.1: {} @@ -9684,6 +12634,7 @@ snapshots: transitivePeerDependencies: - debug +<<<<<<< HEAD babel-jest@29.7.0(@babel/core@7.28.4): dependencies: '@babel/core': 7.28.4 @@ -9691,6 +12642,15 @@ snapshots: '@types/babel__core': 7.20.5 babel-plugin-istanbul: 6.1.1 babel-preset-jest: 29.6.3(@babel/core@7.28.4) +======= + babel-jest@29.7.0(@babel/core@7.26.0): + dependencies: + '@babel/core': 7.26.0 + '@jest/transform': 29.7.0 + '@types/babel__core': 7.20.5 + babel-plugin-istanbul: 6.1.1 + babel-preset-jest: 29.6.3(@babel/core@7.26.0) +>>>>>>> c7bb80d chalk: 4.1.2 graceful-fs: 4.2.11 slash: 3.0.0 @@ -9699,7 +12659,11 @@ snapshots: babel-plugin-istanbul@6.1.1: dependencies: +<<<<<<< HEAD '@babel/helper-plugin-utils': 7.27.1 +======= + '@babel/helper-plugin-utils': 7.25.9 +>>>>>>> c7bb80d '@istanbuljs/load-nyc-config': 1.1.0 '@istanbuljs/schema': 0.1.3 istanbul-lib-instrument: 5.2.1 @@ -9709,8 +12673,13 @@ snapshots: babel-plugin-jest-hoist@29.6.3: dependencies: +<<<<<<< HEAD '@babel/template': 7.27.2 '@babel/types': 7.28.4 +======= + '@babel/template': 7.25.9 + '@babel/types': 7.26.0 +>>>>>>> c7bb80d '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.20.6 @@ -9722,27 +12691,49 @@ snapshots: reselect: 4.1.8 resolve: 1.22.8 +<<<<<<< HEAD babel-plugin-polyfill-corejs2@0.4.14(@babel/core@7.28.4): dependencies: '@babel/compat-data': 7.28.4 '@babel/core': 7.28.4 '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.4) +======= + babel-plugin-polyfill-corejs2@0.4.12(@babel/core@7.26.0): + dependencies: + '@babel/compat-data': 7.26.2 + '@babel/core': 7.26.0 + '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0) +>>>>>>> c7bb80d semver: 6.3.1 transitivePeerDependencies: - supports-color +<<<<<<< HEAD babel-plugin-polyfill-corejs3@0.13.0(@babel/core@7.28.4): dependencies: '@babel/core': 7.28.4 '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.4) +======= + babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.26.0): + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0) +>>>>>>> c7bb80d core-js-compat: 3.43.0 transitivePeerDependencies: - supports-color +<<<<<<< HEAD babel-plugin-polyfill-regenerator@0.6.5(@babel/core@7.28.4): dependencies: '@babel/core': 7.28.4 '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.4) +======= + babel-plugin-polyfill-regenerator@0.6.3(@babel/core@7.26.0): + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0) +>>>>>>> c7bb80d transitivePeerDependencies: - supports-color @@ -9752,6 +12743,7 @@ snapshots: dependencies: hermes-parser: 0.25.1 +<<<<<<< HEAD babel-plugin-transform-flow-enums@0.0.2(@babel/core@7.28.4): dependencies: '@babel/plugin-syntax-flow': 7.27.1(@babel/core@7.28.4) @@ -9798,17 +12790,73 @@ snapshots: babel-plugin-syntax-hermes-parser: 0.25.1 babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.28.4) debug: 4.4.3 +======= + babel-plugin-transform-flow-enums@0.0.2(@babel/core@7.26.0): + dependencies: + '@babel/plugin-syntax-flow': 7.26.0(@babel/core@7.26.0) + transitivePeerDependencies: + - '@babel/core' + + babel-preset-current-node-syntax@1.1.0(@babel/core@7.26.0): + dependencies: + '@babel/core': 7.26.0 + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.0) + '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.0) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.26.0) + '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.0) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.0) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.0) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.0) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.0) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.0) + + babel-preset-expo@13.2.1(@babel/core@7.26.0): + dependencies: + '@babel/helper-module-imports': 7.25.9 + '@babel/plugin-proposal-decorators': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-proposal-export-default-from': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-syntax-export-default-from': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-flow-strip-types': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-modules-commonjs': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-runtime': 7.25.9(@babel/core@7.26.0) + '@babel/preset-react': 7.25.9(@babel/core@7.26.0) + '@babel/preset-typescript': 7.26.0(@babel/core@7.26.0) + '@react-native/babel-preset': 0.79.4(@babel/core@7.26.0) + babel-plugin-react-native-web: 0.19.13 + babel-plugin-syntax-hermes-parser: 0.25.1 + babel-plugin-transform-flow-enums: 0.0.2(@babel/core@7.26.0) + debug: 4.4.1 +>>>>>>> c7bb80d react-refresh: 0.14.2 resolve-from: 5.0.0 transitivePeerDependencies: - '@babel/core' - supports-color +<<<<<<< HEAD babel-preset-jest@29.6.3(@babel/core@7.28.4): dependencies: '@babel/core': 7.28.4 babel-plugin-jest-hoist: 29.6.3 babel-preset-current-node-syntax: 1.2.0(@babel/core@7.28.4) +======= + babel-preset-jest@29.6.3(@babel/core@7.26.0): + dependencies: + '@babel/core': 7.26.0 + babel-plugin-jest-hoist: 29.6.3 + babel-preset-current-node-syntax: 1.1.0(@babel/core@7.26.0) +>>>>>>> c7bb80d balanced-match@1.0.2: {} @@ -9841,7 +12889,11 @@ snapshots: chalk: 5.3.0 cli-boxes: 3.0.0 string-width: 7.2.0 +<<<<<<< HEAD type-fest: 4.41.0 +======= + type-fest: 4.27.0 +>>>>>>> c7bb80d widest-line: 5.0.0 wrap-ansi: 9.0.0 @@ -9877,6 +12929,7 @@ snapshots: node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.2) +<<<<<<< HEAD browserslist@4.26.2: dependencies: baseline-browser-mapping: 2.8.4 @@ -9884,6 +12937,14 @@ snapshots: electron-to-chromium: 1.5.218 node-releases: 2.0.21 update-browserslist-db: 1.1.3(browserslist@4.26.2) +======= + browserslist@4.25.0: + dependencies: + caniuse-lite: 1.0.30001723 + electron-to-chromium: 1.5.167 + node-releases: 2.0.19 + update-browserslist-db: 1.1.3(browserslist@4.25.0) +>>>>>>> c7bb80d bs-logger@0.2.6: dependencies: @@ -9912,6 +12973,15 @@ snapshots: call-bind-apply-helpers@1.0.2: dependencies: +<<<<<<< HEAD +======= + es-errors: 1.3.0 + function-bind: 1.1.2 + + call-bind@1.0.7: + dependencies: + es-define-property: 1.0.0 +>>>>>>> c7bb80d es-errors: 1.3.0 function-bind: 1.1.2 @@ -9922,6 +12992,16 @@ snapshots: get-intrinsic: 1.3.0 set-function-length: 1.2.2 +<<<<<<< HEAD +======= + call-bind@1.0.8: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-define-property: 1.0.0 + get-intrinsic: 1.2.4 + set-function-length: 1.2.2 + +>>>>>>> c7bb80d call-bound@1.0.4: dependencies: call-bind-apply-helpers: 1.0.2 @@ -9949,7 +13029,11 @@ snapshots: caniuse-lite@1.0.30001680: {} +<<<<<<< HEAD caniuse-lite@1.0.30001743: {} +======= + caniuse-lite@1.0.30001723: {} +>>>>>>> c7bb80d centra@2.7.0: dependencies: @@ -10033,7 +13117,11 @@ snapshots: ci-info@3.9.0: {} +<<<<<<< HEAD ci-info@4.3.0: {} +======= + ci-info@4.2.0: {} +>>>>>>> c7bb80d cjs-module-lexer@1.4.1: {} @@ -10204,7 +13292,11 @@ snapshots: core-js-compat@3.43.0: dependencies: +<<<<<<< HEAD browserslist: 4.26.2 +======= + browserslist: 4.25.0 +>>>>>>> c7bb80d core-util-is@1.0.3: {} @@ -10320,21 +13412,49 @@ snapshots: es-errors: 1.3.0 is-data-view: 1.0.2 +<<<<<<< HEAD data-view-byte-length@1.0.2: +======= + data-view-buffer@1.0.2: + dependencies: + call-bound: 1.0.4 + es-errors: 1.3.0 + is-data-view: 1.0.2 + + data-view-byte-length@1.0.1: +>>>>>>> c7bb80d dependencies: call-bound: 1.0.4 es-errors: 1.3.0 is-data-view: 1.0.2 +<<<<<<< HEAD data-view-byte-offset@1.0.1: +======= + data-view-byte-length@1.0.2: dependencies: call-bound: 1.0.4 es-errors: 1.3.0 is-data-view: 1.0.2 - date-fns@1.30.1: {} + data-view-byte-offset@1.0.0: +>>>>>>> c7bb80d + dependencies: + call-bound: 1.0.4 + es-errors: 1.3.0 + is-data-view: 1.0.2 + + data-view-byte-offset@1.0.1: + dependencies: + call-bound: 1.0.4 + es-errors: 1.3.0 + is-data-view: 1.0.2 +<<<<<<< HEAD dayjs@1.11.18: {} +======= + date-fns@1.30.1: {} +>>>>>>> c7bb80d debug@2.6.9: dependencies: @@ -10348,7 +13468,11 @@ snapshots: dependencies: ms: 2.1.3 +<<<<<<< HEAD debug@4.4.3: +======= + debug@4.4.1: +>>>>>>> c7bb80d dependencies: ms: 2.1.3 @@ -10462,7 +13586,11 @@ snapshots: dot-prop@9.0.0: dependencies: +<<<<<<< HEAD type-fest: 4.41.0 +======= + type-fest: 4.27.0 +>>>>>>> c7bb80d dotenv-expand@11.0.7: dependencies: @@ -10480,7 +13608,11 @@ snapshots: ee-first@1.1.1: {} +<<<<<<< HEAD electron-to-chromium@1.5.218: {} +======= + electron-to-chromium@1.5.167: {} +>>>>>>> c7bb80d electron-to-chromium@1.5.63: {} @@ -10521,6 +13653,89 @@ snapshots: dependencies: stackframe: 1.3.4 +<<<<<<< HEAD + es-abstract@1.24.0: + dependencies: + array-buffer-byte-length: 1.0.2 + arraybuffer.prototype.slice: 1.0.4 +======= + es-abstract@1.23.5: + dependencies: + array-buffer-byte-length: 1.0.1 + arraybuffer.prototype.slice: 1.0.3 +>>>>>>> c7bb80d + available-typed-arrays: 1.0.7 + call-bind: 1.0.8 + call-bound: 1.0.4 + data-view-buffer: 1.0.2 + data-view-byte-length: 1.0.2 + data-view-byte-offset: 1.0.1 + es-define-property: 1.0.1 + es-errors: 1.3.0 + es-object-atoms: 1.1.1 + es-set-tostringtag: 2.1.0 + es-to-primitive: 1.3.0 + function.prototype.name: 1.1.8 + get-intrinsic: 1.3.0 + get-proto: 1.0.1 + get-symbol-description: 1.1.0 + globalthis: 1.0.4 + gopd: 1.2.0 + has-property-descriptors: 1.0.2 + has-proto: 1.2.0 + has-symbols: 1.1.0 + hasown: 2.0.2 + internal-slot: 1.1.0 + is-array-buffer: 3.0.5 + is-callable: 1.2.7 + is-data-view: 1.0.2 + is-negative-zero: 2.0.3 +<<<<<<< HEAD + is-regex: 1.2.1 + is-set: 2.0.3 + is-shared-array-buffer: 1.0.4 + is-string: 1.1.1 + is-typed-array: 1.1.15 + is-weakref: 1.1.1 + math-intrinsics: 1.1.0 + object-inspect: 1.13.4 + object-keys: 1.1.1 + object.assign: 4.1.7 + own-keys: 1.0.1 + regexp.prototype.flags: 1.5.4 + safe-array-concat: 1.1.3 + safe-push-apply: 1.0.0 + safe-regex-test: 1.1.0 + set-proto: 1.0.0 + stop-iteration-iterator: 1.1.0 + string.prototype.trim: 1.2.10 + string.prototype.trimend: 1.0.9 +======= + is-regex: 1.1.4 + is-shared-array-buffer: 1.0.3 + is-string: 1.0.7 + is-typed-array: 1.1.13 + is-weakref: 1.0.2 + object-inspect: 1.13.3 + object-keys: 1.1.1 + object.assign: 4.1.5 + regexp.prototype.flags: 1.5.3 + safe-array-concat: 1.1.2 + safe-regex-test: 1.0.3 + string.prototype.trim: 1.2.9 + string.prototype.trimend: 1.0.8 +>>>>>>> c7bb80d + string.prototype.trimstart: 1.0.8 + typed-array-buffer: 1.0.3 + typed-array-byte-length: 1.0.3 + typed-array-byte-offset: 1.0.4 + typed-array-length: 1.0.7 + unbox-primitive: 1.1.0 + which-typed-array: 1.1.19 + +<<<<<<< HEAD + es-define-property@1.0.1: {} +======= es-abstract@1.24.0: dependencies: array-buffer-byte-length: 1.0.2 @@ -10578,6 +13793,11 @@ snapshots: unbox-primitive: 1.1.0 which-typed-array: 1.1.19 + es-define-property@1.0.0: + dependencies: + get-intrinsic: 1.2.4 +>>>>>>> c7bb80d + es-define-property@1.0.1: {} es-errors@1.3.0: {} @@ -10600,6 +13820,11 @@ snapshots: internal-slot: 1.1.0 iterator.prototype: 1.1.5 safe-array-concat: 1.1.3 +<<<<<<< HEAD +======= + + es-module-lexer@1.5.4: {} +>>>>>>> c7bb80d es-module-lexer@1.5.4: {} @@ -10607,6 +13832,21 @@ snapshots: dependencies: es-errors: 1.3.0 +<<<<<<< HEAD + es-set-tostringtag@2.1.0: +======= + es-object-atoms@1.1.1: + dependencies: + es-errors: 1.3.0 + + es-set-tostringtag@2.0.3: +>>>>>>> c7bb80d + dependencies: + es-errors: 1.3.0 + get-intrinsic: 1.3.0 + has-tostringtag: 1.0.2 + hasown: 2.0.2 + es-set-tostringtag@2.1.0: dependencies: es-errors: 1.3.0 @@ -10624,6 +13864,15 @@ snapshots: is-date-object: 1.1.0 is-symbol: 1.1.1 +<<<<<<< HEAD +======= + es-to-primitive@1.3.0: + dependencies: + is-callable: 1.2.7 + is-date-object: 1.0.5 + is-symbol: 1.0.4 + +>>>>>>> c7bb80d escalade@3.2.0: {} escape-goat@4.0.0: {} @@ -10646,6 +13895,7 @@ snapshots: optionalDependencies: source-map: 0.6.1 +<<<<<<< HEAD eslint-config-expo@9.2.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3): dependencies: '@typescript-eslint/eslint-plugin': 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) @@ -10657,6 +13907,19 @@ snapshots: eslint-plugin-react: 7.37.5(eslint@9.35.0(jiti@1.21.6)) eslint-plugin-react-hooks: 5.2.0(eslint@9.35.0(jiti@1.21.6)) globals: 16.4.0 +======= + eslint-config-expo@9.2.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3): + dependencies: + '@typescript-eslint/eslint-plugin': 8.34.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/parser': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint: 9.29.0(jiti@1.21.6) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-plugin-import@2.31.0)(eslint@9.29.0(jiti@1.21.6)) + eslint-plugin-expo: 0.1.4(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@3.6.3)(eslint@9.29.0(jiti@1.21.6)) + eslint-plugin-react: 7.37.5(eslint@9.29.0(jiti@1.21.6)) + eslint-plugin-react-hooks: 5.2.0(eslint@9.29.0(jiti@1.21.6)) + globals: 16.2.0 +>>>>>>> c7bb80d transitivePeerDependencies: - eslint-import-resolver-node - eslint-import-resolver-webpack @@ -10664,6 +13927,7 @@ snapshots: - supports-color - typescript +<<<<<<< HEAD eslint-config-prettier@10.1.8(eslint@9.35.0(jiti@1.21.6)): dependencies: eslint: 9.35.0(jiti@1.21.6) @@ -10674,6 +13938,18 @@ snapshots: stable-hash-x: 0.2.0 optionalDependencies: unrs-resolver: 1.11.1 +======= + eslint-config-prettier@10.1.5(eslint@9.29.0(jiti@1.21.6)): + dependencies: + eslint: 9.29.0(jiti@1.21.6) + + eslint-import-context@0.1.8(unrs-resolver@1.9.0): + dependencies: + get-tsconfig: 4.10.1 + stable-hash-x: 0.1.1 + optionalDependencies: + unrs-resolver: 1.9.0 +>>>>>>> c7bb80d eslint-import-resolver-node@0.3.9: dependencies: @@ -10683,6 +13959,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint-plugin-import@2.31.0)(eslint@9.35.0(jiti@1.21.6)): dependencies: '@nolyfill/is-core-module': 1.0.39 @@ -10690,18 +13967,32 @@ snapshots: enhanced-resolve: 5.17.1 eslint: 9.35.0(jiti@1.21.6) eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@3.6.3)(eslint@9.35.0(jiti@1.21.6)) +======= + eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-plugin-import@2.31.0)(eslint@9.29.0(jiti@1.21.6)): + dependencies: + '@nolyfill/is-core-module': 1.0.39 + debug: 4.3.7 + enhanced-resolve: 5.17.1 + eslint: 9.29.0(jiti@1.21.6) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@3.6.3)(eslint@9.29.0(jiti@1.21.6)) +>>>>>>> c7bb80d fast-glob: 3.3.2 get-tsconfig: 4.8.1 is-bun-module: 1.2.1 is-glob: 4.0.3 optionalDependencies: +<<<<<<< HEAD eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@4.4.4)(eslint@9.35.0(jiti@1.21.6)) +======= + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@4.4.3)(eslint@9.29.0(jiti@1.21.6)) +>>>>>>> c7bb80d transitivePeerDependencies: - '@typescript-eslint/parser' - eslint-import-resolver-node - eslint-import-resolver-webpack - supports-color +<<<<<<< HEAD eslint-import-resolver-typescript@4.4.4(eslint-plugin-import@2.31.0)(eslint@9.35.0(jiti@1.21.6)): dependencies: debug: 4.4.3 @@ -10754,15 +14045,77 @@ snapshots: '@typescript-eslint/types': 8.44.0 '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) eslint: 9.35.0(jiti@1.21.6) +======= + eslint-import-resolver-typescript@4.4.3(eslint-plugin-import@2.31.0)(eslint@9.29.0(jiti@1.21.6)): + dependencies: + debug: 4.4.1 + eslint: 9.29.0(jiti@1.21.6) + eslint-import-context: 0.1.8(unrs-resolver@1.9.0) + get-tsconfig: 4.10.1 + is-bun-module: 2.0.0 + stable-hash-x: 0.1.1 + tinyglobby: 0.2.14 + unrs-resolver: 1.9.0 + optionalDependencies: + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@4.4.3)(eslint@9.29.0(jiti@1.21.6)) + transitivePeerDependencies: + - supports-color + + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.29.0(jiti@1.21.6)): + dependencies: + debug: 3.2.7 + optionalDependencies: + '@typescript-eslint/parser': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint: 9.29.0(jiti@1.21.6) + eslint-import-resolver-node: 0.3.9 + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-plugin-import@2.31.0)(eslint@9.29.0(jiti@1.21.6)) + transitivePeerDependencies: + - supports-color + + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@4.4.3)(eslint@9.29.0(jiti@1.21.6)): + dependencies: + debug: 3.2.7 + optionalDependencies: + '@typescript-eslint/parser': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint: 9.29.0(jiti@1.21.6) + eslint-import-resolver-node: 0.3.9 + eslint-import-resolver-typescript: 4.4.3(eslint-plugin-import@2.31.0)(eslint@9.29.0(jiti@1.21.6)) + transitivePeerDependencies: + - supports-color + + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@3.6.3)(eslint@9.29.0(jiti@1.21.6)): + dependencies: + debug: 3.2.7 + optionalDependencies: + '@typescript-eslint/parser': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint: 9.29.0(jiti@1.21.6) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-plugin-import@2.31.0)(eslint@9.29.0(jiti@1.21.6)) + transitivePeerDependencies: + - supports-color + + eslint-plugin-expo@0.1.4(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3): + dependencies: + '@typescript-eslint/types': 8.34.0 + '@typescript-eslint/utils': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint: 9.29.0(jiti@1.21.6) +>>>>>>> c7bb80d transitivePeerDependencies: - supports-color - typescript +<<<<<<< HEAD eslint-plugin-i18n-json@4.0.1(eslint@9.35.0(jiti@1.21.6)): dependencies: '@formatjs/icu-messageformat-parser': 2.9.4 chalk: 2.4.2 eslint: 9.35.0(jiti@1.21.6) +======= + eslint-plugin-i18n-json@4.0.1(eslint@9.29.0(jiti@1.21.6)): + dependencies: + '@formatjs/icu-messageformat-parser': 2.9.4 + chalk: 2.4.2 + eslint: 9.29.0(jiti@1.21.6) +>>>>>>> c7bb80d indent-string: 3.2.0 jest-diff: 22.4.3 lodash: 4.17.21 @@ -10771,7 +14124,11 @@ snapshots: plur: 2.1.2 pretty-format: 22.4.3 +<<<<<<< HEAD eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@3.6.3)(eslint@9.35.0(jiti@1.21.6)): +======= + eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@3.6.3)(eslint@9.29.0(jiti@1.21.6)): +>>>>>>> c7bb80d dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.8 @@ -10780,9 +14137,15 @@ snapshots: array.prototype.flatmap: 1.3.3 debug: 3.2.7 doctrine: 2.1.0 +<<<<<<< HEAD eslint: 9.35.0(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.35.0(jiti@1.21.6)) +======= + eslint: 9.29.0(jiti@1.21.6) + eslint-import-resolver-node: 0.3.9 + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.29.0(jiti@1.21.6)) +>>>>>>> c7bb80d hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -10791,19 +14154,86 @@ snapshots: object.groupby: 1.0.3 object.values: 1.2.1 semver: 6.3.1 +<<<<<<< HEAD string.prototype.trimend: 1.0.9 tsconfig-paths: 3.15.0 optionalDependencies: '@typescript-eslint/parser': 8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) +======= + string.prototype.trimend: 1.0.8 + tsconfig-paths: 3.15.0 + optionalDependencies: + '@typescript-eslint/parser': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) +>>>>>>> c7bb80d transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack - supports-color +<<<<<<< HEAD eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@4.4.4)(eslint@9.35.0(jiti@1.21.6)): +======= + eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-typescript@4.4.3)(eslint@9.29.0(jiti@1.21.6)): + dependencies: + '@rtsao/scc': 1.1.0 + array-includes: 3.1.8 + array.prototype.findlastindex: 1.2.5 + array.prototype.flat: 1.3.2 + array.prototype.flatmap: 1.3.2 + debug: 3.2.7 + doctrine: 2.1.0 + eslint: 9.29.0(jiti@1.21.6) + eslint-import-resolver-node: 0.3.9 + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@4.4.3)(eslint@9.29.0(jiti@1.21.6)) + hasown: 2.0.2 + is-core-module: 2.15.1 + is-glob: 4.0.3 + minimatch: 3.1.2 + object.fromentries: 2.0.8 + object.groupby: 1.0.3 + object.values: 1.2.0 + semver: 6.3.1 + string.prototype.trimend: 1.0.8 + tsconfig-paths: 3.15.0 + optionalDependencies: + '@typescript-eslint/parser': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + transitivePeerDependencies: + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - supports-color + + eslint-plugin-prettier@5.4.1(@types/eslint@9.6.1)(eslint-config-prettier@10.1.5(eslint@9.29.0(jiti@1.21.6)))(eslint@9.29.0(jiti@1.21.6))(prettier@3.3.3): + dependencies: + eslint: 9.29.0(jiti@1.21.6) + prettier: 3.3.3 + prettier-linter-helpers: 1.0.0 + synckit: 0.11.8 + optionalDependencies: + '@types/eslint': 9.6.1 + eslint-config-prettier: 10.1.5(eslint@9.29.0(jiti@1.21.6)) + + eslint-plugin-react-compiler@19.1.0-rc.2(eslint@9.29.0(jiti@1.21.6)): + dependencies: + '@babel/core': 7.26.0 + '@babel/parser': 7.26.2 + '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.26.0) + eslint: 9.29.0(jiti@1.21.6) + hermes-parser: 0.25.1 + zod: 3.23.8 + zod-validation-error: 3.4.0(zod@3.23.8) + transitivePeerDependencies: + - supports-color + + eslint-plugin-react-hooks@5.2.0(eslint@9.29.0(jiti@1.21.6)): + dependencies: + eslint: 9.29.0(jiti@1.21.6) + + eslint-plugin-react@7.37.5(eslint@9.29.0(jiti@1.21.6)): +>>>>>>> c7bb80d dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.8 +<<<<<<< HEAD array.prototype.findlastindex: 1.2.5 array.prototype.flat: 1.3.2 array.prototype.flatmap: 1.3.3 @@ -10812,10 +14242,20 @@ snapshots: eslint: 9.35.0(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@4.4.4)(eslint@9.35.0(jiti@1.21.6)) +======= + array.prototype.findlast: 1.2.5 + array.prototype.flatmap: 1.3.3 + array.prototype.tosorted: 1.1.4 + doctrine: 2.1.0 + es-iterator-helpers: 1.2.1 + eslint: 9.29.0(jiti@1.21.6) + estraverse: 5.3.0 +>>>>>>> c7bb80d hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 minimatch: 3.1.2 +<<<<<<< HEAD object.fromentries: 2.0.8 object.groupby: 1.0.3 object.values: 1.2.1 @@ -10836,10 +14276,37 @@ snapshots: optionalDependencies: '@typescript-eslint/eslint-plugin': 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) jest: 29.7.0(@types/node@22.9.1) +======= + object.entries: 1.1.9 + object.fromentries: 2.0.8 + object.values: 1.2.1 + prop-types: 15.8.1 + resolve: 2.0.0-next.5 + semver: 6.3.1 + string.prototype.matchall: 4.0.12 + string.prototype.repeat: 1.0.0 + + eslint-plugin-simple-import-sort@12.1.1(eslint@9.29.0(jiti@1.21.6)): + dependencies: + eslint: 9.29.0(jiti@1.21.6) + + eslint-plugin-tailwindcss@3.18.0(tailwindcss@3.4.4): + dependencies: + fast-glob: 3.3.2 + postcss: 8.4.49 + tailwindcss: 3.4.4 + + eslint-plugin-testing-library@7.5.3(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3): + dependencies: + '@typescript-eslint/scope-manager': 8.34.0 + '@typescript-eslint/utils': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint: 9.29.0(jiti@1.21.6) +>>>>>>> c7bb80d transitivePeerDependencies: - supports-color - typescript +<<<<<<< HEAD eslint-plugin-prettier@5.5.4(@types/eslint@9.6.1)(eslint-config-prettier@10.1.8(eslint@9.35.0(jiti@1.21.6)))(eslint@9.35.0(jiti@1.21.6))(prettier@3.3.3): dependencies: eslint: 9.35.0(jiti@1.21.6) @@ -10937,6 +14404,34 @@ snapshots: eslint: 9.35.0(jiti@1.21.6) optionalDependencies: '@typescript-eslint/eslint-plugin': 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) +======= + eslint-plugin-unicorn@59.0.1(eslint@9.29.0(jiti@1.21.6)): + dependencies: + '@babel/helper-validator-identifier': 7.25.9 + '@eslint-community/eslint-utils': 4.7.0(eslint@9.29.0(jiti@1.21.6)) + '@eslint/plugin-kit': 0.2.8 + ci-info: 4.2.0 + clean-regexp: 1.0.0 + core-js-compat: 3.43.0 + eslint: 9.29.0(jiti@1.21.6) + esquery: 1.6.0 + find-up-simple: 1.0.1 + globals: 16.2.0 + indent-string: 5.0.0 + is-builtin-module: 5.0.0 + jsesc: 3.1.0 + pluralize: 8.0.0 + regexp-tree: 0.1.27 + regjsparser: 0.12.0 + semver: 7.7.2 + strip-indent: 4.0.0 + + eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.34.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.29.0(jiti@1.21.6)): + dependencies: + eslint: 9.29.0(jiti@1.21.6) + optionalDependencies: + '@typescript-eslint/eslint-plugin': 8.34.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) +>>>>>>> c7bb80d eslint-scope@5.1.1: dependencies: @@ -10952,6 +14447,7 @@ snapshots: eslint-visitor-keys@4.2.1: {} +<<<<<<< HEAD eslint@9.35.0(jiti@1.21.6): dependencies: '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@1.21.6)) @@ -10963,6 +14459,19 @@ snapshots: '@eslint/js': 9.35.0 '@eslint/plugin-kit': 0.3.5 '@humanfs/node': 0.16.7 +======= + eslint@9.29.0(jiti@1.21.6): + dependencies: + '@eslint-community/eslint-utils': 4.4.1(eslint@9.29.0(jiti@1.21.6)) + '@eslint-community/regexpp': 4.12.1 + '@eslint/config-array': 0.20.1 + '@eslint/config-helpers': 0.2.3 + '@eslint/core': 0.14.0 + '@eslint/eslintrc': 3.3.1 + '@eslint/js': 9.29.0 + '@eslint/plugin-kit': 0.3.2 + '@humanfs/node': 0.16.6 +>>>>>>> c7bb80d '@humanwhocodes/module-importer': 1.0.1 '@humanwhocodes/retry': 0.4.3 '@types/estree': 1.0.6 @@ -10970,7 +14479,11 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.6 +<<<<<<< HEAD debug: 4.4.3 +======= + debug: 4.3.7 +>>>>>>> c7bb80d escape-string-regexp: 4.0.0 eslint-scope: 8.4.0 eslint-visitor-keys: 4.2.1 @@ -11064,6 +14577,7 @@ snapshots: jest-message-util: 29.7.0 jest-util: 29.7.0 +<<<<<<< HEAD expo-asset@11.1.7(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): dependencies: '@expo/image-utils': 0.7.6 @@ -11105,10 +14619,54 @@ snapshots: expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) expo-dev-menu: 6.1.14(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) expo-manifests: 0.16.6(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) +======= + expo-asset@11.1.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + '@expo/image-utils': 0.7.4 + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-constants: 17.1.6(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + transitivePeerDependencies: + - supports-color + + expo-constants@17.1.6(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)): + dependencies: + '@expo/config': 11.0.10 + '@expo/env': 1.0.5 + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + transitivePeerDependencies: + - supports-color + + expo-crypto@14.1.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): + dependencies: + base64-js: 1.5.1 + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + + expo-dev-client@5.2.1(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): + dependencies: + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-dev-launcher: 5.1.13(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + expo-dev-menu: 6.1.12(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + expo-dev-menu-interface: 1.10.0(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + expo-manifests: 0.16.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + expo-updates-interface: 1.1.0(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + transitivePeerDependencies: + - supports-color + + expo-dev-launcher@5.1.13(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): + dependencies: + ajv: 8.11.0 + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-dev-menu: 6.1.12(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + expo-manifests: 0.16.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) +>>>>>>> c7bb80d resolve-from: 5.0.0 transitivePeerDependencies: - supports-color +<<<<<<< HEAD expo-dev-menu-interface@1.10.0(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): dependencies: expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) @@ -11134,11 +14692,39 @@ snapshots: expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) react: 19.0.0 react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) +======= + expo-dev-menu-interface@1.10.0(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): + dependencies: + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + + expo-dev-menu@6.1.12(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): + dependencies: + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-dev-menu-interface: 1.10.0(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)) + + expo-file-system@18.1.10(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)): + dependencies: + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + expo-font@13.3.1(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0): + dependencies: + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + fontfaceobserver: 2.3.0 + react: 19.0.0 + + expo-image@2.3.0(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-web@0.20.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) +>>>>>>> c7bb80d optionalDependencies: react-native-web: 0.20.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) expo-json-utils@0.15.0: {} +<<<<<<< HEAD expo-keep-awake@14.1.4(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0): dependencies: expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) @@ -11150,10 +14736,24 @@ snapshots: invariant: 2.2.4 react: 19.0.0 react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) +======= + expo-keep-awake@14.1.4(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0): + dependencies: + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react: 19.0.0 + + expo-linking@7.1.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + expo-constants: 17.1.6(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + invariant: 2.2.4 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) +>>>>>>> c7bb80d transitivePeerDependencies: - expo - supports-color +<<<<<<< HEAD expo-localization@16.1.6(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0): dependencies: expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) @@ -11164,11 +14764,27 @@ snapshots: dependencies: '@expo/config': 11.0.13 expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + expo-localization@16.1.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0): + dependencies: + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react: 19.0.0 + rtl-detect: 1.1.2 + + expo-manifests@0.16.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): + dependencies: + '@expo/config': 11.0.10 + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +>>>>>>> c7bb80d expo-json-utils: 0.15.0 transitivePeerDependencies: - supports-color +<<<<<<< HEAD expo-modules-autolinking@2.1.14: +======= + expo-modules-autolinking@2.1.12: +>>>>>>> c7bb80d dependencies: '@expo/spawn-async': 1.7.2 chalk: 4.1.2 @@ -11178,6 +14794,7 @@ snapshots: require-from-string: 2.0.2 resolve-from: 5.0.0 +<<<<<<< HEAD expo-modules-core@2.5.0: dependencies: invariant: 2.2.4 @@ -11200,11 +14817,39 @@ snapshots: react-native-is-edge-to-edge: 1.1.7(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) react-native-safe-area-context: 5.4.0(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) react-native-screens: 4.11.1(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + expo-modules-core@2.4.0: + dependencies: + invariant: 2.2.4 + + expo-router@5.1.0(7ec05cbd1f45884dfc25001ff0a5198d): + dependencies: + '@expo/metro-runtime': 5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + '@expo/server': 0.6.2 + '@radix-ui/react-slot': 1.2.0(@types/react@19.0.14)(react@19.0.0) + '@react-navigation/bottom-tabs': 7.3.15(@react-navigation/native@7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-screens@4.11.1(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + '@react-navigation/native': 7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + '@react-navigation/native-stack': 7.3.16(@react-navigation/native@7.1.11(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-screens@4.11.1(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + client-only: 0.0.1 + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-constants: 17.1.6(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + expo-linking: 7.1.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + invariant: 2.2.4 + react-fast-compare: 3.2.2 + react-native-is-edge-to-edge: 1.1.6(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-safe-area-context: 5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-screens: 4.11.1(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + schema-utils: 4.2.0 +>>>>>>> c7bb80d semver: 7.6.3 server-only: 0.0.1 shallowequal: 1.1.0 optionalDependencies: +<<<<<<< HEAD react-native-reanimated: 3.17.5(@babel/core@7.28.4)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + react-native-reanimated: 3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +>>>>>>> c7bb80d transitivePeerDependencies: - '@react-native-masked-view/masked-view' - '@types/react' @@ -11212,6 +14857,7 @@ snapshots: - react-native - supports-color +<<<<<<< HEAD expo-splash-screen@0.30.10(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): dependencies: '@expo/prebuild-config': 9.0.12 @@ -11232,11 +14878,34 @@ snapshots: debug: 4.4.3 expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) +======= + expo-splash-screen@0.30.9(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): + dependencies: + '@expo/prebuild-config': 9.0.6 + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + transitivePeerDependencies: + - supports-color + + expo-status-bar@2.2.3(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-edge-to-edge: 1.6.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-is-edge-to-edge: 1.1.6(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + + expo-system-ui@5.0.9(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-web@0.20.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)): + dependencies: + '@react-native/normalize-colors': 0.79.4 + debug: 4.4.1 + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) +>>>>>>> c7bb80d optionalDependencies: react-native-web: 0.20.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) transitivePeerDependencies: - supports-color +<<<<<<< HEAD expo-updates-interface@1.1.0(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): dependencies: expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) @@ -11265,6 +14934,35 @@ snapshots: optionalDependencies: '@expo/metro-runtime': 5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)) react-native-webview: 13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + expo-updates-interface@1.1.0(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)): + dependencies: + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + + expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + '@expo/cli': 0.24.15 + '@expo/config': 11.0.10 + '@expo/config-plugins': 10.0.3 + '@expo/fingerprint': 0.13.1 + '@expo/metro-config': 0.20.15 + '@expo/vector-icons': 14.0.4 + babel-preset-expo: 13.2.1(@babel/core@7.26.0) + expo-asset: 11.1.5(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + expo-constants: 17.1.6(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + expo-file-system: 18.1.10(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + expo-font: 13.3.1(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0) + expo-keep-awake: 14.1.4(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0) + expo-modules-autolinking: 2.1.12 + expo-modules-core: 2.4.0 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-edge-to-edge: 1.6.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + whatwg-url-without-unicode: 8.0.0-3 + optionalDependencies: + '@expo/metro-runtime': 5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) +>>>>>>> c7bb80d transitivePeerDependencies: - '@babel/core' - babel-plugin-react-compiler @@ -11321,9 +15019,15 @@ snapshots: transitivePeerDependencies: - encoding +<<<<<<< HEAD fdir@6.5.0(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 +======= + fdir@6.4.6(picomatch@4.0.2): + optionalDependencies: + picomatch: 4.0.2 +>>>>>>> c7bb80d figures@1.7.0: dependencies: @@ -11407,6 +15111,10 @@ snapshots: fontfaceobserver@2.3.0: {} + for-each@0.3.5: + dependencies: + is-callable: 1.2.7 + for-each@0.3.5: dependencies: is-callable: 1.2.7 @@ -11450,6 +15158,19 @@ snapshots: function-bind@1.1.2: {} + function.prototype.name@1.1.8: + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + define-properties: 1.2.1 +<<<<<<< HEAD +======= + es-abstract: 1.23.5 +>>>>>>> c7bb80d + functions-have-names: 1.2.3 + hasown: 2.0.2 + is-callable: 1.2.7 + function.prototype.name@1.1.8: dependencies: call-bind: 1.0.8 @@ -11467,6 +15188,19 @@ snapshots: get-east-asian-width@1.3.0: {} + get-intrinsic@1.3.0: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-define-property: 1.0.1 + es-errors: 1.3.0 + es-object-atoms: 1.1.1 + function-bind: 1.1.2 + get-proto: 1.0.1 + gopd: 1.2.0 + has-symbols: 1.1.0 + hasown: 2.0.2 + math-intrinsics: 1.1.0 + get-intrinsic@1.3.0: dependencies: call-bind-apply-helpers: 1.0.2 @@ -11499,16 +15233,32 @@ snapshots: es-errors: 1.3.0 get-intrinsic: 1.3.0 +<<<<<<< HEAD + get-tsconfig@4.10.1: +======= + get-symbol-description@1.1.0: + dependencies: + call-bound: 1.0.4 + es-errors: 1.3.0 + get-intrinsic: 1.3.0 + get-tsconfig@4.10.1: dependencies: resolve-pkg-maps: 1.0.0 + get-tsconfig@4.8.1: +>>>>>>> c7bb80d + dependencies: + resolve-pkg-maps: 1.0.0 + get-tsconfig@4.8.1: dependencies: resolve-pkg-maps: 1.0.0 getenv@2.0.0: {} + getenv@2.0.0: {} + gifwrap@0.10.1: dependencies: image-q: 4.0.0 @@ -11570,12 +15320,20 @@ snapshots: globals@14.0.0: {} +<<<<<<< HEAD globals@16.4.0: {} +======= + globals@16.2.0: {} +>>>>>>> c7bb80d globalthis@1.0.4: dependencies: define-properties: 1.2.1 +<<<<<<< HEAD gopd: 1.2.0 +======= + gopd: 1.0.1 +>>>>>>> c7bb80d globby@13.2.2: dependencies: @@ -11587,12 +15345,15 @@ snapshots: gopd@1.2.0: {} + gopd@1.2.0: {} + graceful-fs@4.2.10: {} graceful-fs@4.2.11: {} graphemer@1.4.0: {} +<<<<<<< HEAD handlebars@4.7.8: dependencies: minimist: 1.2.8 @@ -11602,6 +15363,8 @@ snapshots: optionalDependencies: uglify-js: 3.19.3 +======= +>>>>>>> c7bb80d has-ansi@2.0.0: dependencies: ansi-regex: 2.1.1 @@ -11622,6 +15385,16 @@ snapshots: dependencies: dunder-proto: 1.0.1 +<<<<<<< HEAD + has-symbols@1.1.0: {} +======= + has-proto@1.2.0: + dependencies: + dunder-proto: 1.0.1 + + has-symbols@1.0.3: {} +>>>>>>> c7bb80d + has-symbols@1.1.0: {} has-tostringtag@1.0.2: @@ -11634,15 +15407,25 @@ snapshots: hermes-estree@0.25.1: {} +<<<<<<< HEAD hermes-estree@0.29.1: {} +======= + hermes-estree@0.28.1: {} +>>>>>>> c7bb80d hermes-parser@0.25.1: dependencies: hermes-estree: 0.25.1 +<<<<<<< HEAD hermes-parser@0.29.1: dependencies: hermes-estree: 0.29.1 +======= + hermes-parser@0.28.1: + dependencies: + hermes-estree: 0.28.1 +>>>>>>> c7bb80d hey-listen@1.0.8: {} @@ -11676,21 +15459,34 @@ snapshots: dependencies: '@tootallnate/once': 2.0.0 agent-base: 6.0.2 +<<<<<<< HEAD debug: 4.4.3 +======= + debug: 4.4.1 +>>>>>>> c7bb80d transitivePeerDependencies: - supports-color https-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 +<<<<<<< HEAD debug: 4.4.3 +======= + debug: 4.4.1 +>>>>>>> c7bb80d transitivePeerDependencies: - supports-color https-proxy-agent@7.0.6: dependencies: +<<<<<<< HEAD agent-base: 7.1.4 debug: 4.4.3 +======= + agent-base: 7.1.3 + debug: 4.4.1 +>>>>>>> c7bb80d transitivePeerDependencies: - supports-color @@ -11827,6 +15623,16 @@ snapshots: wrap-ansi: 6.2.0 yoctocolors-cjs: 2.1.2 +<<<<<<< HEAD + internal-slot@1.1.0: +======= + internal-slot@1.0.7: +>>>>>>> c7bb80d + dependencies: + es-errors: 1.3.0 + hasown: 2.0.2 + side-channel: 1.1.0 + internal-slot@1.1.0: dependencies: es-errors: 1.3.0 @@ -11839,6 +15645,19 @@ snapshots: irregular-plurals@1.4.0: {} +<<<<<<< HEAD + is-array-buffer@3.0.5: + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + get-intrinsic: 1.3.0 +======= + is-array-buffer@3.0.4: + dependencies: + call-bind: 1.0.7 + get-intrinsic: 1.2.4 +>>>>>>> c7bb80d + is-array-buffer@3.0.5: dependencies: call-bind: 1.0.8 @@ -11857,6 +15676,10 @@ snapshots: dependencies: has-bigints: 1.0.2 + is-bigint@1.1.0: + dependencies: + has-bigints: 1.0.2 + is-binary-path@2.1.0: dependencies: binary-extensions: 2.3.0 @@ -11866,10 +15689,22 @@ snapshots: call-bound: 1.0.4 has-tostringtag: 1.0.2 +<<<<<<< HEAD + is-builtin-module@5.0.0: + dependencies: + builtin-modules: 5.0.0 + +======= + is-boolean-object@1.2.2: + dependencies: + call-bound: 1.0.4 + has-tostringtag: 1.0.2 + is-builtin-module@5.0.0: dependencies: builtin-modules: 5.0.0 +>>>>>>> c7bb80d is-bun-module@1.2.1: dependencies: semver: 7.7.2 @@ -11878,6 +15713,10 @@ snapshots: dependencies: semver: 7.7.2 + is-bun-module@2.0.0: + dependencies: + semver: 7.7.2 + is-callable@1.2.7: {} is-core-module@2.15.1: @@ -11889,6 +15728,15 @@ snapshots: hasown: 2.0.2 is-data-view@1.0.2: +<<<<<<< HEAD +======= + dependencies: + call-bound: 1.0.4 + get-intrinsic: 1.3.0 + is-typed-array: 1.1.15 + + is-date-object@1.0.5: +>>>>>>> c7bb80d dependencies: call-bound: 1.0.4 get-intrinsic: 1.3.0 @@ -11899,6 +15747,11 @@ snapshots: call-bound: 1.0.4 has-tostringtag: 1.0.2 + is-date-object@1.1.0: + dependencies: + call-bound: 1.0.4 + has-tostringtag: 1.0.2 + is-directory@0.3.1: {} is-docker@2.2.1: {} @@ -11909,6 +15762,13 @@ snapshots: is-finalizationregistry@1.1.1: dependencies: +<<<<<<< HEAD +======= + call-bind: 1.0.8 + + is-finalizationregistry@1.1.1: + dependencies: +>>>>>>> c7bb80d call-bound: 1.0.4 is-fullwidth-code-point@1.0.0: @@ -11958,6 +15818,11 @@ snapshots: is-npm@6.0.0: {} + is-number-object@1.1.1: + dependencies: + call-bound: 1.0.4 + has-tostringtag: 1.0.2 + is-number-object@1.1.1: dependencies: call-bound: 1.0.4 @@ -11979,6 +15844,13 @@ snapshots: is-promise@2.2.2: {} + is-regex@1.2.1: + dependencies: + call-bound: 1.0.4 + gopd: 1.2.0 + has-tostringtag: 1.0.2 + hasown: 2.0.2 + is-regex@1.2.1: dependencies: call-bound: 1.0.4 @@ -11992,6 +15864,10 @@ snapshots: is-set@2.0.3: {} + is-shared-array-buffer@1.0.4: + dependencies: + call-bound: 1.0.4 + is-shared-array-buffer@1.0.4: dependencies: call-bound: 1.0.4 @@ -12007,6 +15883,21 @@ snapshots: call-bound: 1.0.4 has-tostringtag: 1.0.2 +<<<<<<< HEAD + is-symbol@1.1.1: +======= + is-string@1.1.1: + dependencies: + call-bound: 1.0.4 + has-tostringtag: 1.0.2 + + is-symbol@1.0.4: +>>>>>>> c7bb80d + dependencies: + call-bound: 1.0.4 + has-symbols: 1.1.0 + safe-regex-test: 1.1.0 + is-symbol@1.1.1: dependencies: call-bound: 1.0.4 @@ -12021,6 +15912,10 @@ snapshots: dependencies: which-typed-array: 1.1.19 + is-typed-array@1.1.15: + dependencies: + which-typed-array: 1.1.19 + is-unicode-supported@0.1.0: {} is-unicode-supported@1.3.0: {} @@ -12029,6 +15924,10 @@ snapshots: is-weakmap@2.0.2: {} + is-weakref@1.1.1: + dependencies: + call-bound: 1.0.4 + is-weakref@1.1.1: dependencies: call-bound: 1.0.4 @@ -12063,8 +15962,13 @@ snapshots: istanbul-lib-instrument@5.2.1: dependencies: +<<<<<<< HEAD '@babel/core': 7.28.4 '@babel/parser': 7.28.4 +======= + '@babel/core': 7.26.0 + '@babel/parser': 7.26.2 +>>>>>>> c7bb80d '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 semver: 6.3.1 @@ -12073,8 +15977,13 @@ snapshots: istanbul-lib-instrument@6.0.3: dependencies: +<<<<<<< HEAD '@babel/core': 7.28.4 '@babel/parser': 7.28.4 +======= + '@babel/core': 7.26.0 + '@babel/parser': 7.26.2 +>>>>>>> c7bb80d '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 semver: 7.7.2 @@ -12089,7 +15998,11 @@ snapshots: istanbul-lib-source-maps@4.0.1: dependencies: +<<<<<<< HEAD debug: 4.4.3 +======= + debug: 4.4.1 +>>>>>>> c7bb80d istanbul-lib-coverage: 3.2.2 source-map: 0.6.1 transitivePeerDependencies: @@ -12103,7 +16016,11 @@ snapshots: iterator.prototype@1.1.5: dependencies: define-data-property: 1.1.4 +<<<<<<< HEAD es-object-atoms: 1.1.1 +======= + es-object-atoms: 1.0.0 +>>>>>>> c7bb80d get-intrinsic: 1.3.0 get-proto: 1.0.1 has-symbols: 1.1.0 @@ -12168,10 +16085,17 @@ snapshots: jest-config@29.7.0(@types/node@22.9.1): dependencies: +<<<<<<< HEAD '@babel/core': 7.28.4 '@jest/test-sequencer': 29.7.0 '@jest/types': 29.6.3 babel-jest: 29.7.0(@babel/core@7.28.4) +======= + '@babel/core': 7.26.0 + '@jest/test-sequencer': 29.7.0 + '@jest/types': 29.6.3 + babel-jest: 29.7.0(@babel/core@7.26.0) +>>>>>>> c7bb80d chalk: 4.1.2 ci-info: 3.9.0 deepmerge: 4.3.1 @@ -12246,6 +16170,7 @@ snapshots: jest-mock: 29.7.0 jest-util: 29.7.0 +<<<<<<< HEAD jest-expo@53.0.10(@babel/core@7.28.4)(expo@53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(jest@29.7.0(@types/node@22.9.1))(react-dom@19.0.0(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(webpack@5.96.1): dependencies: '@expo/config': 11.0.13 @@ -12254,6 +16179,16 @@ snapshots: '@jest/globals': 29.7.0 babel-jest: 29.7.0(@babel/core@7.28.4) expo: 53.0.22(@babel/core@7.28.4)(@expo/metro-runtime@5.0.4(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)))(react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + jest-expo@53.0.7(@babel/core@7.26.0)(expo@53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(jest@29.7.0(@types/node@22.9.1))(react-dom@19.0.0(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(webpack@5.96.1): + dependencies: + '@expo/config': 11.0.10 + '@expo/json-file': 9.1.4 + '@jest/create-cache-key-function': 29.7.0 + '@jest/globals': 29.7.0 + babel-jest: 29.7.0(@babel/core@7.26.0) + expo: 53.0.12(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +>>>>>>> c7bb80d find-up: 5.0.0 jest-environment-jsdom: 29.7.0 jest-snapshot: 29.7.0 @@ -12261,7 +16196,11 @@ snapshots: jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@22.9.1)) json5: 2.2.3 lodash: 4.17.21 +<<<<<<< HEAD react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) +======= + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) +>>>>>>> c7bb80d react-server-dom-webpack: 19.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(webpack@5.96.1) react-test-renderer: 19.0.0(react@19.0.0) server-only: 0.0.1 @@ -12318,7 +16257,11 @@ snapshots: jest-message-util@29.7.0: dependencies: +<<<<<<< HEAD '@babel/code-frame': 7.27.1 +======= + '@babel/code-frame': 7.26.2 +>>>>>>> c7bb80d '@jest/types': 29.6.3 '@types/stack-utils': 2.0.3 chalk: 4.1.2 @@ -12414,6 +16357,7 @@ snapshots: jest-snapshot@29.7.0: dependencies: +<<<<<<< HEAD '@babel/core': 7.28.4 '@babel/generator': 7.28.3 '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.4) @@ -12423,6 +16367,17 @@ snapshots: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 babel-preset-current-node-syntax: 1.2.0(@babel/core@7.28.4) +======= + '@babel/core': 7.26.0 + '@babel/generator': 7.26.2 + '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0) + '@babel/types': 7.26.0 + '@jest/expect-utils': 29.7.0 + '@jest/transform': 29.7.0 + '@jest/types': 29.6.3 + babel-preset-current-node-syntax: 1.1.0(@babel/core@7.26.0) +>>>>>>> c7bb80d chalk: 4.1.2 expect: 29.7.0 graceful-fs: 4.2.11 @@ -12598,7 +16553,11 @@ snapshots: dependencies: array-includes: 3.1.8 array.prototype.flat: 1.3.2 +<<<<<<< HEAD object.assign: 4.1.7 +======= + object.assign: 4.1.5 +>>>>>>> c7bb80d object.values: 1.2.1 keyv@4.5.4: @@ -12877,43 +16836,75 @@ snapshots: merge2@1.4.1: {} +<<<<<<< HEAD metro-babel-transformer@0.82.5: dependencies: '@babel/core': 7.28.4 flow-enums-runtime: 0.0.6 hermes-parser: 0.29.1 +======= + metro-babel-transformer@0.82.4: + dependencies: + '@babel/core': 7.26.0 + flow-enums-runtime: 0.0.6 + hermes-parser: 0.28.1 +>>>>>>> c7bb80d nullthrows: 1.1.1 transitivePeerDependencies: - supports-color +<<<<<<< HEAD metro-cache-key@0.82.5: dependencies: flow-enums-runtime: 0.0.6 metro-cache@0.82.5: +======= + metro-cache-key@0.82.4: + dependencies: + flow-enums-runtime: 0.0.6 + + metro-cache@0.82.4: +>>>>>>> c7bb80d dependencies: exponential-backoff: 3.1.1 flow-enums-runtime: 0.0.6 https-proxy-agent: 7.0.6 +<<<<<<< HEAD metro-core: 0.82.5 transitivePeerDependencies: - supports-color metro-config@0.82.5: +======= + metro-core: 0.82.4 + transitivePeerDependencies: + - supports-color + + metro-config@0.82.4: +>>>>>>> c7bb80d dependencies: connect: 3.7.0 cosmiconfig: 5.2.1 flow-enums-runtime: 0.0.6 jest-validate: 29.7.0 +<<<<<<< HEAD metro: 0.82.5 metro-cache: 0.82.5 metro-core: 0.82.5 metro-runtime: 0.82.5 +======= + metro: 0.82.4 + metro-cache: 0.82.4 + metro-core: 0.82.4 + metro-runtime: 0.82.4 +>>>>>>> c7bb80d transitivePeerDependencies: - bufferutil - supports-color - utf-8-validate +<<<<<<< HEAD metro-core@0.82.5: dependencies: flow-enums-runtime: 0.0.6 @@ -12923,6 +16914,17 @@ snapshots: metro-file-map@0.82.5: dependencies: debug: 4.4.3 +======= + metro-core@0.82.4: + dependencies: + flow-enums-runtime: 0.0.6 + lodash.throttle: 4.1.1 + metro-resolver: 0.82.4 + + metro-file-map@0.82.4: + dependencies: + debug: 4.4.1 +>>>>>>> c7bb80d fb-watchman: 2.0.2 flow-enums-runtime: 0.0.6 graceful-fs: 4.2.11 @@ -12934,20 +16936,33 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD metro-minify-terser@0.82.5: +======= + metro-minify-terser@0.82.4: +>>>>>>> c7bb80d dependencies: flow-enums-runtime: 0.0.6 terser: 5.36.0 +<<<<<<< HEAD metro-resolver@0.82.5: dependencies: flow-enums-runtime: 0.0.6 metro-runtime@0.82.5: +======= + metro-resolver@0.82.4: + dependencies: + flow-enums-runtime: 0.0.6 + + metro-runtime@0.82.4: +>>>>>>> c7bb80d dependencies: '@babel/runtime': 7.26.0 flow-enums-runtime: 0.0.6 +<<<<<<< HEAD metro-source-map@0.82.5: dependencies: '@babel/traverse': 7.28.4 @@ -12958,33 +16973,63 @@ snapshots: metro-symbolicate: 0.82.5 nullthrows: 1.1.1 ob1: 0.82.5 +======= + metro-source-map@0.82.4: + dependencies: + '@babel/traverse': 7.25.9 + '@babel/traverse--for-generate-function-map': '@babel/traverse@7.25.9' + '@babel/types': 7.26.0 + flow-enums-runtime: 0.0.6 + invariant: 2.2.4 + metro-symbolicate: 0.82.4 + nullthrows: 1.1.1 + ob1: 0.82.4 +>>>>>>> c7bb80d source-map: 0.5.7 vlq: 1.0.1 transitivePeerDependencies: - supports-color +<<<<<<< HEAD metro-symbolicate@0.82.5: dependencies: flow-enums-runtime: 0.0.6 invariant: 2.2.4 metro-source-map: 0.82.5 +======= + metro-symbolicate@0.82.4: + dependencies: + flow-enums-runtime: 0.0.6 + invariant: 2.2.4 + metro-source-map: 0.82.4 +>>>>>>> c7bb80d nullthrows: 1.1.1 source-map: 0.5.7 vlq: 1.0.1 transitivePeerDependencies: - supports-color +<<<<<<< HEAD metro-transform-plugins@0.82.5: dependencies: '@babel/core': 7.28.4 '@babel/generator': 7.28.3 '@babel/template': 7.27.2 '@babel/traverse': 7.28.4 +======= + metro-transform-plugins@0.82.4: + dependencies: + '@babel/core': 7.26.0 + '@babel/generator': 7.26.2 + '@babel/template': 7.25.9 + '@babel/traverse': 7.25.9 +>>>>>>> c7bb80d flow-enums-runtime: 0.0.6 nullthrows: 1.1.1 transitivePeerDependencies: - supports-color +<<<<<<< HEAD metro-transform-worker@0.82.5: dependencies: '@babel/core': 7.28.4 @@ -12999,12 +17044,29 @@ snapshots: metro-minify-terser: 0.82.5 metro-source-map: 0.82.5 metro-transform-plugins: 0.82.5 +======= + metro-transform-worker@0.82.4: + dependencies: + '@babel/core': 7.26.0 + '@babel/generator': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 + flow-enums-runtime: 0.0.6 + metro: 0.82.4 + metro-babel-transformer: 0.82.4 + metro-cache: 0.82.4 + metro-cache-key: 0.82.4 + metro-minify-terser: 0.82.4 + metro-source-map: 0.82.4 + metro-transform-plugins: 0.82.4 +>>>>>>> c7bb80d nullthrows: 1.1.1 transitivePeerDependencies: - bufferutil - supports-color - utf-8-validate +<<<<<<< HEAD metro@0.82.5: dependencies: '@babel/code-frame': 7.27.1 @@ -13014,20 +17076,40 @@ snapshots: '@babel/template': 7.27.2 '@babel/traverse': 7.28.4 '@babel/types': 7.28.4 +======= + metro@0.82.4: + dependencies: + '@babel/code-frame': 7.26.2 + '@babel/core': 7.26.0 + '@babel/generator': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/template': 7.25.9 + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 +>>>>>>> c7bb80d accepts: 1.3.8 chalk: 4.1.2 ci-info: 2.0.0 connect: 3.7.0 +<<<<<<< HEAD debug: 4.4.3 error-stack-parser: 2.1.4 flow-enums-runtime: 0.0.6 graceful-fs: 4.2.11 hermes-parser: 0.29.1 +======= + debug: 4.4.1 + error-stack-parser: 2.1.4 + flow-enums-runtime: 0.0.6 + graceful-fs: 4.2.11 + hermes-parser: 0.28.1 +>>>>>>> c7bb80d image-size: 1.1.1 invariant: 2.2.4 jest-worker: 29.7.0 jsc-safe-url: 0.2.4 lodash.throttle: 4.1.1 +<<<<<<< HEAD metro-babel-transformer: 0.82.5 metro-cache: 0.82.5 metro-cache-key: 0.82.5 @@ -13040,6 +17122,20 @@ snapshots: metro-symbolicate: 0.82.5 metro-transform-plugins: 0.82.5 metro-transform-worker: 0.82.5 +======= + metro-babel-transformer: 0.82.4 + metro-cache: 0.82.4 + metro-cache-key: 0.82.4 + metro-config: 0.82.4 + metro-core: 0.82.4 + metro-file-map: 0.82.4 + metro-resolver: 0.82.4 + metro-runtime: 0.82.4 + metro-source-map: 0.82.4 + metro-symbolicate: 0.82.4 + metro-transform-plugins: 0.82.4 + metro-transform-worker: 0.82.4 +>>>>>>> c7bb80d mime-types: 2.1.35 nullthrows: 1.1.1 serialize-error: 2.1.0 @@ -13111,10 +17207,17 @@ snapshots: mkdirp@3.0.1: {} +<<<<<<< HEAD moti@0.29.0(react-dom@19.0.0(react@19.0.0))(react-native-reanimated@3.17.5(@babel/core@7.28.4)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0): dependencies: framer-motion: 6.5.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) react-native-reanimated: 3.17.5(@babel/core@7.28.4)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +======= + moti@0.29.0(react-dom@19.0.0(react@19.0.0))(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react@19.0.0): + dependencies: + framer-motion: 6.5.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react-native-reanimated: 3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) +>>>>>>> c7bb80d transitivePeerDependencies: - react - react-dom @@ -13141,6 +17244,7 @@ snapshots: nanoid@3.3.8: {} +<<<<<<< HEAD napi-postinstall@0.3.3: {} nativewind@4.1.21(react-native-reanimated@3.17.5(@babel/core@7.28.4)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-svg@15.11.2(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(tailwindcss@3.4.4): @@ -13148,6 +17252,15 @@ snapshots: comment-json: 4.2.5 debug: 4.3.7 react-native-css-interop: 0.1.20(react-native-reanimated@3.17.5(@babel/core@7.28.4)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-svg@15.11.2(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(tailwindcss@3.4.4) +======= + napi-postinstall@0.2.4: {} + + nativewind@4.1.21(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-svg@15.11.2(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(tailwindcss@3.4.4): + dependencies: + comment-json: 4.2.5 + debug: 4.3.7 + react-native-css-interop: 0.1.20(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-svg@15.11.2(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(tailwindcss@3.4.4) +>>>>>>> c7bb80d tailwindcss: 3.4.4 transitivePeerDependencies: - react @@ -13181,7 +17294,11 @@ snapshots: node-releases@2.0.18: {} +<<<<<<< HEAD node-releases@2.0.21: {} +======= + node-releases@2.0.19: {} +>>>>>>> c7bb80d normalize-package-data@6.0.2: dependencies: @@ -13271,7 +17388,11 @@ snapshots: nwsapi@2.2.13: {} +<<<<<<< HEAD ob1@0.82.5: +======= + ob1@0.82.4: +>>>>>>> c7bb80d dependencies: flow-enums-runtime: 0.0.6 @@ -13279,6 +17400,11 @@ snapshots: object-hash@3.0.0: {} +<<<<<<< HEAD +======= + object-inspect@1.13.3: {} + +>>>>>>> c7bb80d object-inspect@1.13.4: {} object-keys@1.1.1: {} @@ -13292,25 +17418,50 @@ snapshots: has-symbols: 1.1.0 object-keys: 1.1.1 +<<<<<<< HEAD + object.entries@1.1.9: +======= + object.assign@4.1.7: +>>>>>>> c7bb80d + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + define-properties: 1.2.1 + es-object-atoms: 1.1.1 +<<<<<<< HEAD +======= + has-symbols: 1.1.0 + object-keys: 1.1.1 + object.entries@1.1.9: dependencies: call-bind: 1.0.8 call-bound: 1.0.4 define-properties: 1.2.1 es-object-atoms: 1.1.1 +>>>>>>> c7bb80d object.fromentries@2.0.8: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 +<<<<<<< HEAD es-abstract: 1.24.0 es-object-atoms: 1.1.1 +======= + es-abstract: 1.23.5 + es-object-atoms: 1.0.0 +>>>>>>> c7bb80d object.groupby@1.0.3: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 +<<<<<<< HEAD es-abstract: 1.24.0 +======= + es-abstract: 1.23.5 +>>>>>>> c7bb80d object.values@1.2.1: dependencies: @@ -13319,6 +17470,13 @@ snapshots: define-properties: 1.2.1 es-object-atoms: 1.1.1 + object.values@1.2.1: + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + define-properties: 1.2.1 + es-object-atoms: 1.0.0 + omggif@1.0.10: {} on-finished@2.3.0: @@ -13487,16 +17645,26 @@ snapshots: parse-json@5.2.0: dependencies: +<<<<<<< HEAD '@babel/code-frame': 7.27.1 +======= + '@babel/code-frame': 7.26.2 +>>>>>>> c7bb80d error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 parse-json@8.1.0: dependencies: +<<<<<<< HEAD '@babel/code-frame': 7.27.1 index-to-position: 0.1.2 type-fest: 4.41.0 +======= + '@babel/code-frame': 7.26.2 + index-to-position: 0.1.2 + type-fest: 4.27.0 +>>>>>>> c7bb80d parse-png@2.1.0: dependencies: @@ -13548,7 +17716,11 @@ snapshots: picomatch@3.0.1: {} +<<<<<<< HEAD picomatch@4.0.3: {} +======= + picomatch@4.0.2: {} +>>>>>>> c7bb80d pidtree@0.6.0: {} @@ -13726,7 +17898,11 @@ snapshots: minimist: 1.2.8 strip-json-comments: 2.0.1 +<<<<<<< HEAD react-devtools-core@6.1.5: +======= + react-devtools-core@6.1.2: +>>>>>>> c7bb80d dependencies: shell-quote: 1.8.1 ws: 7.5.10 @@ -13739,6 +17915,7 @@ snapshots: react: 19.0.0 scheduler: 0.25.0 +<<<<<<< HEAD react-error-boundary@3.1.4(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -13748,6 +17925,12 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 react: 19.0.0 +======= + react-error-boundary@4.0.13(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + react: 19.0.0 +>>>>>>> c7bb80d react-fast-compare@3.2.2: {} @@ -13759,7 +17942,11 @@ snapshots: dependencies: react: 19.0.0 +<<<<<<< HEAD react-i18next@15.0.1(i18next@23.14.0)(react-dom@19.0.0(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): +======= + react-i18next@15.0.1(i18next@23.14.0)(react-dom@19.0.0(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): +>>>>>>> c7bb80d dependencies: '@babel/runtime': 7.26.0 html-parse-stringify: 3.0.1 @@ -13767,19 +17954,30 @@ snapshots: react: 19.0.0 optionalDependencies: react-dom: 19.0.0(react@19.0.0) +<<<<<<< HEAD react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) +======= + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) +>>>>>>> c7bb80d react-is@16.13.1: {} react-is@18.3.1: {} +<<<<<<< HEAD react-is@19.1.1: {} react-native-css-interop@0.1.20(react-native-reanimated@3.17.5(@babel/core@7.28.4)(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-svg@15.11.2(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(tailwindcss@3.4.4): +======= + react-is@19.1.0: {} + + react-native-css-interop@0.1.20(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native-svg@15.11.2(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0)(tailwindcss@3.4.4): +>>>>>>> c7bb80d dependencies: '@babel/helper-module-imports': 7.25.9 '@babel/traverse': 7.25.9 '@babel/types': 7.26.0 +<<<<<<< HEAD debug: 4.4.3 lightningcss: 1.27.0 react: 19.0.0 @@ -13806,11 +18004,40 @@ snapshots: react-native-iphone-screen-helper: 2.1.2(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)) react-native-gesture-handler@2.24.0(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): +======= + debug: 4.3.7 + lightningcss: 1.27.0 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-reanimated: 3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + semver: 7.6.3 + tailwindcss: 3.4.4 + optionalDependencies: + react-native-safe-area-context: 5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-svg: 15.11.2(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + transitivePeerDependencies: + - supports-color + + react-native-edge-to-edge@1.6.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + react-native-flash-message@0.4.2(prop-types@15.8.1)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + prop-types: 15.8.1 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-iphone-screen-helper: 2.1.2(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)) + + react-native-gesture-handler@2.24.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): +>>>>>>> c7bb80d dependencies: '@egjs/hammerjs': 2.0.17 hoist-non-react-statics: 3.3.2 invariant: 2.2.4 react: 19.0.0 +<<<<<<< HEAD react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) react-native-iphone-screen-helper@2.1.2(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)): @@ -13878,16 +18105,94 @@ snapshots: warn-once: 0.1.1 react-native-svg@15.11.2(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): +======= + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + react-native-iphone-screen-helper@2.1.2(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)): + dependencies: + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + react-native-is-edge-to-edge@1.1.6(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + react-native-is-edge-to-edge@1.1.7(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + react-native-keyboard-controller@1.17.4(react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-is-edge-to-edge: 1.1.6(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + react-native-reanimated: 3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + + react-native-mmkv@3.1.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + react-native-reanimated@3.17.5(@babel/core@7.26.0)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/core': 7.26.0 + '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-nullish-coalescing-operator': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-template-literals': 7.25.9(@babel/core@7.26.0) + '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.26.0) + '@babel/preset-typescript': 7.26.0(@babel/core@7.26.0) + convert-source-map: 2.0.0 + invariant: 2.2.4 + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-is-edge-to-edge: 1.1.7(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + transitivePeerDependencies: + - supports-color + + react-native-restart@0.0.27(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + react-native-safe-area-context@5.4.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + react: 19.0.0 + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + + react-native-screens@4.11.1(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): + dependencies: + react: 19.0.0 + react-freeze: 1.0.4(react@19.0.0) + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + react-native-is-edge-to-edge: 1.1.7(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + warn-once: 0.1.1 + + react-native-svg@15.11.2(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): +>>>>>>> c7bb80d dependencies: css-select: 5.1.0 css-tree: 1.1.3 react: 19.0.0 +<<<<<<< HEAD react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) warn-once: 0.1.1 react-native-url-polyfill@2.0.0(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0)): dependencies: react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) +======= + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) + warn-once: 0.1.1 + + react-native-url-polyfill@2.0.0(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)): + dependencies: + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) +>>>>>>> c7bb80d whatwg-url-without-unicode: 8.0.0-3 react-native-web@0.20.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): @@ -13905,6 +18210,7 @@ snapshots: transitivePeerDependencies: - encoding +<<<<<<< HEAD react-native-webview@13.13.5(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): dependencies: escape-string-regexp: 4.0.0 @@ -13926,6 +18232,22 @@ snapshots: anser: 1.4.10 ansi-regex: 5.0.1 babel-jest: 29.7.0(@babel/core@7.28.4) +======= + react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0): + dependencies: + '@jest/create-cache-key-function': 29.7.0 + '@react-native/assets-registry': 0.79.4 + '@react-native/codegen': 0.79.4(@babel/core@7.26.0) + '@react-native/community-cli-plugin': 0.79.4 + '@react-native/gradle-plugin': 0.79.4 + '@react-native/js-polyfills': 0.79.4 + '@react-native/normalize-colors': 0.79.4 + '@react-native/virtualized-lists': 0.79.4(@types/react@19.0.14)(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0) + abort-controller: 3.0.0 + anser: 1.4.10 + ansi-regex: 5.0.1 + babel-jest: 29.7.0(@babel/core@7.26.0) +>>>>>>> c7bb80d babel-plugin-syntax-hermes-parser: 0.25.1 base64-js: 1.5.1 chalk: 4.1.2 @@ -13936,13 +18258,22 @@ snapshots: invariant: 2.2.4 jest-environment-node: 29.7.0 memoize-one: 5.2.1 +<<<<<<< HEAD metro-runtime: 0.82.5 metro-source-map: 0.82.5 +======= + metro-runtime: 0.82.4 + metro-source-map: 0.82.4 +>>>>>>> c7bb80d nullthrows: 1.1.1 pretty-format: 29.7.0 promise: 8.3.0 react: 19.0.0 +<<<<<<< HEAD react-devtools-core: 6.1.5 +======= + react-devtools-core: 6.1.2 +>>>>>>> c7bb80d react-refresh: 0.14.2 regenerator-runtime: 0.13.11 scheduler: 0.25.0 @@ -13978,7 +18309,11 @@ snapshots: react-test-renderer@19.0.0(react@19.0.0): dependencies: react: 19.0.0 +<<<<<<< HEAD react-is: 19.1.1 +======= + react-is: 19.1.0 +>>>>>>> c7bb80d scheduler: 0.25.0 react@19.0.0: {} @@ -14015,12 +18350,20 @@ snapshots: dependencies: picomatch: 2.3.1 +<<<<<<< HEAD recyclerlistview@4.2.3(react-native@0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): +======= + recyclerlistview@4.2.3(react-native@0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0): +>>>>>>> c7bb80d dependencies: lodash.debounce: 4.0.8 prop-types: 15.8.1 react: 19.0.0 +<<<<<<< HEAD react-native: 0.79.5(@babel/core@7.28.4)(@types/react@19.0.14)(react@19.0.0) +======= + react-native: 0.79.4(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0) +>>>>>>> c7bb80d ts-object-utils: 0.0.5 redent@3.0.0: @@ -14029,17 +18372,39 @@ snapshots: strip-indent: 3.0.0 reflect.getprototypeof@1.0.10: +<<<<<<< HEAD +======= + dependencies: + call-bind: 1.0.8 + define-properties: 1.2.1 + es-abstract: 1.24.0 + es-errors: 1.3.0 + es-object-atoms: 1.1.1 + get-intrinsic: 1.3.0 + get-proto: 1.0.1 + which-builtin-type: 1.2.1 + + reflect.getprototypeof@1.0.6: +>>>>>>> c7bb80d dependencies: call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.24.0 es-errors: 1.3.0 +<<<<<<< HEAD es-object-atoms: 1.1.1 get-intrinsic: 1.3.0 get-proto: 1.0.1 which-builtin-type: 1.2.1 regenerate-unicode-properties@10.2.2: +======= + get-intrinsic: 1.3.0 + globalthis: 1.0.4 + which-builtin-type: 1.1.4 + + regenerate-unicode-properties@10.2.0: +>>>>>>> c7bb80d dependencies: regenerate: 1.4.2 @@ -14049,9 +18414,19 @@ snapshots: regenerator-runtime@0.14.1: {} +<<<<<<< HEAD regexp-tree@0.1.27: {} regexp.prototype.flags@1.5.4: +======= + regenerator-transform@0.15.2: + dependencies: + '@babel/runtime': 7.26.0 + + regexp-tree@0.1.27: {} + + regexp.prototype.flags@1.5.3: +>>>>>>> c7bb80d dependencies: call-bind: 1.0.8 define-properties: 1.2.1 @@ -14060,6 +18435,7 @@ snapshots: gopd: 1.2.0 set-function-name: 2.0.2 +<<<<<<< HEAD regexpu-core@6.3.1: dependencies: regenerate: 1.4.2 @@ -14068,6 +18444,25 @@ snapshots: regjsparser: 0.12.0 unicode-match-property-ecmascript: 2.0.0 unicode-match-property-value-ecmascript: 2.2.1 +======= + regexp.prototype.flags@1.5.4: + dependencies: + call-bind: 1.0.8 + define-properties: 1.2.1 + es-errors: 1.3.0 + get-proto: 1.0.1 + gopd: 1.2.0 + set-function-name: 2.0.2 + + regexpu-core@6.1.1: + dependencies: + regenerate: 1.4.2 + regenerate-unicode-properties: 10.2.0 + regjsgen: 0.8.0 + regjsparser: 0.11.2 + unicode-match-property-ecmascript: 2.0.0 + unicode-match-property-value-ecmascript: 2.2.0 +>>>>>>> c7bb80d registry-auth-token@5.0.2: dependencies: @@ -14079,6 +18474,13 @@ snapshots: regjsgen@0.8.0: {} +<<<<<<< HEAD +======= + regjsparser@0.11.2: + dependencies: + jsesc: 3.0.2 + +>>>>>>> c7bb80d regjsparser@0.12.0: dependencies: jsesc: 3.0.2 @@ -14117,12 +18519,15 @@ snapshots: resolve.exports@2.0.3: {} +<<<<<<< HEAD resolve@1.22.10: dependencies: is-core-module: 2.16.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 +======= +>>>>>>> c7bb80d resolve@1.22.8: dependencies: is-core-module: 2.15.1 @@ -14190,6 +18595,19 @@ snapshots: has-symbols: 1.1.0 isarray: 2.0.5 +<<<<<<< HEAD + safe-buffer@5.2.1: {} + + safe-push-apply@1.0.0: +======= + safe-array-concat@1.1.3: + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + get-intrinsic: 1.3.0 + has-symbols: 1.1.0 + isarray: 2.0.5 + safe-buffer@5.2.1: {} safe-push-apply@1.0.0: @@ -14197,6 +18615,12 @@ snapshots: es-errors: 1.3.0 isarray: 2.0.5 + safe-regex-test@1.0.3: +>>>>>>> c7bb80d + dependencies: + es-errors: 1.3.0 + isarray: 2.0.5 + safe-regex-test@1.1.0: dependencies: call-bound: 1.0.4 @@ -14214,6 +18638,15 @@ snapshots: scheduler@0.25.0: {} schema-utils@3.3.0: +<<<<<<< HEAD +======= + dependencies: + '@types/json-schema': 7.0.15 + ajv: 6.12.6 + ajv-keywords: 3.5.2(ajv@6.12.6) + + schema-utils@4.2.0: +>>>>>>> c7bb80d dependencies: '@types/json-schema': 7.0.15 ajv: 6.12.6 @@ -14317,8 +18750,32 @@ snapshots: shell-quote@1.8.1: {} side-channel-list@1.0.0: +<<<<<<< HEAD +======= + dependencies: + es-errors: 1.3.0 + object-inspect: 1.13.3 + + side-channel-map@1.0.1: + dependencies: + call-bound: 1.0.4 + es-errors: 1.3.0 + get-intrinsic: 1.3.0 + object-inspect: 1.13.3 + + side-channel-weakmap@1.0.2: + dependencies: + call-bound: 1.0.4 + es-errors: 1.3.0 + get-intrinsic: 1.3.0 + object-inspect: 1.13.3 + side-channel-map: 1.0.1 + + side-channel@1.0.6: +>>>>>>> c7bb80d dependencies: es-errors: 1.3.0 +<<<<<<< HEAD object-inspect: 1.13.4 side-channel-map@1.0.1: @@ -14335,11 +18792,19 @@ snapshots: get-intrinsic: 1.3.0 object-inspect: 1.13.4 side-channel-map: 1.0.1 +======= + get-intrinsic: 1.2.4 + object-inspect: 1.13.3 +>>>>>>> c7bb80d side-channel@1.1.0: dependencies: es-errors: 1.3.0 +<<<<<<< HEAD object-inspect: 1.13.4 +======= + object-inspect: 1.13.3 +>>>>>>> c7bb80d side-channel-list: 1.0.0 side-channel-map: 1.0.1 side-channel-weakmap: 1.0.2 @@ -14418,7 +18883,11 @@ snapshots: sprintf-js@1.0.3: {} +<<<<<<< HEAD stable-hash-x@0.2.0: {} +======= + stable-hash-x@0.1.1: {} +>>>>>>> c7bb80d stack-generator@2.0.10: dependencies: @@ -14506,19 +18975,41 @@ snapshots: define-properties: 1.2.1 es-abstract: 1.24.0 es-errors: 1.3.0 +<<<<<<< HEAD es-object-atoms: 1.1.1 +======= + es-object-atoms: 1.0.0 +>>>>>>> c7bb80d get-intrinsic: 1.3.0 gopd: 1.2.0 has-symbols: 1.1.0 internal-slot: 1.1.0 +<<<<<<< HEAD regexp.prototype.flags: 1.5.4 +======= + regexp.prototype.flags: 1.5.3 +>>>>>>> c7bb80d set-function-name: 2.0.2 side-channel: 1.1.0 string.prototype.repeat@1.0.0: dependencies: define-properties: 1.2.1 +<<<<<<< HEAD + es-abstract: 1.24.0 +======= + es-abstract: 1.23.5 + + string.prototype.trim@1.2.10: + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + define-data-property: 1.1.4 + define-properties: 1.2.1 es-abstract: 1.24.0 + es-object-atoms: 1.1.1 + has-property-descriptors: 1.0.2 +>>>>>>> c7bb80d string.prototype.trim@1.2.10: dependencies: @@ -14526,9 +19017,21 @@ snapshots: call-bound: 1.0.4 define-data-property: 1.1.4 define-properties: 1.2.1 +<<<<<<< HEAD es-abstract: 1.24.0 es-object-atoms: 1.1.1 has-property-descriptors: 1.0.2 +======= + es-abstract: 1.23.5 + es-object-atoms: 1.0.0 +>>>>>>> c7bb80d + + string.prototype.trimend@1.0.9: + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + define-properties: 1.2.1 + es-object-atoms: 1.1.1 string.prototype.trimend@1.0.9: dependencies: @@ -14541,7 +19044,11 @@ snapshots: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 +<<<<<<< HEAD es-object-atoms: 1.1.1 +======= + es-object-atoms: 1.0.0 +>>>>>>> c7bb80d string_decoder@1.3.0: dependencies: @@ -14579,7 +19086,13 @@ snapshots: dependencies: min-indent: 1.0.1 +<<<<<<< HEAD strip-indent@4.1.0: {} +======= + strip-indent@4.0.0: + dependencies: + min-indent: 1.0.1 +>>>>>>> c7bb80d strip-json-comments@2.0.1: {} @@ -14640,9 +19153,15 @@ snapshots: symbol-tree@3.2.4: {} +<<<<<<< HEAD synckit@0.11.11: dependencies: '@pkgr/core': 0.2.9 +======= + synckit@0.11.8: + dependencies: + '@pkgr/core': 0.2.7 +>>>>>>> c7bb80d tailwind-merge@2.5.4: {} @@ -14703,7 +19222,11 @@ snapshots: terser-webpack-plugin@5.3.10(webpack@5.96.1): dependencies: +<<<<<<< HEAD '@jridgewell/trace-mapping': 0.3.31 +======= + '@jridgewell/trace-mapping': 0.3.25 +>>>>>>> c7bb80d jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 @@ -14743,10 +19266,17 @@ snapshots: tinyexec@0.3.1: {} +<<<<<<< HEAD tinyglobby@0.2.15: dependencies: fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 +======= + tinyglobby@0.2.14: + dependencies: + fdir: 6.4.6(picomatch@4.0.2) + picomatch: 4.0.2 +>>>>>>> c7bb80d tmp@0.0.33: dependencies: @@ -14784,6 +19314,7 @@ snapshots: ts-interface-checker@0.1.13: {} +<<<<<<< HEAD ts-jest@29.4.2(@babel/core@7.28.4)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.4))(jest-util@29.7.0)(jest@29.7.0(@types/node@22.9.1))(typescript@5.8.3): dependencies: bs-logger: 0.2.6 @@ -14803,6 +19334,24 @@ snapshots: '@jest/types': 29.6.3 babel-jest: 29.7.0(@babel/core@7.28.4) jest-util: 29.7.0 +======= + ts-jest@29.1.2(@babel/core@7.26.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.9.1))(typescript@5.8.3): + dependencies: + bs-logger: 0.2.6 + fast-json-stable-stringify: 2.1.0 + jest: 29.7.0(@types/node@22.9.1) + jest-util: 29.7.0 + json5: 2.2.3 + lodash.memoize: 4.1.2 + make-error: 1.3.6 + semver: 7.6.3 + typescript: 5.8.3 + yargs-parser: 21.1.1 + optionalDependencies: + '@babel/core': 7.26.0 + '@jest/types': 29.6.3 + babel-jest: 29.7.0(@babel/core@7.26.0) +>>>>>>> c7bb80d ts-object-utils@0.0.5: {} @@ -14843,7 +19392,17 @@ snapshots: es-errors: 1.3.0 is-typed-array: 1.1.15 +<<<<<<< HEAD typed-array-byte-length@1.0.3: +======= + typed-array-buffer@1.0.3: + dependencies: + call-bound: 1.0.4 + es-errors: 1.3.0 + is-typed-array: 1.1.15 + + typed-array-byte-length@1.0.1: +>>>>>>> c7bb80d dependencies: call-bind: 1.0.8 for-each: 0.3.5 @@ -14851,7 +19410,19 @@ snapshots: has-proto: 1.2.0 is-typed-array: 1.1.15 +<<<<<<< HEAD typed-array-byte-offset@1.0.4: +======= + typed-array-byte-length@1.0.3: + dependencies: + call-bind: 1.0.8 + for-each: 0.3.3 + gopd: 1.2.0 + has-proto: 1.2.0 + is-typed-array: 1.1.15 + + typed-array-byte-offset@1.0.2: +>>>>>>> c7bb80d dependencies: available-typed-arrays: 1.0.7 call-bind: 1.0.8 @@ -14861,7 +19432,21 @@ snapshots: is-typed-array: 1.1.15 reflect.getprototypeof: 1.0.10 +<<<<<<< HEAD typed-array-length@1.0.7: +======= + typed-array-byte-offset@1.0.4: + dependencies: + available-typed-arrays: 1.0.7 + call-bind: 1.0.8 + for-each: 0.3.3 + gopd: 1.2.0 + has-proto: 1.2.0 + is-typed-array: 1.1.15 + reflect.getprototypeof: 1.0.10 + + typed-array-length@1.0.6: +>>>>>>> c7bb80d dependencies: call-bind: 1.0.8 for-each: 0.3.5 @@ -14870,6 +19455,7 @@ snapshots: possible-typed-array-names: 1.0.0 reflect.getprototypeof: 1.0.10 +<<<<<<< HEAD typescript-eslint@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3): dependencies: '@typescript-eslint/eslint-plugin': 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.35.0(jiti@1.21.6))(typescript@5.8.3) @@ -14883,6 +19469,29 @@ snapshots: typescript@5.8.3: {} +======= + typed-array-length@1.0.7: + dependencies: + call-bind: 1.0.8 + for-each: 0.3.3 + gopd: 1.2.0 + is-typed-array: 1.1.15 + possible-typed-array-names: 1.0.0 + reflect.getprototypeof: 1.0.6 + + typescript-eslint@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3): + dependencies: + '@typescript-eslint/eslint-plugin': 8.34.0(@typescript-eslint/parser@8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3))(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/parser': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/utils': 8.34.0(eslint@9.29.0(jiti@1.21.6))(typescript@5.8.3) + eslint: 9.29.0(jiti@1.21.6) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + + typescript@5.8.3: {} + +>>>>>>> c7bb80d ua-parser-js@1.0.39: {} uglify-js@3.19.3: @@ -14892,12 +19501,26 @@ snapshots: dependencies: call-bound: 1.0.4 has-bigints: 1.0.2 +<<<<<<< HEAD +======= + has-symbols: 1.0.3 + which-boxed-primitive: 1.0.2 + + unbox-primitive@1.1.0: + dependencies: + call-bound: 1.0.4 + has-bigints: 1.0.2 +>>>>>>> c7bb80d has-symbols: 1.1.0 which-boxed-primitive: 1.1.1 undici-types@6.19.8: {} +<<<<<<< HEAD undici@6.21.3: {} +======= + undici@6.21.0: {} +>>>>>>> c7bb80d unicode-canonical-property-names-ecmascript@2.0.1: {} @@ -14906,7 +19529,11 @@ snapshots: unicode-canonical-property-names-ecmascript: 2.0.1 unicode-property-aliases-ecmascript: 2.1.0 +<<<<<<< HEAD unicode-match-property-value-ecmascript@2.2.1: {} +======= + unicode-match-property-value-ecmascript@2.2.0: {} +>>>>>>> c7bb80d unicode-property-aliases-ecmascript@2.1.0: {} @@ -14920,6 +19547,7 @@ snapshots: unpipe@1.0.0: {} +<<<<<<< HEAD unrs-resolver@1.11.1: dependencies: napi-postinstall: 0.3.3 @@ -14943,6 +19571,31 @@ snapshots: '@unrs/resolver-binding-win32-arm64-msvc': 1.11.1 '@unrs/resolver-binding-win32-ia32-msvc': 1.11.1 '@unrs/resolver-binding-win32-x64-msvc': 1.11.1 +======= + unrs-resolver@1.9.0: + dependencies: + napi-postinstall: 0.2.4 + optionalDependencies: + '@unrs/resolver-binding-android-arm-eabi': 1.9.0 + '@unrs/resolver-binding-android-arm64': 1.9.0 + '@unrs/resolver-binding-darwin-arm64': 1.9.0 + '@unrs/resolver-binding-darwin-x64': 1.9.0 + '@unrs/resolver-binding-freebsd-x64': 1.9.0 + '@unrs/resolver-binding-linux-arm-gnueabihf': 1.9.0 + '@unrs/resolver-binding-linux-arm-musleabihf': 1.9.0 + '@unrs/resolver-binding-linux-arm64-gnu': 1.9.0 + '@unrs/resolver-binding-linux-arm64-musl': 1.9.0 + '@unrs/resolver-binding-linux-ppc64-gnu': 1.9.0 + '@unrs/resolver-binding-linux-riscv64-gnu': 1.9.0 + '@unrs/resolver-binding-linux-riscv64-musl': 1.9.0 + '@unrs/resolver-binding-linux-s390x-gnu': 1.9.0 + '@unrs/resolver-binding-linux-x64-gnu': 1.9.0 + '@unrs/resolver-binding-linux-x64-musl': 1.9.0 + '@unrs/resolver-binding-wasm32-wasi': 1.9.0 + '@unrs/resolver-binding-win32-arm64-msvc': 1.9.0 + '@unrs/resolver-binding-win32-ia32-msvc': 1.9.0 + '@unrs/resolver-binding-win32-x64-msvc': 1.9.0 +>>>>>>> c7bb80d update-browserslist-db@1.1.1(browserslist@4.24.2): dependencies: @@ -14950,9 +19603,15 @@ snapshots: escalade: 3.2.0 picocolors: 1.1.1 +<<<<<<< HEAD update-browserslist-db@1.1.3(browserslist@4.26.2): dependencies: browserslist: 4.26.2 +======= + update-browserslist-db@1.1.3(browserslist@4.25.0): + dependencies: + browserslist: 4.25.0 +>>>>>>> c7bb80d escalade: 3.2.0 picocolors: 1.1.1 @@ -15052,7 +19711,11 @@ snapshots: '@webassemblyjs/wasm-edit': 1.14.1 '@webassemblyjs/wasm-parser': 1.14.1 acorn: 8.15.0 +<<<<<<< HEAD browserslist: 4.26.2 +======= + browserslist: 4.25.0 +>>>>>>> c7bb80d chrome-trace-event: 1.0.4 enhanced-resolve: 5.17.1 es-module-lexer: 1.5.4 @@ -15108,6 +19771,37 @@ snapshots: is-string: 1.1.1 is-symbol: 1.1.1 +<<<<<<< HEAD + which-builtin-type@1.2.1: + dependencies: + call-bound: 1.0.4 +======= + which-boxed-primitive@1.1.1: + dependencies: + is-bigint: 1.1.0 + is-boolean-object: 1.2.2 + is-number-object: 1.1.1 + is-string: 1.1.1 + is-symbol: 1.1.1 + + which-builtin-type@1.1.4: + dependencies: +>>>>>>> c7bb80d + function.prototype.name: 1.1.8 + has-tostringtag: 1.0.2 + is-async-function: 2.0.0 + is-date-object: 1.1.0 + is-finalizationregistry: 1.1.1 + is-generator-function: 1.0.10 + is-regex: 1.2.1 + is-weakref: 1.1.1 + isarray: 2.0.5 + which-boxed-primitive: 1.1.1 + which-collection: 1.0.2 + which-typed-array: 1.1.19 +<<<<<<< HEAD +======= + which-builtin-type@1.2.1: dependencies: call-bound: 1.0.4 @@ -15123,6 +19817,7 @@ snapshots: which-boxed-primitive: 1.1.1 which-collection: 1.0.2 which-typed-array: 1.1.19 +>>>>>>> c7bb80d which-collection@1.0.2: dependencies: @@ -15131,6 +19826,22 @@ snapshots: is-weakmap: 2.0.2 is-weakset: 2.0.3 +<<<<<<< HEAD + which-typed-array@1.1.19: +======= + which-typed-array@1.1.15: +>>>>>>> c7bb80d + dependencies: + available-typed-arrays: 1.0.7 + call-bind: 1.0.8 + call-bound: 1.0.4 + for-each: 0.3.5 + get-proto: 1.0.1 + gopd: 1.2.0 + has-tostringtag: 1.0.2 + +<<<<<<< HEAD +======= which-typed-array@1.1.19: dependencies: available-typed-arrays: 1.0.7 @@ -15141,6 +19852,7 @@ snapshots: gopd: 1.2.0 has-tostringtag: 1.0.2 +>>>>>>> c7bb80d which@2.0.2: dependencies: isexe: 2.0.0 @@ -15271,7 +19983,11 @@ snapshots: zod@3.23.8: {} +<<<<<<< HEAD zustand@5.0.8(@types/react@19.0.14)(react@19.0.0)(use-sync-external-store@1.5.0(react@19.0.0)): +======= + zustand@5.0.5(@types/react@19.0.14)(react@19.0.0)(use-sync-external-store@1.5.0(react@19.0.0)): +>>>>>>> c7bb80d optionalDependencies: '@types/react': 19.0.14 react: 19.0.0 diff --git a/src/app/(app)/_layout.tsx b/src/app/(app)/_layout.tsx index 9da348c65..3a41e9e7a 100644 --- a/src/app/(app)/_layout.tsx +++ b/src/app/(app)/_layout.tsx @@ -1,14 +1,21 @@ import { Link, Redirect, SplashScreen, Tabs } from 'expo-router'; import { useCallback, useEffect } from 'react'; +<<<<<<< HEAD import { useAuth } from '@/components/providers/auth'; +======= +>>>>>>> c7bb80d import { Pressable, Text } from '@/components/ui'; import { Feed as FeedIcon, Settings as SettingsIcon, Style as StyleIcon, } from '@/components/ui/icons'; +<<<<<<< HEAD import { useIsFirstTime } from '@/lib'; +======= +import { useAuth, useIsFirstTime } from '@/lib'; +>>>>>>> c7bb80d export default function TabLayout() { const { isAuthenticated, ready } = useAuth(); diff --git a/src/app/(app)/index.tsx b/src/app/(app)/index.tsx index b5ca90b4c..41bc0a410 100644 --- a/src/app/(app)/index.tsx +++ b/src/app/(app)/index.tsx @@ -1,4 +1,14 @@ +<<<<<<< HEAD import { FocusAwareStatusBar, View } from '@/components/ui'; +======= +import { FlashList } from '@shopify/flash-list'; +import React from 'react'; + +import type { Post } from '@/api'; +import { usePosts } from '@/api'; +import { Card } from '@/components/card'; +import { EmptyList, FocusAwareStatusBar, Text, View } from '@/components/ui'; +>>>>>>> c7bb80d export default function Feed() { return ( diff --git a/src/app/(app)/settings.tsx b/src/app/(app)/settings.tsx index 218cab78a..4c265571a 100644 --- a/src/app/(app)/settings.tsx +++ b/src/app/(app)/settings.tsx @@ -18,9 +18,14 @@ import { Text, View, } from '@/components/ui'; +<<<<<<< HEAD import { Website } from '@/components/ui/icons'; import { translate } from '@/lib'; import { Env } from '@/lib/env'; +======= +import { Github, Rate, Share, Support, Website } from '@/components/ui/icons'; +import { translate, useAuth } from '@/lib'; +>>>>>>> c7bb80d export default function Settings() { const { logout } = useAuth(); diff --git a/src/app/+html.tsx b/src/app/+html.tsx index 6dfbeea3e..322a85b58 100644 --- a/src/app/+html.tsx +++ b/src/app/+html.tsx @@ -1,11 +1,18 @@ import { ScrollViewStyleReset } from 'expo-router/html'; +<<<<<<< HEAD import { type ReactNode } from 'react'; +======= +>>>>>>> c7bb80d // This file is web-only and used to configure the root HTML for every // web page during static rendering. // The contents of this function only run in Node.js environments and // do not have access to the DOM or browser APIs. +<<<<<<< HEAD export default function Root({ children }: { children: ReactNode }) { +======= +export default function Root({ children }: { children: React.ReactNode }) { +>>>>>>> c7bb80d return ( diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx index b56ec01ec..64b23d536 100644 --- a/src/app/_layout.tsx +++ b/src/app/_layout.tsx @@ -13,8 +13,11 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler'; import { KeyboardProvider } from 'react-native-keyboard-controller'; import { APIProvider } from '@/api'; +<<<<<<< HEAD import interceptors from '@/api/common/interceptors'; import { AuthProvider } from '@/components/providers/auth'; +======= +>>>>>>> c7bb80d import { hydrateAuth, loadSelectedTheme } from '@/lib'; import { useThemeConfig } from '@/lib/use-theme-config'; diff --git a/src/app/feed/[id].tsx b/src/app/feed/[id].tsx index 8e610d44b..c90a7ef12 100644 --- a/src/app/feed/[id].tsx +++ b/src/app/feed/[id].tsx @@ -1,6 +1,16 @@ import { Stack } from 'expo-router'; +<<<<<<< HEAD import { FocusAwareStatusBar, View } from '@/components/ui'; +======= +import { usePost } from '@/api'; +import { + ActivityIndicator, + FocusAwareStatusBar, + Text, + View, +} from '@/components/ui'; +>>>>>>> c7bb80d export default function Post() { return ( diff --git a/src/app/feed/add-post.tsx b/src/app/feed/add-post.tsx index bf64a9d9f..ed494b343 100644 --- a/src/app/feed/add-post.tsx +++ b/src/app/feed/add-post.tsx @@ -1,4 +1,27 @@ import { Stack } from 'expo-router'; +<<<<<<< HEAD +======= +import * as React from 'react'; +import { useForm } from 'react-hook-form'; +import { showMessage } from 'react-native-flash-message'; +import { z } from 'zod'; + +import { useAddPost } from '@/api'; +import { + Button, + ControlledInput, + showErrorMessage, + View, +} from '@/components/ui'; + +const schema = z.object({ + title: z.string().min(10), + body: z.string().min(120), +}); + +type FormType = z.infer; + +>>>>>>> c7bb80d export default function AddPost() { return ( { + console.log(data); + signIn({ access: 'access-token', refresh: 'refresh-token' }); + router.push('/'); + }; + return ( + <> + + + + ); +} diff --git a/src/app/onboarding.tsx b/src/app/onboarding.tsx index e6b357c44..0ec2cbaf1 100644 --- a/src/app/onboarding.tsx +++ b/src/app/onboarding.tsx @@ -8,7 +8,10 @@ import { Text, View, } from '@/components/ui'; +<<<<<<< HEAD import { translate } from '@/lib'; +======= +>>>>>>> c7bb80d import { useIsFirstTime } from '@/lib/hooks'; export default function Onboarding() { const [, setIsFirstTime] = useIsFirstTime(); diff --git a/src/components/buttons.tsx b/src/components/buttons.tsx index 2d56ee3de..3ebfd23b0 100644 --- a/src/components/buttons.tsx +++ b/src/components/buttons.tsx @@ -1,3 +1,8 @@ +<<<<<<< HEAD +======= +import React from 'react'; + +>>>>>>> c7bb80d import { Button, View } from '@/components/ui'; import { Title } from './title'; diff --git a/src/components/card.tsx b/src/components/card.tsx new file mode 100644 index 000000000..02f297e13 --- /dev/null +++ b/src/components/card.tsx @@ -0,0 +1,40 @@ +import { Link } from 'expo-router'; +import React from 'react'; + +import type { Post } from '@/api'; +import { Image, Pressable, Text, View } from '@/components/ui'; + +type Props = Post; + +const images = [ + 'https://images.unsplash.com/photo-1489749798305-4fea3ae63d43?auto=format&fit=crop&w=800&q=80', + 'https://images.unsplash.com/photo-1564507004663-b6dfb3c824d5?auto=format&fit=crop&w=800&q=80', + 'https://images.unsplash.com/photo-1515386474292-47555758ef2e?auto=format&fit=crop&w=800&q=80', + 'https://plus.unsplash.com/premium_photo-1666815503002-5f07a44ac8fb?auto=format&fit=crop&w=800&q=80', + 'https://images.unsplash.com/photo-1587974928442-77dc3e0dba72?auto=format&fit=crop&w=800&q=80', +]; + +export const Card = ({ title, body, id }: Props) => { + return ( + + + + + + + {title} + + {body} + + + + + + ); +}; diff --git a/src/components/colors.tsx b/src/components/colors.tsx index 0e6788b2d..ecb2053a1 100644 --- a/src/components/colors.tsx +++ b/src/components/colors.tsx @@ -1,3 +1,8 @@ +<<<<<<< HEAD +======= +import React from 'react'; + +>>>>>>> c7bb80d import { Text, View } from '@/components/ui'; import colors from '@/components/ui/colors'; diff --git a/src/components/inputs.tsx b/src/components/inputs.tsx index d8bd56e94..7f923d8dd 100644 --- a/src/components/inputs.tsx +++ b/src/components/inputs.tsx @@ -1,7 +1,12 @@ import { useState } from 'react'; import type { OptionType } from '@/components/ui'; +<<<<<<< HEAD import { Checkbox, Input, Radio, Select, Switch, View } from '@/components/ui'; +======= +import { Input, Select, View } from '@/components/ui'; +import { Checkbox, Radio, Switch } from '@/components/ui'; +>>>>>>> c7bb80d import { Title } from './title'; diff --git a/src/components/login-form.test.tsx b/src/components/login-form.test.tsx index 8cd22fe99..c93f7f46f 100644 --- a/src/components/login-form.test.tsx +++ b/src/components/login-form.test.tsx @@ -1,5 +1,11 @@ import { cleanup, fireEvent, render, screen } from '@/lib/test-utils'; +<<<<<<< HEAD +======= +import { cleanup, screen, setup, waitFor } from '@/lib/test-utils'; + +import type { LoginFormProps } from './login-form'; +>>>>>>> c7bb80d import { LoginForm } from './login-form'; afterEach(cleanup); @@ -7,8 +13,13 @@ afterEach(cleanup); describe('LoginForm Form ', () => { const LOGIN_BUTTON = 'login-button'; it('renders correctly', async () => { +<<<<<<< HEAD render(); expect(await screen.findByText(/Sign in/i)).toBeOnTheScreen(); +======= + setup(); + expect(await screen.findByTestId('form-title')).toBeOnTheScreen(); +>>>>>>> c7bb80d }); it('should display required error when values are empty', async () => { @@ -33,6 +44,32 @@ describe('LoginForm Form ', () => { fireEvent.press(button); expect(screen.queryByText(/Email is required/i)).not.toBeOnTheScreen(); +<<<<<<< HEAD expect(await screen.findByText(/Invalid Email Format/i)).toBeOnTheScreen(); +======= + }); + + it('Should call LoginForm with correct values when values are valid', async () => { + const { user } = setup(); + + const button = screen.getByTestId('login-button'); + const emailInput = screen.getByTestId('email-input'); + const passwordInput = screen.getByTestId('password-input'); + + await user.type(emailInput, 'youssef@gmail.com'); + await user.type(passwordInput, 'password'); + await user.press(button); + await waitFor(() => { + expect(onSubmitMock).toHaveBeenCalledTimes(1); + }); + // expect.objectContaining({}) because we don't want to test the target event we are receiving from the onSubmit function + expect(onSubmitMock).toHaveBeenCalledWith( + { + email: 'youssef@gmail.com', + password: 'password', + }, + expect.objectContaining({}) + ); +>>>>>>> c7bb80d }); }); diff --git a/src/components/login-form.tsx b/src/components/login-form.tsx index a161a4de9..cbe4a70cf 100644 --- a/src/components/login-form.tsx +++ b/src/components/login-form.tsx @@ -6,7 +6,10 @@ import { KeyboardAvoidingView } from 'react-native-keyboard-controller'; import { object, string, type z } from 'zod'; import { Button, ControlledInput, Text, View } from '@/components/ui'; +<<<<<<< HEAD import { translate } from '@/lib'; +======= +>>>>>>> c7bb80d const MIN_CHARS = 6; const schema = object({ @@ -38,6 +41,7 @@ export const LoginForm = ({ behavior="padding" keyboardVerticalOffset={10} > +<<<<<<< HEAD {translate('auth.signIn.title')} @@ -59,6 +63,22 @@ export const LoginForm = ({ placeholder="***" secureTextEntry={true} /> +======= + + + + Sign In + + + + Welcome! 👋 This is a demo login screen! Feel free to use any email + and password to sign in and try it out. + + +>>>>>>> c7bb80d , + ); expect(screen.getByText('Custom child')).toBeOnTheScreen(); }); @@ -33,7 +33,7 @@ describe('Button component ', () => { it('should call onClick handler when clicked', async () => { const onClick = jest.fn(); const { user } = setup( -