diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
deleted file mode 100644
index b6956730..00000000
--- a/.github/workflows/build-pull-request.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Build pull request
-
-on:
- pull_request:
- types: ['opened', 'synchronize']
-
-jobs:
- build-pull-request:
- name: Build pull request
- runs-on: ubuntu-latest
- permissions:
- contents: read
- env:
- PR_NUMBER: ${{github.event.number}}
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Setup node
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- with:
- node-version-file: '.node-version'
- cache: 'npm'
- - name: Install dependencies
- run: npm ci
- - name: Build app
- env:
- NODE_OPTIONS: '--max_old_space_size=4096'
- run: npm run build
- - name: Upload artifact
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
- with:
- name: preview
- path: dist
- retention-days: 1
- - name: Save pr number
- run: echo ${PR_NUMBER} > ./pr.txt
- - name: Upload pr number
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
- with:
- name: pr
- path: ./pr.txt
- retention-days: 1
diff --git a/.github/workflows/deploy-pull-request.yml b/.github/workflows/deploy-pull-request.yml
deleted file mode 100644
index 19c11b29..00000000
--- a/.github/workflows/deploy-pull-request.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Deploy PR to Netlify
-
-on:
- workflow_run:
- workflows: ['Build pull request']
- types: [completed]
-
-jobs:
- deploy-pull-request:
- name: Deploy pull request
- runs-on: ubuntu-latest
- permissions:
- actions: read
- contents: read
- pull-requests: write
- if: ${{ github.event.workflow_run.conclusion == 'success' }}
- steps:
- - name: Download pr number
- uses: dawidd6/action-download-artifact@fe9d59ce33ce92db8a6ac90b2c8be6b6d90417c8
- with:
- workflow: ${{ github.event.workflow.id }}
- run_id: ${{ github.event.workflow_run.id }}
- name: pr
- - name: Output pr number
- id: pr
- run: echo "id=$(> $GITHUB_OUTPUT
- - name: Download artifact
- uses: dawidd6/action-download-artifact@fe9d59ce33ce92db8a6ac90b2c8be6b6d90417c8
- with:
- workflow: ${{ github.event.workflow.id }}
- run_id: ${{ github.event.workflow_run.id }}
- name: preview
- path: dist
- - name: Deploy to Netlify
- id: netlify
- uses: nwtgck/actions-netlify@4cbaf4c08f1a7bfa537d6113472ef4424e4eb654 # v3.0.0
- with:
- publish-dir: dist
- deploy-message: 'Deploy PR ${{ steps.pr.outputs.id }}'
- alias: ${{ steps.pr.outputs.id }}
- # These don't work because we're in workflow_run
- enable-pull-request-comment: false
- enable-commit-comment: false
- env:
- NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
- NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_PR_CINNY }}
- timeout-minutes: 1
- - name: Comment preview on PR
- uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b #v3.0.1
- env:
- github-token: ${{ secrets.GITHUB_TOKEN }}
- with:
- pr-number: ${{ steps.pr.outputs.id }}
- comment-tag: ${{ steps.pr.outputs.id }}
- message: |
- Preview: ${{ steps.netlify.outputs.deploy-url }}
- ⚠️ Exercise caution. Use test accounts. ⚠️
diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
deleted file mode 100644
index cfa196e8..00000000
--- a/.github/workflows/docker-pr.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: 'Docker check'
-
-on:
- pull_request:
- paths:
- - 'Dockerfile'
- - '.github/workflows/docker-pr.yml'
- - '.github/workflows/prod-deploy.yml'
-
-jobs:
- docker-build:
- runs-on: ubuntu-latest
- permissions:
- contents: read
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Build Docker image
- uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
- with:
- context: .
- push: false
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
new file mode 100644
index 00000000..ff7656b9
--- /dev/null
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,76 @@
+name: Build and publish Docker image
+
+on:
+ push:
+ branches: [dev]
+ tags:
+ - '+([0-9]).+([0-9]).+([0-9])'
+
+env:
+ REGISTRY: ghcr.io
+ IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+ build-and-push:
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ packages: write
+ attestations: write
+ artifact-metadata: write
+ id-token: write
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+
+ - name: Log in to GitHub Container Registry
+ uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+ with:
+ registry: ${{ env.REGISTRY }}
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Extract metadata
+ id: meta
+ uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+ with:
+ images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ flavor: |
+ latest=false
+ tags: |
+ # dev branch: short commit SHA + latest
+ type=sha,prefix=,format=short,enable=${{ github.ref == 'refs/heads/dev' }}
+ type=raw,value=latest,enable=${{ github.ref == 'refs/heads/dev' }}
+
+ # git tags: semver breakdown
+ type=semver,pattern={{version}}
+ type=semver,pattern={{major}}.{{minor}}
+ type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/0.') }}
+
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+
+ - name: Build and push Docker image
+ id: push
+ uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+ with:
+ context: .
+ push: true
+ platforms: linux/amd64,linux/arm64,linux/arm/v7
+ tags: ${{ steps.meta.outputs.tags }}
+ labels: ${{ steps.meta.outputs.labels }}
+ cache-from: type=gha
+ cache-to: type=gha,mode=max
+
+ - name: Generate artifact attestation
+ uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
+ with:
+ subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ subject-digest: ${{ steps.push.outputs.digest }}
+ push-to-registry: true
diff --git a/.github/workflows/netlify-dev.yml b/.github/workflows/netlify-dev.yml
deleted file mode 100644
index 69a99042..00000000
--- a/.github/workflows/netlify-dev.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Deploy to Netlify (dev)
-
-on:
- push:
- branches:
- - dev
-
-jobs:
- deploy-to-netlify:
- name: Deploy to Netlify
- runs-on: ubuntu-latest
- permissions:
- contents: read
- deployments: write
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Setup node
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- with:
- node-version-file: '.node-version'
- cache: 'npm'
- - name: Install dependencies
- run: npm ci
- - name: Build app
- env:
- NODE_OPTIONS: '--max_old_space_size=4096'
- run: npm run build
- - name: Deploy to Netlify
- uses: nwtgck/actions-netlify@4cbaf4c08f1a7bfa537d6113472ef4424e4eb654 # v3.0.0
- with:
- publish-dir: dist
- deploy-message: 'Dev deploy ${{ github.sha }}'
- enable-commit-comment: false
- github-token: ${{ secrets.GITHUB_TOKEN }}
- production-deploy: true
- github-deployment-environment: nightly
- github-deployment-description: 'Nightly deployment on each commit to dev branch'
- env:
- NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
- NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_DEV }}
- timeout-minutes: 1
diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml
deleted file mode 100644
index 074b6026..00000000
--- a/.github/workflows/prod-deploy.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-name: Production deploy
-
-on:
- release:
- types: [published]
-
-jobs:
- deploy-and-tarball:
- name: Netlify deploy and tarball
- runs-on: ubuntu-latest
- permissions:
- contents: write
- deployments: write
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Setup node
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- with:
- node-version-file: '.node-version'
- package-manager-cache: false
- - name: Install dependencies
- run: npm ci
- - name: Build app
- env:
- NODE_OPTIONS: '--max_old_space_size=4096'
- run: npm run build
- - name: Deploy to Netlify
- uses: nwtgck/actions-netlify@4cbaf4c08f1a7bfa537d6113472ef4424e4eb654 # v3.0.0
- with:
- publish-dir: dist
- deploy-message: 'Prod deploy ${{ github.ref_name }}'
- enable-commit-comment: false
- github-token: ${{ secrets.GITHUB_TOKEN }}
- production-deploy: true
- github-deployment-environment: stable
- github-deployment-description: 'Stable deployment on each release'
- env:
- NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
- NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID_APP }}
- timeout-minutes: 1
- - name: Get version from tag
- id: vars
- run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
- - name: Create tar.gz
- env:
- RELEASE_TAG: ${{ steps.vars.outputs.tag }}
- run: tar -czvf "cinny-${RELEASE_TAG}.tar.gz" dist
- - name: Sign tar.gz
- env:
- RELEASE_TAG: ${{ steps.vars.outputs.tag }}
- run: |
- echo '${{ secrets.GNUPG_KEY }}' | gpg --batch --import
- # Sadly a few lines in the private key match a few lines in the public key,
- # As a result just --export --armor gives us a few lines replaced with ***
- # making it useless for importing the signing key. Instead, we dump it as
- # non-armored and hex-encode it so that its printable.
- echo "PGP Signing key, in raw PGP format in hex. Import with cat ... | xxd -r -p - | gpg --import"
- gpg --export | xxd -p
- echo '${{ secrets.GNUPG_PASSPHRASE }}' | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --armor --detach-sign "cinny-${RELEASE_TAG}.tar.gz"
- - name: Upload tagged release
- uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
- with:
- files: |
- cinny-${{ steps.vars.outputs.tag }}.tar.gz
- cinny-${{ steps.vars.outputs.tag }}.tar.gz.asc
-
- publish-image:
- name: Push Docker image to Docker Hub, ghcr
- runs-on: ubuntu-latest
- permissions:
- contents: read
- packages: write
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Set up QEMU
- uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
- - name: Login to Docker Hub
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
- with:
- username: ${{ secrets.DOCKER_USERNAME }}
- password: ${{ secrets.DOCKER_PASSWORD }}
- - name: Login to the Container registry
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Extract metadata (tags, labels) for Docker
- id: meta
- uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
- with:
- images: |
- ${{ secrets.DOCKER_USERNAME }}/cinny
- ghcr.io/${{ github.repository }}
- - name: Build and push Docker image
- uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
- with:
- context: .
- platforms: linux/amd64,linux/arm64
- push: true
- tags: ${{ steps.meta.outputs.tags }}
- labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml
new file mode 100644
index 00000000..fb8e582c
--- /dev/null
+++ b/.github/workflows/quality-checks.yml
@@ -0,0 +1,86 @@
+name: Quality checks
+
+on:
+ pull_request:
+ push:
+
+jobs:
+ format:
+ name: Format check
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+ - name: Setup node
+ uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+ with:
+ node-version-file: '.node-version'
+ cache: 'npm'
+ - name: Install dependencies
+ run: npm ci
+ - name: Check formatting
+ run: npm run fmt:check
+
+ lint:
+ name: Lint
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+ - name: Setup node
+ uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+ with:
+ node-version-file: '.node-version'
+ cache: 'npm'
+ - name: Install dependencies
+ run: npm ci
+ - name: Run ESLint
+ run: npm run lint
+
+ typecheck:
+ name: Typecheck
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+ - name: Setup node
+ uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+ with:
+ node-version-file: '.node-version'
+ cache: 'npm'
+ - name: Install dependencies
+ run: npm ci
+ - name: Run TypeScript typecheck
+ run: npm run typecheck -- --pretty false
+
+ knip:
+ name: Knip
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+ - name: Setup node
+ uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+ with:
+ node-version-file: '.node-version'
+ cache: 'npm'
+ - name: Install dependencies
+ run: npm ci --ignore-scripts
+ - name: Run Knip
+ run: npm run knip
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 1d7ac851..a3854a85 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,3 +1,3 @@
{
- "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
+ "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "webpro.vscode-knip"]
}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f45682b..3a568bf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
# Sable Client Changelog
+## 1.2.4 - in dev
+
+- Add validation to timezones before rendering.
+- Fix invalid matrix.to event link generation ([cinnyapp#2717](https://github.com/cinnyapp/cinny/pull/2717)) - [tulir](https://github.com/tulir)
+- Fix Call Rooms' chat button ([#58](https://github.com/7w1/sable/pull/58)) - [Rosy-iso](https://github.com/Rosy-iso)
+- Strip quotes for mxc urls converted to http for tuwunel ([#56](https://github.com/7w1/sable/pull/56)) - [Rosy-iso](https://github.com/Rosy-iso)
+- Add sable space and announcements room to featured communities.
+
+## 1.2.3 - 3/2/2026
+
+- Actually fix quotes around colors for tuwunel homeservers ([#46](https://github.com/7w1/sable/issues/46))
+- Option to have your own message bubbles in bubble layout right aligned ([#38](https://github.com/7w1/sable/issues/38))
+- Allow responding to and rendering replies with files ([#54](https://github.com/7w1/sable/pull/54)) - [nushea](https://github.com/nushea)
+- Added Gruvbox theme ([#51](https://github.com/7w1/sable/pull/51)) - [dollth.ing](https://github.com/dollth-ing)
+
+## 1.2.2 v2
+
+- hotfix for stupid firefox cors crash
+
## 1.2.2 - 3/1/2026
- Fixed/updated unknown extended profile keys rendering.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b9812722..62a49325 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,6 +37,13 @@ It is not always possible to phrase every change in such a manner, but it is des
Also, we use [ESLint](https://eslint.org/) for clean and stylistically consistent code syntax, so make sure your pull request follow it.
+**Pull requests are not merged unless all quality checks are passing.** At minimum, `format`, `lint`, `typecheck`, and `knip` must all be green before a pull request can be merged. Run these locally before opening or updating a pull request:
+
+- `npm run fmt:check`
+- `npm run lint`
+- `npm run typecheck`
+- `npm run knip`
+
**For any query or design discussion, join our [Matrix room](https://matrix.to/#/#sable:sable.moe).**
## Helpful links
diff --git a/README.md b/README.md
index a893884f..f8998a50 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,41 @@ The web app is available at [app.sable.moe](https://app.sable.moe/) and gets upd
You can also download our desktop app for windows and linux from [releases](https://github.com/7w1/sable/releases/latest).
## Self-hosting
-To host Sable on your own, download this repo and built with nginx.
+You can either run the prebuilt container image or build Sable yourself.
+
+### Docker
+
+Prebuilt images are published to `ghcr.io/7w1/sable`.
+
+- `latest` tracks the current `dev` branch image.
+- `X.Y.Z` tags are versioned releases.
+- `X.Y` tags float within a release line.
+- Pushes to `dev` also publish a short commit SHA tag.
+
+Run the latest image with:
+
+```sh
+docker run --rm -p 8080:80 ghcr.io/7w1/sable:latest
+```
+
+Then open `http://localhost:8080`.
+
+If you want to override the bundled [`config.json`](config.json), mount your own
+file at `/app/config.json`:
+
+```yaml
+services:
+ sable:
+ image: ghcr.io/7w1/sable:latest
+ ports:
+ - '8080:80'
+ volumes:
+ - ./config.json:/app/config.json:ro
+```
+
+### Build it yourself
+
+To build and serve Sable yourself with nginx, clone this repo and build it:
```sh
npm ci # Installs all dependencies
diff --git a/config.json b/config.json
index 0b967410..ef8a5218 100644
--- a/config.json
+++ b/config.json
@@ -5,6 +5,7 @@
"elementCallUrl": null,
"disableAccountSwitcher": false,
+ "matrixToBaseUrl": "https://matrix.to",
"pushNotificationDetails": {
"pushNotifyUrl": "https://cinny.cc/_matrix/push/v1/notify",
@@ -15,6 +16,7 @@
"featuredCommunities": {
"openAsDefault": false,
"spaces": [
+ "#sable:sable.moe",
"#community:matrix.org",
"#space:unredacted.org",
"#science-space:matrix.org",
@@ -22,6 +24,7 @@
"#mathematics-on:matrix.org"
],
"rooms": [
+ "#announcements:sable.moe",
"#freesoftware:matrix.org",
"#pcapdroid:matrix.org",
"#gentoo:matrix.org",
diff --git a/eslint.config.js b/eslint.config.js
index 792e263f..9fa0c87b 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,65 +1,97 @@
+import path from 'node:path';
+
+import { includeIgnoreFile } from '@eslint/compat';
import js from '@eslint/js';
import { defineConfig } from 'eslint/config';
-import css from '@eslint/css';
-import tseslint from 'typescript-eslint';
-import react from 'eslint-plugin-react';
-import reactHooks from 'eslint-plugin-react-hooks';
-import importPlugin from 'eslint-plugin-import';
-import eslintConfigPrettier from 'eslint-config-prettier';
+import { configs, helpers, plugins } from 'eslint-config-airbnb-extended';
+import { rules as prettierConfigRules } from 'eslint-config-prettier';
+import prettierPlugin from 'eslint-plugin-prettier';
+import reactPlugin from 'eslint-plugin-react';
+import globals from 'globals';
-const sourceFiles = ['**/*.{js,jsx,ts,tsx,mjs,cjs,mts,cts}'];
-const tsSourceFiles = ['**/*.{ts,tsx,mts,cts}'];
-const jsSourceFiles = ['**/*.{js,jsx,mjs,cjs}'];
-const scopedRecommendedTsConfigs = tseslint.configs.recommended.map((config) =>
- config.files ? config : { ...config, files: sourceFiles }
-);
-const scopedRecommendedTypeCheckedTsConfigs = tseslint.configs.recommendedTypeChecked.map(
- (config) => (config.files ? config : { ...config, files: sourceFiles })
-);
+const gitignorePath = path.resolve('.', '.gitignore');
+const { jsFiles, tsFiles } = helpers.extensions;
-export default defineConfig(
+const jsConfig = defineConfig([
+ // ESLint recommended config
{
- files: ['**/*.css'],
- plugins: { css },
- language: 'css/css',
- rules: css.configs.recommended.rules,
+ name: 'js/config',
+ ...js.configs.recommended,
},
+ // Stylistic plugin
+ plugins.stylistic,
+ // Import X plugin
+ plugins.importX,
+ // Airbnb base recommended config
+ ...configs.base.recommended,
+]);
+
+const reactConfig = defineConfig([
+ // React plugin
+ plugins.react,
+ // React hooks plugin
+ plugins.reactHooks,
+ // React JSX A11y plugin
+ plugins.reactA11y,
+ // Airbnb React recommended config
+ ...configs.react.recommended,
+ // React 17+ automatic JSX runtime
+ reactPlugin.configs.flat['jsx-runtime'],
+]);
+
+const typescriptConfig = defineConfig([
+ // TypeScript ESLint plugin
+ plugins.typescriptEslint,
+ // Airbnb base TypeScript config
+ ...configs.base.typescript,
+ // Airbnb React TypeScript config
+ ...configs.react.typescript,
+]);
+
+const prettierConfig = defineConfig([
+ // Prettier plugin
{
- files: sourceFiles,
+ name: 'prettier/plugin/config',
+ plugins: {
+ prettier: prettierPlugin,
+ },
+ },
+ // Prettier config
+ {
+ name: 'prettier/config',
+ rules: {
+ ...prettierConfigRules,
+ 'prettier/prettier': 'error',
+ },
+ },
+]);
+
+const projectOverrides = defineConfig([
+ {
+ name: 'project/rule-overrides',
+ files: [...jsFiles, ...tsFiles],
languageOptions: {
- ecmaVersion: 'latest',
- sourceType: 'module',
- parserOptions: {
- projectService: true,
- tsconfigRootDir: import.meta.dirname,
- },
globals: {
JSX: 'readonly',
+ ...globals.browser,
},
},
- settings: {
- react: {
- version: 'detect',
- },
- },
- },
- { ...js.configs.recommended, files: sourceFiles },
- ...scopedRecommendedTsConfigs,
- ...scopedRecommendedTypeCheckedTsConfigs,
- { ...importPlugin.flatConfigs.recommended, files: sourceFiles },
- { ...importPlugin.flatConfigs.typescript, files: tsSourceFiles },
- { ...react.configs.flat.recommended, files: sourceFiles },
- { ...react.configs.flat['jsx-runtime'], files: sourceFiles },
- { ...reactHooks.configs.flat.recommended, files: sourceFiles },
- { ...tseslint.configs.disableTypeChecked, files: jsSourceFiles },
- { ...eslintConfigPrettier, files: sourceFiles },
- {
- files: sourceFiles,
rules: {
'linebreak-style': 'off',
- 'no-unused-vars': 'off',
'no-underscore-dangle': 'off',
'no-shadow': 'off',
+ 'import-x/prefer-default-export': 'off',
+ 'import-x/extensions': 'off',
+ 'import-x/no-unresolved': 'off',
+ 'import-x/no-extraneous-dependencies': [
+ 'error',
+ {
+ devDependencies: true,
+ optionalDependencies: false,
+ peerDependencies: true,
+ bundledDependencies: true,
+ },
+ ],
'react/no-unstable-nested-components': ['error', { allowAsProps: true }],
'react/jsx-filename-extension': [
'error',
@@ -67,28 +99,45 @@ export default defineConfig(
extensions: ['.tsx', '.jsx'],
},
],
+ // obsolete in a React 19
+ 'react/prop-types': 'off',
'react/require-default-props': 'off',
'react/jsx-props-no-spreading': 'off',
+ 'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'error',
- 'import/no-extraneous-dependencies': [
- 'error',
- {
- devDependencies: true,
- },
- ],
- '@typescript-eslint/no-unused-vars': [
- 'error',
- {
- varsIgnorePattern: '^React$',
- },
- ],
- '@typescript-eslint/no-shadow': 'error',
},
},
{
- files: tsSourceFiles,
+ name: 'project/typescript-rule-overrides',
+ files: tsFiles,
rules: {
+ // disabled for now to get eslint to pass
+ '@typescript-eslint/consistent-type-definitions': 'off',
+ '@typescript-eslint/no-unsafe-enum-comparison': 'off',
+ '@typescript-eslint/only-throw-error': 'off',
+ '@typescript-eslint/array-type': 'off',
+ '@typescript-eslint/no-unused-vars': [
+ 'error',
+ {
+ args: 'after-used',
+ enableAutofixRemoval: {
+ imports: true,
+ },
+ ignoreRestSiblings: true,
+ vars: 'all',
+ },
+ ],
+ '@typescript-eslint/no-shadow': 'error',
'no-undef': 'off',
},
- }
-);
+ },
+]);
+
+export default defineConfig([
+ includeIgnoreFile(gitignorePath),
+ ...jsConfig,
+ ...reactConfig,
+ ...typescriptConfig,
+ ...prettierConfig,
+ ...projectOverrides,
+]);
diff --git a/knip.json b/knip.json
new file mode 100644
index 00000000..bc885b41
--- /dev/null
+++ b/knip.json
@@ -0,0 +1,15 @@
+{
+ "$schema": "https://unpkg.com/knip@5/schema.json",
+ "entry": ["src/sw.ts", "scripts/normalize-imports.js"],
+ "ignoreExportsUsedInFile": {
+ "interface": true,
+ "type": true
+ },
+ "ignoreDependencies": ["buffer", "@element-hq/element-call-embedded"],
+ "rules": {
+ "exports": "off",
+ "types": "off",
+ "enumMembers": "off"
+ },
+ "tags": ["-lintignore"]
+}
diff --git a/package-lock.json b/package-lock.json
index 351a7880..fde07c52 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "sable",
- "version": "1.2.2",
+ "version": "1.2.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "sable",
- "version": "1.2.2",
+ "version": "1.2.3",
"license": "AGPL-3.0-only",
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.7.7",
@@ -27,11 +27,11 @@
"browser-encrypt-attachment": "^0.3.0",
"chroma-js": "^3.2.0",
"classnames": "^2.5.1",
- "dateformat": "^5.0.3",
"dayjs": "^1.11.19",
"domhandler": "^5.0.3",
"emojibase": "^15.3.1",
"emojibase-data": "^15.3.2",
+ "eslint-plugin-react": "7.37.5",
"file-saver": "^2.0.5",
"focus-trap-react": "^10.3.1",
"folds": "^2.6.1",
@@ -71,9 +71,8 @@
"devDependencies": {
"@element-hq/element-call-embedded": "0.16.3",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
- "@eslint/css": "^0.14.1",
- "@eslint/eslintrc": "^3.3.4",
- "@eslint/js": "^9.39.3",
+ "@eslint/compat": "2.0.2",
+ "@eslint/js": "9.39.3",
"@rollup/plugin-inject": "^5.0.5",
"@rollup/plugin-wasm": "^6.2.2",
"@types/chroma-js": "^3.1.2",
@@ -88,15 +87,14 @@
"@types/ua-parser-js": "^0.7.39",
"@vitejs/plugin-react": "^5.1.4",
"buffer": "^6.0.3",
- "eslint": "^9.39.3",
- "eslint-config-prettier": "^10.1.8",
- "eslint-plugin-import": "^2.32.0",
- "eslint-plugin-jsx-a11y": "^6.10.2",
- "eslint-plugin-react": "^7.37.5",
- "eslint-plugin-react-hooks": "^7.0.1",
- "prettier": "^3.8.1",
+ "eslint": "9.39.3",
+ "eslint-config-airbnb-extended": "3.0.1",
+ "eslint-config-prettier": "10.1.8",
+ "eslint-plugin-prettier": "5.5.5",
+ "globals": "17.3.0",
+ "knip": "5.85.0",
+ "prettier": "3.8.1",
"typescript": "^5.9.3",
- "typescript-eslint": "^8.56.1",
"vite": "^7.3.1",
"vite-plugin-pwa": "^1.2.0",
"vite-plugin-static-copy": "^3.2.0",
@@ -1762,6 +1760,40 @@
"integrity": "sha512-OViKJonDaDNVBUW9WdV9mk78/Ruh34C7XsEgt3O8D9z+64C39elbIgllHSoH5S12IRlv9RYrrV37FZLo6QWsDQ==",
"dev": true
},
+ "node_modules/@emnapi/core": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz",
+ "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/wasi-threads": "1.1.0",
+ "tslib": "^2.4.0"
+ }
+ },
+ "node_modules/@emnapi/runtime": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz",
+ "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
+ "node_modules/@emnapi/wasi-threads": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz",
+ "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
"node_modules/@emotion/hash": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz",
@@ -2247,6 +2279,40 @@
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
}
},
+ "node_modules/@eslint/compat": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-2.0.2.tgz",
+ "integrity": "sha512-pR1DoD0h3HfF675QZx0xsyrsU8q70Z/plx7880NOhS02NuWLgBCOMDL787nUeQ7EWLkxv3bPQJaarjcPQb2Dwg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@eslint/core": "^1.1.0"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ },
+ "peerDependencies": {
+ "eslint": "^8.40 || 9 || 10"
+ },
+ "peerDependenciesMeta": {
+ "eslint": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@eslint/compat/node_modules/@eslint/core": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.1.0.tgz",
+ "integrity": "sha512-/nr9K9wkr3P1EzFTdFdMoLuo1PmIxjmwvPozwoSodjNBdefGujXQUF93u1DDZpEaTuDvMsIQddsd35BwtrW9Xw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@types/json-schema": "^7.0.15"
+ },
+ "engines": {
+ "node": "^20.19.0 || ^22.13.0 || >=24"
+ }
+ },
"node_modules/@eslint/config-array": {
"version": "0.21.1",
"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
@@ -2288,35 +2354,6 @@
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
}
},
- "node_modules/@eslint/css": {
- "version": "0.14.1",
- "resolved": "https://registry.npmjs.org/@eslint/css/-/css-0.14.1.tgz",
- "integrity": "sha512-NXiteSacmpaXqgyIW3+GcNzexXyfC0kd+gig6WTjD4A74kBGJeNx1tV0Hxa0v7x0+mnIyKfGPhGNs1uhRFdh+w==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "@eslint/core": "^0.17.0",
- "@eslint/css-tree": "^3.6.6",
- "@eslint/plugin-kit": "^0.4.1"
- },
- "engines": {
- "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
- }
- },
- "node_modules/@eslint/css-tree": {
- "version": "3.6.9",
- "resolved": "https://registry.npmjs.org/@eslint/css-tree/-/css-tree-3.6.9.tgz",
- "integrity": "sha512-3D5/OHibNEGk+wKwNwMbz63NMf367EoR4mVNNpxddCHKEb2Nez7z62J2U6YjtErSsZDoY0CsccmoUpdEbkogNA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "mdn-data": "2.23.0",
- "source-map-js": "^1.0.1"
- },
- "engines": {
- "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
- }
- },
"node_modules/@eslint/eslintrc": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.4.tgz",
@@ -2887,6 +2924,397 @@
"url": "https://github.com/sponsors/Brooooooklyn"
}
},
+ "node_modules/@napi-rs/wasm-runtime": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.1.tgz",
+ "integrity": "sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/core": "^1.7.1",
+ "@emnapi/runtime": "^1.7.1",
+ "@tybys/wasm-util": "^0.10.1"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/Brooooooklyn"
+ }
+ },
+ "node_modules/@next/eslint-plugin-next": {
+ "version": "16.1.6",
+ "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-16.1.6.tgz",
+ "integrity": "sha512-/Qq3PTagA6+nYVfryAtQ7/9FEr/6YVyvOtl6rZnGsbReGLf0jZU6gkpr1FuChAQpvV46a78p4cmHOVP8mbfSMQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fast-glob": "3.3.1"
+ }
+ },
+ "node_modules/@next/eslint-plugin-next/node_modules/fast-glob": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+ "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.2",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.4"
+ },
+ "engines": {
+ "node": ">=8.6.0"
+ }
+ },
+ "node_modules/@next/eslint-plugin-next/node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/@nodelib/fs.scandir": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.stat": "2.0.5",
+ "run-parallel": "^1.1.9"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.stat": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.walk": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.scandir": "2.1.5",
+ "fastq": "^1.6.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@oxc-resolver/binding-android-arm-eabi": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.19.0.tgz",
+ "integrity": "sha512-dlMjjWE3h+qMujLp5nBX/x7R5ny+xfr4YtsyaMNuM5JImOtQBzpFxQr9kJOKGL+9RbaoTOXpt5KF05f9pnOsgw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-android-arm64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.19.0.tgz",
+ "integrity": "sha512-x5P0Y12oMcSC9PKkz1FtdVVLosXYi/05m+ufxPrUggd6vZRBPJhW4zZUsMVbz8dwwk71Dh0f6/2ntw3WPOq+Ig==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-darwin-arm64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.19.0.tgz",
+ "integrity": "sha512-DjnuIPB60IQrVSCiuVBzN8/8AeeIjthdkk+dZYdZzgLeP2T5ZF41u50haJMtIdGr5cRzRH6zPV/gh6+RFjlvKA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-darwin-x64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.19.0.tgz",
+ "integrity": "sha512-dVAqIZIIY7xOXCCV0nJPs8ExlYc6R7mcNpFobwNyE3qlXGbgvwb7Gl3iOumOiPBfF+sbJR3MMP7RAPfKqbvYyA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-freebsd-x64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.19.0.tgz",
+ "integrity": "sha512-kwcZ30bIpJNFcT22sIlde4mz0EyXmB3lAefCFWtffqpbmLweQUwz1dKDcsutxEjpkbEKLmfrj1wCyRZp7n5Hnw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.19.0.tgz",
+ "integrity": "sha512-GImk/cb3X+zBGEwr6l9h0dbiNo5zNd52gamZmluEpbyybiZ8kc5q44/7zRR4ILChWRW7pI92W57CJwhkF+wRmg==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-arm-musleabihf": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.19.0.tgz",
+ "integrity": "sha512-uIEyws3bBD1gif4SZCOV2XIr6q5fd1WbzzBbpL8qk+TbzOvKMWnMNNtfNacnAGGa2lLRNXR1Fffot2mlZ/Xmbw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.19.0.tgz",
+ "integrity": "sha512-bIkgp+AB+yZfvdKDfjFT7PycsRtih7+zCV5AbnkzfyvNvQ47rfssf8R1IbG++mx+rZ4YUCUu8EbP66HC3O5c5w==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-arm64-musl": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.19.0.tgz",
+ "integrity": "sha512-bOt5pKPcbidTSy64m2CfM0XcaCmxBEFclCMPuOPO08hh8QIFTiZVhFf/OxTFqyRwhq/tlzzKmXpMo7DfzbO5lQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-ppc64-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.19.0.tgz",
+ "integrity": "sha512-BymEPqVeLZzA/1kXow9U9rdniq1r5kk4u686Cx3ZU77YygR48NJI/2TyjM70vKHZffGx75ZShobcc1M5GXG3WA==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-riscv64-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.19.0.tgz",
+ "integrity": "sha512-aFgPTzZZY+XCYe4B+3A1S63xcIh2i136+2TPXWr9NOwXXTdMdBntb1J9fEgxXDnX82MjBknLUpJqAZHNTJzixA==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-riscv64-musl": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.19.0.tgz",
+ "integrity": "sha512-9WDGt7fV9GK97WrWE/VEDhMFv9m0ZXYn5NQ+16QvyT0ux8yGLAvyadi6viaTjEdJII/OaHBRYHcL+zUjmaWwmg==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-s390x-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.19.0.tgz",
+ "integrity": "sha512-SY3di6tccocppAVal5Hev3D6D1N5Y6TCEypAvNCOiPqku2Y8U/aXfvGbthqdPNa72KYqjUR1vomOv6J9thHITA==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-x64-gnu": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.19.0.tgz",
+ "integrity": "sha512-SV+4zBeCC3xjSE2wvhN45eyABoVRX3xryWBABFKfLwAWhF3wsB3bUF+CantYfQ/TLpasyvplRS9ovvFT9cb/0A==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-linux-x64-musl": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.19.0.tgz",
+ "integrity": "sha512-LkbjO+r5Isl8Xl29pJYOCB/iSUIULFUJDGdMp+yJD3OgWtSa6VJta2iw7QXmpcoOkq18UIL09yWrlyjLDL0Hug==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-openharmony-arm64": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-openharmony-arm64/-/binding-openharmony-arm64-11.19.0.tgz",
+ "integrity": "sha512-Ud1gelL5slpEU5AjzBWQz1WheprOAl5CPnCKTWynvvdlBbAZXA6fPYLuCrlRo0uw+x3f37XJ71kirpSew8Zyvg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openharmony"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-wasm32-wasi": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.19.0.tgz",
+ "integrity": "sha512-wXLNAVmL4vWXKaYJnFPgg5zQsSr3Rv+ftNReIU3UkzTcoVLK0805Pnbr2NwcBWSO5hhpOEdys02qlT2kxVgjWw==",
+ "cpu": [
+ "wasm32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@napi-rs/wasm-runtime": "^1.1.1"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.19.0.tgz",
+ "integrity": "sha512-zszvr0dJfvv0Jg49hLwjAJ4SRzfsq28SoearUtT1qv3qXRYsBWuctdlRa/lEZkiuG4tZWiY425Jh9QqLafwsAg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-win32-ia32-msvc": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-11.19.0.tgz",
+ "integrity": "sha512-I7ZYujr5XL1l7OwuddbOeqdUyFOaf51W1U2xUogInFdupIAKGqbpugpAK6RaccLcSlN0bbuo3CS5h7ue38SUAg==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@oxc-resolver/binding-win32-x64-msvc": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.19.0.tgz",
+ "integrity": "sha512-NxErbI1TmJEZZVvGPePjgXFZCuOzrjQuJ6YwHjcWkelReK7Uhg4QeL05zRdfTpgkH6IY/C8OjbKx5ZilQ4yDFg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@pkgr/core": {
+ "version": "0.2.9",
+ "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+ "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/pkgr"
+ }
+ },
"node_modules/@react-aria/breadcrumbs": {
"version": "3.5.31",
"resolved": "https://registry.npmjs.org/@react-aria/breadcrumbs/-/breadcrumbs-3.5.31.tgz",
@@ -5153,6 +5581,40 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/@stylistic/eslint-plugin": {
+ "version": "5.9.0",
+ "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.9.0.tgz",
+ "integrity": "sha512-FqqSkvDMYJReydrMhlugc71M76yLLQWNfmGq+SIlLa7N3kHp8Qq8i2PyWrVNAfjOyOIY+xv9XaaYwvVW7vroMA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.9.1",
+ "@typescript-eslint/types": "^8.56.0",
+ "eslint-visitor-keys": "^4.2.1",
+ "espree": "^10.4.0",
+ "estraverse": "^5.3.0",
+ "picomatch": "^4.0.3"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "peerDependencies": {
+ "eslint": "^9.0.0 || ^10.0.0"
+ }
+ },
+ "node_modules/@stylistic/eslint-plugin/node_modules/eslint-visitor-keys": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+ "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
"node_modules/@surma/rollup-plugin-off-main-thread": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -5723,6 +6185,17 @@
"url": "https://github.com/sponsors/tannerlinsley"
}
},
+ "node_modules/@tybys/wasm-util": {
+ "version": "0.10.1",
+ "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
+ "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
"node_modules/@types/babel__core": {
"version": "7.20.5",
"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -5808,7 +6281,8 @@
"version": "0.0.29",
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/@types/node": {
"version": "24.10.13",
@@ -6167,6 +6641,288 @@
"url": "https://opencollective.com/eslint"
}
},
+ "node_modules/@unrs/resolver-binding-android-arm-eabi": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
+ "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-android-arm64": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
+ "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-darwin-arm64": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
+ "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-darwin-x64": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
+ "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-freebsd-x64": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
+ "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
+ "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
+ "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
+ "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
+ "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
+ "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
+ "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
+ "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
+ "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
+ "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-linux-x64-musl": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
+ "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-wasm32-wasi": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
+ "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+ "cpu": [
+ "wasm32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@napi-rs/wasm-runtime": "^0.2.11"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@unrs/resolver-binding-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+ "version": "0.2.12",
+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+ "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/core": "^1.4.3",
+ "@emnapi/runtime": "^1.4.3",
+ "@tybys/wasm-util": "^0.10.0"
+ }
+ },
+ "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
+ "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
+ "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
+ "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
"node_modules/@use-gesture/core": {
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz",
@@ -7276,7 +8032,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
"integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"is-array-buffer": "^3.0.5"
@@ -7292,7 +8047,6 @@
"version": "3.1.9",
"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
"integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.8",
@@ -7315,7 +8069,6 @@
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
"integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.7",
@@ -7358,7 +8111,6 @@
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
"integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"define-properties": "^1.2.1",
@@ -7376,7 +8128,6 @@
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
"integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"define-properties": "^1.2.1",
@@ -7394,7 +8145,6 @@
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
"integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"define-properties": "^1.2.1",
@@ -7410,7 +8160,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
"integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
- "dev": true,
"dependencies": {
"array-buffer-byte-length": "^1.0.1",
"call-bind": "^1.0.8",
@@ -7455,7 +8204,6 @@
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
"integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
- "dev": true,
"dependencies": {
"possible-typed-array-names": "^1.0.0"
},
@@ -7475,10 +8223,11 @@
}
},
"node_modules/axe-core": {
- "version": "4.10.2",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
- "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
+ "version": "4.11.1",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.1.tgz",
+ "integrity": "sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==",
"dev": true,
+ "license": "MPL-2.0",
"engines": {
"node": ">=4"
}
@@ -7554,8 +8303,7 @@
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
- "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
- "dev": true
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
},
"node_modules/base-x": {
"version": "5.0.1",
@@ -7619,7 +8367,6 @@
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
"dependencies": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -7728,7 +8475,6 @@
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
"integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
- "dev": true,
"dependencies": {
"call-bind-apply-helpers": "^1.0.0",
"es-define-property": "^1.0.0",
@@ -7746,7 +8492,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"es-errors": "^1.3.0",
@@ -7760,7 +8505,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
"integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind-apply-helpers": "^1.0.2",
@@ -7926,6 +8670,16 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/comment-parser": {
+ "version": "1.4.5",
+ "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.5.tgz",
+ "integrity": "sha512-aRDkn3uyIlCFfk5NUA+VdwMmMsh8JGhc4hapfV4yxymHGQ3BVskMQfoXGpCo5IoBuQ9tS5iiVKhCpTcB4pW4qw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 12.0.0"
+ }
+ },
"node_modules/common-tags": {
"version": "1.8.2",
"resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
@@ -7945,8 +8699,7 @@
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
- "dev": true
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
},
"node_modules/confbox": {
"version": "0.1.8",
@@ -7954,6 +8707,13 @@
"integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
"license": "MIT"
},
+ "node_modules/confusing-browser-globals": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/content-type": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
@@ -8066,13 +8826,13 @@
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
"integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
- "dev": true
+ "dev": true,
+ "license": "BSD-2-Clause"
},
"node_modules/data-view-buffer": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
"integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"es-errors": "^1.3.0",
@@ -8089,7 +8849,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
"integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"es-errors": "^1.3.0",
@@ -8106,7 +8865,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
"integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"es-errors": "^1.3.0",
@@ -8119,14 +8877,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/dateformat": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-5.0.3.tgz",
- "integrity": "sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA==",
- "engines": {
- "node": ">=12.20"
- }
- },
"node_modules/dayjs": {
"version": "1.11.19",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
@@ -8193,7 +8943,6 @@
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
- "dev": true,
"dependencies": {
"es-define-property": "^1.0.0",
"es-errors": "^1.3.0",
@@ -8210,7 +8959,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
- "dev": true,
"dependencies": {
"define-data-property": "^1.0.1",
"has-property-descriptors": "^1.0.0",
@@ -8235,6 +8983,18 @@
"url": "https://github.com/sponsors/wooorm"
}
},
+ "node_modules/doctrine": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "esutils": "^2.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/dom-serializer": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
@@ -8301,7 +9061,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
- "dev": true,
"dependencies": {
"call-bind-apply-helpers": "^1.0.1",
"es-errors": "^1.3.0",
@@ -8337,7 +9096,8 @@
"version": "9.2.2",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/emojibase": {
"version": "15.3.1",
@@ -8362,6 +9122,20 @@
"emojibase": "*"
}
},
+ "node_modules/enhanced-resolve": {
+ "version": "5.20.0",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.0.tgz",
+ "integrity": "sha512-/ce7+jQ1PQ6rVXwe+jKEg5hW5ciicHwIQUagZkp6IufBoY3YDgdTTY1azVs0qoRgVmvsNB+rbjLJxDAeHHtwsQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "graceful-fs": "^4.2.4",
+ "tapable": "^2.3.0"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ }
+ },
"node_modules/entities": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -8387,7 +9161,6 @@
"version": "1.24.1",
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.1.tgz",
"integrity": "sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==",
- "dev": true,
"license": "MIT",
"dependencies": {
"array-buffer-byte-length": "^1.0.2",
@@ -8456,7 +9229,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -8465,7 +9237,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -8474,7 +9245,6 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.2.tgz",
"integrity": "sha512-BrUQ0cPTB/IwXj23HtwHjS9n7O4h9FX94b4xc5zlTHxeLgTAdzYUDyy6KdExAl9lbN5rtfe44xpjpmj9grxs5w==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.8",
@@ -8502,7 +9272,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0"
},
@@ -8514,7 +9283,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
"integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"get-intrinsic": "^1.2.6",
@@ -8529,7 +9297,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
"integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
- "dev": true,
"license": "MIT",
"dependencies": {
"hasown": "^2.0.2"
@@ -8542,7 +9309,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
"integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
- "dev": true,
"dependencies": {
"is-callable": "^1.2.7",
"is-date-object": "^1.0.5",
@@ -8676,6 +9442,54 @@
}
}
},
+ "node_modules/eslint-compat-utils": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz",
+ "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "semver": "^7.5.4"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "peerDependencies": {
+ "eslint": ">=6.0.0"
+ }
+ },
+ "node_modules/eslint-config-airbnb-extended": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/eslint-config-airbnb-extended/-/eslint-config-airbnb-extended-3.0.1.tgz",
+ "integrity": "sha512-JUVAh/tqLx99AFPmjXl5nalD6wrv6AD2muilieUJZG/uCjc89O93upoIcdB9221fTrcBdZAQ6f1jbyda1vcJ+Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@next/eslint-plugin-next": "^16.1.4",
+ "@stylistic/eslint-plugin": "^5.7.0",
+ "confusing-browser-globals": "^1.0.11",
+ "eslint-import-resolver-typescript": "^4.4.4",
+ "eslint-plugin-import": "^2.32.0",
+ "eslint-plugin-import-x": "^4.16.1",
+ "eslint-plugin-jsx-a11y": "^6.10.2",
+ "eslint-plugin-n": "^17.23.2",
+ "eslint-plugin-react": "^7.37.5",
+ "eslint-plugin-react-hooks": "^7.0.1",
+ "globals": "^17.0.0",
+ "typescript-eslint": "^8.53.1"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "peerDependencies": {
+ "eslint": "^9.0.0"
+ },
+ "peerDependenciesMeta": {
+ "eslint": {
+ "optional": false
+ }
+ }
+ },
"node_modules/eslint-config-prettier": {
"version": "10.1.8",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz",
@@ -8692,11 +9506,37 @@
"eslint": ">=7.0.0"
}
},
+ "node_modules/eslint-import-context": {
+ "version": "0.1.9",
+ "resolved": "https://registry.npmjs.org/eslint-import-context/-/eslint-import-context-0.1.9.tgz",
+ "integrity": "sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "get-tsconfig": "^4.10.1",
+ "stable-hash-x": "^0.2.0"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-import-context"
+ },
+ "peerDependencies": {
+ "unrs-resolver": "^1.0.0"
+ },
+ "peerDependenciesMeta": {
+ "unrs-resolver": {
+ "optional": true
+ }
+ }
+ },
"node_modules/eslint-import-resolver-node": {
"version": "0.3.9",
"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
"integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"debug": "^3.2.7",
"is-core-module": "^2.13.0",
@@ -8708,10 +9548,46 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"ms": "^2.1.1"
}
},
+ "node_modules/eslint-import-resolver-typescript": {
+ "version": "4.4.4",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.4.4.tgz",
+ "integrity": "sha512-1iM2zeBvrYmUNTj2vSC/90JTHDth+dfOfiNKkxApWRsTJYNrc8rOdxxIf5vazX+BiAXTeOT0UvWpGI/7qIWQOw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "debug": "^4.4.1",
+ "eslint-import-context": "^0.1.8",
+ "get-tsconfig": "^4.10.1",
+ "is-bun-module": "^2.0.0",
+ "stable-hash-x": "^0.2.0",
+ "tinyglobby": "^0.2.14",
+ "unrs-resolver": "^1.7.11"
+ },
+ "engines": {
+ "node": "^16.17.0 || >=18.6.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-import-resolver-typescript"
+ },
+ "peerDependencies": {
+ "eslint": "*",
+ "eslint-plugin-import": "*",
+ "eslint-plugin-import-x": "*"
+ },
+ "peerDependenciesMeta": {
+ "eslint-plugin-import": {
+ "optional": true
+ },
+ "eslint-plugin-import-x": {
+ "optional": true
+ }
+ }
+ },
"node_modules/eslint-module-utils": {
"version": "2.12.1",
"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
@@ -8740,6 +9616,28 @@
"ms": "^2.1.1"
}
},
+ "node_modules/eslint-plugin-es-x": {
+ "version": "7.8.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.8.0.tgz",
+ "integrity": "sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/ota-meshi",
+ "https://opencollective.com/eslint"
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.1.2",
+ "@eslint-community/regexpp": "^4.11.0",
+ "eslint-compat-utils": "^0.5.1"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.0.0"
+ },
+ "peerDependencies": {
+ "eslint": ">=8"
+ }
+ },
"node_modules/eslint-plugin-import": {
"version": "2.32.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
@@ -8774,32 +9672,98 @@
"eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
}
},
+ "node_modules/eslint-plugin-import-x": {
+ "version": "4.16.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.16.1.tgz",
+ "integrity": "sha512-vPZZsiOKaBAIATpFE2uMI4w5IRwdv/FpQ+qZZMR4E+PeOcM4OeoEbqxRMnywdxP19TyB/3h6QBB0EWon7letSQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/types": "^8.35.0",
+ "comment-parser": "^1.4.1",
+ "debug": "^4.4.1",
+ "eslint-import-context": "^0.1.9",
+ "is-glob": "^4.0.3",
+ "minimatch": "^9.0.3 || ^10.0.1",
+ "semver": "^7.7.2",
+ "stable-hash-x": "^0.2.0",
+ "unrs-resolver": "^1.9.2"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-plugin-import-x"
+ },
+ "peerDependencies": {
+ "@typescript-eslint/utils": "^8.0.0",
+ "eslint": "^8.57.0 || ^9.0.0",
+ "eslint-import-resolver-node": "*"
+ },
+ "peerDependenciesMeta": {
+ "@typescript-eslint/utils": {
+ "optional": true
+ },
+ "eslint-import-resolver-node": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-plugin-import-x/node_modules/balanced-match": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+ "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/eslint-plugin-import-x/node_modules/brace-expansion": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
+ "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^4.0.2"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
+ },
+ "node_modules/eslint-plugin-import-x/node_modules/minimatch": {
+ "version": "10.2.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+ "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+ "dev": true,
+ "license": "BlueOak-1.0.0",
+ "dependencies": {
+ "brace-expansion": "^5.0.2"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
"node_modules/eslint-plugin-import/node_modules/debug": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"ms": "^2.1.1"
}
},
- "node_modules/eslint-plugin-import/node_modules/doctrine": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
- "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
- "dev": true,
- "dependencies": {
- "esutils": "^2.0.2"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/eslint-plugin-import/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true,
+ "license": "ISC",
"bin": {
"semver": "bin/semver.js"
}
@@ -8834,11 +9798,91 @@
"eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
}
},
+ "node_modules/eslint-plugin-n": {
+ "version": "17.24.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.24.0.tgz",
+ "integrity": "sha512-/gC7/KAYmfNnPNOb3eu8vw+TdVnV0zhdQwexsw6FLXbhzroVj20vRn2qL8lDWDGnAQ2J8DhdfvXxX9EoxvERvw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.5.0",
+ "enhanced-resolve": "^5.17.1",
+ "eslint-plugin-es-x": "^7.8.0",
+ "get-tsconfig": "^4.8.1",
+ "globals": "^15.11.0",
+ "globrex": "^0.1.2",
+ "ignore": "^5.3.2",
+ "semver": "^7.6.3",
+ "ts-declaration-location": "^1.0.6"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ },
+ "peerDependencies": {
+ "eslint": ">=8.23.0"
+ }
+ },
+ "node_modules/eslint-plugin-n/node_modules/globals": {
+ "version": "15.15.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
+ "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint-plugin-n/node_modules/ignore": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+ "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/eslint-plugin-prettier": {
+ "version": "5.5.5",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.5.tgz",
+ "integrity": "sha512-hscXkbqUZ2sPithAuLm5MXL+Wph+U7wHngPBv9OMWwlP8iaflyxpjTYZkmdgB4/vPIhemRlBEoLrH7UC1n7aUw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "prettier-linter-helpers": "^1.0.1",
+ "synckit": "^0.11.12"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint-plugin-prettier"
+ },
+ "peerDependencies": {
+ "@types/eslint": ">=8.0.0",
+ "eslint": ">=8.0.0",
+ "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0",
+ "prettier": ">=3.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/eslint": {
+ "optional": true
+ },
+ "eslint-config-prettier": {
+ "optional": true
+ }
+ }
+ },
"node_modules/eslint-plugin-react": {
"version": "7.37.5",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
"integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
- "dev": true,
"license": "MIT",
"dependencies": {
"array-includes": "^3.1.8",
@@ -8887,23 +9931,10 @@
"eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
}
},
- "node_modules/eslint-plugin-react/node_modules/doctrine": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
- "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
- "dev": true,
- "dependencies": {
- "esutils": "^2.0.2"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/eslint-plugin-react/node_modules/resolve": {
"version": "2.0.0-next.5",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
"integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
- "dev": true,
"dependencies": {
"is-core-module": "^2.13.0",
"path-parse": "^1.0.7",
@@ -8920,7 +9951,6 @@
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
- "dev": true,
"bin": {
"semver": "bin/semver.js"
}
@@ -9039,7 +10069,6 @@
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
- "dev": true,
"engines": {
"node": ">=4.0"
}
@@ -9054,7 +10083,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -9086,6 +10114,43 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"dev": true
},
+ "node_modules/fast-diff": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+ "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+ "dev": true,
+ "license": "Apache-2.0"
+ },
+ "node_modules/fast-glob": {
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+ "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.2",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.8"
+ },
+ "engines": {
+ "node": ">=8.6.0"
+ }
+ },
+ "node_modules/fast-glob/node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/fast-json-stable-stringify": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -9115,6 +10180,26 @@
],
"license": "BSD-3-Clause"
},
+ "node_modules/fastq": {
+ "version": "1.20.1",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+ "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "reusify": "^1.0.4"
+ }
+ },
+ "node_modules/fd-package-json": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/fd-package-json/-/fd-package-json-2.0.0.tgz",
+ "integrity": "sha512-jKmm9YtsNXN789RS/0mSzOC1NUq9mkVd65vbSSVsKdjGvYXBuE4oWe2QOEoFeRmJg+lPuZxpmrfFclNhoRMneQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "walk-up-path": "^4.0.0"
+ }
+ },
"node_modules/fdir": {
"version": "6.5.0",
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -9273,7 +10358,6 @@
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
"integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
- "dev": true,
"license": "MIT",
"dependencies": {
"is-callable": "^1.2.7"
@@ -9302,6 +10386,22 @@
"url": "https://github.com/sponsors/isaacs"
}
},
+ "node_modules/formatly": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/formatly/-/formatly-0.3.0.tgz",
+ "integrity": "sha512-9XNj/o4wrRFyhSMJOvsuyMwy8aUfBaZ1VrqHVfohyXf0Sw0e+yfKG+xZaY3arGCOMdwFsqObtzVOc1gU9KiT9w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fd-package-json": "^2.0.0"
+ },
+ "bin": {
+ "formatly": "bin/index.mjs"
+ },
+ "engines": {
+ "node": ">=18.3.0"
+ }
+ },
"node_modules/framer-motion": {
"version": "12.34.3",
"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.34.3.tgz",
@@ -9347,7 +10447,6 @@
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
- "dev": true,
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@@ -9356,7 +10455,6 @@
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
"integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -9376,7 +10474,6 @@
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
- "dev": true,
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@@ -9401,7 +10498,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
"integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind-apply-helpers": "^1.0.2",
@@ -9433,7 +10529,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
- "dev": true,
"dependencies": {
"dunder-proto": "^1.0.1",
"es-object-atoms": "^1.0.0"
@@ -9446,7 +10541,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
"integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"es-errors": "^1.3.0",
@@ -9459,6 +10553,19 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/get-tsconfig": {
+ "version": "4.13.6",
+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.6.tgz",
+ "integrity": "sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "resolve-pkg-maps": "^1.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+ }
+ },
"node_modules/glob": {
"version": "11.1.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
@@ -9538,11 +10645,23 @@
"url": "https://github.com/sponsors/isaacs"
}
},
+ "node_modules/globals": {
+ "version": "17.3.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-17.3.0.tgz",
+ "integrity": "sha512-yMqGUQVVCkD4tqjOJf3TnrvaaHDMYp4VlUSObbkIiuCPe/ofdMBFIAcBbCSRFWOnos6qRiTVStDwqPLUclaxIw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/globalthis": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
"integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
- "dev": true,
"dependencies": {
"define-properties": "^1.2.1",
"gopd": "^1.0.1"
@@ -9554,11 +10673,17 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/globrex": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
+ "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/gopd": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -9576,7 +10701,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
"integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -9598,7 +10722,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
- "dev": true,
"dependencies": {
"es-define-property": "^1.0.0"
},
@@ -9610,7 +10733,6 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
"integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
- "dev": true,
"dependencies": {
"dunder-proto": "^1.0.0"
},
@@ -9625,7 +10747,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -9637,7 +10758,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
- "dev": true,
"dependencies": {
"has-symbols": "^1.0.3"
},
@@ -9652,7 +10772,6 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
- "dev": true,
"dependencies": {
"function-bind": "^1.1.2"
},
@@ -9942,7 +11061,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
"integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"hasown": "^2.0.2",
@@ -9968,7 +11086,6 @@
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
"integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -9992,7 +11109,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.0.tgz",
"integrity": "sha512-GExz9MtyhlZyXYLxzlJRj5WUCE661zhDa1Yna52CN57AJsymh+DvXXjyveSioqSRdxvUrdKdvqB1b5cVKsNpWQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"get-proto": "^1.0.1",
@@ -10010,7 +11126,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
"integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
- "dev": true,
"dependencies": {
"has-bigints": "^1.0.2"
},
@@ -10037,7 +11152,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz",
"integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"has-tostringtag": "^1.0.2"
@@ -10049,11 +11163,20 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/is-bun-module": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-2.0.0.tgz",
+ "integrity": "sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "semver": "^7.7.1"
+ }
+ },
"node_modules/is-callable": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -10065,7 +11188,6 @@
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
- "dev": true,
"dependencies": {
"hasown": "^2.0.2"
},
@@ -10080,7 +11202,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
"integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"get-intrinsic": "^1.2.6",
@@ -10097,7 +11218,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
"integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"has-tostringtag": "^1.0.2"
@@ -10122,7 +11242,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
"integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3"
},
@@ -10145,7 +11264,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
"integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"get-proto": "^1.0.0",
@@ -10181,7 +11299,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
"integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -10200,7 +11317,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
"integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
- "dev": true,
"license": "MIT",
"engines": {
"node": ">= 0.4"
@@ -10234,7 +11350,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
"integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"has-tostringtag": "^1.0.2"
@@ -10268,7 +11383,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
"integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"gopd": "^1.2.0",
@@ -10296,7 +11410,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
"integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -10308,7 +11421,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
"integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3"
},
@@ -10336,7 +11448,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
"integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"has-tostringtag": "^1.0.2"
@@ -10352,7 +11463,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
"integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"has-symbols": "^1.1.0",
@@ -10369,7 +11479,6 @@
"version": "1.1.15",
"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
"integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
- "dev": true,
"dependencies": {
"which-typed-array": "^1.1.16"
},
@@ -10384,7 +11493,6 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
"integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -10396,7 +11504,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
"integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bound": "^1.0.3"
@@ -10412,7 +11519,6 @@
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
"integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"get-intrinsic": "^1.2.6"
@@ -10427,8 +11533,7 @@
"node_modules/isarray": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
- "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
- "dev": true
+ "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
},
"node_modules/isexe": {
"version": "2.0.0",
@@ -10440,7 +11545,6 @@
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
"integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
- "dev": true,
"license": "MIT",
"dependencies": {
"define-data-property": "^1.1.4",
@@ -10494,6 +11598,16 @@
"integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
"license": "MIT"
},
+ "node_modules/jiti": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
+ "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "jiti": "lib/jiti-cli.mjs"
+ }
+ },
"node_modules/jotai": {
"version": "2.18.0",
"resolved": "https://registry.npmjs.org/jotai/-/jotai-2.18.0.tgz",
@@ -10623,7 +11737,6 @@
"version": "3.3.5",
"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
"integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
- "dev": true,
"dependencies": {
"array-includes": "^3.1.6",
"array.prototype.flat": "^1.3.1",
@@ -10653,17 +11766,74 @@
"json-buffer": "3.0.1"
}
},
+ "node_modules/knip": {
+ "version": "5.85.0",
+ "resolved": "https://registry.npmjs.org/knip/-/knip-5.85.0.tgz",
+ "integrity": "sha512-V2kyON+DZiYdNNdY6GALseiNCwX7dYdpz9Pv85AUn69Gk0UKCts+glOKWfe5KmaMByRjM9q17Mzj/KinTVOyxg==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/webpro"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/knip"
+ }
+ ],
+ "license": "ISC",
+ "dependencies": {
+ "@nodelib/fs.walk": "^1.2.3",
+ "fast-glob": "^3.3.3",
+ "formatly": "^0.3.0",
+ "jiti": "^2.6.0",
+ "js-yaml": "^4.1.1",
+ "minimist": "^1.2.8",
+ "oxc-resolver": "^11.15.0",
+ "picocolors": "^1.1.1",
+ "picomatch": "^4.0.1",
+ "smol-toml": "^1.5.2",
+ "strip-json-comments": "5.0.3",
+ "zod": "^4.1.11"
+ },
+ "bin": {
+ "knip": "bin/knip.js",
+ "knip-bun": "bin/knip-bun.js"
+ },
+ "engines": {
+ "node": ">=18.18.0"
+ },
+ "peerDependencies": {
+ "@types/node": ">=18",
+ "typescript": ">=5.0.4 <7"
+ }
+ },
+ "node_modules/knip/node_modules/strip-json-comments": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.3.tgz",
+ "integrity": "sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=14.16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/language-subtag-registry": {
"version": "0.3.23",
"resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
"integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==",
- "dev": true
+ "dev": true,
+ "license": "CC0-1.0"
},
"node_modules/language-tags": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
"integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"language-subtag-registry": "^0.3.20"
},
@@ -10825,7 +11995,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -10884,13 +12053,6 @@
"events": "^3.2.0"
}
},
- "node_modules/mdn-data": {
- "version": "2.23.0",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.23.0.tgz",
- "integrity": "sha512-786vq1+4079JSeu2XdcDjrhi/Ry7BWtjDl9WtGPWLiIHb2T66GvIVflZTBoSNZ5JqTtJGYEVMuFA/lbQlMOyDQ==",
- "dev": true,
- "license": "CC0-1.0"
- },
"node_modules/media-query-parser": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/media-query-parser/-/media-query-parser-2.0.2.tgz",
@@ -10899,6 +12061,43 @@
"@babel/runtime": "^7.12.5"
}
},
+ "node_modules/merge2": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/micromatch": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "braces": "^3.0.3",
+ "picomatch": "^2.3.1"
+ },
+ "engines": {
+ "node": ">=8.6"
+ }
+ },
+ "node_modules/micromatch/node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
"node_modules/millify": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/millify/-/millify-6.1.0.tgz",
@@ -10914,7 +12113,6 @@
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
- "dev": true,
"license": "ISC",
"dependencies": {
"brace-expansion": "^1.1.7"
@@ -10998,6 +12196,22 @@
"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
}
},
+ "node_modules/napi-postinstall": {
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz",
+ "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "napi-postinstall": "lib/cli.js"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/napi-postinstall"
+ }
+ },
"node_modules/natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -11068,7 +12282,6 @@
"version": "1.13.4",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
"integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
- "dev": true,
"license": "MIT",
"engines": {
"node": ">= 0.4"
@@ -11081,7 +12294,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -11090,7 +12302,6 @@
"version": "4.1.7",
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
"integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -11110,7 +12321,6 @@
"version": "1.1.9",
"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz",
"integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==",
- "dev": true,
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.8",
@@ -11126,7 +12336,6 @@
"version": "2.0.8",
"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
"integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"define-properties": "^1.2.1",
@@ -11145,6 +12354,7 @@
"resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
"integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"call-bind": "^1.0.7",
"define-properties": "^1.2.1",
@@ -11158,7 +12368,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
"integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -11211,7 +12420,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
"integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
- "dev": true,
"dependencies": {
"get-intrinsic": "^1.2.6",
"object-keys": "^1.1.1",
@@ -11224,6 +12432,38 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/oxc-resolver": {
+ "version": "11.19.0",
+ "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.19.0.tgz",
+ "integrity": "sha512-oEe42WEoZc2T5sCQqgaRBx8huzP4cJvrnm+BfNTJESdtM633Tqs6iowkpsMTXgnb7SLwU6N6D9bqwW/PULjo6A==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/Boshen"
+ },
+ "optionalDependencies": {
+ "@oxc-resolver/binding-android-arm-eabi": "11.19.0",
+ "@oxc-resolver/binding-android-arm64": "11.19.0",
+ "@oxc-resolver/binding-darwin-arm64": "11.19.0",
+ "@oxc-resolver/binding-darwin-x64": "11.19.0",
+ "@oxc-resolver/binding-freebsd-x64": "11.19.0",
+ "@oxc-resolver/binding-linux-arm-gnueabihf": "11.19.0",
+ "@oxc-resolver/binding-linux-arm-musleabihf": "11.19.0",
+ "@oxc-resolver/binding-linux-arm64-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-arm64-musl": "11.19.0",
+ "@oxc-resolver/binding-linux-ppc64-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-riscv64-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-riscv64-musl": "11.19.0",
+ "@oxc-resolver/binding-linux-s390x-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-x64-gnu": "11.19.0",
+ "@oxc-resolver/binding-linux-x64-musl": "11.19.0",
+ "@oxc-resolver/binding-openharmony-arm64": "11.19.0",
+ "@oxc-resolver/binding-wasm32-wasi": "11.19.0",
+ "@oxc-resolver/binding-win32-arm64-msvc": "11.19.0",
+ "@oxc-resolver/binding-win32-ia32-msvc": "11.19.0",
+ "@oxc-resolver/binding-win32-x64-msvc": "11.19.0"
+ }
+ },
"node_modules/p-limit": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -11344,8 +12584,7 @@
"node_modules/path-parse": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
- "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
- "dev": true
+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
},
"node_modules/path-scurry": {
"version": "2.0.1",
@@ -11436,7 +12675,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
"integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -11529,6 +12767,19 @@
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
+ "node_modules/prettier-linter-helpers": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz",
+ "integrity": "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fast-diff": "^1.1.2"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
"node_modules/pretty-bytes": {
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.1.tgz",
@@ -11569,6 +12820,27 @@
"node": ">=6"
}
},
+ "node_modules/queue-microtask": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "license": "MIT"
+ },
"node_modules/raf-schd": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
@@ -11838,7 +13110,6 @@
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
"integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"define-properties": "^1.2.1",
@@ -11880,7 +13151,6 @@
"version": "1.5.4",
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
"integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"define-properties": "^1.2.1",
@@ -11991,6 +13261,27 @@
"node": ">=4"
}
},
+ "node_modules/resolve-pkg-maps": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+ "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+ }
+ },
+ "node_modules/reusify": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+ "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "iojs": ">=1.0.0",
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/rollup": {
"version": "4.57.1",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
@@ -12035,11 +13326,34 @@
"fsevents": "~2.3.2"
}
},
+ "node_modules/run-parallel": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "queue-microtask": "^1.2.2"
+ }
+ },
"node_modules/safe-array-concat": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
"integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.2",
@@ -12079,7 +13393,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
"integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"isarray": "^2.0.5"
@@ -12095,7 +13408,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
"integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"es-errors": "^1.3.0",
@@ -12176,7 +13488,6 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
- "dev": true,
"dependencies": {
"define-data-property": "^1.1.4",
"es-errors": "^1.3.0",
@@ -12193,7 +13504,6 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
"integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
- "dev": true,
"dependencies": {
"define-data-property": "^1.1.4",
"es-errors": "^1.3.0",
@@ -12208,7 +13518,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
"integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
- "dev": true,
"dependencies": {
"dunder-proto": "^1.0.1",
"es-errors": "^1.3.0",
@@ -12243,7 +13552,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
"integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"object-inspect": "^1.13.3",
@@ -12262,7 +13570,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
"integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"object-inspect": "^1.13.3"
@@ -12278,7 +13585,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
"integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"es-errors": "^1.3.0",
@@ -12296,7 +13602,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
"integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"es-errors": "^1.3.0",
@@ -12390,6 +13695,19 @@
"node": ">=20.0.0"
}
},
+ "node_modules/smol-toml": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.0.tgz",
+ "integrity": "sha512-4zemZi0HvTnYwLfrpk/CF9LOd9Lt87kAt50GnqhMpyF9U3poDAP2+iukq2bZsO/ufegbYehBkqINbsWxj4l4cw==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "engines": {
+ "node": ">= 18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/cyyynthia"
+ }
+ },
"node_modules/snake-case": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz",
@@ -12481,11 +13799,20 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/stable-hash-x": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/stable-hash-x/-/stable-hash-x-0.2.0.tgz",
+ "integrity": "sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/stop-iteration-iterator": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
"integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
"es-errors": "^1.3.0",
@@ -12532,7 +13859,6 @@
"version": "4.0.12",
"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
"integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.3",
@@ -12559,7 +13885,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
"integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
- "dev": true,
"license": "MIT",
"dependencies": {
"define-properties": "^1.1.3",
@@ -12570,7 +13895,6 @@
"version": "1.2.10",
"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
"integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.2",
@@ -12591,7 +13915,6 @@
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
"integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"call-bound": "^1.0.2",
@@ -12609,7 +13932,6 @@
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
"integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"define-properties": "^1.2.1",
@@ -12653,6 +13975,7 @@
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=4"
}
@@ -12715,7 +14038,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -12730,12 +14052,42 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/synckit": {
+ "version": "0.11.12",
+ "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
+ "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@pkgr/core": "^0.2.9"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/synckit"
+ }
+ },
"node_modules/tabbable": {
"version": "6.4.0",
"resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
"integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
"license": "MIT"
},
+ "node_modules/tapable": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+ "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
+ }
+ },
"node_modules/temp-dir": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
@@ -12837,11 +14189,35 @@
"typescript": ">=4.8.4"
}
},
+ "node_modules/ts-declaration-location": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/ts-declaration-location/-/ts-declaration-location-1.0.7.tgz",
+ "integrity": "sha512-EDyGAwH1gO0Ausm9gV6T2nUvBgXT5kGoCMJPllOaooZ+4VvJiKBdZE7wK18N1deEowhcUptS+5GXZK8U/fvpwA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "ko-fi",
+ "url": "https://ko-fi.com/rebeccastevens"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/ts-declaration-location"
+ }
+ ],
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "picomatch": "^4.0.2"
+ },
+ "peerDependencies": {
+ "typescript": ">=4.0.0"
+ }
+ },
"node_modules/tsconfig-paths": {
"version": "3.15.0",
"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
"integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@types/json5": "^0.0.29",
"json5": "^1.0.2",
@@ -12854,6 +14230,7 @@
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"minimist": "^1.2.0"
},
@@ -12896,7 +14273,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
"integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"es-errors": "^1.3.0",
@@ -12910,7 +14286,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
"integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.8",
"for-each": "^0.3.3",
@@ -12929,7 +14304,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
"integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
- "dev": true,
"dependencies": {
"available-typed-arrays": "^1.0.7",
"call-bind": "^1.0.8",
@@ -12950,7 +14324,6 @@
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
"integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"for-each": "^0.3.3",
@@ -13040,7 +14413,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
"integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.3",
"has-bigints": "^1.0.2",
@@ -13132,6 +14504,41 @@
"node": ">= 10.0.0"
}
},
+ "node_modules/unrs-resolver": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
+ "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "dependencies": {
+ "napi-postinstall": "^0.3.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/unrs-resolver"
+ },
+ "optionalDependencies": {
+ "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
+ "@unrs/resolver-binding-android-arm64": "1.11.1",
+ "@unrs/resolver-binding-darwin-arm64": "1.11.1",
+ "@unrs/resolver-binding-darwin-x64": "1.11.1",
+ "@unrs/resolver-binding-freebsd-x64": "1.11.1",
+ "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
+ "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
+ "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
+ "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
+ "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
+ "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
+ "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
+ "@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"
+ }
+ },
"node_modules/upath": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
@@ -13866,6 +15273,16 @@
"node": ">=0.10.0"
}
},
+ "node_modules/walk-up-path": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-4.0.0.tgz",
+ "integrity": "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": "20 || >=22"
+ }
+ },
"node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -13899,7 +15316,6 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
"integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
- "dev": true,
"dependencies": {
"is-bigint": "^1.1.0",
"is-boolean-object": "^1.2.1",
@@ -13918,7 +15334,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
"integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
- "dev": true,
"dependencies": {
"call-bound": "^1.0.2",
"function.prototype.name": "^1.1.6",
@@ -13945,7 +15360,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
"integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
- "dev": true,
"dependencies": {
"is-map": "^2.0.3",
"is-set": "^2.0.3",
@@ -13963,7 +15377,6 @@
"version": "1.1.20",
"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
"integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==",
- "dev": true,
"license": "MIT",
"dependencies": {
"available-typed-arrays": "^1.0.7",
diff --git a/package.json b/package.json
index e7326695..28cb6369 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,7 @@
{
"name": "sable",
- "version": "1.2.2",
+ "version": "1.2.3",
"description": "Yet another matrix client fork",
- "main": "index.js",
"type": "module",
"packageManager": "npm@11.11.0",
"engines": {
@@ -10,14 +9,15 @@
"npm": "11.x"
},
"scripts": {
- "start": "vite",
+ "dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
- "lint": "npm run check:eslint && npm run check:prettier",
- "check:eslint": "eslint src/*",
- "check:prettier": "prettier --check .",
- "fix:prettier": "prettier --write .",
- "typecheck": "tsc"
+ "lint": "eslint .",
+ "lint:fix": "eslint . --fix",
+ "fmt": "prettier --write .",
+ "fmt:check": "prettier --check .",
+ "typecheck": "tsc",
+ "knip": "knip"
},
"keywords": [],
"author": "7w1",
@@ -41,11 +41,11 @@
"browser-encrypt-attachment": "^0.3.0",
"chroma-js": "^3.2.0",
"classnames": "^2.5.1",
- "dateformat": "^5.0.3",
"dayjs": "^1.11.19",
"domhandler": "^5.0.3",
"emojibase": "^15.3.1",
"emojibase-data": "^15.3.2",
+ "eslint-plugin-react": "7.37.5",
"file-saver": "^2.0.5",
"focus-trap-react": "^10.3.1",
"folds": "^2.6.1",
@@ -85,9 +85,8 @@
"devDependencies": {
"@element-hq/element-call-embedded": "0.16.3",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
- "@eslint/css": "^0.14.1",
- "@eslint/eslintrc": "^3.3.4",
- "@eslint/js": "^9.39.3",
+ "@eslint/compat": "2.0.2",
+ "@eslint/js": "9.39.3",
"@rollup/plugin-inject": "^5.0.5",
"@rollup/plugin-wasm": "^6.2.2",
"@types/chroma-js": "^3.1.2",
@@ -102,15 +101,14 @@
"@types/ua-parser-js": "^0.7.39",
"@vitejs/plugin-react": "^5.1.4",
"buffer": "^6.0.3",
- "eslint": "^9.39.3",
- "eslint-config-prettier": "^10.1.8",
- "eslint-plugin-import": "^2.32.0",
- "eslint-plugin-jsx-a11y": "^6.10.2",
- "eslint-plugin-react": "^7.37.5",
- "eslint-plugin-react-hooks": "^7.0.1",
- "prettier": "^3.8.1",
+ "eslint": "9.39.3",
+ "eslint-config-airbnb-extended": "3.0.1",
+ "eslint-config-prettier": "10.1.8",
+ "eslint-plugin-prettier": "5.5.5",
+ "globals": "17.3.0",
+ "knip": "5.85.0",
+ "prettier": "3.8.1",
"typescript": "^5.9.3",
- "typescript-eslint": "^8.56.1",
"vite": "^7.3.1",
"vite-plugin-pwa": "^1.2.0",
"vite-plugin-static-copy": "^3.2.0",
diff --git a/scripts/normalize-imports.js b/scripts/normalize-imports.js
index ce49354c..dd803af3 100644
--- a/scripts/normalize-imports.js
+++ b/scripts/normalize-imports.js
@@ -1,4 +1,5 @@
#!/usr/bin/env node
+/* eslint-disable no-console */
import fs from 'node:fs/promises';
import path from 'node:path';
@@ -37,23 +38,18 @@ function toPosix(inputPath) {
function parseArgs(argv) {
let write = false;
const roots = [];
+ let index = 0;
- for (let i = 0; i < argv.length; i += 1) {
- const arg = argv[i];
+ while (index < argv.length) {
+ const arg = argv[index];
if (arg === '--write') {
write = true;
- continue;
- }
- if (arg === '--root' && argv[i + 1]) {
- roots.push(argv[i + 1]);
- i += 1;
- continue;
- }
- if (arg.startsWith('--root=')) {
+ } else if (arg === '--root' && argv[index + 1]) {
+ roots.push(argv[index + 1]);
+ index += 1;
+ } else if (arg.startsWith('--root=')) {
roots.push(arg.slice('--root='.length));
- continue;
- }
- if (arg === '--help' || arg === '-h') {
+ } else if (arg === '--help' || arg === '-h') {
console.log(
[
'Usage: node scripts/normalize-imports.mjs [--write] [--root ]',
@@ -65,6 +61,8 @@ function parseArgs(argv) {
);
process.exit(0);
}
+
+ index += 1;
}
return {
@@ -149,7 +147,7 @@ function getRewrittenSpecifier(filePath, specifier, aliases, projectRoot) {
return `$types/matrix-sdk${suffix}`;
}
- if (!bare.startsWith('.') || !/^(\.\.\/){2,}/.test(bare)) {
+ if (!/^\.\.(?:\/|$)/.test(bare)) {
return null;
}
@@ -232,13 +230,11 @@ function rewriteFileImports(filePath, sourceCode, aliases, projectRoot) {
new Map(replacements.map((r) => [`${r.start}:${r.end}`, r])).values()
).sort((a, b) => b.start - a.start);
- let updatedCode = sourceCode;
- for (const replacement of uniqueReplacements) {
- updatedCode =
- updatedCode.slice(0, replacement.start) +
- replacement.value +
- updatedCode.slice(replacement.end);
- }
+ const updatedCode = uniqueReplacements.reduce(
+ (code, replacement) =>
+ code.slice(0, replacement.start) + replacement.value + code.slice(replacement.end),
+ sourceCode
+ );
return {
changed: updatedCode !== sourceCode,
@@ -276,48 +272,51 @@ async function main() {
)
).flat();
- let filesChanged = 0;
- let importRewrites = 0;
- const displayRows = [];
+ const fileResults = await Promise.all(
+ sourceFiles.map(async (filePath) => {
+ const sourceCode = await fs.readFile(filePath, 'utf8');
+ const { changed, updatedCode, replacements, edits } = rewriteFileImports(
+ filePath,
+ sourceCode,
+ aliases,
+ projectRoot
+ );
- for (const filePath of sourceFiles) {
- const sourceCode = await fs.readFile(filePath, 'utf8');
- const { changed, updatedCode, replacements, edits } = rewriteFileImports(
- filePath,
- sourceCode,
- aliases,
- projectRoot
- );
+ if (!changed) return null;
- if (!changed) continue;
+ if (write) {
+ await fs.writeFile(filePath, updatedCode, 'utf8');
+ }
- filesChanged += 1;
- importRewrites += replacements;
- const relativeFilePath = toPosix(path.relative(projectRoot, filePath));
+ return {
+ file: toPosix(path.relative(projectRoot, filePath)),
+ replacements,
+ edits,
+ };
+ })
+ );
- for (const edit of edits) {
- displayRows.push({
- file: relativeFilePath,
- from: edit.from,
- to: edit.to,
- });
- }
-
- if (write) {
- await fs.writeFile(filePath, updatedCode, 'utf8');
- }
- }
+ const changedFiles = fileResults.filter((result) => result !== null);
+ const filesChanged = changedFiles.length;
+ const importRewrites = changedFiles.reduce((total, result) => total + result.replacements, 0);
+ const displayRows = changedFiles.flatMap((result) =>
+ result.edits.map((edit) => ({
+ file: result.file,
+ from: edit.from,
+ to: edit.to,
+ }))
+ );
displayRows.sort((a, b) =>
a.file === b.file ? a.from.localeCompare(b.from) : a.file.localeCompare(b.file)
);
- for (const row of displayRows) {
+ displayRows.forEach((row) => {
const fileLabel = styleText(row.file, ANSI.dim, useColor);
const fromLabel = styleText(`"${row.from}"`, ANSI.red, useColor);
const arrowLabel = styleText(' -> ', ANSI.dim, useColor);
const toLabel = styleText(`"${row.to}"`, ANSI.green, useColor);
console.log(`${fileLabel}: ${fromLabel}${arrowLabel}${toLabel}`);
- }
+ });
const mode = write ? 'Applied' : 'Dry run';
console.log(`${mode}: ${importRewrites} imports across ${filesChanged} files.`);
diff --git a/src/app/components/AccountDataEditor.tsx b/src/app/components/AccountDataEditor.tsx
index 2e58bed9..f8fd8445 100644
--- a/src/app/components/AccountDataEditor.tsx
+++ b/src/app/components/AccountDataEditor.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Box,
Text,
@@ -15,14 +15,14 @@ import {
config,
} from 'folds';
import { MatrixError } from '$types/matrix-sdk';
-import { Cursor } from '../plugins/text-area';
-import { syntaxErrorPosition } from '../utils/dom';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
+import { Cursor } from '$plugins/text-area';
+import { syntaxErrorPosition } from '$utils/dom';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { useAlive } from '$hooks/useAlive';
+import { useTextAreaCodeEditor } from '$hooks/useTextAreaCodeEditor';
import { Page, PageHeader } from './page';
-import { useAlive } from '../hooks/useAlive';
import { SequenceCard } from './sequence-card';
import { TextViewerContent } from './text-viewer';
-import { useTextAreaCodeEditor } from '../hooks/useTextAreaCodeEditor';
const EDITOR_INTENT_SPACE_COUNT = 2;
diff --git a/src/app/components/ActionUIA.tsx b/src/app/components/ActionUIA.tsx
index 10a16792..caffb032 100644
--- a/src/app/components/ActionUIA.tsx
+++ b/src/app/components/ActionUIA.tsx
@@ -1,10 +1,10 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { AuthDict, AuthType, IAuthData, UIAFlow } from '$types/matrix-sdk';
-import { getUIAFlowForStages } from '../utils/matrix-uia';
-import { useSupportedUIAFlows, useUIACompleted, useUIAFlow } from '../hooks/useUIAFlows';
+import { getUIAFlowForStages } from '$utils/matrix-uia';
+import { useSupportedUIAFlows, useUIACompleted, useUIAFlow } from '$hooks/useUIAFlows';
+import { useMatrixClient } from '$hooks/useMatrixClient';
import { UIAFlowOverlay } from './UIAFlowOverlay';
import { PasswordStage, SSOStage } from './uia-stages';
-import { useMatrixClient } from '../hooks/useMatrixClient';
export const SUPPORTED_IN_APP_UIA_STAGES = [AuthType.Password, AuthType.Sso];
diff --git a/src/app/components/AuthFlowsLoader.tsx b/src/app/components/AuthFlowsLoader.tsx
index 95d9d40c..4ea21b92 100644
--- a/src/app/components/AuthFlowsLoader.tsx
+++ b/src/app/components/AuthFlowsLoader.tsx
@@ -1,14 +1,14 @@
import { ReactNode, useCallback, useEffect, useMemo } from 'react';
import { MatrixError, createClient } from '$types/matrix-sdk';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { useAutoDiscoveryInfo } from '../hooks/useAutoDiscoveryInfo';
-import { promiseFulfilledResult, promiseRejectedResult } from '../utils/common';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
+import { promiseFulfilledResult, promiseRejectedResult } from '$utils/common';
import {
AuthFlows,
RegisterFlowStatus,
RegisterFlowsResponse,
parseRegisterErrResp,
-} from '../hooks/useAuthFlows';
+} from '$hooks/useAuthFlows';
type AuthFlowsLoaderProps = {
fallback?: () => ReactNode;
diff --git a/src/app/components/BackRouteHandler.tsx b/src/app/components/BackRouteHandler.tsx
index 42a3ffe9..a6e91bcd 100644
--- a/src/app/components/BackRouteHandler.tsx
+++ b/src/app/components/BackRouteHandler.tsx
@@ -7,7 +7,7 @@ import {
getHomePath,
getInboxPath,
getSpacePath,
-} from '../pages/pathUtils';
+} from '$pages/pathUtils';
import {
DIRECT_PATH,
EXPLORE_PATH,
@@ -17,8 +17,8 @@ import {
HOME_ROOM_PATH,
DIRECT_ROOM_PATH,
SPACE_ROOM_PATH,
-} from '../pages/paths';
-import { lastVisitedRoomIdAtom } from '../state/room/lastRoom';
+} from '$pages/paths';
+import { lastVisitedRoomIdAtom } from '$state/room/lastRoom';
type BackRouteHandlerProps = {
children: (onBack: () => void) => ReactNode;
@@ -107,7 +107,7 @@ export function BackRouteHandler({ children }: BackRouteHandlerProps) {
) {
navigate(getInboxPath());
}
- }, [navigate, location]);
+ }, [navigate, location, setLastRoomId]);
return children(goBack);
}
diff --git a/src/app/components/BackupRestore.tsx b/src/app/components/BackupRestore.tsx
index 0192af2f..78d65dff 100644
--- a/src/app/components/BackupRestore.tsx
+++ b/src/app/components/BackupRestore.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEventHandler, useCallback, useState } from 'react';
import { useAtom } from 'jotai';
import { CryptoApi, KeyBackupInfo } from '$types/matrix-sdk';
import {
@@ -19,17 +19,17 @@ import {
Text,
} from 'folds';
import FocusTrap from 'focus-trap-react';
-import { BackupProgressStatus, backupRestoreProgressAtom } from '../state/backupRestore';
-import { InfoCard } from './info-card';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
+import { BackupProgressStatus, backupRestoreProgressAtom } from '$state/backupRestore';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import {
useKeyBackupInfo,
useKeyBackupStatus,
useKeyBackupSync,
useKeyBackupTrust,
-} from '../hooks/useKeyBackup';
-import { stopPropagation } from '../utils/keyboard';
-import { useRestoreBackupOnVerification } from '../hooks/useRestoreBackupOnVerification';
+} from '$hooks/useKeyBackup';
+import { stopPropagation } from '$utils/keyboard';
+import { useRestoreBackupOnVerification } from '$hooks/useRestoreBackupOnVerification';
+import { InfoCard } from './info-card';
type BackupStatusProps = {
enabled: boolean;
diff --git a/src/app/components/BetaNoticeBadge.tsx b/src/app/components/BetaNoticeBadge.tsx
index d1859876..a6ba55e0 100644
--- a/src/app/components/BetaNoticeBadge.tsx
+++ b/src/app/components/BetaNoticeBadge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { TooltipProvider, Tooltip, Box, Text, Badge, toRem } from 'folds';
export function BetaNoticeBadge() {
diff --git a/src/app/components/CapabilitiesLoader.tsx b/src/app/components/CapabilitiesLoader.tsx
deleted file mode 100644
index 2152b572..00000000
--- a/src/app/components/CapabilitiesLoader.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ReactNode, useCallback, useEffect } from 'react';
-import { Capabilities } from '$types/matrix-sdk';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-
-type CapabilitiesLoaderProps = {
- children: (capabilities: Capabilities | undefined) => ReactNode;
-};
-export function CapabilitiesLoader({ children }: CapabilitiesLoaderProps) {
- const mx = useMatrixClient();
-
- const [state, load] = useAsyncCallback(useCallback(() => mx.getCapabilities(), [mx]));
-
- useEffect(() => {
- load();
- }, [load]);
-
- return children(state.status === AsyncStatus.Success ? state.data : undefined);
-}
diff --git a/src/app/components/ClientConfigLoader.tsx b/src/app/components/ClientConfigLoader.tsx
index 72d367c0..92af0c14 100644
--- a/src/app/components/ClientConfigLoader.tsx
+++ b/src/app/components/ClientConfigLoader.tsx
@@ -1,7 +1,7 @@
import { ReactNode, useCallback, useEffect, useState } from 'react';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { ClientConfig } from '../hooks/useClientConfig';
-import { trimTrailingSlash } from '../utils/common';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { ClientConfig } from '$hooks/useClientConfig';
+import { trimTrailingSlash } from '$utils/common';
const getClientConfig = async (): Promise => {
const url = `${trimTrailingSlash(import.meta.env.BASE_URL)}/config.json`;
diff --git a/src/app/components/ConfirmPasswordMatch.tsx b/src/app/components/ConfirmPasswordMatch.tsx
index bb50eb60..dea22892 100644
--- a/src/app/components/ConfirmPasswordMatch.tsx
+++ b/src/app/components/ConfirmPasswordMatch.tsx
@@ -1,5 +1,5 @@
import { ReactNode, RefObject, useCallback, useRef, useState } from 'react';
-import { useDebounce } from '../hooks/useDebounce';
+import { useDebounce } from '$hooks/useDebounce';
type ConfirmPasswordMatchProps = {
initialValue: boolean;
diff --git a/src/app/components/DeviceVerification.tsx b/src/app/components/DeviceVerification.tsx
index 3267b72a..642125e8 100644
--- a/src/app/components/DeviceVerification.tsx
+++ b/src/app/components/DeviceVerification.tsx
@@ -3,9 +3,9 @@ import {
VerificationPhase,
VerificationRequest,
Verifier,
+ VerificationMethod,
} from '$types/matrix-sdk';
-import React, { CSSProperties, useCallback, useEffect, useState } from 'react';
-import { VerificationMethod } from '$types/matrix-sdk';
+import { CSSProperties, useCallback, useEffect, useState } from 'react';
import {
Box,
Button,
@@ -27,9 +27,9 @@ import {
useVerificationRequestReceived,
useVerifierCancel,
useVerifierShowSas,
-} from '../hooks/useVerificationRequest';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { ContainerColor } from '../styles/ContainerColor.css';
+} from '$hooks/useVerificationRequest';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { ContainerColor } from '$styles/ContainerColor.css';
const DialogHeaderStyles: CSSProperties = {
padding: `0 ${config.space.S200} 0 ${config.space.S400}`,
diff --git a/src/app/components/DeviceVerificationSetup.tsx b/src/app/components/DeviceVerificationSetup.tsx
index 46f8e21e..83c7187c 100644
--- a/src/app/components/DeviceVerificationSetup.tsx
+++ b/src/app/components/DeviceVerificationSetup.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, forwardRef, useCallback, useState } from 'react';
+import { FormEventHandler, forwardRef, useCallback, useState } from 'react';
import {
Dialog,
Header,
@@ -16,14 +16,14 @@ import {
import FileSaver from 'file-saver';
import to from 'await-to-js';
import { AuthDict, IAuthData, MatrixError, UIAuthCallback } from '$types/matrix-sdk';
-import { PasswordInput } from './password-input';
-import { ContainerColor } from '../styles/ContainerColor.css';
-import { copyToClipboard } from '../utils/dom';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
import { clearSecretStorageKeys } from '$client/secretStorageKeys';
+import { ContainerColor } from '$styles/ContainerColor.css';
+import { copyToClipboard } from '$utils/dom';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { useAlive } from '$hooks/useAlive';
+import { PasswordInput } from './password-input';
import { ActionUIA, ActionUIAFlowsLoader } from './ActionUIA';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { useAlive } from '../hooks/useAlive';
import { UseStateProvider } from './UseStateProvider';
type UIACallback = (
diff --git a/src/app/components/DeviceVerificationStatus.ts b/src/app/components/DeviceVerificationStatus.ts
index b1eb3b8b..f69c64ac 100644
--- a/src/app/components/DeviceVerificationStatus.ts
+++ b/src/app/components/DeviceVerificationStatus.ts
@@ -3,7 +3,7 @@ import { CryptoApi } from '$types/matrix-sdk';
import {
useDeviceVerificationStatus,
VerificationStatus,
-} from '../hooks/useDeviceVerificationStatus';
+} from '$hooks/useDeviceVerificationStatus';
type DeviceVerificationStatusProps = {
crypto?: CryptoApi;
diff --git a/src/app/components/HexColorPickerPopOut.tsx b/src/app/components/HexColorPickerPopOut.tsx
index d8fb4bc3..25c5d661 100644
--- a/src/app/components/HexColorPickerPopOut.tsx
+++ b/src/app/components/HexColorPickerPopOut.tsx
@@ -1,7 +1,7 @@
import FocusTrap from 'focus-trap-react';
import { Box, Button, config, Menu, PopOut, RectCords, Text } from 'folds';
-import React, { MouseEventHandler, ReactNode, useState } from 'react';
-import { stopPropagation } from '../utils/keyboard';
+import { MouseEventHandler, ReactNode, useState } from 'react';
+import { stopPropagation } from '$utils/keyboard';
type HexColorPickerPopOutProps = {
children: (onOpen: MouseEventHandler, opened: boolean) => ReactNode;
diff --git a/src/app/components/JoinRulesSwitcher.tsx b/src/app/components/JoinRulesSwitcher.tsx
index 048b960d..5b33b397 100644
--- a/src/app/components/JoinRulesSwitcher.tsx
+++ b/src/app/components/JoinRulesSwitcher.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useMemo, useState } from 'react';
+import { MouseEventHandler, useCallback, useMemo, useState } from 'react';
import {
config,
Box,
@@ -15,8 +15,8 @@ import {
} from 'folds';
import { JoinRule } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
-import { stopPropagation } from '../utils/keyboard';
-import { getRoomIconSrc } from '../utils/room';
+import { stopPropagation } from '$utils/keyboard';
+import { getRoomIconSrc } from '$utils/room';
export type ExtraJoinRules = 'knock_restricted';
export type ExtendedJoinRules = JoinRule | ExtraJoinRules;
diff --git a/src/app/components/LogoutDialog.tsx b/src/app/components/LogoutDialog.tsx
index da9ba80c..c1cf9d1c 100644
--- a/src/app/components/LogoutDialog.tsx
+++ b/src/app/components/LogoutDialog.tsx
@@ -1,14 +1,14 @@
-import React, { forwardRef, useCallback } from 'react';
+import { forwardRef, useCallback } from 'react';
import { Dialog, Header, config, Box, Text, Button, Spinner, color } from 'folds';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
import { logoutClient } from '$client/initMatrix';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { useCrossSigningActive } from '../hooks/useCrossSigning';
-import { InfoCard } from './info-card';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { useCrossSigningActive } from '$hooks/useCrossSigning';
import {
useDeviceVerificationStatus,
VerificationStatus,
-} from '../hooks/useDeviceVerificationStatus';
+} from '$hooks/useDeviceVerificationStatus';
+import { InfoCard } from './info-card';
type LogoutDialogProps = {
handleClose: () => void;
diff --git a/src/app/components/ManualVerification.tsx b/src/app/components/ManualVerification.tsx
index 20d8c69c..31903f95 100644
--- a/src/app/components/ManualVerification.tsx
+++ b/src/app/components/ManualVerification.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, ReactNode, useCallback, useState } from 'react';
+import { MouseEventHandler, ReactNode, useCallback, useState } from 'react';
import {
Box,
Text,
@@ -13,13 +13,13 @@ import {
color,
} from 'folds';
import FocusTrap from 'focus-trap-react';
-import { stopPropagation } from '../utils/keyboard';
-import { SettingTile } from './setting-tile';
import { SecretStorageKeyContent } from '$types/matrix/accountData';
-import { SecretStorageRecoveryKey, SecretStorageRecoveryPassphrase } from './SecretStorage';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
import { storePrivateKey } from '$client/secretStorageKeys';
+import { stopPropagation } from '$utils/keyboard';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { SettingTile } from './setting-tile';
+import { SecretStorageRecoveryKey, SecretStorageRecoveryPassphrase } from './SecretStorage';
export enum ManualVerificationMethod {
RecoveryPassphrase = 'passphrase',
diff --git a/src/app/components/MediaConfigLoader.tsx b/src/app/components/MediaConfigLoader.tsx
deleted file mode 100644
index 9fd99330..00000000
--- a/src/app/components/MediaConfigLoader.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ReactNode, useCallback, useEffect } from 'react';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { MediaConfig } from '../hooks/useMediaConfig';
-
-type MediaConfigLoaderProps = {
- children: (mediaConfig: MediaConfig | undefined) => ReactNode;
-};
-export function MediaConfigLoader({ children }: MediaConfigLoaderProps) {
- const mx = useMatrixClient();
-
- const [state, load] = useAsyncCallback(useCallback(() => mx.getMediaConfig(), [mx]));
-
- useEffect(() => {
- load();
- }, [load]);
-
- return children(state.status === AsyncStatus.Success ? state.data : undefined);
-}
diff --git a/src/app/components/MemberSortMenu.tsx b/src/app/components/MemberSortMenu.tsx
index d77c80c6..e25569cf 100644
--- a/src/app/components/MemberSortMenu.tsx
+++ b/src/app/components/MemberSortMenu.tsx
@@ -1,8 +1,7 @@
import FocusTrap from 'focus-trap-react';
-import React from 'react';
import { config, Menu, MenuItem, Text } from 'folds';
-import { stopPropagation } from '../utils/keyboard';
-import { useMemberSortMenu } from '../hooks/useMemberSort';
+import { stopPropagation } from '$utils/keyboard';
+import { useMemberSortMenu } from '$hooks/useMemberSort';
type MemberSortMenuProps = {
requestClose: () => void;
diff --git a/src/app/components/MembershipFilterMenu.tsx b/src/app/components/MembershipFilterMenu.tsx
index bf17677d..1c279823 100644
--- a/src/app/components/MembershipFilterMenu.tsx
+++ b/src/app/components/MembershipFilterMenu.tsx
@@ -1,8 +1,7 @@
import FocusTrap from 'focus-trap-react';
-import React from 'react';
import { config, Menu, MenuItem, Text } from 'folds';
-import { stopPropagation } from '../utils/keyboard';
-import { useMembershipFilterMenu } from '../hooks/useMemberFilter';
+import { stopPropagation } from '$utils/keyboard';
+import { useMembershipFilterMenu } from '$hooks/useMemberFilter';
type MembershipFilterMenuProps = {
requestClose: () => void;
diff --git a/src/app/components/Modal500.tsx b/src/app/components/Modal500.tsx
index d421b625..260baa6d 100644
--- a/src/app/components/Modal500.tsx
+++ b/src/app/components/Modal500.tsx
@@ -1,7 +1,7 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import FocusTrap from 'focus-trap-react';
import { Modal, Overlay, OverlayBackdrop, OverlayCenter } from 'folds';
-import { stopPropagation } from '../utils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
type Modal500Props = {
requestClose: () => void;
diff --git a/src/app/components/Pdf-viewer/PdfViewer.tsx b/src/app/components/Pdf-viewer/PdfViewer.tsx
index a99c0204..e3072e6f 100644
--- a/src/app/components/Pdf-viewer/PdfViewer.tsx
+++ b/src/app/components/Pdf-viewer/PdfViewer.tsx
@@ -1,6 +1,6 @@
/* eslint-disable no-param-reassign */
-/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
-import React, { FormEventHandler, MouseEventHandler, useEffect, useRef, useState } from 'react';
+
+import { FormEventHandler, MouseEventHandler, useEffect, useRef, useState } from 'react';
import classNames from 'classnames';
import {
Box,
@@ -22,11 +22,11 @@ import {
} from 'folds';
import FocusTrap from 'focus-trap-react';
import FileSaver from 'file-saver';
-import * as css from './PdfViewer.css';
import { AsyncStatus } from '$hooks/useAsyncCallback';
import { useImageGestures } from '$hooks/useImageGestures';
import { createPage, usePdfDocumentLoader, usePdfJSLoader } from '$plugins/pdfjs-dist';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
+import * as css from './PdfViewer.css';
export type PdfViewerProps = {
name: string;
diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx
index b3bf50e8..8ba8f6dc 100644
--- a/src/app/components/RenderMessageContent.tsx
+++ b/src/app/components/RenderMessageContent.tsx
@@ -1,5 +1,6 @@
-import React, { useMemo, useCallback } from 'react';
+import { memo, useMemo, useCallback } from 'react';
import { MsgType } from '$types/matrix-sdk';
+import { testMatrixTo } from '$plugins/matrix-to';
import { HTMLReactParserOptions } from 'html-react-parser';
import { Opts } from 'linkifyjs';
import { config } from 'folds';
@@ -29,7 +30,6 @@ import { Image, MediaControl, Video } from './media';
import { ImageViewer } from './image-viewer';
import { PdfViewer } from './Pdf-viewer';
import { TextViewer } from './text-viewer';
-import { testMatrixTo } from '../plugins/matrix-to';
type RenderMessageContentProps = {
displayName: string;
@@ -267,4 +267,4 @@ function RenderMessageContentInternal({
return ;
}
-export const RenderMessageContent = React.memo(RenderMessageContentInternal);
+export const RenderMessageContent = memo(RenderMessageContentInternal);
diff --git a/src/app/components/RoomNotificationSwitcher.tsx b/src/app/components/RoomNotificationSwitcher.tsx
index 7ce91566..f62c41a4 100644
--- a/src/app/components/RoomNotificationSwitcher.tsx
+++ b/src/app/components/RoomNotificationSwitcher.tsx
@@ -1,13 +1,13 @@
import { Box, config, Icon, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
-import React, { MouseEventHandler, ReactNode, useMemo, useState } from 'react';
+import { MouseEventHandler, ReactNode, useMemo, useState } from 'react';
import FocusTrap from 'focus-trap-react';
-import { stopPropagation } from '../utils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import {
getRoomNotificationModeIcon,
RoomNotificationMode,
useSetRoomNotificationPreference,
-} from '../hooks/useRoomsNotificationPreferences';
-import { AsyncStatus } from '../hooks/useAsyncCallback';
+} from '$hooks/useRoomsNotificationPreferences';
+import { AsyncStatus } from '$hooks/useAsyncCallback';
const useRoomNotificationModes = (): RoomNotificationMode[] =>
useMemo(
diff --git a/src/app/components/RoomSummaryLoader.tsx b/src/app/components/RoomSummaryLoader.tsx
index bd460a63..93baa572 100644
--- a/src/app/components/RoomSummaryLoader.tsx
+++ b/src/app/components/RoomSummaryLoader.tsx
@@ -1,10 +1,9 @@
import { ReactNode, useCallback, useState } from 'react';
-import { MatrixClient, Room } from '$types/matrix-sdk';
+import { MatrixClient, Room, IHierarchyRoom } from '$types/matrix-sdk';
import { useQuery } from '@tanstack/react-query';
-import { IHierarchyRoom } from '$types/matrix-sdk';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { LocalRoomSummary, useLocalRoomSummary } from '../hooks/useLocalRoomSummary';
-import { AsyncState, AsyncStatus } from '../hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { LocalRoomSummary, useLocalRoomSummary } from '$hooks/useLocalRoomSummary';
+import { AsyncState, AsyncStatus } from '$hooks/useAsyncCallback';
export type IRoomSummary = Awaited>;
diff --git a/src/app/components/RoomUnreadProvider.tsx b/src/app/components/RoomUnreadProvider.tsx
index a74b291c..5a1fc13a 100644
--- a/src/app/components/RoomUnreadProvider.tsx
+++ b/src/app/components/RoomUnreadProvider.tsx
@@ -1,11 +1,11 @@
import { ReactElement } from 'react';
import { Unread } from '$types/matrix/room';
-import { useRoomUnread, useRoomsUnread } from '../state/hooks/unread';
-import { roomToUnreadAtom } from '../state/room/roomToUnread';
+import { useRoomUnread, useRoomsUnread } from '$state/hooks/unread';
+import { roomToUnreadAtom } from '$state/room/roomToUnread';
type RoomUnreadProviderProps = {
roomId: string;
- children: (unread?: Unread) => ReactElement;
+ children: (unread?: Unread) => ReactElement;
};
export function RoomUnreadProvider({ roomId, children }: RoomUnreadProviderProps) {
const unread = useRoomUnread(roomId, roomToUnreadAtom);
@@ -15,7 +15,7 @@ export function RoomUnreadProvider({ roomId, children }: RoomUnreadProviderProps
type RoomsUnreadProviderProps = {
rooms: string[];
- children: (unread?: Unread) => ReactElement;
+ children: (unread?: Unread) => ReactElement;
};
export function RoomsUnreadProvider({ rooms, children }: RoomsUnreadProviderProps) {
const unread = useRoomsUnread(rooms, roomToUnreadAtom);
diff --git a/src/app/components/SecretStorage.tsx b/src/app/components/SecretStorage.tsx
index 91cf875a..07b2e15d 100644
--- a/src/app/components/SecretStorage.tsx
+++ b/src/app/components/SecretStorage.tsx
@@ -1,11 +1,11 @@
-import React, { FormEventHandler, useCallback } from 'react';
+import { FormEventHandler, useCallback } from 'react';
import { Box, Text, Button, Spinner, color } from 'folds';
import { decodeRecoveryKey, deriveRecoveryKeyFromPassphrase } from '$types/matrix-sdk';
-import { PasswordInput } from './password-input';
import { SecretStorageKeyContent, SecretStoragePassphraseContent } from '$types/matrix/accountData';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { useAlive } from '../hooks/useAlive';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { useAlive } from '$hooks/useAlive';
+import { PasswordInput } from './password-input';
type SecretStorageRecoveryPassphraseProps = {
processing?: boolean;
diff --git a/src/app/components/ServerConfigsLoader.tsx b/src/app/components/ServerConfigsLoader.tsx
index 59f75a47..3f7b395e 100644
--- a/src/app/components/ServerConfigsLoader.tsx
+++ b/src/app/components/ServerConfigsLoader.tsx
@@ -1,9 +1,10 @@
import { ReactNode, useCallback, useMemo } from 'react';
import { Capabilities, validateAuthMetadata, ValidatedAuthMetadata } from '$types/matrix-sdk';
-import { AsyncStatus, useAsyncCallbackValue } from '../hooks/useAsyncCallback';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { MediaConfig } from '../hooks/useMediaConfig';
-import { promiseFulfilledResult } from '../utils/common';
+import { AsyncStatus, useAsyncCallbackValue } from '$hooks/useAsyncCallback';
+import { useMatrixClient } from '$hooks/useMatrixClient';
+import { MediaConfig } from '$hooks/useMediaConfig';
+import { promiseFulfilledResult } from '$utils/common';
+import { createLogger } from '$utils/debug';
export type ServerConfigs = {
capabilities?: Capabilities;
@@ -14,6 +15,9 @@ export type ServerConfigs = {
type ServerConfigsLoaderProps = {
children: (configs: ServerConfigs) => ReactNode;
};
+
+const log = createLogger('ServerConfigsLoader');
+
export function ServerConfigsLoader({ children }: ServerConfigsLoaderProps) {
const mx = useMatrixClient();
const fallbackConfigs = useMemo(() => ({}), []);
@@ -34,7 +38,7 @@ export function ServerConfigsLoader({ children }: ServerConfigsLoaderProps) {
try {
validatedAuthMetadata = validateAuthMetadata(authMetadata);
} catch (e) {
- console.error(e);
+ log.error('Failed to validate auth metadata:', e);
}
return {
diff --git a/src/app/components/SpaceChildDirectsProvider.tsx b/src/app/components/SpaceChildDirectsProvider.tsx
deleted file mode 100644
index 8ec88614..00000000
--- a/src/app/components/SpaceChildDirectsProvider.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ReactNode } from 'react';
-import { RoomToParents } from '$types/matrix/room';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { allRoomsAtom } from '../state/room-list/roomList';
-import { useChildDirectScopeFactory, useSpaceChildren } from '../state/hooks/roomList';
-
-type SpaceChildDirectsProviderProps = {
- spaceId: string;
- mDirects: Set;
- roomToParents: RoomToParents;
- children: (rooms: string[]) => ReactNode;
-};
-export function SpaceChildDirectsProvider({
- spaceId,
- roomToParents,
- mDirects,
- children,
-}: SpaceChildDirectsProviderProps) {
- const mx = useMatrixClient();
-
- const childDirects = useSpaceChildren(
- allRoomsAtom,
- spaceId,
- useChildDirectScopeFactory(mx, mDirects, roomToParents)
- );
-
- return children(childDirects);
-}
diff --git a/src/app/components/SpaceChildRoomsProvider.tsx b/src/app/components/SpaceChildRoomsProvider.tsx
deleted file mode 100644
index d7ce387b..00000000
--- a/src/app/components/SpaceChildRoomsProvider.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ReactNode } from 'react';
-import { RoomToParents } from '$types/matrix/room';
-import { useMatrixClient } from '../hooks/useMatrixClient';
-import { allRoomsAtom } from '../state/room-list/roomList';
-import { useChildRoomScopeFactory, useSpaceChildren } from '../state/hooks/roomList';
-
-type SpaceChildRoomsProviderProps = {
- spaceId: string;
- mDirects: Set;
- roomToParents: RoomToParents;
- children: (rooms: string[]) => ReactNode;
-};
-export function SpaceChildRoomsProvider({
- spaceId,
- roomToParents,
- mDirects,
- children,
-}: SpaceChildRoomsProviderProps) {
- const mx = useMatrixClient();
-
- const childRooms = useSpaceChildren(
- allRoomsAtom,
- spaceId,
- useChildRoomScopeFactory(mx, mDirects, roomToParents)
- );
-
- return children(childRooms);
-}
diff --git a/src/app/components/SpecVersionsLoader.tsx b/src/app/components/SpecVersionsLoader.tsx
index 5ee47bdf..2bbbff27 100644
--- a/src/app/components/SpecVersionsLoader.tsx
+++ b/src/app/components/SpecVersionsLoader.tsx
@@ -1,5 +1,5 @@
import { ReactNode, useCallback, useEffect, useState } from 'react';
-import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
+import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { SpecVersions, specVersions } from '../cs-api';
type SpecVersionsLoaderProps = {
diff --git a/src/app/components/SupportedUIAFlowsLoader.tsx b/src/app/components/SupportedUIAFlowsLoader.tsx
index dff000fa..cd3f8149 100644
--- a/src/app/components/SupportedUIAFlowsLoader.tsx
+++ b/src/app/components/SupportedUIAFlowsLoader.tsx
@@ -1,6 +1,6 @@
import { ReactNode } from 'react';
import { UIAFlow } from '$types/matrix-sdk';
-import { useSupportedUIAFlows } from '../hooks/useUIAFlows';
+import { useSupportedUIAFlows } from '$hooks/useUIAFlows';
export function SupportedUIAFlowsLoader({
flows,
diff --git a/src/app/components/SwipeableChatWrapper.tsx b/src/app/components/SwipeableChatWrapper.tsx
index 9795dee5..2eba0d01 100644
--- a/src/app/components/SwipeableChatWrapper.tsx
+++ b/src/app/components/SwipeableChatWrapper.tsx
@@ -1,9 +1,9 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { motion, useMotionValue, useSpring } from 'framer-motion';
import { useDrag } from '@use-gesture/react';
import { useAtomValue } from 'jotai';
-import { settingsAtom, RightSwipeAction } from '../state/settings';
-import { mobileOrTablet } from '../utils/user-agent';
+import { settingsAtom, RightSwipeAction } from '$state/settings';
+import { mobileOrTablet } from '$utils/user-agent';
interface SwipeableChatWrapperProps {
children: ReactNode;
diff --git a/src/app/components/SwipeableMessageWrapper.tsx b/src/app/components/SwipeableMessageWrapper.tsx
index df6ddd54..4b219355 100644
--- a/src/app/components/SwipeableMessageWrapper.tsx
+++ b/src/app/components/SwipeableMessageWrapper.tsx
@@ -1,18 +1,12 @@
import { useMotionValue, useSpring, useTransform, motion } from 'framer-motion';
import { useDrag } from '@use-gesture/react';
-import React, { useState, useMemo } from 'react';
+import { ReactNode, useMemo, useState } from 'react';
import { useAtomValue } from 'jotai';
import { config, Icon, Icons } from 'folds';
-import { mobileOrTablet } from '../utils/user-agent';
-import { RightSwipeAction, settingsAtom } from '../state/settings';
+import { mobileOrTablet } from '$utils/user-agent';
+import { RightSwipeAction, settingsAtom } from '$state/settings';
-function ActiveSwipeWrapper({
- children,
- onReply,
-}: {
- children: React.ReactNode;
- onReply: () => void;
-}) {
+function ActiveSwipeWrapper({ children, onReply }: { children: ReactNode; onReply: () => void }) {
const x = useMotionValue(0);
const springX = useSpring(x, { stiffness: 300, damping: 35 });
const [isReady, setIsReady] = useState(false);
@@ -75,7 +69,7 @@ export function SwipeableMessageWrapper({
children,
onReply,
}: {
- children: React.ReactNode;
+ children: ReactNode;
onReply: () => void;
}) {
const settings = useAtomValue(settingsAtom);
@@ -89,7 +83,7 @@ export function SwipeableMessageWrapper({
);
if (!isSwipeToReplyEnabled) {
- return <>{children}>;
+ return children;
}
return {children};
diff --git a/src/app/components/SwipeableOverlayWrapper.tsx b/src/app/components/SwipeableOverlayWrapper.tsx
index facff78c..15521bb1 100644
--- a/src/app/components/SwipeableOverlayWrapper.tsx
+++ b/src/app/components/SwipeableOverlayWrapper.tsx
@@ -1,9 +1,9 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { motion, useMotionValue, useSpring } from 'framer-motion';
import { useDrag } from '@use-gesture/react';
import { useAtomValue } from 'jotai';
-import { settingsAtom } from '../state/settings';
-import { mobileOrTablet } from '../utils/user-agent';
+import { settingsAtom } from '$state/settings';
+import { mobileOrTablet } from '$utils/user-agent';
interface SwipeableOverlayWrapperProps {
children: ReactNode;
diff --git a/src/app/components/UIAFlowOverlay.tsx b/src/app/components/UIAFlowOverlay.tsx
index a2bdd1b8..85211a0f 100644
--- a/src/app/components/UIAFlowOverlay.tsx
+++ b/src/app/components/UIAFlowOverlay.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import {
Overlay,
OverlayBackdrop,
diff --git a/src/app/components/UseStateProvider.tsx b/src/app/components/UseStateProvider.tsx
index 4e5b8332..21e5b3ca 100644
--- a/src/app/components/UseStateProvider.tsx
+++ b/src/app/components/UseStateProvider.tsx
@@ -2,7 +2,7 @@ import { Dispatch, ReactElement, SetStateAction, useState } from 'react';
type UseStateProviderProps = {
initial: T | (() => T);
- children: (value: T, setter: Dispatch>) => ReactElement;
+ children: (value: T, setter: Dispatch>) => ReactElement;
};
export function UseStateProvider({ initial, children }: UseStateProviderProps) {
return children(...useState(initial));
diff --git a/src/app/components/UserRoomProfileRenderer.tsx b/src/app/components/UserRoomProfileRenderer.tsx
index 246b54fd..97489d27 100644
--- a/src/app/components/UserRoomProfileRenderer.tsx
+++ b/src/app/components/UserRoomProfileRenderer.tsx
@@ -1,13 +1,12 @@
-import React from 'react';
import { Menu, PopOut, toRem } from 'folds';
import FocusTrap from 'focus-trap-react';
-import { useCloseUserRoomProfile, useUserRoomProfileState } from '../state/hooks/userRoomProfile';
+import { useCloseUserRoomProfile, useUserRoomProfileState } from '$state/hooks/userRoomProfile';
+import { UserRoomProfileState } from '$state/userRoomProfile';
+import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
+import { stopPropagation } from '$utils/keyboard';
+import { SpaceProvider } from '$hooks/useSpace';
+import { RoomProvider } from '$hooks/useRoom';
import { UserRoomProfile } from './user-profile';
-import { UserRoomProfileState } from '../state/userRoomProfile';
-import { useAllJoinedRoomsSet, useGetRoom } from '../hooks/useGetRoom';
-import { stopPropagation } from '../utils/keyboard';
-import { SpaceProvider } from '../hooks/useSpace';
-import { RoomProvider } from '../hooks/useRoom';
function UserRoomProfileContextMenu({ state }: { state: UserRoomProfileState }) {
const { roomId, spaceId, userId, cords, position, initialProfile } = state;
diff --git a/src/app/components/create-room/AdditionalCreatorInput.tsx b/src/app/components/create-room/AdditionalCreatorInput.tsx
index 815e9847..f362122a 100644
--- a/src/app/components/create-room/AdditionalCreatorInput.tsx
+++ b/src/app/components/create-room/AdditionalCreatorInput.tsx
@@ -17,20 +17,20 @@ import {
} from 'folds';
import { isKeyHotkey } from 'is-hotkey';
import FocusTrap from 'focus-trap-react';
-import React, {
+import {
ChangeEventHandler,
KeyboardEventHandler,
MouseEventHandler,
useMemo,
useState,
} from 'react';
-import { getMxIdLocalPart, getMxIdServer, isUserId } from '$appUtils/matrix';
+import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix';
import { useDirectUsers } from '$hooks/useDirectUsers';
-import { SettingTile } from '../setting-tile';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useAsyncSearch, UseAsyncSearchOptions } from '$hooks/useAsyncSearch';
import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser';
+import { SettingTile } from '$components/setting-tile';
export const useAdditionalCreators = (defaultCreators?: string[]) => {
const mx = useMatrixClient();
diff --git a/src/app/components/create-room/CreateRoomAccessSelector.tsx b/src/app/components/create-room/CreateRoomAccessSelector.tsx
index 35f39af8..6dd04983 100644
--- a/src/app/components/create-room/CreateRoomAccessSelector.tsx
+++ b/src/app/components/create-room/CreateRoomAccessSelector.tsx
@@ -1,7 +1,6 @@
-import React from 'react';
import { Box, Text, Icon, Icons, config, IconSrc } from 'folds';
-import { SequenceCard } from '../sequence-card';
-import { SettingTile } from '../setting-tile';
+import { SequenceCard } from '$components/sequence-card';
+import { SettingTile } from '$components/setting-tile';
import { CreateRoomAccess } from './types';
type CreateRoomAccessSelectorProps = {
diff --git a/src/app/components/create-room/CreateRoomAliasInput.tsx b/src/app/components/create-room/CreateRoomAliasInput.tsx
index 7e2c51b8..0460717a 100644
--- a/src/app/components/create-room/CreateRoomAliasInput.tsx
+++ b/src/app/components/create-room/CreateRoomAliasInput.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
FormEventHandler,
KeyboardEventHandler,
useCallback,
@@ -9,9 +9,9 @@ import React, {
import { MatrixError } from '$types/matrix-sdk';
import { Box, color, Icon, Icons, Input, Spinner, Text, toRem } from 'folds';
import { isKeyHotkey } from 'is-hotkey';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { replaceSpaceWithDash } from '$appUtils/common';
+import { replaceSpaceWithDash } from '$utils/common';
import { AsyncState, AsyncStatus, useAsync } from '$hooks/useAsyncCallback';
import { useDebounce } from '$hooks/useDebounce';
diff --git a/src/app/components/create-room/CreateRoomTypeSelector.tsx b/src/app/components/create-room/CreateRoomTypeSelector.tsx
index 06227cb5..ff40c983 100644
--- a/src/app/components/create-room/CreateRoomTypeSelector.tsx
+++ b/src/app/components/create-room/CreateRoomTypeSelector.tsx
@@ -1,7 +1,6 @@
-import React from 'react';
import { Box, Text, Icon, Icons, config, IconSrc } from 'folds';
-import { SequenceCard } from '../sequence-card';
-import { SettingTile } from '../setting-tile';
+import { SequenceCard } from '$components/sequence-card';
+import { SettingTile } from '$components/setting-tile';
import { CreateRoomType } from './types';
type CreateRoomTypeSelectorProps = {
diff --git a/src/app/components/create-room/RoomVersionSelector.tsx b/src/app/components/create-room/RoomVersionSelector.tsx
index 10502914..a86b1d2d 100644
--- a/src/app/components/create-room/RoomVersionSelector.tsx
+++ b/src/app/components/create-room/RoomVersionSelector.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useState } from 'react';
+import { MouseEventHandler, useState } from 'react';
import {
Box,
Button,
@@ -13,9 +13,9 @@ import {
toRem,
} from 'folds';
import FocusTrap from 'focus-trap-react';
-import { SettingTile } from '../setting-tile';
-import { SequenceCard } from '../sequence-card';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
+import { SettingTile } from '$components/setting-tile';
+import { SequenceCard } from '$components/sequence-card';
export function RoomVersionSelector({
versions,
diff --git a/src/app/components/create-room/utils.ts b/src/app/components/create-room/utils.ts
index 3daf8fab..d0322682 100644
--- a/src/app/components/create-room/utils.ts
+++ b/src/app/components/create-room/utils.ts
@@ -5,11 +5,11 @@ import {
MatrixClient,
RestrictedAllowType,
Room,
+ RoomJoinRulesEventContent,
} from '$types/matrix-sdk';
-import { RoomJoinRulesEventContent } from '$types/matrix-sdk';
import { RoomType, StateEvent } from '$types/matrix/room';
import { getViaServers } from '$plugins/via-servers';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
import { CreateRoomAccess } from './types';
export const createRoomCreationContent = (
diff --git a/src/app/components/cutout-card/CutoutCard.tsx b/src/app/components/cutout-card/CutoutCard.tsx
index f19a556f..5a6c2ae3 100644
--- a/src/app/components/cutout-card/CutoutCard.tsx
+++ b/src/app/components/cutout-card/CutoutCard.tsx
@@ -1,5 +1,4 @@
import { as, ContainerColor as TContainerColor } from 'folds';
-import React from 'react';
import classNames from 'classnames';
import { ContainerColor } from '$styles/ContainerColor.css';
import * as css from './CutoutCard.css';
diff --git a/src/app/components/direct-invite-prompt/DirectInvitePrompt.tsx b/src/app/components/direct-invite-prompt/DirectInvitePrompt.tsx
index 1cba4931..fbb83a86 100644
--- a/src/app/components/direct-invite-prompt/DirectInvitePrompt.tsx
+++ b/src/app/components/direct-invite-prompt/DirectInvitePrompt.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import FocusTrap from 'focus-trap-react';
import {
Box,
@@ -16,7 +15,7 @@ import {
color,
config,
} from 'folds';
-import { stopPropagation } from '../../utils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
type DirectInvitePromptProps = {
onCancel: () => void;
@@ -82,9 +81,16 @@ export function DirectInvitePrompt({
}
aria-disabled={converting}
>
- {converting ? 'Converting...' : 'Convert to Group Chat and Invite'}
+
+ {converting ? 'Converting...' : 'Convert to Group Chat and Invite'}
+
-
} />
- } />
+ } />
+ join} />
+ } />
@@ -219,9 +219,9 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize)
}
>
{mobile ? null : } />}
- } />
+ } />
@@ -261,10 +261,10 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize)
element={}
/>
)}
- } />
- } />
+ } />
+ } />
@@ -293,8 +293,8 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize)
element={}
/>
)}
- } />
- } />
+ } />
+ } />
} />
}
/>
)}
- } />
- } />
+ } />
+ } />
} />
diff --git a/src/app/pages/ThemeManager.tsx b/src/app/pages/ThemeManager.tsx
index 69d50cdb..dea860f9 100644
--- a/src/app/pages/ThemeManager.tsx
+++ b/src/app/pages/ThemeManager.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useEffect } from 'react';
+import { ReactNode, useEffect } from 'react';
import { configClass, varsClass } from 'folds';
import {
DarkTheme,
@@ -7,9 +7,9 @@ import {
ThemeKind,
useActiveTheme,
useSystemThemeKind,
-} from '../hooks/useTheme';
-import { useSetting } from '../state/hooks/settings';
-import { settingsAtom } from '../state/settings';
+} from '$hooks/useTheme';
+import { useSetting } from '$state/hooks/settings';
+import { settingsAtom } from '$state/settings';
export function UnAuthRouteThemeManager() {
const systemThemeKind = useSystemThemeKind();
diff --git a/src/app/pages/auth/AuthFooter.tsx b/src/app/pages/auth/AuthFooter.tsx
index 3b35da11..7881c17a 100644
--- a/src/app/pages/auth/AuthFooter.tsx
+++ b/src/app/pages/auth/AuthFooter.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Text } from 'folds';
import * as css from './styles.css';
@@ -15,7 +14,7 @@ export function AuthFooter() {
target="_blank"
rel="noreferrer"
>
- v1.2.2
+ v1.2.3
Twitter
diff --git a/src/app/pages/auth/AuthLayout.tsx b/src/app/pages/auth/AuthLayout.tsx
index 7b2d218a..edc913a6 100644
--- a/src/app/pages/auth/AuthLayout.tsx
+++ b/src/app/pages/auth/AuthLayout.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import { Box, Header, Scroll, Spinner, Text, color } from 'folds';
import {
Outlet,
@@ -11,21 +11,21 @@ import {
} from 'react-router-dom';
import classNames from 'classnames';
-import { AuthFooter } from './AuthFooter';
-import * as css from './styles.css';
import * as PatternsCss from '$styles/Patterns.css';
import { clientAllowedServer, clientDefaultServer, useClientConfig } from '$hooks/useClientConfig';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
-import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '../paths';
import CinnySVG from '$public/favicon.png';
-import { ServerPicker } from './ServerPicker';
-import { AutoDiscoveryAction, autoDiscovery } from '../../cs-api';
import { SpecVersionsLoader } from '$components/SpecVersionsLoader';
import { SpecVersionsProvider } from '$hooks/useSpecVersions';
import { AutoDiscoveryInfoProvider } from '$hooks/useAutoDiscoveryInfo';
import { AuthFlowsLoader } from '$components/AuthFlowsLoader';
import { AuthFlowsProvider } from '$hooks/useAuthFlows';
import { AuthServerProvider } from '$hooks/useAuthServer';
+import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '$pages/paths';
+import { AutoDiscoveryAction, autoDiscovery } from '../../cs-api';
+import { ServerPicker } from './ServerPicker';
+import * as css from './styles.css';
+import { AuthFooter } from './AuthFooter';
const currentAuthPath = (pathname: string): string => {
if (matchPath(LOGIN_PATH, pathname)) {
diff --git a/src/app/pages/auth/FiledError.tsx b/src/app/pages/auth/FiledError.tsx
index d96fc872..eddd65b6 100644
--- a/src/app/pages/auth/FiledError.tsx
+++ b/src/app/pages/auth/FiledError.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, Icons, color, Text } from 'folds';
export function FieldError({ message }: { message: string }) {
diff --git a/src/app/pages/auth/OrDivider.tsx b/src/app/pages/auth/OrDivider.tsx
index 629d3f52..db13a7ab 100644
--- a/src/app/pages/auth/OrDivider.tsx
+++ b/src/app/pages/auth/OrDivider.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Line, Text } from 'folds';
export function OrDivider() {
diff --git a/src/app/pages/auth/SSOLogin.tsx b/src/app/pages/auth/SSOLogin.tsx
index 4ef20e1e..eabb2360 100644
--- a/src/app/pages/auth/SSOLogin.tsx
+++ b/src/app/pages/auth/SSOLogin.tsx
@@ -1,6 +1,6 @@
import { Avatar, AvatarImage, Box, Button, Text } from 'folds';
import { IIdentityProvider, SSOAction, createClient } from '$types/matrix-sdk';
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
type SSOLoginProps = {
diff --git a/src/app/pages/auth/ServerPicker.tsx b/src/app/pages/auth/ServerPicker.tsx
index 8eb9dafc..e66d92a1 100644
--- a/src/app/pages/auth/ServerPicker.tsx
+++ b/src/app/pages/auth/ServerPicker.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
ChangeEventHandler,
KeyboardEventHandler,
MouseEventHandler,
@@ -22,7 +22,7 @@ import {
import FocusTrap from 'focus-trap-react';
import { useDebounce } from '$hooks/useDebounce';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
export function ServerPicker({
server,
diff --git a/src/app/pages/auth/login/Login.tsx b/src/app/pages/auth/login/Login.tsx
index e376dc09..11df22a8 100644
--- a/src/app/pages/auth/login/Login.tsx
+++ b/src/app/pages/auth/login/Login.tsx
@@ -1,18 +1,18 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { Box, Text, color } from 'folds';
import { Link, useSearchParams } from 'react-router-dom';
import { SSOAction } from '$types/matrix-sdk';
import { useAuthFlows } from '$hooks/useAuthFlows';
import { useAuthServer } from '$hooks/useAuthServer';
import { useParsedLoginFlows } from '$hooks/useParsedLoginFlows';
-import { PasswordLoginForm } from './PasswordLoginForm';
-import { SSOLogin } from '../SSOLogin';
-import { TokenLogin } from './TokenLogin';
-import { OrDivider } from '../OrDivider';
import { getLoginPath, getRegisterPath, withSearchParam } from '$pages/pathUtils';
import { usePathWithOrigin } from '$hooks/usePathWithOrigin';
import { LoginPathSearchParams } from '$pages/paths';
import { useClientConfig } from '$hooks/useClientConfig';
+import { SSOLogin } from '$pages/auth/SSOLogin';
+import { OrDivider } from '$pages/auth/OrDivider';
+import { PasswordLoginForm } from './PasswordLoginForm';
+import { TokenLogin } from './TokenLogin';
const getLoginTokenSearchParam = () => {
// when using hasRouter query params in existing route
diff --git a/src/app/pages/auth/login/PasswordLoginForm.tsx b/src/app/pages/auth/login/PasswordLoginForm.tsx
index aca5f598..bbbb5f35 100644
--- a/src/app/pages/auth/login/PasswordLoginForm.tsx
+++ b/src/app/pages/auth/login/PasswordLoginForm.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, MouseEventHandler, useCallback, useState } from 'react';
+import { FormEventHandler, MouseEventHandler, useCallback, useState } from 'react';
import {
Box,
Button,
@@ -20,12 +20,16 @@ import {
import FocusTrap from 'focus-trap-react';
import { Link } from 'react-router-dom';
import { MatrixError } from '$types/matrix-sdk';
-import { getMxIdLocalPart, getMxIdServer, isUserId } from '$appUtils/matrix';
-import { EMAIL_REGEX } from '$appUtils/regex';
+import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix';
+import { EMAIL_REGEX } from '$utils/regex';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAuthServer } from '$hooks/useAuthServer';
import { useClientConfig } from '$hooks/useClientConfig';
+import { PasswordInput } from '$components/password-input';
+import { getResetPasswordPath } from '$pages/pathUtils';
+import { stopPropagation } from '$utils/keyboard';
+import { FieldError } from '$pages/auth/FiledError';
import {
CustomLoginResponse,
LoginError,
@@ -33,10 +37,6 @@ import {
login,
useLoginComplete,
} from './loginUtil';
-import { PasswordInput } from '$components/password-input';
-import { FieldError } from '../FiledError';
-import { getResetPasswordPath } from '$pages/pathUtils';
-import { stopPropagation } from '$appUtils/keyboard';
function UsernameHint({ server }: { server: string }) {
const [anchor, setAnchor] = useState();
diff --git a/src/app/pages/auth/login/TokenLogin.tsx b/src/app/pages/auth/login/TokenLogin.tsx
index c6efb86e..984cf89f 100644
--- a/src/app/pages/auth/login/TokenLogin.tsx
+++ b/src/app/pages/auth/login/TokenLogin.tsx
@@ -10,7 +10,7 @@ import {
color,
config,
} from 'folds';
-import React, { useCallback, useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
import { MatrixError } from '$types/matrix-sdk';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
diff --git a/src/app/pages/auth/login/loginUtil.ts b/src/app/pages/auth/login/loginUtil.ts
index 931cdb6a..1659e547 100644
--- a/src/app/pages/auth/login/loginUtil.ts
+++ b/src/app/pages/auth/login/loginUtil.ts
@@ -4,15 +4,15 @@ import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { useSetAtom } from 'jotai';
import { clientAllowedServer, ClientConfig } from '$hooks/useClientConfig';
-import { autoDiscovery, specVersions } from '../../../cs-api';
-import { ErrorCode } from '../../../cs-errorcode';
import {
deleteAfterLoginRedirectPath,
getAfterLoginRedirectPath,
} from '$pages/afterLoginRedirectPath';
import { getHomePath } from '$pages/pathUtils';
import { activeSessionIdAtom, sessionsAtom } from '$state/sessions';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
+import { ErrorCode } from '../../../cs-errorcode';
+import { autoDiscovery, specVersions } from '../../../cs-api';
const log = createLogger('loginUtil');
@@ -20,8 +20,8 @@ export enum GetBaseUrlError {
NotAllow = 'NotAllow',
NotFound = 'NotFound',
}
-export const factoryGetBaseUrl = (clientConfig: ClientConfig, server: string) => {
- return async (): Promise => {
+export const factoryGetBaseUrl =
+ (clientConfig: ClientConfig, server: string) => async (): Promise => {
if (!clientAllowedServer(clientConfig, server)) {
throw new Error(GetBaseUrlError.NotAllow);
}
@@ -44,7 +44,6 @@ export const factoryGetBaseUrl = (clientConfig: ClientConfig, server: string) =>
}
return mxIdBaseUrl;
};
-};
export enum LoginError {
ServerNotAllowed = 'ServerNotAllowed',
diff --git a/src/app/pages/auth/register/PasswordRegisterForm.tsx b/src/app/pages/auth/register/PasswordRegisterForm.tsx
index 87fb2799..7dacb7f0 100644
--- a/src/app/pages/auth/register/PasswordRegisterForm.tsx
+++ b/src/app/pages/auth/register/PasswordRegisterForm.tsx
@@ -10,7 +10,7 @@ import {
Text,
color,
} from 'folds';
-import React, { ChangeEventHandler, useCallback, useMemo, useState } from 'react';
+import { ChangeEventHandler, useCallback, useMemo, useState } from 'react';
import {
AuthDict,
AuthType,
@@ -26,12 +26,10 @@ import {
getUIAFlowForStages,
hasStageInFlows,
requiredStageInFlows,
-} from '$appUtils/matrix-uia';
+} from '$utils/matrix-uia';
import { useUIACompleted, useUIAFlow, useUIAParams } from '$hooks/useUIAFlows';
import { AsyncState, AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
-import { RegisterError, RegisterResult, register, useRegisterComplete } from './registerUtil';
-import { FieldError } from '../FiledError';
import {
AutoDummyStageDialog,
AutoTermsStageDialog,
@@ -43,6 +41,8 @@ import { useRegisterEmail } from '$hooks/useRegisterEmail';
import { ConfirmPasswordMatch } from '$components/ConfirmPasswordMatch';
import { UIAFlowOverlay } from '$components/UIAFlowOverlay';
import { RequestEmailTokenCallback, RequestEmailTokenResponse } from '$hooks/types';
+import { FieldError } from '$pages/auth/FiledError';
+import { RegisterError, RegisterResult, register, useRegisterComplete } from './registerUtil';
export const SUPPORTED_REGISTER_STAGES = [
AuthType.RegistrationToken,
diff --git a/src/app/pages/auth/register/Register.tsx b/src/app/pages/auth/register/Register.tsx
index 987419fd..11bee338 100644
--- a/src/app/pages/auth/register/Register.tsx
+++ b/src/app/pages/auth/register/Register.tsx
@@ -1,17 +1,17 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { Box, Text, color } from 'folds';
import { Link, useSearchParams } from 'react-router-dom';
import { SSOAction } from '$types/matrix-sdk';
import { useAuthServer } from '$hooks/useAuthServer';
import { RegisterFlowStatus, useAuthFlows } from '$hooks/useAuthFlows';
import { useParsedLoginFlows } from '$hooks/useParsedLoginFlows';
-import { PasswordRegisterForm, SUPPORTED_REGISTER_STAGES } from './PasswordRegisterForm';
-import { OrDivider } from '../OrDivider';
-import { SSOLogin } from '../SSOLogin';
import { SupportedUIAFlowsLoader } from '$components/SupportedUIAFlowsLoader';
import { getLoginPath } from '$pages/pathUtils';
import { usePathWithOrigin } from '$hooks/usePathWithOrigin';
import { RegisterPathSearchParams } from '$pages/paths';
+import { SSOLogin } from '$pages/auth/SSOLogin';
+import { OrDivider } from '$pages/auth/OrDivider';
+import { PasswordRegisterForm, SUPPORTED_REGISTER_STAGES } from './PasswordRegisterForm';
const useRegisterSearchParams = (searchParams: URLSearchParams): RegisterPathSearchParams =>
useMemo(
diff --git a/src/app/pages/auth/register/registerUtil.ts b/src/app/pages/auth/register/registerUtil.ts
index a9c8f32f..ff82ccca 100644
--- a/src/app/pages/auth/register/registerUtil.ts
+++ b/src/app/pages/auth/register/registerUtil.ts
@@ -9,14 +9,14 @@ import {
import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { LoginPathSearchParams } from '$pages/paths';
-import { ErrorCode } from '../../../cs-errorcode';
import {
deleteAfterLoginRedirectPath,
getAfterLoginRedirectPath,
} from '$pages/afterLoginRedirectPath';
import { getHomePath, getLoginPath, withSearchParam } from '$pages/pathUtils';
-import { getMxIdLocalPart, getMxIdServer } from '$appUtils/matrix';
+import { getMxIdLocalPart, getMxIdServer } from '$utils/matrix';
import { setFallbackSession } from '$state/sessions';
+import { ErrorCode } from '../../../cs-errorcode';
export enum RegisterError {
UserTaken = 'UserTaken',
diff --git a/src/app/pages/auth/reset-password/PasswordResetForm.tsx b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
index 5eaec74a..af4c5752 100644
--- a/src/app/pages/auth/reset-password/PasswordResetForm.tsx
+++ b/src/app/pages/auth/reset-password/PasswordResetForm.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
+import { FormEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
import {
Box,
Button,
@@ -21,13 +21,13 @@ import { useAuthServer } from '$hooks/useAuthServer';
import { usePasswordEmail } from '$hooks/usePasswordEmail';
import { PasswordInput } from '$components/password-input';
import { ConfirmPasswordMatch } from '$components/ConfirmPasswordMatch';
-import { FieldError } from '../FiledError';
import { UIAFlowOverlay } from '$components/UIAFlowOverlay';
import { EmailStageDialog } from '$components/uia-stages';
-import { ResetPasswordResult, resetPassword } from './resetPasswordUtil';
import { getLoginPath, withSearchParam } from '$pages/pathUtils';
import { LoginPathSearchParams } from '$pages/paths';
-import { getUIAError, getUIAErrorCode } from '$appUtils/matrix-uia';
+import { getUIAError, getUIAErrorCode } from '$utils/matrix-uia';
+import { FieldError } from '$pages/auth/FiledError';
+import { ResetPasswordResult, resetPassword } from './resetPasswordUtil';
type FormData = {
email: string;
diff --git a/src/app/pages/auth/reset-password/ResetPassword.tsx b/src/app/pages/auth/reset-password/ResetPassword.tsx
index 0b90a3b7..718101fa 100644
--- a/src/app/pages/auth/reset-password/ResetPassword.tsx
+++ b/src/app/pages/auth/reset-password/ResetPassword.tsx
@@ -1,10 +1,10 @@
import { Box, Text } from 'folds';
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { Link, useSearchParams } from 'react-router-dom';
import { getLoginPath } from '$pages/pathUtils';
import { useAuthServer } from '$hooks/useAuthServer';
-import { PasswordResetForm } from './PasswordResetForm';
import { ResetPasswordPathSearchParams } from '$pages/paths';
+import { PasswordResetForm } from './PasswordResetForm';
const useResetPasswordSearchParams = (
searchParams: URLSearchParams
diff --git a/src/app/pages/client/BackgroundNotifications.tsx b/src/app/pages/client/BackgroundNotifications.tsx
index 2fe646eb..ab49fd48 100644
--- a/src/app/pages/client/BackgroundNotifications.tsx
+++ b/src/app/pages/client/BackgroundNotifications.tsx
@@ -7,10 +7,9 @@ import {
Room,
RoomEvent,
SyncState,
+ PushProcessor,
} from '$types/matrix-sdk';
-import { PushProcessor } from '$types/matrix-sdk';
import { useAtomValue, useSetAtom } from 'jotai';
-import { useNavigate } from 'react-router-dom';
import {
sessionsAtom,
activeSessionIdAtom,
@@ -19,10 +18,10 @@ import {
} from '$state/sessions';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
-import { getMemberDisplayName, getNotificationType, isNotificationEvent } from '$appUtils/room';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
+import { getMemberDisplayName, getNotificationType, isNotificationEvent } from '$utils/room';
import { NotificationType } from '$types/matrix/room';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import LogoSVG from '$public/res/svg/cinny.svg';
import { nicknamesAtom } from '$state/nicknames';
import { useMatrixClient } from '$hooks/useMatrixClient';
diff --git a/src/app/pages/client/ClientInitStorageAtom.tsx b/src/app/pages/client/ClientInitStorageAtom.tsx
index ead77eb5..80b263e9 100644
--- a/src/app/pages/client/ClientInitStorageAtom.tsx
+++ b/src/app/pages/client/ClientInitStorageAtom.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, useMemo } from 'react';
+import { ReactNode, useMemo } from 'react';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { makeClosedNavCategoriesAtom } from '$state/closedNavCategories';
import { ClosedNavCategoriesProvider } from '$state/hooks/closedNavCategories';
diff --git a/src/app/pages/client/ClientLayout.tsx b/src/app/pages/client/ClientLayout.tsx
index 4a077ba6..4bbd4068 100644
--- a/src/app/pages/client/ClientLayout.tsx
+++ b/src/app/pages/client/ClientLayout.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box } from 'folds';
type ClientLayoutProps = {
diff --git a/src/app/pages/client/ClientNonUIFeatures.tsx b/src/app/pages/client/ClientNonUIFeatures.tsx
index 5e9bc1cd..1e7ecb37 100644
--- a/src/app/pages/client/ClientNonUIFeatures.tsx
+++ b/src/app/pages/client/ClientNonUIFeatures.tsx
@@ -1,5 +1,5 @@
import { useAtomValue, useSetAtom } from 'jotai';
-import React, { ReactNode, useCallback, useEffect, useRef } from 'react';
+import { ReactNode, useCallback, useEffect, useRef } from 'react';
import { useNavigate } from 'react-router-dom';
import { EventType, RoomEvent, RoomEventHandlerMap } from '$types/matrix-sdk';
import { roomToUnreadAtom, unreadEqual, unreadInfoToUnread } from '$state/room/roomToUnread';
@@ -8,22 +8,21 @@ import LogoUnreadSVG from '$public/res/svg/cinny-unread.svg';
import LogoHighlightSVG from '$public/res/svg/cinny-highlight.svg';
import NotificationSound from '$public/sound/notification.ogg';
import InviteSound from '$public/sound/invite.ogg';
-import { notificationPermission, setFavicon } from '$appUtils/dom';
+import { notificationPermission, setFavicon } from '$utils/dom';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import { nicknamesAtom } from '$state/nicknames';
import { allInvitesAtom } from '$state/room-list/inviteList';
import { usePreviousValue } from '$hooks/usePreviousValue';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getInboxInvitesPath } from '../pathUtils';
import {
getMemberDisplayName,
getNotificationType,
getUnreadInfo,
isNotificationEvent,
-} from '$appUtils/room';
+} from '$utils/room';
import { NotificationType, UnreadInfo } from '$types/matrix/room';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { useInboxNotificationsSelected } from '$hooks/router/useInbox';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
diff --git a/src/app/pages/client/ClientRoomsNotificationPreferences.tsx b/src/app/pages/client/ClientRoomsNotificationPreferences.tsx
index 3881f2e9..c6ef04a4 100644
--- a/src/app/pages/client/ClientRoomsNotificationPreferences.tsx
+++ b/src/app/pages/client/ClientRoomsNotificationPreferences.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import {
RoomsNotificationPreferencesProvider,
useRoomsNotificationPreferences,
diff --git a/src/app/pages/client/ClientRoot.tsx b/src/app/pages/client/ClientRoot.tsx
index 65ee0b85..4f06f56e 100644
--- a/src/app/pages/client/ClientRoot.tsx
+++ b/src/app/pages/client/ClientRoot.tsx
@@ -15,7 +15,7 @@ import {
} from 'folds';
import { HttpApiEvent, HttpApiEventHandlerMap, MatrixClient } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
-import React, { MouseEventHandler, ReactNode, useCallback, useEffect, useState } from 'react';
+import { useRef, MouseEventHandler, ReactNode, useCallback, useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { useAtom, useAtomValue, useSetAtom } from 'jotai';
import {
@@ -31,18 +31,18 @@ import { ServerConfigsLoader } from '$components/ServerConfigsLoader';
import { CapabilitiesProvider } from '$hooks/useCapabilities';
import { MediaConfigProvider } from '$hooks/useMediaConfig';
import { MatrixClientProvider } from '$hooks/useMatrixClient';
-import { SpecVersions } from './SpecVersions';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useSyncState } from '$hooks/useSyncState';
-import { stopPropagation } from '$appUtils/keyboard';
-import { SyncStatus } from './SyncStatus';
+import { stopPropagation } from '$utils/keyboard';
import { AuthMetadataProvider } from '$hooks/useAuthMetadata';
import { sessionsAtom, activeSessionIdAtom, Session, SessionsAction } from '$state/sessions';
-import { getHomePath } from '../pathUtils';
-import { createLogger } from '$appUtils/debug';
-import { pushSessionToSW } from '../../../sw-session';
+import { createLogger } from '$utils/debug';
import { useSyncNicknames } from '$hooks/useNickname';
import { useAppVisibility } from '$hooks/useAppVisibility';
+import { getHomePath } from '$pages/pathUtils';
+import { pushSessionToSW } from '../../../sw-session';
+import { SyncStatus } from './SyncStatus';
+import { SpecVersions } from './SpecVersions';
const log = createLogger('ClientRoot');
@@ -59,7 +59,6 @@ function ClientRootLoading() {
type ClientRootOptionsProps = {
mx?: MatrixClient;
- session?: Session;
onLogout: () => void;
};
function ClientRootOptions({ mx, onLogout }: ClientRootOptionsProps) {
@@ -168,7 +167,7 @@ export function ClientRoot({ children }: ClientRootProps) {
const { baseUrl } = activeSession ?? {};
- const loadedUserIdRef = React.useRef(undefined);
+ const loadedUserIdRef = useRef(undefined);
const [loadState, loadMatrix, setLoadState] = useAsyncCallback(
useCallback(async () => {
@@ -228,14 +227,15 @@ export function ClientRoot({ children }: ClientRootProps) {
useLogoutListener(mx);
useAppVisibility(mx);
- useEffect(() => {
- return () => {
+ useEffect(
+ () => () => {
if (mx?.clientRunning) {
log.log('ClientRoot unmounting — stopping client', mx.getUserId());
mx.stopClient();
}
- };
- }, [mx]);
+ },
+ [mx]
+ );
useEffect(() => {
if (loadState.status === AsyncStatus.Idle) {
@@ -258,9 +258,9 @@ export function ClientRoot({ children }: ClientRootProps) {
}, [])
);
return (
-
+
{mx && }
- {loading && }
+ {loading && }
{(loadState.status === AsyncStatus.Error || startState.status === AsyncStatus.Error) && (
diff --git a/src/app/pages/client/SidebarNav.tsx b/src/app/pages/client/SidebarNav.tsx
index f521106e..7bb47408 100644
--- a/src/app/pages/client/SidebarNav.tsx
+++ b/src/app/pages/client/SidebarNav.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import { useRef } from 'react';
import { Scroll } from 'folds';
import { Sidebar, SidebarContent, SidebarStackSeparator, SidebarStack } from '$components/sidebar';
diff --git a/src/app/pages/client/SpecVersions.tsx b/src/app/pages/client/SpecVersions.tsx
index b3552cf6..75cb3caf 100644
--- a/src/app/pages/client/SpecVersions.tsx
+++ b/src/app/pages/client/SpecVersions.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { Box, Dialog, config, Text, Button, Spinner } from 'folds';
import { SpecVersionsLoader } from '$components/SpecVersionsLoader';
import { SpecVersionsProvider } from '$hooks/useSpecVersions';
diff --git a/src/app/pages/client/SyncStatus.tsx b/src/app/pages/client/SyncStatus.tsx
index 63c7b400..818d7700 100644
--- a/src/app/pages/client/SyncStatus.tsx
+++ b/src/app/pages/client/SyncStatus.tsx
@@ -1,5 +1,5 @@
import { MatrixClient, SyncState } from '$types/matrix-sdk';
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
import { Box, config, Line, Text } from 'folds';
import { useSyncState } from '$hooks/useSyncState';
import { ContainerColor } from '$styles/ContainerColor.css';
diff --git a/src/app/pages/client/WelcomePage.tsx b/src/app/pages/client/WelcomePage.tsx
index 453abfa3..1af3483f 100644
--- a/src/app/pages/client/WelcomePage.tsx
+++ b/src/app/pages/client/WelcomePage.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Button, Icon, Icons, Text, config, toRem } from 'folds';
import { Page, PageHero, PageHeroSection } from '$components/page';
import CinnySVG from '$public/res/svg/cinny.svg';
@@ -20,7 +19,7 @@ export function WelcomePage() {
Yet another matrix client fork.{' '}
- v1.2.2
+ v1.2.3
}
diff --git a/src/app/pages/client/call/CallProvider.tsx b/src/app/pages/client/call/CallProvider.tsx
index 27c13478..69aa3bdb 100644
--- a/src/app/pages/client/call/CallProvider.tsx
+++ b/src/app/pages/client/call/CallProvider.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
createContext,
useState,
useContext,
@@ -7,12 +7,7 @@ import React, {
ReactNode,
useEffect,
} from 'react';
-import {
- WidgetApiToWidgetAction,
- WidgetApiAction,
- ClientWidgetApi,
- IWidgetApiRequestData,
-} from 'matrix-widget-api';
+import { WidgetApiToWidgetAction, ClientWidgetApi, IWidgetApiRequestData } from 'matrix-widget-api';
import { useParams } from 'react-router-dom';
import { SmallWidget } from '$features/call/SmallWidget';
@@ -132,7 +127,7 @@ export function CallProvider({ children }: CallProviderProps) {
const hangUp = useCallback(() => {
setActiveClientWidgetApi(null, null, null, null);
setActiveCallRoomIdState(null);
- activeClientWidgetApi?.transport.send(`${WIDGET_HANGUP_ACTION}`, {});
+ activeClientWidgetApi?.transport.send(WIDGET_HANGUP_ACTION, {});
setIsActiveCallReady(false);
}, [activeClientWidgetApi?.transport, setActiveClientWidgetApi]);
@@ -148,7 +143,7 @@ export function CallProvider({ children }: CallProviderProps) {
return Promise.reject(new Error('Mismatched active call clientWidgetApi'));
}
- await activeClientWidgetApi.transport.send(action as WidgetApiAction, data);
+ await activeClientWidgetApi.transport.send(action, data);
return Promise.resolve();
},
@@ -209,16 +204,14 @@ export function CallProvider({ children }: CallProviderProps) {
if (!isActiveCallReady) return;
ev.preventDefault();
- /* eslint-disable camelcase */
- const { audio_enabled, video_enabled } = ev.detail.data ?? {};
+ const { audio_enabled: audioEnabled, video_enabled: videoEnabled } = ev.detail.data ?? {};
- if (typeof audio_enabled === 'boolean' && audio_enabled !== isAudioEnabled) {
- setIsAudioEnabledState(audio_enabled);
+ if (typeof audioEnabled === 'boolean' && audioEnabled !== isAudioEnabled) {
+ setIsAudioEnabledState(audioEnabled);
}
- if (typeof video_enabled === 'boolean' && video_enabled !== isVideoEnabled) {
- setIsVideoEnabledState(video_enabled);
+ if (typeof videoEnabled === 'boolean' && videoEnabled !== isVideoEnabled) {
+ setIsVideoEnabledState(videoEnabled);
}
- /* eslint-enable camelcase */
};
const handleOnScreenStateUpdate = (ev: CustomEvent) => {
@@ -257,7 +250,7 @@ export function CallProvider({ children }: CallProviderProps) {
setIsActiveCallReady(true);
};
- void sendWidgetAction(WIDGET_MEDIA_STATE_UPDATE_ACTION, {
+ sendWidgetAction(WIDGET_MEDIA_STATE_UPDATE_ACTION, {
audio_enabled: isAudioEnabled,
video_enabled: isVideoEnabled,
}).catch(() => {
diff --git a/src/app/pages/client/call/PersistentCallContainer.tsx b/src/app/pages/client/call/PersistentCallContainer.tsx
index fec94116..31809786 100644
--- a/src/app/pages/client/call/PersistentCallContainer.tsx
+++ b/src/app/pages/client/call/PersistentCallContainer.tsx
@@ -1,7 +1,14 @@
-import React, { createContext, ReactNode, useCallback, useEffect, useMemo, useRef } from 'react';
+import {
+ createContext,
+ MutableRefObject,
+ ReactNode,
+ useCallback,
+ useEffect,
+ useMemo,
+ useRef,
+} from 'react';
import { ClientWidgetApi } from 'matrix-widget-api';
import { Box } from 'folds';
-import { useCallState } from './CallProvider';
import {
createVirtualWidget,
SmallWidget,
@@ -12,13 +19,15 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
import { useClientConfig } from '$hooks/useClientConfig';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { ThemeKind, useTheme } from '$hooks/useTheme';
+import { useCallState } from './CallProvider';
interface PersistentCallContainerProps {
children: ReactNode;
}
-export const CallRefContext =
- createContext | null>(null);
+export const CallRefContext = createContext | null>(
+ null
+);
export function PersistentCallContainer({ children }: PersistentCallContainerProps) {
const callIframeRef = useRef(null);
@@ -43,9 +52,9 @@ export function PersistentCallContainer({ children }: PersistentCallContainerPro
const setupWidget = useCallback(
(
- widgetApiRef: React.MutableRefObject,
- smallWidgetRef: React.MutableRefObject,
- iframeRef: React.MutableRefObject,
+ widgetApiRef: MutableRefObject,
+ smallWidgetRef: MutableRefObject,
+ iframeRef: MutableRefObject,
skipLobby: boolean,
themeKind: ThemeKind | null
) => {
diff --git a/src/app/pages/client/create/Create.tsx b/src/app/pages/client/create/Create.tsx
index 6e81d203..4fb78183 100644
--- a/src/app/pages/client/create/Create.tsx
+++ b/src/app/pages/client/create/Create.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, Icons, Scroll } from 'folds';
import { Page, PageContent, PageContentCenter, PageHero, PageHeroSection } from '$components/page';
import { CreateSpaceForm } from '$features/create-space';
diff --git a/src/app/pages/client/direct/Direct.tsx b/src/app/pages/client/direct/Direct.tsx
index e60bfbb4..8915d5f7 100644
--- a/src/app/pages/client/direct/Direct.tsx
+++ b/src/app/pages/client/direct/Direct.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
import { useAtom, useAtomValue } from 'jotai';
import {
Avatar,
@@ -19,7 +19,7 @@ import { useVirtualizer } from '@tanstack/react-virtual';
import FocusTrap from 'focus-trap-react';
import { useNavigate } from 'react-router-dom';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { factoryRoomIdByActivity } from '$appUtils/sort';
+import { factoryRoomIdByActivity } from '$utils/sort';
import {
NavButton,
NavCategory,
@@ -30,7 +30,7 @@ import {
NavItemContent,
} from '$components/nav';
import { getDirectCreatePath, getDirectRoomPath } from '$pages/pathUtils';
-import { getCanonicalAliasOrRoomId } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId } from '$utils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { VirtualTile } from '$components/virtualizer';
import { RoomNavCategoryButton, RoomNavItem } from '$features/room-nav';
@@ -38,12 +38,11 @@ import { makeNavCategoryId } from '$state/closedNavCategories';
import { roomToUnreadAtom } from '$state/room/roomToUnread';
import { useCategoryHandler } from '$hooks/useCategoryHandler';
import { useNavToActivePathMapper } from '$hooks/useNavToActivePathMapper';
-import { useDirectRooms } from './useDirectRooms';
import { PageNav, PageNavContent, PageNavHeader } from '$components/page';
import { useClosedNavCategoriesAtom } from '$state/hooks/closedNavCategories';
import { useRoomsUnread } from '$state/hooks/unread';
-import { markAsRead } from '$appUtils/notifications';
-import { stopPropagation } from '$appUtils/keyboard';
+import { markAsRead } from '$utils/notifications';
+import { stopPropagation } from '$utils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import {
@@ -52,6 +51,7 @@ import {
} from '$hooks/useRoomsNotificationPreferences';
import { useDirectCreateSelected } from '$hooks/router/useDirectSelected';
import { CallNavStatus } from '$features/room-nav/RoomCallNavStatus';
+import { useDirectRooms } from './useDirectRooms';
type DirectMenuProps = {
requestClose: () => void;
diff --git a/src/app/pages/client/direct/DirectCreate.tsx b/src/app/pages/client/direct/DirectCreate.tsx
index fdc3aa06..19b278bc 100644
--- a/src/app/pages/client/direct/DirectCreate.tsx
+++ b/src/app/pages/client/direct/DirectCreate.tsx
@@ -1,11 +1,10 @@
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
import { useNavigate, useSearchParams } from 'react-router-dom';
import { Box, Icon, IconButton, Icons, Scroll } from 'folds';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { getDirectCreateSearchParams } from '$pages/pathSearchParam';
import { getDirectRoomPath } from '$pages/pathUtils';
-import { getDMRoomFor } from '$appUtils/matrix';
-import { useDirectRooms } from './useDirectRooms';
+import { getDMRoomFor } from '$utils/matrix';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import {
Page,
@@ -17,6 +16,7 @@ import {
} from '$components/page';
import { BackRouteHandler } from '$components/BackRouteHandler';
import { CreateChat } from '$features/create-chat';
+import { useDirectRooms } from './useDirectRooms';
export function DirectCreate() {
const mx = useMatrixClient();
diff --git a/src/app/pages/client/direct/RoomProvider.tsx b/src/app/pages/client/direct/RoomProvider.tsx
index b1bddcf3..1780fa72 100644
--- a/src/app/pages/client/direct/RoomProvider.tsx
+++ b/src/app/pages/client/direct/RoomProvider.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { IsDirectRoomProvider, RoomProvider } from '$hooks/useRoom';
diff --git a/src/app/pages/client/explore/Explore.tsx b/src/app/pages/client/explore/Explore.tsx
index a546bcbb..9ac55e2d 100644
--- a/src/app/pages/client/explore/Explore.tsx
+++ b/src/app/pages/client/explore/Explore.tsx
@@ -1,4 +1,4 @@
-import React, { FormEventHandler, useCallback, useRef, useState } from 'react';
+import { FormEventHandler, useCallback, useRef, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import FocusTrap from 'focus-trap-react';
import {
@@ -23,11 +23,11 @@ import { getExploreFeaturedPath, getExploreServerPath } from '$pages/pathUtils';
import { useClientConfig } from '$hooks/useClientConfig';
import { useExploreFeaturedSelected, useExploreServer } from '$hooks/router/useExploreSelected';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useNavToActivePathMapper } from '$hooks/useNavToActivePathMapper';
import { PageNav, PageNavContent, PageNavHeader } from '$components/page';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
export function AddServer() {
const mx = useMatrixClient();
diff --git a/src/app/pages/client/explore/Featured.tsx b/src/app/pages/client/explore/Featured.tsx
index 41717101..e7095772 100644
--- a/src/app/pages/client/explore/Featured.tsx
+++ b/src/app/pages/client/explore/Featured.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
import { useAtomValue } from 'jotai';
import { useClientConfig } from '$hooks/useClientConfig';
@@ -14,10 +13,10 @@ import {
PageHeroSection,
} from '$components/page';
import { RoomTopicViewer } from '$components/room-topic-viewer';
-import * as css from './style.css';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { BackRouteHandler } from '$components/BackRouteHandler';
+import * as css from './style.css';
export function FeaturedRooms() {
const { featuredCommunities } = useClientConfig();
diff --git a/src/app/pages/client/explore/Server.tsx b/src/app/pages/client/explore/Server.tsx
index 2d64cba3..84fd8f36 100644
--- a/src/app/pages/client/explore/Server.tsx
+++ b/src/app/pages/client/explore/Server.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
FormEventHandler,
MouseEventHandler,
RefObject,
@@ -38,13 +38,13 @@ import { RoomTopicViewer } from '$components/room-topic-viewer';
import { RoomCard, RoomCardBase, RoomCardGrid } from '$components/room-card';
import { ExploreServerPathSearchParams } from '$pages/paths';
import { getExploreServerPath, withSearchParam } from '$pages/pathUtils';
-import * as css from './style.css';
import { allRoomsAtom } from '$state/room-list/roomList';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
-import { getMxIdServer } from '$appUtils/matrix';
-import { stopPropagation } from '$appUtils/keyboard';
+import { getMxIdServer } from '$utils/matrix';
+import { stopPropagation } from '$utils/keyboard';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { BackRouteHandler } from '$components/BackRouteHandler';
+import * as css from './style.css';
const useServerSearchParams = (searchParams: URLSearchParams): ExploreServerPathSearchParams =>
useMemo(
diff --git a/src/app/pages/client/home/CreateRoom.tsx b/src/app/pages/client/home/CreateRoom.tsx
index b1a01e63..30dc6b52 100644
--- a/src/app/pages/client/home/CreateRoom.tsx
+++ b/src/app/pages/client/home/CreateRoom.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Icon, Icons, Scroll, IconButton } from 'folds';
import {
Page,
diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx
index cc775dd4..fec44d6c 100644
--- a/src/app/pages/client/home/Home.tsx
+++ b/src/app/pages/client/home/Home.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import {
Avatar,
@@ -18,7 +18,7 @@ import {
import { useVirtualizer } from '@tanstack/react-virtual';
import { useAtom, useAtomValue } from 'jotai';
import FocusTrap from 'focus-trap-react';
-import { factoryRoomIdByActivity, factoryRoomIdByAtoZ } from '$appUtils/sort';
+import { factoryRoomIdByActivity, factoryRoomIdByAtoZ } from '$utils/sort';
import {
NavButton,
NavCategory,
@@ -37,10 +37,9 @@ import {
getHomeSearchPath,
withSearchParam,
} from '$pages/pathUtils';
-import { getCanonicalAliasOrRoomId } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId } from '$utils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { useHomeCreateSelected, useHomeSearchSelected } from '$hooks/router/useHomeSelected';
-import { useHomeRooms } from './useHomeRooms';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { VirtualTile } from '$components/virtualizer';
import { RoomNavCategoryButton, RoomNavItem } from '$features/room-nav';
@@ -50,9 +49,9 @@ import { useCategoryHandler } from '$hooks/useCategoryHandler';
import { useNavToActivePathMapper } from '$hooks/useNavToActivePathMapper';
import { PageNav, PageNavHeader, PageNavContent } from '$components/page';
import { useRoomsUnread } from '$state/hooks/unread';
-import { markAsRead } from '$appUtils/notifications';
+import { markAsRead } from '$utils/notifications';
import { useClosedNavCategoriesAtom } from '$state/hooks/closedNavCategories';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
import {
@@ -61,8 +60,9 @@ import {
} from '$hooks/useRoomsNotificationPreferences';
import { UseStateProvider } from '$components/UseStateProvider';
import { JoinAddressPrompt } from '$components/join-address-prompt';
-import { _RoomSearchParams } from '$pages/paths';
+import { RoomSearchParams } from '$pages/paths';
import { CallNavStatus } from '$features/room-nav/RoomCallNavStatus';
+import { useHomeRooms } from './useHomeRooms';
type HomeMenuProps = {
requestClose: () => void;
@@ -282,7 +282,7 @@ export function Home() {
const path = getHomeRoomPath(roomIdOrAlias, eventId);
navigate(
viaServers
- ? withSearchParam<_RoomSearchParams>(path, {
+ ? withSearchParam(path, {
viaServers: encodeSearchParamValueArray(viaServers),
})
: path
diff --git a/src/app/pages/client/home/RoomProvider.tsx b/src/app/pages/client/home/RoomProvider.tsx
index 5bf71b5a..b6f7ba7e 100644
--- a/src/app/pages/client/home/RoomProvider.tsx
+++ b/src/app/pages/client/home/RoomProvider.tsx
@@ -1,11 +1,11 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { IsDirectRoomProvider, RoomProvider } from '$hooks/useRoom';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { JoinBeforeNavigate } from '$features/join-before-navigate';
-import { useHomeRooms } from './useHomeRooms';
import { useSearchParamsViaServers } from '$hooks/router/useSearchParamsViaServers';
+import { useHomeRooms } from './useHomeRooms';
export function HomeRouteRoomProvider({ children }: { children: ReactNode }) {
const mx = useMatrixClient();
diff --git a/src/app/pages/client/home/Search.tsx b/src/app/pages/client/home/Search.tsx
index 314fec4d..0deca3e1 100644
--- a/src/app/pages/client/home/Search.tsx
+++ b/src/app/pages/client/home/Search.tsx
@@ -1,10 +1,10 @@
-import React, { useRef } from 'react';
+import { useRef } from 'react';
import { Box, Icon, Icons, Text, Scroll, IconButton } from 'folds';
import { Page, PageContent, PageContentCenter, PageHeader } from '$components/page';
import { MessageSearch } from '$features/message-search';
-import { useHomeRooms } from './useHomeRooms';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { BackRouteHandler } from '$components/BackRouteHandler';
+import { useHomeRooms } from './useHomeRooms';
export function HomeSearch() {
const scrollRef = useRef(null);
diff --git a/src/app/pages/client/inbox/Inbox.tsx b/src/app/pages/client/inbox/Inbox.tsx
index f63555ce..66143551 100644
--- a/src/app/pages/client/inbox/Inbox.tsx
+++ b/src/app/pages/client/inbox/Inbox.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Avatar, Box, Icon, Icons, Text } from 'folds';
import { useAtomValue } from 'jotai';
import { NavCategory, NavItem, NavItemContent, NavLink } from '$components/nav';
diff --git a/src/app/pages/client/inbox/Invites.tsx b/src/app/pages/client/inbox/Invites.tsx
index fc35755d..8eeff6ad 100644
--- a/src/app/pages/client/inbox/Invites.tsx
+++ b/src/app/pages/client/inbox/Invites.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useRef, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
import {
Avatar,
Badge,
@@ -19,9 +19,8 @@ import {
} from 'folds';
import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
-import { RoomTopicEventContent } from '$types/matrix-sdk';
+import { RoomTopicEventContent, MatrixClient, MatrixError, Room } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
-import { MatrixClient, MatrixError, Room } from '$types/matrix-sdk';
import {
Page,
PageContent,
@@ -43,18 +42,18 @@ import {
getStateEvent,
isDirectInvite,
isSpace,
-} from '$appUtils/room';
-import { nameInitials } from '$appUtils/common';
+} from '$utils/room';
+import { nameInitials } from '$utils/common';
import { RoomAvatar } from '$components/room-avatar';
import {
addRoomIdToMDirect,
getMxIdLocalPart,
guessDmRoomUserId,
rateLimitedActions,
-} from '$appUtils/matrix';
+} from '$utils/matrix';
import { Time } from '$components/message';
import { useElementSizeObserver } from '$hooks/useElementSizeObserver';
-import { onEnterOrSpace, stopPropagation } from '$appUtils/keyboard';
+import { onEnterOrSpace, stopPropagation } from '$utils/keyboard';
import { RoomTopicViewer } from '$components/room-topic-viewer';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
diff --git a/src/app/pages/client/inbox/Notifications.tsx b/src/app/pages/client/inbox/Notifications.tsx
index 697486dd..7a05f3a3 100644
--- a/src/app/pages/client/inbox/Notifications.tsx
+++ b/src/app/pages/client/inbox/Notifications.tsx
@@ -1,5 +1,5 @@
/* eslint-disable react/destructuring-assignment */
-import React, { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
Avatar,
Box,
@@ -30,7 +30,7 @@ import { useAtomValue } from 'jotai';
import { nicknamesAtom } from '$state/nicknames';
import { Page, PageContent, PageContentCenter, PageHeader } from '$components/page';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
import { InboxNotificationsPathSearchParams } from '$pages/paths';
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { SequenceCard } from '$components/sequence-card';
@@ -40,7 +40,7 @@ import {
getMemberAvatarMxc,
getMemberDisplayName,
getRoomAvatarUrl,
-} from '$appUtils/room';
+} from '$utils/room';
import { ScrollTopContainer } from '$components/scroll-top-container';
import { useInterval } from '$hooks/useInterval';
import {
@@ -74,7 +74,7 @@ import * as customHtmlCss from '$styles/CustomHtml.css';
import { useRoomNavigate } from '$hooks/useRoomNavigate';
import { useRoomUnread } from '$state/hooks/unread';
import { roomToUnreadAtom } from '$state/room/roomToUnread';
-import { markAsRead } from '$appUtils/notifications';
+import { markAsRead } from '$utils/notifications';
import { ContainerColor } from '$styles/ContainerColor.css';
import { VirtualTile } from '$components/virtualizer';
import { UserAvatar } from '$components/user-avatar';
@@ -89,7 +89,7 @@ import { usePowerLevels } from '$hooks/usePowerLevels';
import { usePowerLevelTags } from '$hooks/usePowerLevelTags';
import { useTheme } from '$hooks/useTheme';
import { PowerIcon } from '$components/power';
-import colorMXID from '$util/colorMXID';
+import colorMXID from '$utils/colorMXID';
import { mDirectAtom } from '$state/mDirectList';
import {
getPowerTagIconSrc,
@@ -593,11 +593,11 @@ export function Notifications() {
setSearchParams();
};
- const [notificationTimeline, _loadTimeline, silentReloadTimeline] = useNotificationTimeline(
+ const [notificationTimeline, loadTimelineRaw, silentReloadTimeline] = useNotificationTimeline(
24,
onlyHighlight
);
- const [timelineState, loadTimeline] = useAsyncCallback(_loadTimeline);
+ const [timelineState, loadTimeline] = useAsyncCallback(loadTimelineRaw);
const virtualizer = useVirtualizer({
count: notificationTimeline.groups.length,
diff --git a/src/app/pages/client/sidebar/AccountSwitcherTab.tsx b/src/app/pages/client/sidebar/AccountSwitcherTab.tsx
index 0e3dd8c9..a41e7172 100644
--- a/src/app/pages/client/sidebar/AccountSwitcherTab.tsx
+++ b/src/app/pages/client/sidebar/AccountSwitcherTab.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, useCallback, useState } from 'react';
+import { MouseEvent, MouseEventHandler, useCallback, useState } from 'react';
import {
Box,
Icon,
@@ -20,9 +20,9 @@ import { useNavigate } from 'react-router-dom';
import { sessionsAtom, activeSessionIdAtom, Session } from '$state/sessions';
import { SidebarItem, SidebarItemTooltip, SidebarAvatar } from '$components/sidebar';
import { UserAvatar } from '$components/user-avatar';
-import { nameInitials } from '$appUtils/common';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
-import { stopPropagation } from '$appUtils/keyboard';
+import { nameInitials } from '$utils/common';
+import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
+import { stopPropagation } from '$utils/keyboard';
import { getHomePath, getLoginPath, withSearchParam } from '$pages/pathUtils';
import { logoutClient, initClient } from '$client/initMatrix';
import { useMatrixClient } from '$hooks/useMatrixClient';
@@ -31,7 +31,7 @@ import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useSessionProfiles } from '$hooks/useSessionProfiles';
import { Settings } from '$features/settings';
import { Modal500 } from '$components/Modal500';
-import { createLogger } from '$appUtils/debug';
+import { createLogger } from '$utils/debug';
import { useClientConfig } from '$hooks/useClientConfig';
const log = createLogger('AccountSwitcherTab');
@@ -88,7 +88,7 @@ function AccountRow({
fill="None"
size="400"
radii="300"
- onClick={(e: React.MouseEvent) => {
+ onClick={(e: MouseEvent) => {
e.stopPropagation();
onSignOut(session);
}}
diff --git a/src/app/pages/client/sidebar/CreateTab.tsx b/src/app/pages/client/sidebar/CreateTab.tsx
index e213d329..0d93621a 100644
--- a/src/app/pages/client/sidebar/CreateTab.tsx
+++ b/src/app/pages/client/sidebar/CreateTab.tsx
@@ -1,9 +1,9 @@
-import React, { MouseEventHandler, useState } from 'react';
+import { MouseEventHandler, useState } from 'react';
import { Box, config, Icon, Icons, Menu, PopOut, RectCords, Text } from 'folds';
import FocusTrap from 'focus-trap-react';
import { useNavigate } from 'react-router-dom';
import { SidebarAvatar, SidebarItem, SidebarItemTooltip } from '$components/sidebar';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { SequenceCard } from '$components/sequence-card';
import { SettingTile } from '$components/setting-tile';
import { ContainerColor } from '$styles/ContainerColor.css';
@@ -15,7 +15,7 @@ import {
} from '$pages/pathUtils';
import { useCreateSelected } from '$hooks/router/useCreateSelected';
import { JoinAddressPrompt } from '$components/join-address-prompt';
-import { _RoomSearchParams } from '$pages/paths';
+import { RoomSearchParams } from '$pages/paths';
export function CreateTab() {
const createSelected = useCreateSelected();
@@ -118,7 +118,7 @@ export function CreateTab() {
const path = getSpacePath(roomIdOrAlias);
navigate(
viaServers
- ? withSearchParam<_RoomSearchParams>(path, {
+ ? withSearchParam(path, {
viaServers: encodeSearchParamValueArray(viaServers),
})
: path
diff --git a/src/app/pages/client/sidebar/DirectTab.tsx b/src/app/pages/client/sidebar/DirectTab.tsx
index 258a59aa..01d7ce3f 100644
--- a/src/app/pages/client/sidebar/DirectTab.tsx
+++ b/src/app/pages/client/sidebar/DirectTab.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Box, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
import FocusTrap from 'focus-trap-react';
@@ -20,11 +20,11 @@ import { useDirectSelected } from '$hooks/router/useDirectSelected';
import { UnreadBadge } from '$components/unread-badge';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useNavToActivePathAtom } from '$state/hooks/navToActivePath';
-import { useDirectRooms } from '../direct/useDirectRooms';
-import { markAsRead } from '$appUtils/notifications';
-import { stopPropagation } from '$appUtils/keyboard';
+import { markAsRead } from '$utils/notifications';
+import { stopPropagation } from '$utils/keyboard';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
+import { useDirectRooms } from '$pages/client/direct/useDirectRooms';
type DirectMenuProps = {
requestClose: () => void;
diff --git a/src/app/pages/client/sidebar/ExploreTab.tsx b/src/app/pages/client/sidebar/ExploreTab.tsx
index d1c1c147..ee65975e 100644
--- a/src/app/pages/client/sidebar/ExploreTab.tsx
+++ b/src/app/pages/client/sidebar/ExploreTab.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Icon, Icons } from 'folds';
import { useNavigate } from 'react-router-dom';
import { useAtomValue } from 'jotai';
@@ -12,7 +11,7 @@ import {
} from '$pages/pathUtils';
import { useClientConfig } from '$hooks/useClientConfig';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdServer } from '$appUtils/matrix';
+import { getMxIdServer } from '$utils/matrix';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useNavToActivePathAtom } from '$state/hooks/navToActivePath';
diff --git a/src/app/pages/client/sidebar/HomeTab.tsx b/src/app/pages/client/sidebar/HomeTab.tsx
index 5e2eadb6..74f7adfa 100644
--- a/src/app/pages/client/sidebar/HomeTab.tsx
+++ b/src/app/pages/client/sidebar/HomeTab.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, forwardRef, useState } from 'react';
+import { MouseEventHandler, forwardRef, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Box, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
import { useAtomValue } from 'jotai';
@@ -21,11 +21,11 @@ import { useHomeSelected } from '$hooks/router/useHomeSelected';
import { UnreadBadge } from '$components/unread-badge';
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
import { useNavToActivePathAtom } from '$state/hooks/navToActivePath';
-import { useHomeRooms } from '../home/useHomeRooms';
-import { markAsRead } from '$appUtils/notifications';
-import { stopPropagation } from '$appUtils/keyboard';
+import { markAsRead } from '$utils/notifications';
+import { stopPropagation } from '$utils/keyboard';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
+import { useHomeRooms } from '$pages/client/home/useHomeRooms';
type HomeMenuProps = {
requestClose: () => void;
diff --git a/src/app/pages/client/sidebar/InboxTab.tsx b/src/app/pages/client/sidebar/InboxTab.tsx
index c2ffbe20..ec3bb21d 100644
--- a/src/app/pages/client/sidebar/InboxTab.tsx
+++ b/src/app/pages/client/sidebar/InboxTab.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { useNavigate } from 'react-router-dom';
import { Icon, Icons } from 'folds';
import { useAtomValue } from 'jotai';
diff --git a/src/app/pages/client/sidebar/SearchTab.tsx b/src/app/pages/client/sidebar/SearchTab.tsx
index ed75ff06..c3ef38c5 100644
--- a/src/app/pages/client/sidebar/SearchTab.tsx
+++ b/src/app/pages/client/sidebar/SearchTab.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Icon, Icons } from 'folds';
import { useAtom } from 'jotai';
import { SidebarAvatar, SidebarItem, SidebarItemTooltip } from '$components/sidebar';
diff --git a/src/app/pages/client/sidebar/SettingsTab.tsx b/src/app/pages/client/sidebar/SettingsTab.tsx
deleted file mode 100644
index 8e495d2e..00000000
--- a/src/app/pages/client/sidebar/SettingsTab.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React, { useState } from 'react';
-import { Text } from 'folds';
-import { SidebarItem, SidebarItemTooltip, SidebarAvatar } from '$components/sidebar';
-import { UserAvatar } from '$components/user-avatar';
-import { useMatrixClient } from '$hooks/useMatrixClient';
-import { getMxIdLocalPart, mxcUrlToHttp } from '$appUtils/matrix';
-import { nameInitials } from '$appUtils/common';
-import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
-import { Settings } from '$features/settings';
-import { useUserProfile } from '$hooks/useUserProfile';
-import { Modal500 } from '$components/Modal500';
-
-export function SettingsTab() {
- const mx = useMatrixClient();
- const useAuthentication = useMediaAuthentication();
- const userId = mx.getUserId()!;
- const profile = useUserProfile(userId);
-
- const [settings, setSettings] = useState(false);
-
- const displayName = profile.displayName ?? getMxIdLocalPart(userId) ?? userId;
- const avatarUrl = profile.avatarUrl
- ? (mxcUrlToHttp(mx, profile.avatarUrl, useAuthentication, 96, 96, 'crop') ?? undefined)
- : undefined;
-
- const openSettings = () => setSettings(true);
- const closeSettings = () => setSettings(false);
-
- return (
-
-
- {(triggerRef) => (
-
- {nameInitials(displayName)}}
- />
-
- )}
-
- {settings && (
-
-
-
- )}
-
- );
-}
diff --git a/src/app/pages/client/sidebar/SpaceTabs.tsx b/src/app/pages/client/sidebar/SpaceTabs.tsx
index 95906a00..99f54040 100644
--- a/src/app/pages/client/sidebar/SpaceTabs.tsx
+++ b/src/app/pages/client/sidebar/SpaceTabs.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
MouseEventHandler,
ReactNode,
RefObject,
@@ -61,9 +61,9 @@ import {
import { RoomUnreadProvider, RoomsUnreadProvider } from '$components/RoomUnreadProvider';
import { useSelectedSpace } from '$hooks/router/useSelectedSpace';
import { UnreadBadge } from '$components/unread-badge';
-import { getCanonicalAliasOrRoomId, isRoomAlias } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId, isRoomAlias } from '$utils/matrix';
import { RoomAvatar } from '$components/room-avatar';
-import { nameInitials, randomStr } from '$appUtils/common';
+import { nameInitials, randomStr } from '$utils/common';
import {
ISidebarFolder,
SidebarItems,
@@ -80,12 +80,12 @@ import { useOpenedSidebarFolderAtom } from '$state/hooks/openedSidebarFolder';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { useRoomsUnread } from '$state/hooks/unread';
import { roomToUnreadAtom } from '$state/room/roomToUnread';
-import { markAsRead } from '$appUtils/notifications';
-import { copyToClipboard } from '$appUtils/dom';
-import { stopPropagation } from '$appUtils/keyboard';
+import { markAsRead } from '$utils/notifications';
+import { copyToClipboard } from '$utils/dom';
+import { stopPropagation } from '$utils/keyboard';
import { getMatrixToRoom } from '$plugins/matrix-to';
import { getViaServers } from '$plugins/via-servers';
-import { getRoomAvatarUrl } from '$appUtils/room';
+import { getRoomAvatarUrl } from '$utils/room';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
diff --git a/src/app/pages/client/sidebar/UnverifiedTab.tsx b/src/app/pages/client/sidebar/UnverifiedTab.tsx
index 07f47304..3aca6655 100644
--- a/src/app/pages/client/sidebar/UnverifiedTab.tsx
+++ b/src/app/pages/client/sidebar/UnverifiedTab.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Badge, color, Icon, Icons, Text } from 'folds';
import {
SidebarAvatar,
@@ -8,7 +8,6 @@ import {
} from '$components/sidebar';
import { useDeviceIds, useDeviceList, useSplitCurrentDevice } from '$hooks/useDeviceList';
import { useMatrixClient } from '$hooks/useMatrixClient';
-import * as css from './UnverifiedTab.css';
import {
useDeviceVerificationStatus,
useUnverifiedDeviceCount,
@@ -17,6 +16,7 @@ import {
import { useCrossSigningActive } from '$hooks/useCrossSigning';
import { Modal500 } from '$components/Modal500';
import { Settings, SettingsPages } from '$features/settings';
+import * as css from './UnverifiedTab.css';
function UnverifiedIndicator() {
const mx = useMatrixClient();
diff --git a/src/app/pages/client/space/RoomProvider.tsx b/src/app/pages/client/space/RoomProvider.tsx
index 6320bc48..411efc16 100644
--- a/src/app/pages/client/space/RoomProvider.tsx
+++ b/src/app/pages/client/space/RoomProvider.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { useAtom, useAtomValue } from 'jotai';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
@@ -6,7 +6,7 @@ import { IsDirectRoomProvider, RoomProvider } from '$hooks/useRoom';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { JoinBeforeNavigate } from '$features/join-before-navigate';
import { useSpace } from '$hooks/useSpace';
-import { getAllParents, getSpaceChildren } from '$appUtils/room';
+import { getAllParents, getSpaceChildren } from '$utils/room';
import { roomToParentsAtom } from '$state/room/roomToParents';
import { allRoomsAtom } from '$state/room-list/roomList';
import { useSearchParamsViaServers } from '$hooks/router/useSearchParamsViaServers';
diff --git a/src/app/pages/client/space/Search.tsx b/src/app/pages/client/space/Search.tsx
index 83162ef4..c2b4c15c 100644
--- a/src/app/pages/client/space/Search.tsx
+++ b/src/app/pages/client/space/Search.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import { useRef } from 'react';
import { Box, Icon, Icons, Text, Scroll, IconButton } from 'folds';
import { useAtomValue } from 'jotai';
import { Page, PageContent, PageContentCenter, PageHeader } from '$components/page';
diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx
index b6b85e85..a774c8fa 100644
--- a/src/app/pages/client/space/Space.tsx
+++ b/src/app/pages/client/space/Space.tsx
@@ -1,11 +1,4 @@
-import React, {
- MouseEventHandler,
- forwardRef,
- useCallback,
- useMemo,
- useRef,
- useState,
-} from 'react';
+import { MouseEventHandler, forwardRef, useCallback, useMemo, useRef, useState } from 'react';
import { useAtom, useAtomValue } from 'jotai';
import {
Avatar,
@@ -26,14 +19,13 @@ import {
toRem,
} from 'folds';
import { useVirtualizer } from '@tanstack/react-virtual';
-import { JoinRule, Room } from '$types/matrix-sdk';
-import { RoomJoinRulesEventContent } from '$types/matrix-sdk';
+import { JoinRule, Room, RoomJoinRulesEventContent } from '$types/matrix-sdk';
import FocusTrap from 'focus-trap-react';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { mDirectAtom } from '$state/mDirectList';
import { NavCategory, NavCategoryHeader, NavItem, NavItemContent, NavLink } from '$components/nav';
import { getSpaceLobbyPath, getSpaceRoomPath, getSpaceSearchPath } from '$pages/pathUtils';
-import { getCanonicalAliasOrRoomId, isRoomAlias } from '$appUtils/matrix';
+import { getCanonicalAliasOrRoomId, isRoomAlias } from '$utils/matrix';
import { useSelectedRoom } from '$hooks/router/useSelectedRoom';
import { useSpaceLobbySelected, useSpaceSearchSelected } from '$hooks/router/useSelectedSpace';
import { useSpace } from '$hooks/useSpace';
@@ -50,15 +42,15 @@ import { PageNav, PageNavContent, PageNavHeader } from '$components/page';
import { usePowerLevels } from '$hooks/usePowerLevels';
import { useRecursiveChildScopeFactory, useSpaceChildren } from '$state/hooks/roomList';
import { roomToParentsAtom } from '$state/room/roomToParents';
-import { markAsRead } from '$appUtils/notifications';
+import { markAsRead } from '$utils/notifications';
import { useRoomsUnread } from '$state/hooks/unread';
import { UseStateProvider } from '$components/UseStateProvider';
import { LeaveSpacePrompt } from '$components/leave-space-prompt';
-import { copyToClipboard } from '$appUtils/dom';
+import { copyToClipboard } from '$utils/dom';
import { useClosedNavCategoriesAtom } from '$state/hooks/closedNavCategories';
import { useStateEvent } from '$hooks/useStateEvent';
import { Membership, StateEvent } from '$types/matrix/room';
-import { stopPropagation } from '$appUtils/keyboard';
+import { stopPropagation } from '$utils/keyboard';
import { getMatrixToRoom } from '$plugins/matrix-to';
import { getViaServers } from '$plugins/via-servers';
import { useSetting } from '$state/hooks/settings';
@@ -76,12 +68,11 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { BreakWord } from '$styles/Text.css';
import { InviteUserPrompt } from '$components/invite-user-prompt';
import { CallNavStatus } from '$features/room-nav/RoomCallNavStatus';
-import { useCallState } from '../call/CallProvider';
-import { SwipeableChatWrapper } from '$components/SwipeableChatWrapper';
-import { mobileOrTablet } from '$appUtils/user-agent';
+import { mobileOrTablet } from '$utils/user-agent';
import { useNavigate } from 'react-router-dom';
import { lastVisitedRoomIdAtom } from '$state/room/lastRoom';
import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper';
+import { useCallState } from '$pages/client/call/CallProvider';
type SpaceMenuProps = {
room: Room;
diff --git a/src/app/pages/client/space/SpaceProvider.tsx b/src/app/pages/client/space/SpaceProvider.tsx
index f279eb7d..cc2eb5bd 100644
--- a/src/app/pages/client/space/SpaceProvider.tsx
+++ b/src/app/pages/client/space/SpaceProvider.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { useMatrixClient } from '$hooks/useMatrixClient';
import { useSpaces } from '$state/hooks/roomList';
diff --git a/src/app/pages/pathSearchParam.ts b/src/app/pages/pathSearchParam.ts
index 8e4c93e5..813abc3d 100644
--- a/src/app/pages/pathSearchParam.ts
+++ b/src/app/pages/pathSearchParam.ts
@@ -1,8 +1,8 @@
-import { _RoomSearchParams, DirectCreateSearchParams } from './paths';
+import { RoomSearchParams, DirectCreateSearchParams } from './paths';
type SearchParamsGetter = (searchParams: URLSearchParams) => T;
-export const getRoomSearchParams: SearchParamsGetter<_RoomSearchParams> = (searchParams) => ({
+export const getRoomSearchParams: SearchParamsGetter = (searchParams) => ({
viaServers: searchParams.get('viaServers') ?? undefined,
});
diff --git a/src/app/pages/pathUtils.ts b/src/app/pages/pathUtils.ts
index 817d21d1..3872c929 100644
--- a/src/app/pages/pathUtils.ts
+++ b/src/app/pages/pathUtils.ts
@@ -1,4 +1,6 @@
import { generatePath, Path } from 'react-router-dom';
+import { trimLeadingSlash, trimTrailingSlash } from '$utils/common';
+import { HashRouterConfig } from '$hooks/useClientConfig';
import {
DIRECT_CREATE_PATH,
DIRECT_PATH,
@@ -24,8 +26,6 @@ import {
SPACE_SEARCH_PATH,
CREATE_PATH,
} from './paths';
-import { trimLeadingSlash, trimTrailingSlash } from '../utils/common';
-import { HashRouterConfig } from '../hooks/useClientConfig';
export const joinPathComponent = (path: Path): string => path.pathname + path.search + path.hash;
diff --git a/src/app/pages/paths.ts b/src/app/pages/paths.ts
index 399354e4..06b1faf0 100644
--- a/src/app/pages/paths.ts
+++ b/src/app/pages/paths.ts
@@ -19,51 +19,51 @@ export type ResetPasswordPathSearchParams = {
};
export const RESET_PASSWORD_PATH = '/reset-password/:server?/';
-export const _CREATE_PATH = 'create/';
-export const _JOIN_PATH = 'join/';
-export const _LOBBY_PATH = 'lobby/';
+export const CREATE_PATH_SEGMENT = 'create/';
+export const JOIN_PATH_SEGMENT = 'join/';
+export const LOBBY_PATH_SEGMENT = 'lobby/';
/**
* array of rooms and senders mxId assigned
* to search param as string should be "," separated
* Like: url?rooms=!one:server,!two:server
*/
-export type _SearchPathSearchParams = {
+export type SearchPathSearchParams = {
global?: string;
term?: string;
order?: string;
rooms?: string;
senders?: string;
};
-export const _SEARCH_PATH = 'search/';
+export const SEARCH_PATH_SEGMENT = 'search/';
-export type _RoomSearchParams = {
+export type RoomSearchParams = {
/* comma separated string of servers */
viaServers?: string;
};
-export const _ROOM_PATH = ':roomIdOrAlias/:eventId?/';
+export const ROOM_PATH_SEGMENT = ':roomIdOrAlias/:eventId?/';
export const HOME_PATH = '/home/';
-export const HOME_CREATE_PATH = `/home/${_CREATE_PATH}`;
-export const HOME_JOIN_PATH = `/home/${_JOIN_PATH}`;
-export const HOME_SEARCH_PATH = `/home/${_SEARCH_PATH}`;
-export const HOME_ROOM_PATH = `/home/${_ROOM_PATH}`;
+export const HOME_CREATE_PATH = `/home/${CREATE_PATH_SEGMENT}`;
+export const HOME_JOIN_PATH = `/home/${JOIN_PATH_SEGMENT}`;
+export const HOME_SEARCH_PATH = `/home/${SEARCH_PATH_SEGMENT}`;
+export const HOME_ROOM_PATH = `/home/${ROOM_PATH_SEGMENT}`;
export const DIRECT_PATH = '/direct/';
export type DirectCreateSearchParams = {
userId?: string;
};
-export const DIRECT_CREATE_PATH = `/direct/${_CREATE_PATH}`;
-export const DIRECT_ROOM_PATH = `/direct/${_ROOM_PATH}`;
+export const DIRECT_CREATE_PATH = `/direct/${CREATE_PATH_SEGMENT}`;
+export const DIRECT_ROOM_PATH = `/direct/${ROOM_PATH_SEGMENT}`;
export const SPACE_PATH = '/:spaceIdOrAlias/';
-export const SPACE_LOBBY_PATH = `/:spaceIdOrAlias/${_LOBBY_PATH}`;
-export const SPACE_SEARCH_PATH = `/:spaceIdOrAlias/${_SEARCH_PATH}`;
-export const SPACE_ROOM_PATH = `/:spaceIdOrAlias/${_ROOM_PATH}`;
+export const SPACE_LOBBY_PATH = `/:spaceIdOrAlias/${LOBBY_PATH_SEGMENT}`;
+export const SPACE_SEARCH_PATH = `/:spaceIdOrAlias/${SEARCH_PATH_SEGMENT}`;
+export const SPACE_ROOM_PATH = `/:spaceIdOrAlias/${ROOM_PATH_SEGMENT}`;
-export const _FEATURED_PATH = 'featured/';
-export const _SERVER_PATH = ':server/';
+export const FEATURED_PATH_SEGMENT = 'featured/';
+export const SERVER_PATH_SEGMENT = ':server/';
export const EXPLORE_PATH = '/explore/';
-export const EXPLORE_FEATURED_PATH = `/explore/${_FEATURED_PATH}`;
+export const EXPLORE_FEATURED_PATH = `/explore/${FEATURED_PATH_SEGMENT}`;
export type ExploreServerPathSearchParams = {
limit?: string;
@@ -72,18 +72,18 @@ export type ExploreServerPathSearchParams = {
type?: string;
instance?: string;
};
-export const EXPLORE_SERVER_PATH = `/explore/${_SERVER_PATH}`;
+export const EXPLORE_SERVER_PATH = `/explore/${SERVER_PATH_SEGMENT}`;
export const CREATE_PATH = '/create';
-export const _NOTIFICATIONS_PATH = 'notifications/';
-export const _INVITES_PATH = 'invites/';
+export const NOTIFICATIONS_PATH_SEGMENT = 'notifications/';
+export const INVITES_PATH_SEGMENT = 'invites/';
export const INBOX_PATH = '/inbox/';
export type InboxNotificationsPathSearchParams = {
only?: string;
};
-export const INBOX_NOTIFICATIONS_PATH = `/inbox/${_NOTIFICATIONS_PATH}`;
-export const INBOX_INVITES_PATH = `/inbox/${_INVITES_PATH}`;
+export const INBOX_NOTIFICATIONS_PATH = `/inbox/${NOTIFICATIONS_PATH_SEGMENT}`;
+export const INBOX_INVITES_PATH = `/inbox/${INVITES_PATH_SEGMENT}`;
export const _TO_PATH = '/to';
export const TO_ROOM_EVENT_PATH = `${_TO_PATH}/:room_id/:event_id?`;
diff --git a/src/app/plugins/bad-words.ts b/src/app/plugins/bad-words.ts
index bb6073d8..74fcaddb 100644
--- a/src/app/plugins/bad-words.ts
+++ b/src/app/plugins/bad-words.ts
@@ -1,5 +1,5 @@
import * as badWords from 'badwords-list';
-import { sanitizeForRegex } from '../utils/regex';
+import { sanitizeForRegex } from '$utils/regex';
const additionalBadWords: string[] = ['torture', 't0rture'];
diff --git a/src/app/plugins/color.ts b/src/app/plugins/color.ts
index 47c73170..97b756e3 100644
--- a/src/app/plugins/color.ts
+++ b/src/app/plugins/color.ts
@@ -1,5 +1,5 @@
import chroma from 'chroma-js';
-import { ThemeKind } from '../hooks/useTheme';
+import { ThemeKind } from '$hooks/useTheme';
export const accessibleColor = (themeKind: ThemeKind, color: string): string => {
if (!chroma.valid(color)) return color;
diff --git a/src/app/plugins/custom-emoji/utils.ts b/src/app/plugins/custom-emoji/utils.ts
index 37e832c0..4b35cad1 100644
--- a/src/app/plugins/custom-emoji/utils.ts
+++ b/src/app/plugins/custom-emoji/utils.ts
@@ -1,9 +1,9 @@
import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
-import { ImagePack } from './ImagePack';
-import { EmoteRoomsContent, ImageUsage } from './types';
import { StateEvent } from '$types/matrix/room';
-import { getAccountData, getStateEvent, getStateEvents } from '$appUtils/room';
+import { getAccountData, getStateEvent, getStateEvents } from '$utils/room';
import { AccountDataEvent } from '$types/matrix/accountData';
+import { ImageUsage } from './types';
+import { ImagePack } from './ImagePack';
import { PackMetaReader } from './PackMetaReader';
import { PackAddress } from './PackAddress';
@@ -49,9 +49,7 @@ export function getRoomImagePacks(room: Room): ImagePack[] {
}
export function getGlobalImagePacks(mx: MatrixClient): ImagePack[] {
- const emoteRoomsContent = getAccountData(mx, AccountDataEvent.PoniesEmoteRooms)?.getContent() as
- | EmoteRoomsContent
- | undefined;
+ const emoteRoomsContent = getAccountData(mx, AccountDataEvent.PoniesEmoteRooms)?.getContent();
if (typeof emoteRoomsContent !== 'object') return [];
const { rooms: roomIdToPackInfo } = emoteRoomsContent;
diff --git a/src/app/plugins/markdown/block/parser.ts b/src/app/plugins/markdown/block/parser.ts
index a86ccb0e..b56d3e3b 100644
--- a/src/app/plugins/markdown/block/parser.ts
+++ b/src/app/plugins/markdown/block/parser.ts
@@ -1,4 +1,4 @@
-import { replaceMatch } from '../internal';
+import { replaceMatch } from '$plugins/markdown/internal';
import {
BlockQuoteRule,
CodeBlockRule,
diff --git a/src/app/plugins/markdown/block/runner.ts b/src/app/plugins/markdown/block/runner.ts
index 1dc8d8b8..8e80c95f 100644
--- a/src/app/plugins/markdown/block/runner.ts
+++ b/src/app/plugins/markdown/block/runner.ts
@@ -1,4 +1,4 @@
-import { replaceMatch } from '../internal';
+import { replaceMatch } from '$plugins/markdown/internal';
import { BlockMDParser, BlockMDRule } from './type';
/**
diff --git a/src/app/plugins/markdown/block/type.ts b/src/app/plugins/markdown/block/type.ts
index 0949eb70..9462e1d5 100644
--- a/src/app/plugins/markdown/block/type.ts
+++ b/src/app/plugins/markdown/block/type.ts
@@ -1,4 +1,4 @@
-import { MatchResult, MatchRule } from '../internal';
+import { MatchResult, MatchRule } from '$plugins/markdown/internal';
/**
* Type for a function that parses block-level markdown into HTML.
diff --git a/src/app/plugins/markdown/inline/runner.ts b/src/app/plugins/markdown/inline/runner.ts
index 3a794d25..62aef0e2 100644
--- a/src/app/plugins/markdown/inline/runner.ts
+++ b/src/app/plugins/markdown/inline/runner.ts
@@ -1,4 +1,4 @@
-import { MatchResult, replaceMatch } from '../internal';
+import { MatchResult, replaceMatch } from '$plugins/markdown/internal';
import { InlineMDParser, InlineMDRule } from './type';
/**
diff --git a/src/app/plugins/markdown/inline/type.ts b/src/app/plugins/markdown/inline/type.ts
index a65ad276..9b53d045 100644
--- a/src/app/plugins/markdown/inline/type.ts
+++ b/src/app/plugins/markdown/inline/type.ts
@@ -1,4 +1,4 @@
-import { MatchResult, MatchRule } from '../internal';
+import { MatchResult, MatchRule } from '$plugins/markdown/internal';
/**
* Type for a function that parses inline markdown into HTML.
diff --git a/src/app/plugins/markdown/utils.ts b/src/app/plugins/markdown/utils.ts
index 29b4eab6..8a0de61b 100644
--- a/src/app/plugins/markdown/utils.ts
+++ b/src/app/plugins/markdown/utils.ts
@@ -1,4 +1,4 @@
-import { findAndReplace } from '$appUtils/findAndReplace';
+import { findAndReplace } from '$utils/findAndReplace';
import { ESC_BLOCK_SEQ, UN_ESC_BLOCK_SEQ } from './block/rules';
import { EscapeRule, CAP_INLINE_SEQ } from './inline/rules';
import { runInlineRule } from './inline/runner';
diff --git a/src/app/plugins/matrix-to.ts b/src/app/plugins/matrix-to.ts
index feeafe05..03a7d2c1 100644
--- a/src/app/plugins/matrix-to.ts
+++ b/src/app/plugins/matrix-to.ts
@@ -16,11 +16,11 @@ export const getMatrixToRoom = (roomIdOrAlias: string, viaServers?: string[]): s
};
export const getMatrixToRoomEvent = (
- roomIdOrAlias: string,
+ roomId: string,
eventId: string,
viaServers?: string[]
): string => {
- let fragment = `${roomIdOrAlias}/${eventId}`;
+ let fragment = `${roomId}/${eventId}`;
if (Array.isArray(viaServers) && viaServers.length > 0) {
fragment = withViaServers(fragment, viaServers);
diff --git a/src/app/plugins/pdfjs-dist.ts b/src/app/plugins/pdfjs-dist.ts
index aad6e362..d23a7bcc 100644
--- a/src/app/plugins/pdfjs-dist.ts
+++ b/src/app/plugins/pdfjs-dist.ts
@@ -1,8 +1,8 @@
import { useCallback } from 'react';
import type * as PdfJsDist from 'pdfjs-dist';
import type { GetViewportParameters } from 'pdfjs-dist/types/src/display/api';
-import { useAsyncCallback } from '../hooks/useAsyncCallback';
-import { trimTrailingSlash } from '../utils/common';
+import { useAsyncCallback } from '$hooks/useAsyncCallback';
+import { trimTrailingSlash } from '$utils/common';
export const usePdfJSLoader = () =>
useAsyncCallback(
diff --git a/src/app/plugins/react-custom-html-parser.tsx b/src/app/plugins/react-custom-html-parser.tsx
index f1fb3ee1..c02fc6b2 100644
--- a/src/app/plugins/react-custom-html-parser.tsx
+++ b/src/app/plugins/react-custom-html-parser.tsx
@@ -1,5 +1,5 @@
/* eslint-disable jsx-a11y/alt-text */
-import React, {
+import {
ComponentPropsWithoutRef,
lazy,
ReactEventHandler,
@@ -21,27 +21,27 @@ import { IntermediateRepresentation, OptFn, Opts as LinkifyOpts } from 'linkifyj
import Linkify from 'linkify-react';
import { ErrorBoundary } from 'react-error-boundary';
import { ChildNode } from 'domhandler';
-import * as css from '../styles/CustomHtml.css';
+import * as css from '$styles/CustomHtml.css';
import {
getCanonicalAliasRoomId,
getMxIdLocalPart,
isRoomAlias,
mxcUrlToHttp,
-} from '../utils/matrix';
-import { getMemberDisplayName } from '../utils/room';
-import { Nicknames } from '../state/nicknames';
-import { EMOJI_PATTERN, sanitizeForRegex, URL_NEG_LB } from '../utils/regex';
-import { getHexcodeForEmoji, getShortcodeFor } from './emoji';
-import { findAndReplace } from '../utils/findAndReplace';
+} from '$utils/matrix';
+import { getMemberDisplayName } from '$utils/room';
+import { Nicknames } from '$state/nicknames';
+import { EMOJI_PATTERN, sanitizeForRegex, URL_NEG_LB } from '$utils/regex';
+import { findAndReplace } from '$utils/findAndReplace';
+import { onEnterOrSpace } from '$utils/keyboard';
+import { copyToClipboard } from '$utils/dom';
+import { useTimeoutToggle } from '$hooks/useTimeoutToggle';
import {
parseMatrixToRoom,
parseMatrixToRoomEvent,
parseMatrixToUser,
testMatrixTo,
} from './matrix-to';
-import { onEnterOrSpace } from '../utils/keyboard';
-import { copyToClipboard } from '../utils/dom';
-import { useTimeoutToggle } from '../hooks/useTimeoutToggle';
+import { getHexcodeForEmoji, getShortcodeFor } from './emoji';
const ReactPrism = lazy(() => import('./react-prism/ReactPrism'));
diff --git a/src/app/plugins/react-prism/ReactPrism.tsx b/src/app/plugins/react-prism/ReactPrism.tsx
index d18c2910..1d3bb90f 100644
--- a/src/app/plugins/react-prism/ReactPrism.tsx
+++ b/src/app/plugins/react-prism/ReactPrism.tsx
@@ -1,4 +1,4 @@
-import React, { MutableRefObject, ReactNode, useEffect, useRef } from 'react';
+import { MutableRefObject, ReactNode, useEffect, useRef } from 'react';
import Prism from 'prismjs';
diff --git a/src/app/plugins/recent-emoji.ts b/src/app/plugins/recent-emoji.ts
index eb846a9c..c511159d 100644
--- a/src/app/plugins/recent-emoji.ts
+++ b/src/app/plugins/recent-emoji.ts
@@ -1,7 +1,7 @@
import { MatrixClient } from '$types/matrix-sdk';
-import { getAccountData } from '../utils/room';
-import { IEmoji, emojis } from './emoji';
import { AccountDataEvent } from '$types/matrix/accountData';
+import { getAccountData } from '$utils/room';
+import { IEmoji, emojis } from './emoji';
type EmojiUnicode = string;
type EmojiUsageCount = number;
diff --git a/src/app/plugins/text-area/mods/Intent.ts b/src/app/plugins/text-area/mods/Intent.ts
index 35212b95..9ad8533d 100644
--- a/src/app/plugins/text-area/mods/Intent.ts
+++ b/src/app/plugins/text-area/mods/Intent.ts
@@ -1,6 +1,6 @@
-import { Cursor } from '../Cursor';
-import { Operations } from '../Operations';
-import { TextArea } from '../TextArea';
+import { Cursor } from '$plugins/text-area/Cursor';
+import { Operations } from '$plugins/text-area/Operations';
+import { TextArea } from '$plugins/text-area/TextArea';
export class Intent {
public readonly textArea: TextArea;
diff --git a/src/app/plugins/utils.ts b/src/app/plugins/utils.ts
index 27d27e7a..fc84b392 100644
--- a/src/app/plugins/utils.ts
+++ b/src/app/plugins/utils.ts
@@ -1,4 +1,4 @@
-import { SearchItemStrGetter } from '../hooks/useAsyncSearch';
+import { SearchItemStrGetter } from '$hooks/useAsyncSearch';
import { PackImageReader } from './custom-emoji';
import { IEmoji } from './emoji';
diff --git a/src/app/plugins/via-servers.ts b/src/app/plugins/via-servers.ts
index 4288eb65..e789e5f8 100644
--- a/src/app/plugins/via-servers.ts
+++ b/src/app/plugins/via-servers.ts
@@ -1,8 +1,8 @@
import { Room } from '$types/matrix-sdk';
-import { IPowerLevels } from '../hooks/usePowerLevels';
-import { creatorsSupported, getMxIdServer } from '../utils/matrix';
import { IRoomCreateContent, StateEvent } from '$types/matrix/room';
-import { getStateEvent } from '../utils/room';
+import { IPowerLevels } from '$hooks/usePowerLevels';
+import { creatorsSupported, getMxIdServer } from '$utils/matrix';
+import { getStateEvent } from '$utils/room';
export const getViaServers = (room: Room): string[] => {
const getHighestPowerUserId = (): string | undefined => {
diff --git a/src/app/state/createRoomModal.ts b/src/app/state/createRoomModal.ts
index f32e7665..16757ec7 100644
--- a/src/app/state/createRoomModal.ts
+++ b/src/app/state/createRoomModal.ts
@@ -1,5 +1,5 @@
import { atom } from 'jotai';
-import { CreateRoomType } from '../components/create-room/types';
+import { CreateRoomType } from '$components/create-room/types';
export type CreateRoomModalState = {
spaceId?: string;
diff --git a/src/app/state/hooks/closedLobbyCategories.ts b/src/app/state/hooks/closedLobbyCategories.ts
index 1545254f..19843b6e 100644
--- a/src/app/state/hooks/closedLobbyCategories.ts
+++ b/src/app/state/hooks/closedLobbyCategories.ts
@@ -1,5 +1,5 @@
import { createContext, useContext } from 'react';
-import { ClosedLobbyCategoriesAtom } from '../closedLobbyCategories';
+import { ClosedLobbyCategoriesAtom } from '$state/closedLobbyCategories';
const ClosedLobbyCategoriesAtomContext = createContext(null);
export const ClosedLobbyCategoriesProvider = ClosedLobbyCategoriesAtomContext.Provider;
diff --git a/src/app/state/hooks/closedNavCategories.ts b/src/app/state/hooks/closedNavCategories.ts
index ed34c1e6..38a962e4 100644
--- a/src/app/state/hooks/closedNavCategories.ts
+++ b/src/app/state/hooks/closedNavCategories.ts
@@ -1,5 +1,5 @@
import { createContext, useContext } from 'react';
-import { ClosedNavCategoriesAtom } from '../closedNavCategories';
+import { ClosedNavCategoriesAtom } from '$state/closedNavCategories';
const ClosedNavCategoriesAtomContext = createContext(null);
export const ClosedNavCategoriesProvider = ClosedNavCategoriesAtomContext.Provider;
diff --git a/src/app/state/hooks/createRoomModal.ts b/src/app/state/hooks/createRoomModal.ts
index 80ba21a8..8c1ec8b7 100644
--- a/src/app/state/hooks/createRoomModal.ts
+++ b/src/app/state/hooks/createRoomModal.ts
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
-import { createRoomModalAtom, CreateRoomModalState } from '../createRoomModal';
import { CreateRoomType } from '$components/create-room/types';
+import { createRoomModalAtom, CreateRoomModalState } from '$state/createRoomModal';
export const useCreateRoomModalState = (): CreateRoomModalState | undefined => {
const data = useAtomValue(createRoomModalAtom);
diff --git a/src/app/state/hooks/createSpaceModal.ts b/src/app/state/hooks/createSpaceModal.ts
index ea7cb47a..4661712d 100644
--- a/src/app/state/hooks/createSpaceModal.ts
+++ b/src/app/state/hooks/createSpaceModal.ts
@@ -1,6 +1,6 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
-import { createSpaceModalAtom, CreateSpaceModalState } from '../createSpaceModal';
+import { createSpaceModalAtom, CreateSpaceModalState } from '$state/createSpaceModal';
export const useCreateSpaceModalState = (): CreateSpaceModalState | undefined => {
const data = useAtomValue(createSpaceModalAtom);
diff --git a/src/app/state/hooks/inviteList.ts b/src/app/state/hooks/inviteList.ts
deleted file mode 100644
index 54729396..00000000
--- a/src/app/state/hooks/inviteList.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useAtomValue } from 'jotai';
-import { selectAtom } from 'jotai/utils';
-import { MatrixClient } from '$types/matrix-sdk';
-import { useCallback } from 'react';
-import { isDirectInvite, isRoom, isSpace, isUnsupportedRoom } from '$appUtils/room';
-import { compareRoomsEqual } from '../room-list/utils';
-import { allInvitesAtom } from '../room-list/inviteList';
-
-export const useSpaceInvites = (mx: MatrixClient, invitesAtom: typeof allInvitesAtom) => {
- const selector = useCallback(
- (rooms: string[]) => rooms.filter((roomId) => isSpace(mx.getRoom(roomId))),
- [mx]
- );
- return useAtomValue(selectAtom(invitesAtom, selector, compareRoomsEqual));
-};
-
-export const useRoomInvites = (
- mx: MatrixClient,
- invitesAtom: typeof allInvitesAtom,
- mDirects: Set
-) => {
- const selector = useCallback(
- (rooms: string[]) =>
- rooms.filter(
- (roomId) =>
- isRoom(mx.getRoom(roomId)) &&
- !(mDirects.has(roomId) || isDirectInvite(mx.getRoom(roomId), mx.getUserId()))
- ),
- [mx, mDirects]
- );
- return useAtomValue(selectAtom(invitesAtom, selector, compareRoomsEqual));
-};
-
-export const useDirectInvites = (
- mx: MatrixClient,
- invitesAtom: typeof allInvitesAtom,
- mDirects: Set
-) => {
- const selector = useCallback(
- (rooms: string[]) =>
- rooms.filter(
- (roomId) => mDirects.has(roomId) || isDirectInvite(mx.getRoom(roomId), mx.getUserId())
- ),
- [mx, mDirects]
- );
- return useAtomValue(selectAtom(invitesAtom, selector, compareRoomsEqual));
-};
-
-export const useUnsupportedInvites = (mx: MatrixClient, invitesAtom: typeof allInvitesAtom) => {
- const selector = useCallback(
- (rooms: string[]) => rooms.filter((roomId) => isUnsupportedRoom(mx.getRoom(roomId))),
- [mx]
- );
- return useAtomValue(selectAtom(invitesAtom, selector, compareRoomsEqual));
-};
diff --git a/src/app/state/hooks/navToActivePath.ts b/src/app/state/hooks/navToActivePath.ts
index 5f8798f2..41224760 100644
--- a/src/app/state/hooks/navToActivePath.ts
+++ b/src/app/state/hooks/navToActivePath.ts
@@ -1,5 +1,5 @@
import { createContext, useContext } from 'react';
-import { NavToActivePathAtom } from '../navToActivePath';
+import { NavToActivePathAtom } from '$state/navToActivePath';
const NavToActivePathAtomContext = createContext(null);
export const NavToActivePathProvider = NavToActivePathAtomContext.Provider;
diff --git a/src/app/state/hooks/openedSidebarFolder.ts b/src/app/state/hooks/openedSidebarFolder.ts
index 3a165334..6a5e61f9 100644
--- a/src/app/state/hooks/openedSidebarFolder.ts
+++ b/src/app/state/hooks/openedSidebarFolder.ts
@@ -1,5 +1,5 @@
import { createContext, useContext } from 'react';
-import { OpenedSidebarFolderAtom } from '../openedSidebarFolder';
+import { OpenedSidebarFolderAtom } from '$state/openedSidebarFolder';
const OpenedSidebarFolderAtomContext = createContext(null);
export const OpenedSidebarFolderProvider = OpenedSidebarFolderAtomContext.Provider;
diff --git a/src/app/state/hooks/roomList.ts b/src/app/state/hooks/roomList.ts
index a0c9cf2c..70890926 100644
--- a/src/app/state/hooks/roomList.ts
+++ b/src/app/state/hooks/roomList.ts
@@ -2,9 +2,9 @@ import { Atom, useAtomValue } from 'jotai';
import { selectAtom } from 'jotai/utils';
import { MatrixClient } from '$types/matrix-sdk';
import { useCallback, useMemo } from 'react';
-import { getAllParents, isRoom, isSpace, isUnsupportedRoom } from '$appUtils/room';
-import { compareRoomsEqual } from '../room-list/utils';
+import { getAllParents, isRoom, isSpace, isUnsupportedRoom } from '$utils/room';
import { RoomToParents } from '$types/matrix/room';
+import { compareRoomsEqual } from '$state/room-list/utils';
export type RoomsAtom = Atom;
export type RoomSelector = (roomId: string) => boolean | undefined;
diff --git a/src/app/state/hooks/roomSettings.ts b/src/app/state/hooks/roomSettings.ts
index 4d764916..8a078487 100644
--- a/src/app/state/hooks/roomSettings.ts
+++ b/src/app/state/hooks/roomSettings.ts
@@ -1,6 +1,6 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
-import { roomSettingsAtom, RoomSettingsPage, RoomSettingsState } from '../roomSettings';
+import { roomSettingsAtom, RoomSettingsPage, RoomSettingsState } from '$state/roomSettings';
export const useRoomSettingsState = (): RoomSettingsState | undefined => {
const data = useAtomValue(roomSettingsAtom);
diff --git a/src/app/state/hooks/settings.ts b/src/app/state/hooks/settings.ts
index d90c7664..d28c4833 100644
--- a/src/app/state/hooks/settings.ts
+++ b/src/app/state/hooks/settings.ts
@@ -1,7 +1,7 @@
import { atom, useAtomValue, useSetAtom } from 'jotai';
import { selectAtom } from 'jotai/utils';
import { useMemo } from 'react';
-import { Settings, settingsAtom as sAtom } from '../settings';
+import { Settings, settingsAtom as sAtom } from '$state/settings';
export type SettingSetter =
| Settings[K]
diff --git a/src/app/state/hooks/spaceSettings.ts b/src/app/state/hooks/spaceSettings.ts
index e589d65d..ab3b8da2 100644
--- a/src/app/state/hooks/spaceSettings.ts
+++ b/src/app/state/hooks/spaceSettings.ts
@@ -1,6 +1,6 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
-import { spaceSettingsAtom, SpaceSettingsPage, SpaceSettingsState } from '../spaceSettings';
+import { spaceSettingsAtom, SpaceSettingsPage, SpaceSettingsState } from '$state/spaceSettings';
export const useSpaceSettingsState = (): SpaceSettingsState | undefined => {
const data = useAtomValue(spaceSettingsAtom);
diff --git a/src/app/state/hooks/unread.ts b/src/app/state/hooks/unread.ts
index 76093b31..ac94bb6a 100644
--- a/src/app/state/hooks/unread.ts
+++ b/src/app/state/hooks/unread.ts
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
import { useAtomValue } from 'jotai';
import { selectAtom } from 'jotai/utils';
import { RoomToUnread, Unread } from '$types/matrix/room';
-import { roomToUnreadAtom, unreadEqual } from '../room/roomToUnread';
+import { roomToUnreadAtom, unreadEqual } from '$state/room/roomToUnread';
const compareUnreadEqual = (u1?: Unread, u2?: Unread): boolean => {
if (!u1 || !u2) return false;
diff --git a/src/app/state/hooks/useBindAtoms.ts b/src/app/state/hooks/useBindAtoms.ts
index 31f9e15a..1d68295d 100644
--- a/src/app/state/hooks/useBindAtoms.ts
+++ b/src/app/state/hooks/useBindAtoms.ts
@@ -1,10 +1,10 @@
import { MatrixClient } from '$types/matrix-sdk';
-import { allInvitesAtom, useBindAllInvitesAtom } from '../room-list/inviteList';
-import { allRoomsAtom, useBindAllRoomsAtom } from '../room-list/roomList';
-import { mDirectAtom, useBindMDirectAtom } from '../mDirectList';
-import { roomToUnreadAtom, useBindRoomToUnreadAtom } from '../room/roomToUnread';
-import { roomToParentsAtom, useBindRoomToParentsAtom } from '../room/roomToParents';
-import { roomIdToTypingMembersAtom, useBindRoomIdToTypingMembersAtom } from '../typingMembers';
+import { allInvitesAtom, useBindAllInvitesAtom } from '$state/room-list/inviteList';
+import { allRoomsAtom, useBindAllRoomsAtom } from '$state/room-list/roomList';
+import { mDirectAtom, useBindMDirectAtom } from '$state/mDirectList';
+import { roomToUnreadAtom, useBindRoomToUnreadAtom } from '$state/room/roomToUnread';
+import { roomToParentsAtom, useBindRoomToParentsAtom } from '$state/room/roomToParents';
+import { roomIdToTypingMembersAtom, useBindRoomIdToTypingMembersAtom } from '$state/typingMembers';
export const useBindAtoms = (mx: MatrixClient) => {
useBindMDirectAtom(mx, mDirectAtom);
diff --git a/src/app/state/hooks/userRoomProfile.ts b/src/app/state/hooks/userRoomProfile.ts
index 8c46cea6..c0e8edcb 100644
--- a/src/app/state/hooks/userRoomProfile.ts
+++ b/src/app/state/hooks/userRoomProfile.ts
@@ -1,8 +1,8 @@
import { useCallback } from 'react';
import { useAtomValue, useSetAtom } from 'jotai';
import { Position, RectCords } from 'folds';
-import { userRoomProfileAtom, UserRoomProfileState } from '../userRoomProfile';
import { UserProfile } from '$hooks/useUserProfile';
+import { userRoomProfileAtom, UserRoomProfileState } from '$state/userRoomProfile';
export const useUserRoomProfileState = (): UserRoomProfileState | undefined => {
const data = useAtomValue(userRoomProfileAtom);
diff --git a/src/app/state/mDirectList.ts b/src/app/state/mDirectList.ts
index 3ff62e7e..89b3721f 100644
--- a/src/app/state/mDirectList.ts
+++ b/src/app/state/mDirectList.ts
@@ -2,7 +2,7 @@ import { atom, useSetAtom } from 'jotai';
import { ClientEvent, MatrixClient, MatrixEvent } from '$types/matrix-sdk';
import { useEffect } from 'react';
import { AccountDataEvent } from '$types/matrix/accountData';
-import { getAccountData, getMDirects } from '../utils/room';
+import { getAccountData, getMDirects } from '$utils/room';
export type MDirectAction = {
type: 'INITIALIZE' | 'UPDATE';
diff --git a/src/app/state/modal.ts b/src/app/state/modal.ts
index 7fba4b47..1d16cfe8 100644
--- a/src/app/state/modal.ts
+++ b/src/app/state/modal.ts
@@ -1,6 +1,5 @@
import { atom } from 'jotai';
-import { MatrixEvent, Room } from '$types/matrix-sdk';
-import { Relations } from '$types/matrix-sdk';
+import { MatrixEvent, Room, Relations } from '$types/matrix-sdk';
export enum ModalType {
Delete = 'delete',
diff --git a/src/app/state/room/roomInputDrafts.ts b/src/app/state/room/roomInputDrafts.ts
index 425e0f57..f5cdd84a 100644
--- a/src/app/state/room/roomInputDrafts.ts
+++ b/src/app/state/room/roomInputDrafts.ts
@@ -3,9 +3,9 @@ import { atomFamily } from 'jotai/utils';
import { Descendant } from 'slate';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
import { IEventRelation } from '$types/matrix-sdk';
-import { createUploadAtomFamily } from '../upload';
-import { TUploadContent } from '$appUtils/matrix';
-import { createListAtom } from '../list';
+import { TUploadContent } from '$utils/matrix';
+import { createUploadAtomFamily } from '$state/upload';
+import { createListAtom } from '$state/list';
export type TUploadMetadata = {
markedAsSpoiler: boolean;
diff --git a/src/app/state/room/roomToParents.ts b/src/app/state/room/roomToParents.ts
index 418c5622..0b40eb9c 100644
--- a/src/app/state/room/roomToParents.ts
+++ b/src/app/state/room/roomToParents.ts
@@ -16,7 +16,7 @@ import {
isSpace,
isValidChild,
mapParentWithChildren,
-} from '$appUtils/room';
+} from '$utils/room';
export type RoomToParentsAction =
| {
diff --git a/src/app/state/room/roomToUnread.ts b/src/app/state/room/roomToUnread.ts
index 4890a488..38100de6 100644
--- a/src/app/state/room/roomToUnread.ts
+++ b/src/app/state/room/roomToUnread.ts
@@ -7,8 +7,9 @@ import {
Room,
RoomEvent,
SyncState,
+ ReceiptContent,
+ ReceiptType,
} from '$types/matrix-sdk';
-import { ReceiptContent, ReceiptType } from '$types/matrix-sdk';
import { useCallback, useEffect } from 'react';
import {
Membership,
@@ -24,11 +25,11 @@ import {
getUnreadInfo,
getUnreadInfos,
isNotificationEvent,
-} from '$appUtils/room';
-import { roomToParentsAtom } from './roomToParents';
+} from '$utils/room';
import { useStateEventCallback } from '$hooks/useStateEventCallback';
import { useSyncState } from '$hooks/useSyncState';
import { useRoomsNotificationPreferencesContext } from '$hooks/useRoomsNotificationPreferences';
+import { roomToParentsAtom } from './roomToParents';
export type RoomToUnreadAction =
| {
diff --git a/src/app/state/sessions.ts b/src/app/state/sessions.ts
index 6b0802c4..59760815 100644
--- a/src/app/state/sessions.ts
+++ b/src/app/state/sessions.ts
@@ -1,10 +1,10 @@
import { atom } from 'jotai';
+import { createLogger } from '$utils/debug';
import {
atomWithLocalStorage,
getLocalStorageItem,
setLocalStorageItem,
} from './utils/atomWithLocalStorage';
-import { createLogger } from '../utils/debug';
const log = createLogger('sessions');
diff --git a/src/app/state/settings.ts b/src/app/state/settings.ts
index 7d9fa101..fe104bc5 100644
--- a/src/app/state/settings.ts
+++ b/src/app/state/settings.ts
@@ -64,6 +64,7 @@ export interface Settings {
mobileGestures: boolean;
rightSwipeAction: RightSwipeAction;
hideMembershipInReadOnly: boolean;
+ useRightBubbles: boolean;
}
const defaultSettings: Settings = {
@@ -114,6 +115,7 @@ const defaultSettings: Settings = {
mobileGestures: true,
rightSwipeAction: RightSwipeAction.Reply,
hideMembershipInReadOnly: true,
+ useRightBubbles: false,
};
export const getSettings = () => {
diff --git a/src/app/state/upload.ts b/src/app/state/upload.ts
index 7ad172e5..827e4bfd 100644
--- a/src/app/state/upload.ts
+++ b/src/app/state/upload.ts
@@ -2,8 +2,8 @@ import { atom, useAtom } from 'jotai';
import { atomFamily } from 'jotai/utils';
import { MatrixClient, UploadResponse, UploadProgress, MatrixError } from '$types/matrix-sdk';
import { useCallback } from 'react';
-import { useThrottle } from '../hooks/useThrottle';
-import { uploadContent, TUploadContent } from '../utils/matrix';
+import { useThrottle } from '$hooks/useThrottle';
+import { uploadContent, TUploadContent } from '$utils/matrix';
export enum UploadStatus {
Idle = 'idle',
diff --git a/src/app/state/userRoomProfile.ts b/src/app/state/userRoomProfile.ts
index 72b5101a..04540fcd 100644
--- a/src/app/state/userRoomProfile.ts
+++ b/src/app/state/userRoomProfile.ts
@@ -1,6 +1,6 @@
import { Position, RectCords } from 'folds';
import { atom } from 'jotai';
-import { UserProfile } from '../hooks/useUserProfile';
+import type { UserProfile } from '$hooks/useUserProfile';
export type UserRoomProfileState = {
userId: string;
diff --git a/src/app/styles/themes.css b/src/app/styles/themes.css
index a23c8798..94a9cf7f 100644
--- a/src/app/styles/themes.css
+++ b/src/app/styles/themes.css
@@ -532,3 +532,92 @@
--sable-shadow: rgba(0, 0, 0, 1);
--sable-overlay: rgba(0, 0, 0, 0.8);
}
+
+/* --- Gruvdark --- */
+.gruvdark-theme {
+ /* Background */
+ --sable-bg-container: #282828;
+ --sable-bg-container-hover: #3c3836;
+ --sable-bg-container-active: #504945;
+ --sable-bg-container-line: #665c54;
+ --sable-bg-on-container: #fbf1c7;
+
+ /* Surface */
+ --sable-surface-container: #3c3836;
+ --sable-surface-container-hover: #32302f;
+ --sable-surface-container-active: #504945;
+ --sable-surface-container-line: #665c54;
+ --sable-surface-on-container: #fbf1c7;
+
+ /* Surface Variant */
+ --sable-surface-var-container: #282828;
+ --sable-surface-var-container-hover: #1d2021;
+ --sable-surface-var-container-active: #3c3836;
+ --sable-surface-var-container-line: #a89984;
+ --sable-surface-var-on-container: #ebdbb2;
+
+ /* Primary */
+ --sable-primary-main: #fbf1c7;
+ --sable-primary-main-hover: #ebdbb2;
+ --sable-primary-main-active: #d5c4a1;
+ --sable-primary-main-line: #bdae93;
+ --sable-primary-on-main: #1d2021;
+ --sable-primary-container: #fe8019;
+ --sable-primary-container-hover: #d65d0e;
+ --sable-primary-container-active: #e67111;
+ --sable-primary-container-line: #fbf1c7;
+ --sable-primary-on-container: #fbf1c7;
+
+ /* Secondary */
+ --sable-sec-main: #fbf1c7;
+ --sable-sec-main-hover: #ebdbb2;
+ --sable-sec-main-active: #d5c4a1;
+ --sable-sec-main-line: #bdae93;
+ --sable-sec-on-main: #1d2021;
+ --sable-sec-container: #282828;
+ --sable-sec-container-hover: #3c3836;
+ --sable-sec-container-active: #4d483d;
+ --sable-sec-container-line: #a89984;
+ --sable-sec-on-container: #fbf1c7;
+
+ /* Success */
+ --sable-success-main: #6e981a;
+ --sable-success-main-hover: #6e981a;
+ --sable-success-main-active: #6e981a;
+ --sable-success-main-line: #6e981a;
+ --sable-success-on-main: #c2c455;
+ --sable-success-container: #c2c455;
+ --sable-success-container-hover: #c2c455;
+ --sable-success-container-active: #c2c455;
+ --sable-success-container-line: #c2c455;
+ --sable-success-on-container: #fbf1c7;
+
+ /* Warning */
+ --sable-warn-main: #fe8019;
+ --sable-warn-main-hover: #fe8019;
+ --sable-warn-main-active: #fe8019;
+ --sable-warn-main-line: #fe8019;
+ --sable-warn-on-main: #d65d0e;
+ --sable-warn-container: #d65d0e;
+ --sable-warn-container-hover: #d65d0e;
+ --sable-warn-container-active: #d65d0e;
+ --sable-warn-container-line: #d65d0e;
+ --sable-warn-on-container: #fbf1c7;
+
+ /* Critical */
+ --sable-crit-main: #fb4834;
+ --sable-crit-main-hover: #fb4834;
+ --sable-crit-main-active: #fb4834;
+ --sable-crit-main-line: #fb4834;
+ --sable-crit-on-main: #cc241d;
+ --sable-crit-container: #4c1a18;
+ --sable-crit-container-hover: #4c1a18;
+ --sable-crit-container-active: #763333;
+ --sable-crit-container-line: #803737;
+ --sable-crit-on-container: #fbf1c7;
+
+ /* Other */
+ --sable-focus-ring: rgba(227, 186, 145, 0.5);
+ --sable-shadow: rgba(0, 0, 0, 0.6);
+ --sable-overlay: rgba(15, 14, 12, 0.9);
+}
diff --git a/src/app/utils/ASCIILexicalTable.ts b/src/app/utils/ASCIILexicalTable.ts
index 61b2481a..3dcd43d0 100644
--- a/src/app/utils/ASCIILexicalTable.ts
+++ b/src/app/utils/ASCIILexicalTable.ts
@@ -1,3 +1,7 @@
+import { createLogger } from './debug';
+
+const log = createLogger('ASCIILexicalTable');
+
export class ASCIILexicalTable {
readonly startCode: number;
@@ -36,7 +40,7 @@ export class ASCIILexicalTable {
this.populateWidthToSize();
if (this.size() > Number.MAX_SAFE_INTEGER) {
- console.warn(
+ log.warn(
`[!] Warning: ASCIILexicalTable size is larger than the Number.MAX_SAFE_INTEGER: ${this.size()} > ${
Number.MAX_SAFE_INTEGER
}`
diff --git a/src/util/cryptE2ERoomKeys.js b/src/app/utils/MegolmExportEncryption.ts
similarity index 64%
rename from src/util/cryptE2ERoomKeys.js
rename to src/app/utils/MegolmExportEncryption.ts
index d80ef316..896a8d9d 100644
--- a/src/util/cryptE2ERoomKeys.js
+++ b/src/app/utils/MegolmExportEncryption.ts
@@ -1,109 +1,38 @@
-// https://github.com/matrix-org/matrix-react-sdk/blob/e78a1adb6f1af2ea425b0bae9034fb7344a4b2e8/src/utils/MegolmExportEncryption.js
+/* eslint-disable no-bitwise */
+/* eslint-disable no-plusplus */
+// https://github.com/element-hq/element-web/blob/a5b63d582fde59ea4dd3c7fdcad7266ab70dd695/apps/web/src/utils/MegolmExportEncryption.ts
-const subtleCrypto = window.crypto.subtle || window.crypto.webkitSubtle;
+import { createLogger } from './debug';
+
+const logger = createLogger('MegolmExportEncryption');
+const subtleCrypto = window.crypto.subtle;
+
+export type FriendlyError = {
+ message: string;
+ friendlyText: string;
+};
/**
* Make an Error object which has a friendlyText property which is already
* translated and suitable for showing to the user.
*
- * @param {string} msg message for the exception
+ * @param {string} message message for the exception
* @param {string} friendlyText
- * @returns {Error}
+ * @returns {{message: string, friendlyText: string}}
*/
-function friendlyError(msg, friendlyText) {
- const e = new Error(msg);
- e.friendlyText = friendlyText;
- return e;
+function friendlyError(message: string, friendlyText: string): FriendlyError {
+ return { message, friendlyText };
}
-function cryptoFailMsg() {
+function cryptoFailMsg(): string {
return 'Your browser does not support the required cryptography extensions';
}
-/**
- * Derive the AES and HMAC-SHA-256 keys for the file
- *
- * @param {Unit8Array} salt salt for pbkdf
- * @param {Number} iterations number of pbkdf iterations
- * @param {String} password password
- * @return {Promise<[CryptoKey, CryptoKey]>} promise for [aes key, hmac key]
- */
-async function deriveKeys(salt, iterations, password) {
- const start = new Date();
- let key;
- try {
- key = await subtleCrypto.importKey(
- 'raw',
- new TextEncoder().encode(password),
- { name: 'PBKDF2' },
- false,
- ['deriveBits']
- );
- } catch (e) {
- throw friendlyError(`subtleCrypto.importKey failed: ${e}`, cryptoFailMsg());
- }
-
- let keybits;
- try {
- keybits = await subtleCrypto.deriveBits(
- {
- name: 'PBKDF2',
- salt,
- iterations,
- hash: 'SHA-512',
- },
- key,
- 512
- );
- } catch (e) {
- throw friendlyError(`subtleCrypto.deriveBits failed: ${e}`, cryptoFailMsg());
- }
-
- const now = new Date();
- console.log(`E2e import/export: deriveKeys took ${now - start}ms`);
-
- const aesKey = keybits.slice(0, 32);
- const hmacKey = keybits.slice(32);
-
- const aesProm = subtleCrypto
- .importKey('raw', aesKey, { name: 'AES-CTR' }, false, ['encrypt', 'decrypt'])
- .catch((e) => {
- throw friendlyError(`subtleCrypto.importKey failed for AES key: ${e}`, cryptoFailMsg());
- });
-
- const hmacProm = subtleCrypto
- .importKey(
- 'raw',
- hmacKey,
- {
- name: 'HMAC',
- hash: { name: 'SHA-256' },
- },
- false,
- ['sign', 'verify']
- )
- .catch((e) => {
- throw friendlyError(`subtleCrypto.importKey failed for HMAC key: ${e}`, cryptoFailMsg());
- });
-
- // eslint-disable-next-line no-return-await
- return await Promise.all([aesProm, hmacProm]);
-}
-
-/**
- * Decode a base64 string to a typed array of uint8.
- * @param {string} base64 The base64 to decode.
- * @return {Uint8Array} The decoded data.
- */
-function decodeBase64(base64) {
- // window.atob returns a unicode string with codepoints in the range 0-255.
- const latin1String = window.atob(base64);
- // Encode the string as a Uint8Array
- const uint8Array = new Uint8Array(latin1String.length);
- for (let i = 0; i < latin1String.length; i += 1) {
- uint8Array[i] = latin1String.charCodeAt(i);
- }
- return uint8Array;
+function toArrayBufferView(data: Uint8Array): Uint8Array {
+ const buffer = new ArrayBuffer(data.byteLength);
+ const view = new Uint8Array(buffer);
+ view.set(data);
+ return view;
}
/**
@@ -111,14 +40,30 @@ function decodeBase64(base64) {
* @param {Uint8Array} uint8Array The data to encode.
* @return {string} The base64.
*/
-function encodeBase64(uint8Array) {
+function encodeBase64(uint8Array: Uint8Array): string {
// Misinterpt the Uint8Array as Latin-1.
// window.btoa expects a unicode string with codepoints in the range 0-255.
- const latin1String = String.fromCharCode.apply(null, uint8Array);
+ const latin1String = String.fromCharCode.apply(null, Array.from(uint8Array));
// Use the builtin base64 encoder.
return window.btoa(latin1String);
}
+/**
+ * Decode a base64 string to a typed array of uint8.
+ * @param {string} base64 The base64 to decode.
+ * @return {Uint8Array} The decoded data.
+ */
+function decodeBase64(base64: string): Uint8Array {
+ // window.atob returns a unicode string with codepoints in the range 0-255.
+ const latin1String = window.atob(base64);
+ // Encode the string as a Uint8Array
+ const uint8Array = new Uint8Array(new ArrayBuffer(latin1String.length));
+ for (let i = 0; i < latin1String.length; i += 1) {
+ uint8Array[i] = latin1String.charCodeAt(i);
+ }
+ return uint8Array;
+}
+
const HEADER_LINE = '-----BEGIN MEGOLM SESSION DATA-----';
const TRAILER_LINE = '-----END MEGOLM SESSION DATA-----';
@@ -130,7 +75,7 @@ const TRAILER_LINE = '-----END MEGOLM SESSION DATA-----';
* @param {ArrayBuffer} data input file
* @return {Uint8Array} unbase64ed content
*/
-function unpackMegolmKeyFile(data) {
+function unpackMegolmKeyFile(data: ArrayBuffer): Uint8Array {
// parse the file as a great big String. This should be safe, because there
// should be no non-ASCII characters, and it means that we can do string
// comparisons to find the header and footer, and feed it into window.atob.
@@ -138,6 +83,7 @@ function unpackMegolmKeyFile(data) {
// look for the start line
let lineStart = 0;
+ // eslint-disable-next-line no-constant-condition
while (1) {
const lineEnd = fileStr.indexOf('\n', lineStart);
if (lineEnd < 0) {
@@ -156,6 +102,7 @@ function unpackMegolmKeyFile(data) {
const dataStart = lineStart;
// look for the end line
+ // eslint-disable-next-line no-constant-condition
while (1) {
const lineEnd = fileStr.indexOf('\n', lineStart);
const line = fileStr.slice(lineStart, lineEnd < 0 ? undefined : lineEnd).trim();
@@ -183,12 +130,12 @@ function unpackMegolmKeyFile(data) {
* @param {Uint8Array} data raw data
* @return {ArrayBuffer} formatted file
*/
-function packMegolmKeyFile(data) {
+function packMegolmKeyFile(data: Uint8Array): ArrayBuffer {
// we split into lines before base64ing, because encodeBase64 doesn't deal
// terribly well with large arrays.
const LINE_LENGTH = (72 * 4) / 3;
const nLines = Math.ceil(data.length / LINE_LENGTH);
- const lines = new Array(nLines + 3);
+ const lines = new Array(nLines + 3);
lines[0] = HEADER_LINE;
let o = 0;
let i;
@@ -196,13 +143,93 @@ function packMegolmKeyFile(data) {
lines[i] = encodeBase64(data.subarray(o, o + LINE_LENGTH));
o += LINE_LENGTH;
}
- lines[i] = TRAILER_LINE;
- i += 1;
+ lines[i++] = TRAILER_LINE;
lines[i] = '';
return new TextEncoder().encode(lines.join('\n')).buffer;
}
-export async function decryptMegolmKeyFile(data, password) {
+/**
+ * Derive the AES and HMAC-SHA-256 keys for the file
+ *
+ * @param {Unit8Array} salt salt for pbkdf
+ * @param {Number} iterations number of pbkdf iterations
+ * @param {String} password password
+ * @return {Promise<[CryptoKey, CryptoKey]>} promise for [aes key, hmac key]
+ */
+async function deriveKeys(
+ salt: Uint8Array,
+ iterations: number,
+ password: string
+): Promise<[CryptoKey, CryptoKey]> {
+ const start = new Date();
+
+ let key;
+ try {
+ key = await subtleCrypto.importKey(
+ 'raw',
+ new TextEncoder().encode(password),
+ { name: 'PBKDF2' },
+ false,
+ ['deriveBits']
+ );
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.importKey failed: ${error}`, cryptoFailMsg());
+ }
+
+ let keyBits;
+ try {
+ keyBits = await subtleCrypto.deriveBits(
+ {
+ name: 'PBKDF2',
+ salt,
+ iterations,
+ hash: 'SHA-512',
+ },
+ key,
+ 512
+ );
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.deriveBits failed: ${error}`, cryptoFailMsg());
+ }
+
+ const now = new Date();
+ logger.log(`E2e import/export: deriveKeys took ${now.getTime() - start.getTime()}ms`);
+
+ const aesKey = keyBits.slice(0, 32);
+ const hmacKey = keyBits.slice(32);
+
+ const aesProm = subtleCrypto
+ .importKey('raw', aesKey, { name: 'AES-CTR' }, false, ['encrypt', 'decrypt'])
+ .catch((error) => {
+ throw friendlyError(`subtleCrypto.importKey failed for AES key: ${error}`, cryptoFailMsg());
+ });
+
+ const hmacProm = subtleCrypto
+ .importKey(
+ 'raw',
+ hmacKey,
+ {
+ name: 'HMAC',
+ hash: { name: 'SHA-256' },
+ },
+ false,
+ ['sign', 'verify']
+ )
+ .catch((error) => {
+ throw friendlyError(`subtleCrypto.importKey failed for HMAC key: ${error}`, cryptoFailMsg());
+ });
+
+ return Promise.all([aesProm, hmacProm]);
+}
+
+/**
+ * Decrypt a megolm key file
+ *
+ * @param {ArrayBuffer} data file to decrypt
+ * @param {String} password
+ * @return {Promise} promise for decrypted output
+ */
+export async function decryptMegolmKeyFile(data: ArrayBuffer, password: string): Promise {
const body = unpackMegolmKeyFile(data);
// check we have a version byte
@@ -220,20 +247,20 @@ export async function decryptMegolmKeyFile(data, password) {
throw friendlyError('Invalid file: too short', 'Not a valid keyfile');
}
- const salt = body.subarray(1, 1 + 16);
- const iv = body.subarray(17, 17 + 16);
- const iterations = (body[33] << 24) | (body[34] << 16) | (body[35] << 8) | body[36];
- const ciphertext = body.subarray(37, 37 + ciphertextLength);
- const hmac = body.subarray(-32);
+ const salt = toArrayBufferView(body.subarray(1, 17));
+ const iv = toArrayBufferView(body.subarray(17, 33));
+ const iterations = new DataView(body.buffer, body.byteOffset + 33, 4).getInt32(0);
+ const ciphertext = toArrayBufferView(body.subarray(37, 37 + ciphertextLength));
+ const hmac = toArrayBufferView(body.subarray(-32));
const [aesKey, hmacKey] = await deriveKeys(salt, iterations, password);
- const toVerify = body.subarray(0, -32);
+ const toVerify = toArrayBufferView(body.subarray(0, -32));
let isValid;
try {
isValid = await subtleCrypto.verify({ name: 'HMAC' }, hmacKey, hmac, toVerify);
- } catch (e) {
- throw friendlyError(`subtleCrypto.verify failed: ${e}`, cryptoFailMsg());
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.verify failed: ${error}`, cryptoFailMsg());
}
if (!isValid) {
throw friendlyError('hmac mismatch', 'Authentication check failed: Incorrect password?');
@@ -250,8 +277,8 @@ export async function decryptMegolmKeyFile(data, password) {
aesKey,
ciphertext
);
- } catch (e) {
- throw friendlyError(`subtleCrypto.decrypt failed: ${e}`, cryptoFailMsg());
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.decrypt failed: ${error}`, cryptoFailMsg());
}
return new TextDecoder().decode(new Uint8Array(plaintext));
@@ -267,14 +294,18 @@ export async function decryptMegolmKeyFile(data, password) {
* key-derivation function.
* @return {Promise} promise for encrypted output
*/
-export async function encryptMegolmKeyFile(data, password, options) {
- options = options || {};
- const kdfRounds = options.kdf_rounds || 500000;
+export async function encryptMegolmKeyFile(
+ data: string,
+ password: string,
+ options?: { kdf_rounds?: number }
+): Promise {
+ const normalizedOptions = options ?? {};
+ const kdfRounds = normalizedOptions.kdf_rounds || 500000;
- const salt = new Uint8Array(16);
+ const salt = new Uint8Array(new ArrayBuffer(16));
window.crypto.getRandomValues(salt);
- const iv = new Uint8Array(16);
+ const iv = new Uint8Array(new ArrayBuffer(16));
window.crypto.getRandomValues(iv);
// clear bit 63 of the IV to stop us hitting the 64-bit counter boundary
@@ -283,7 +314,7 @@ export async function encryptMegolmKeyFile(data, password, options) {
iv[8] &= 0x7f;
const [aesKey, hmacKey] = await deriveKeys(salt, kdfRounds, password);
- const encodedData = new TextEncoder().encode(data);
+ const encodedData = toArrayBufferView(new TextEncoder().encode(data));
let ciphertext;
try {
@@ -296,13 +327,13 @@ export async function encryptMegolmKeyFile(data, password, options) {
aesKey,
encodedData
);
- } catch (e) {
- throw friendlyError('subtleCrypto.encrypt failed: ' + e, cryptoFailMsg());
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.encrypt failed: ${error}`, cryptoFailMsg());
}
const cipherArray = new Uint8Array(ciphertext);
const bodyLength = 1 + salt.length + iv.length + 4 + cipherArray.length + 32;
- const resultBuffer = new Uint8Array(bodyLength);
+ const resultBuffer = new Uint8Array(new ArrayBuffer(bodyLength));
let idx = 0;
resultBuffer[idx++] = 1; // version
resultBuffer.set(salt, idx);
@@ -316,13 +347,13 @@ export async function encryptMegolmKeyFile(data, password, options) {
resultBuffer.set(cipherArray, idx);
idx += cipherArray.length;
- const toSign = resultBuffer.subarray(0, idx);
+ const toSign = toArrayBufferView(resultBuffer.subarray(0, idx));
let hmac;
try {
hmac = await subtleCrypto.sign({ name: 'HMAC' }, hmacKey, toSign);
- } catch (e) {
- throw friendlyError('subtleCrypto.sign failed: ' + e, cryptoFailMsg());
+ } catch (error) {
+ throw friendlyError(`subtleCrypto.sign failed: ${error}`, cryptoFailMsg());
}
const hmacArray = new Uint8Array(hmac);
diff --git a/src/util/bgColorImg.js b/src/app/utils/bgColorImg.js
similarity index 100%
rename from src/util/bgColorImg.js
rename to src/app/utils/bgColorImg.js
diff --git a/src/util/colorMXID.js b/src/app/utils/colorMXID.ts
similarity index 63%
rename from src/util/colorMXID.js
rename to src/app/utils/colorMXID.ts
index fedc313c..6b40b959 100644
--- a/src/util/colorMXID.js
+++ b/src/app/utils/colorMXID.ts
@@ -1,14 +1,12 @@
// https://github.com/cloudrac3r/cadencegq/blob/master/pug/mxid.pug
-function hashCode(str) {
+function hashCode(str?: string): number {
let hash = 0;
- let i;
- let chr;
- if (str == undefined || str.length === 0) {
+ if (str === undefined || str.length === 0) {
return hash;
}
- for (i = 0; i < str.length; i += 1) {
- chr = str.charCodeAt(i);
+ for (let i = 0; i < str.length; i += 1) {
+ const chr = str.charCodeAt(i);
// eslint-disable-next-line no-bitwise
hash = (hash << 5) - hash + chr;
// eslint-disable-next-line no-bitwise
@@ -17,12 +15,12 @@ function hashCode(str) {
return Math.abs(hash);
}
-export function cssColorMXID(userId) {
+export function cssColorMXID(userId?: string): string {
const colorNumber = hashCode(userId) % 8;
return `--mx-uc-${colorNumber + 1}`;
}
-export default function colorMXID(userId) {
+export default function colorMXID(userId?: string): string {
const hash = hashCode(userId);
const h = hash % 360;
diff --git a/src/app/utils/disposable.ts b/src/app/utils/disposable.ts
deleted file mode 100644
index 0982adaa..00000000
--- a/src/app/utils/disposable.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export type DisposeCallback = (
- ...args: DisposeArgs
-) => DisposeReturn;
-export type DisposableContext<
- DisposableArgs extends unknown[] = [],
- DisposeArgs extends unknown[] = [],
- DisposeReturn = void,
-> = (...args: DisposableArgs) => DisposeCallback;
-
-export const disposable = <
- DisposableArgs extends unknown[],
- DisposeArgs extends unknown[] = [],
- DisposeReturn = void,
->(
- context: DisposableContext
-) => context;
diff --git a/src/app/utils/matrix.ts b/src/app/utils/matrix.ts
index ff097c68..12b455b5 100644
--- a/src/app/utils/matrix.ts
+++ b/src/app/utils/matrix.ts
@@ -16,8 +16,8 @@ import {
import to from 'await-to-js';
import { IImageInfo, IThumbnailContent, IVideoInfo } from '$types/matrix/common';
import { AccountDataEvent } from '$types/matrix/accountData';
-import { getStateEvent } from './room';
import { Membership, StateEvent } from '$types/matrix/room';
+import { getStateEvent } from './room';
const DOMAIN_REGEX = /\b(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}\b/;
@@ -297,7 +297,7 @@ export const mxcUrlToHttp = (
allowRedirects?: boolean
): string | null =>
mx.mxcUrlToHttp(
- mxcUrl,
+ mxcUrl.replace(/^["']|["']$/g, ''),
width,
height,
resizeMethod,
diff --git a/src/app/utils/room.ts b/src/app/utils/room.ts
index 8ede46b6..a8cb47e2 100644
--- a/src/app/utils/room.ts
+++ b/src/app/utils/room.ts
@@ -16,8 +16,8 @@ import {
RelationType,
Room,
RoomMember,
+ CryptoBackend,
} from '$types/matrix-sdk';
-import { CryptoBackend } from '$types/matrix-sdk';
import { AccountDataEvent } from '$types/matrix/accountData';
import {
IRoomCreateContent,
@@ -237,8 +237,8 @@ export const getUnreadInfo = (room: Room): UnreadInfo => {
};
};
-export const getUnreadInfos = (mx: MatrixClient): UnreadInfo[] => {
- return mx.getRooms().reduce((unread, room) => {
+export const getUnreadInfos = (mx: MatrixClient): UnreadInfo[] =>
+ mx.getRooms().reduce((unread, room) => {
if (room.isSpaceRoom()) return unread;
if (room.getMyMembership() !== 'join') return unread;
if (getNotificationType(mx, room.roomId) === NotificationType.Mute) return unread;
@@ -249,7 +249,6 @@ export const getUnreadInfos = (mx: MatrixClient): UnreadInfo[] => {
return unread;
}, []);
-};
export const getRoomIconSrc = (
icons: Record,
diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts
index f11f577c..40f1c283 100644
--- a/src/client/initMatrix.ts
+++ b/src/client/initMatrix.ts
@@ -5,18 +5,18 @@ import {
IndexedDBCryptoStore,
} from '$types/matrix-sdk';
-import { cryptoCallbacks } from './secretStorageKeys';
-import { clearNavToActivePathStore } from '../app/state/navToActivePath';
-import { pushSessionToSW } from '../sw-session';
+import { clearNavToActivePathStore } from '$state/navToActivePath';
import {
Session,
Sessions,
SessionStoreName,
getSessionStoreName,
MATRIX_SESSIONS_KEY,
-} from '../app/state/sessions';
-import { getLocalStorageItem } from '../app/state/utils/atomWithLocalStorage';
-import { createLogger } from '../app/utils/debug';
+} from '$state/sessions';
+import { getLocalStorageItem } from '$state/utils/atomWithLocalStorage';
+import { createLogger } from '$utils/debug';
+import { pushSessionToSW } from '../sw-session';
+import { cryptoCallbacks } from './secretStorageKeys';
const log = createLogger('initMatrix');
@@ -28,6 +28,22 @@ const deleteDatabase = (name: string): Promise =>
req.onblocked = () => resolve();
});
+const deleteSyncStoreGroup = async (syncStoreName: string): Promise => {
+ await Promise.all([
+ deleteDatabase(syncStoreName),
+ deleteDatabase(syncStoreName.replace(/^sync/, 'crypto')),
+ deleteDatabase(`${syncStoreName}::matrix-sdk-crypto`),
+ ]);
+};
+
+const deleteSessionStores = async (storeName: SessionStoreName): Promise => {
+ await Promise.all([
+ deleteDatabase(storeName.sync),
+ deleteDatabase(storeName.crypto),
+ deleteDatabase(`${storeName.rustCryptoPrefix}::matrix-sdk-crypto`),
+ ]);
+};
+
/**
* Reads the account stored in an IndexedDB sync store without opening a full MatrixClient.
* Returns undefined if the database doesn't exist or has no account record.
@@ -40,27 +56,31 @@ const readStoredAccount = (dbName: string): Promise =>
const db = req.result;
try {
if (!db.objectStoreNames.contains('account')) {
- db.close();
- return resolve(undefined);
- }
- const tx = db.transaction('account', 'readonly');
- const store = tx.objectStore('account');
- const getReq = store.get('account');
- getReq.onsuccess = () => {
- db.close();
- const record = getReq.result;
- if (!record?.account_data) return resolve(undefined);
- try {
- const data = JSON.parse(record.account_data);
- resolve(data?.user_id ?? undefined);
- } catch {
- resolve(undefined);
- }
- };
- getReq.onerror = () => {
db.close();
resolve(undefined);
- };
+ } else {
+ const tx = db.transaction('account', 'readonly');
+ const store = tx.objectStore('account');
+ const getReq = store.get('account');
+ getReq.onsuccess = () => {
+ db.close();
+ const record = getReq.result;
+ if (!record?.account_data) {
+ resolve(undefined);
+ } else {
+ try {
+ const data = JSON.parse(record.account_data);
+ resolve(data?.user_id ?? undefined);
+ } catch {
+ resolve(undefined);
+ }
+ }
+ };
+ getReq.onerror = () => {
+ db.close();
+ resolve(undefined);
+ };
+ }
} catch {
try {
db.close();
@@ -95,53 +115,49 @@ export const clearMismatchedStores = async (): Promise => {
// databases() not supported in all browsers
}
- for (const dbInfo of allDbs) {
- const name = dbInfo.name;
- if (!name) continue;
+ await Promise.all(
+ allDbs.map(async ({ name }) => {
+ if (!name) return;
- const containsKnownUser = Array.from(knownUserIds).some((uid) => name.includes(uid));
- const looksLikeUserDb = name.includes('@');
- if (looksLikeUserDb && !containsKnownUser && !knownStoreNames.has(name)) {
- log.warn(`clearMismatchedStores: "${name}" has unknown user — deleting`);
- await deleteDatabase(name);
- continue;
- }
-
- if (name.startsWith('sync')) {
- const storedUserId = await readStoredAccount(name);
- if (storedUserId) {
- if (!knownUserIds.has(storedUserId)) {
- log.warn(`clearMismatchedStores: "${name}" has unknown user ${storedUserId} — deleting`);
- await deleteDatabase(name);
- await deleteDatabase(name.replace(/^sync/, 'crypto'));
- await deleteDatabase(`${name}::matrix-sdk-crypto`);
- } else {
- const expectedStore = `sync${storedUserId}`;
- if (name !== expectedStore && !knownStoreNames.has(name)) {
- log.warn(
- `clearMismatchedStores: "${name}" is misplaced for ${storedUserId} — deleting`
- );
- await deleteDatabase(name);
- await deleteDatabase(name.replace(/^sync/, 'crypto'));
- await deleteDatabase(`${name}::matrix-sdk-crypto`);
- }
- }
+ const containsKnownUser = Array.from(knownUserIds).some((uid) => name.includes(uid));
+ const looksLikeUserDb = name.includes('@');
+ if (looksLikeUserDb && !containsKnownUser && !knownStoreNames.has(name)) {
+ log.warn(`clearMismatchedStores: "${name}" has unknown user — deleting`);
+ await deleteDatabase(name);
+ return;
}
- }
- }
- for (const session of sessions) {
- const sn = getSessionStoreName(session);
- const storedUserId = await readStoredAccount(sn.sync);
- if (storedUserId && storedUserId !== session.userId) {
- log.warn(
- `clearMismatchedStores: "${sn.sync}" has ${storedUserId} but session is ${session.userId} — deleting`
- );
- await deleteDatabase(sn.sync);
- await deleteDatabase(sn.crypto);
- await deleteDatabase(`${sn.rustCryptoPrefix}::matrix-sdk-crypto`);
- }
- }
+ if (!name.startsWith('sync')) return;
+
+ const storedUserId = await readStoredAccount(name);
+ if (!storedUserId) return;
+
+ if (!knownUserIds.has(storedUserId)) {
+ log.warn(`clearMismatchedStores: "${name}" has unknown user ${storedUserId} — deleting`);
+ await deleteSyncStoreGroup(name);
+ return;
+ }
+
+ const expectedStore = `sync${storedUserId}`;
+ if (name !== expectedStore && !knownStoreNames.has(name)) {
+ log.warn(`clearMismatchedStores: "${name}" is misplaced for ${storedUserId} — deleting`);
+ await deleteSyncStoreGroup(name);
+ }
+ })
+ );
+
+ await Promise.all(
+ sessions.map(async (session) => {
+ const sn = getSessionStoreName(session);
+ const storedUserId = await readStoredAccount(sn.sync);
+ if (storedUserId && storedUserId !== session.userId) {
+ log.warn(
+ `clearMismatchedStores: "${sn.sync}" has ${storedUserId} but session is ${session.userId} — deleting`
+ );
+ await deleteSessionStores(sn);
+ }
+ })
+ );
};
const buildClient = async (session: Session): Promise => {
@@ -187,17 +203,17 @@ export const initClient = async (session: Session): Promise => {
const wipeAllStores = async () => {
log.warn('initClient: wiping all stores for', session.userId);
- await deleteDatabase(storeName.sync);
- await deleteDatabase(storeName.crypto);
- await deleteDatabase(`${storeName.rustCryptoPrefix}::matrix-sdk-crypto`);
+ await deleteSessionStores(storeName);
try {
const allDbs = await window.indexedDB.databases();
- for (const db of allDbs) {
- if (db.name && db.name.includes(session.userId)) {
- log.warn('initClient: also wiping db', db.name);
- await deleteDatabase(db.name);
- }
- }
+ await Promise.all(
+ allDbs.map(async ({ name }) => {
+ if (name && name.includes(session.userId)) {
+ log.warn('initClient: also wiping db', name);
+ await deleteDatabase(name);
+ }
+ })
+ );
} catch {
// databases() not available in all browsers
}
diff --git a/src/colors.css.ts b/src/colors.css.ts
index 3e57daf8..2243e818 100644
--- a/src/colors.css.ts
+++ b/src/colors.css.ts
@@ -95,5 +95,6 @@ export const silverTheme = createTheme(color, sableThemeMapping);
export const darkTheme = createTheme(color, sableThemeMapping);
export const butterTheme = createTheme(color, sableThemeMapping);
export const lightTheme = createTheme(color, sableThemeMapping);
+export const gruvdarkTheme = createTheme(color, sableThemeMapping);
export const rosePineTheme = createTheme(color, sableThemeMapping);
export const cinnyDarkTheme = createTheme(color, sableThemeMapping);
diff --git a/src/ext.d.ts b/src/ext.d.ts
index 72acc587..4d5ff494 100644
--- a/src/ext.d.ts
+++ b/src/ext.d.ts
@@ -11,9 +11,7 @@ declare module 'browser-encrypt-attachment' {
ext: boolean;
};
iv: string;
- hashes: {
- [alg: string]: string;
- };
+ hashes: Record;
}
export interface EncryptedAttachment {
diff --git a/src/index.css b/src/index.css
index 39e9bc7d..e799f6d5 100644
--- a/src/index.css
+++ b/src/index.css
@@ -41,6 +41,22 @@
--font-monospace: 'Space Mono', monospace;
}
+.gruvdark-theme {
+ --tc-link: #83a598;
+
+ --mx-uc-1: #d3869b;
+ --mx-uc-2: #fb4934;
+ --mx-uc-3: #458588;
+ --mx-uc-4: #8ec07c;
+ --mx-uc-5: #689d6a;
+ --mx-uc-6: #b16286;
+ --mx-uc-7: #fabd2f;
+ --mx-uc-8: #cc241d;
+
+ --font-secondary: 'Nunito Variable', var(--font-emoji), sans-serif;
+ --font-monospace: 'Space Mono', monospace;
+}
+
html {
height: 100%;
overflow: hidden;
diff --git a/src/index.tsx b/src/index.tsx
index efc13c04..41a646cf 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { createRoot } from 'react-dom/client';
import { enableMapSet } from 'immer';
import '@fontsource-variable/nunito';
@@ -13,8 +12,6 @@ import { trimTrailingSlash } from './app/utils/common';
import App from './app/pages/App';
import './app/i18n';
-enableMapSet();
-
import './index.css';
import './app/styles/themes.css';
import './app/styles/overrides/General.css';
@@ -26,8 +23,12 @@ import {
Sessions,
ACTIVE_SESSION_KEY,
} from './app/state/sessions';
+import { createLogger } from './app/utils/debug';
import { getLocalStorageItem } from './app/state/utils/atomWithLocalStorage';
+enableMapSet();
+const log = createLogger('index');
+
document.body.classList.add(configClass, varsClass);
if ('serviceWorker' in navigator) {
@@ -82,11 +83,18 @@ if ('serviceWorker' in navigator) {
pushSessionToSW(active?.baseUrl, active?.accessToken);
};
- void navigator.serviceWorker.register(swUrl).then(sendSessionToSW);
- void navigator.serviceWorker.ready.then(sendSessionToSW);
+ navigator.serviceWorker
+ .register(swUrl)
+ .then(sendSessionToSW)
+ .catch((err) => {
+ log.warn('SW registration failed:', err);
+ });
+ navigator.serviceWorker.ready.then(sendSessionToSW).catch((err) => {
+ log.warn('SW ready failed:', err);
+ });
navigator.serviceWorker.addEventListener('message', (ev) => {
- const data: unknown = ev.data;
+ const { data } = ev;
if (!data || typeof data !== 'object') return;
const { type } = data as { type?: unknown };
diff --git a/src/sw.ts b/src/sw.ts
index aafba366..28b6e474 100644
--- a/src/sw.ts
+++ b/src/sw.ts
@@ -136,8 +136,8 @@ async function requestSessionWithTimeout(
return Promise.race([sessionPromise, timeout]);
}
-self.addEventListener('install', () => {
- void self.skipWaiting();
+self.addEventListener('install', (event: ExtendableEvent) => {
+ event.waitUntil(self.skipWaiting());
});
self.addEventListener('activate', (event: ExtendableEvent) => {
@@ -156,13 +156,13 @@ self.addEventListener('message', (event: ExtendableMessageEvent) => {
const client = event.source as Client | null;
if (!client) return;
- const data: unknown = event.data;
+ const { data } = event;
if (!data || typeof data !== 'object') return;
const { type, accessToken, baseUrl } = data as Record;
if (type === 'setSession') {
setSession(client.id, accessToken, baseUrl);
- void cleanupDeadClients();
+ event.waitUntil(cleanupDeadClients());
}
if (type === 'setNotificationSettings') {
if (typeof (data as { notificationSoundEnabled?: unknown }).notificationSoundEnabled === 'boolean') {
diff --git a/src/types/matrix-sdk-events.d.ts b/src/types/matrix-sdk-events.d.ts
index 459917f5..532170e0 100644
--- a/src/types/matrix-sdk-events.d.ts
+++ b/src/types/matrix-sdk-events.d.ts
@@ -1,7 +1,6 @@
-import type { PackContent } from '../app/plugins/custom-emoji/types';
-import type { EmoteRoomsContent } from '../app/plugins/custom-emoji/types';
-import type { IRecentEmojiContent } from '../app/plugins/recent-emoji';
-import type { InCinnySpacesContent } from '../app/hooks/useSidebarItems';
+import type { PackContent, EmoteRoomsContent } from '$plugins/custom-emoji/types';
+import type { IRecentEmojiContent } from '$plugins/recent-emoji';
+import type { InCinnySpacesContent } from '$hooks/useSidebarItems';
declare module 'matrix-js-sdk/lib/@types/event' {
interface StateEvents {
diff --git a/src/types/matrix-sdk.ts b/src/types/matrix-sdk.ts
index 5532cf51..2e08feca 100644
--- a/src/types/matrix-sdk.ts
+++ b/src/types/matrix-sdk.ts
@@ -4,9 +4,6 @@ export * from 'matrix-js-sdk/lib/client';
export * from 'matrix-js-sdk/lib/serverCapabilities';
export * from 'matrix-js-sdk/lib/embedded';
export * from 'matrix-js-sdk/lib/http-api/index';
-export * from 'matrix-js-sdk/lib/http-api/method';
-export * from 'matrix-js-sdk/lib/http-api/interface';
-export * from 'matrix-js-sdk/lib/http-api/errors';
export * from 'matrix-js-sdk/lib/autodiscovery';
export * from 'matrix-js-sdk/lib/errors';
export * from 'matrix-js-sdk/lib/interactive-auth';
@@ -48,13 +45,6 @@ export * from 'matrix-js-sdk/lib/@types/registration';
export * from 'matrix-js-sdk/lib/oidc/validate';
export { VerificationMethod } from 'matrix-js-sdk/lib/types';
export * from 'matrix-js-sdk/lib/pushprocessor';
-
-export * from 'matrix-js-sdk/lib/crypto-api/CryptoEvent';
-export * from 'matrix-js-sdk/lib/crypto-api/CryptoEventHandlerMap';
-export * from 'matrix-js-sdk/lib/crypto-api/verification';
-export * from 'matrix-js-sdk/lib/crypto-api/keybackup';
-export * from 'matrix-js-sdk/lib/crypto-api/recovery-key';
-export * from 'matrix-js-sdk/lib/crypto-api/key-passphrase';
export * from 'matrix-js-sdk/lib/common-crypto/CryptoBackend';
export * from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
diff --git a/src/types/utils.ts b/src/types/utils.ts
deleted file mode 100644
index 353ace6e..00000000
--- a/src/types/utils.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export type WithRequiredProp = Type & {
- [Property in Key]-?: Type[Property];
-};
diff --git a/tsconfig.json b/tsconfig.json
index 1372cc8a..839ef9d3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,13 +1,14 @@
{
"compilerOptions": {
"sourceMap": true,
- "jsx": "react",
+ "jsx": "react-jsx",
"target": "ES2022",
"module": "ES2022",
"allowJs": true,
"strict": true,
"strictNullChecks": true,
"esModuleInterop": true,
+ "allowSyntheticDefaultImports": true,
"baseUrl": ".",
"paths": {
"$hooks/*": ["src/app/hooks/*"],
@@ -16,11 +17,10 @@
"$features/*": ["src/app/features/*"],
"$state/*": ["src/app/state/*"],
"$styles/*": ["src/app/styles/*"],
- "$appUtils/*": ["src/app/utils/*"],
+ "$utils/*": ["src/app/utils/*"],
"$pages/*": ["src/app/pages/*"],
"$types/*": ["src/types/*"],
"$public/*": ["public/*"],
- "$util/*": ["src/util/*"],
"$client/*": ["src/client/*"]
},
"moduleResolution": "bundler",
@@ -32,5 +32,5 @@
"lib": ["ES2022", "DOM"]
},
"exclude": ["node_modules", "dist"],
- "include": ["src"]
+ "include": ["src", "vite.config.ts"]
}
diff --git a/vite.config.ts b/vite.config.ts
index c9b2620b..d99b9184 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,4 +1,5 @@
import { defineConfig } from 'vite';
+import type { ViteDevServer } from 'vite';
import react from '@vitejs/plugin-react';
import svgr from 'vite-plugin-svgr';
import { wasm } from '@rollup/plugin-wasm';
@@ -46,10 +47,10 @@ const copyFiles = {
],
};
-function serverMatrixSdkCryptoWasm(wasmFilePath) {
+function serverMatrixSdkCryptoWasm(wasmFilePath: string) {
return {
name: 'vite-plugin-serve-matrix-sdk-crypto-wasm',
- configureServer(server) {
+ configureServer(server: ViteDevServer) {
server.middlewares.use((req, res, next) => {
if (req.url === wasmFilePath) {
const resolvedPath = path.join(
@@ -87,11 +88,10 @@ export default defineConfig({
$features: path.resolve(__dirname, 'src/app/features'),
$state: path.resolve(__dirname, 'src/app/state'),
$styles: path.resolve(__dirname, 'src/app/styles'),
- $appUtils: path.resolve(__dirname, 'src/app/utils'),
+ $utils: path.resolve(__dirname, 'src/app/utils'),
$pages: path.resolve(__dirname, 'src/app/pages'),
$types: path.resolve(__dirname, 'src/types'),
$public: path.resolve(__dirname, 'public'),
- $util: path.resolve(__dirname, 'src/util'),
$client: path.resolve(__dirname, 'src/client'),
},
},
@@ -115,9 +115,7 @@ export default defineConfig({
vanillaExtractPlugin(),
wasm(),
react(),
- svgr({
- exportAsDefault: true,
- }),
+ svgr(),
VitePWA({
srcDir: 'src',
filename: 'sw.ts',