Skip to content

Commit

Permalink
Merge branch 'main' into release-notes-modal
Browse files Browse the repository at this point in the history
  • Loading branch information
brianp authored Jan 15, 2025
2 parents 495159d + e95192c commit 5b7a700
Show file tree
Hide file tree
Showing 54 changed files with 2,019 additions and 2,062 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
echo "AIRDROP_API_BASE_URL=${{ env.AIRDROP_API_BASE_URL }}" >> $GITHUB_ENV
echo "TELEMETRY_API_URL=${{ env.TELEMETRY_API_URL }}" >> $GITHUB_ENV
echo "AIRDROP_WEBSOCKET_CRYPTO_KEY=${{ env.AIRDROP_WEBSOCKET_CRYPTO_KEY }}" >> $GITHUB_ENV
echo "TS_FEATURES=release-ci-beta, airdrop-env" >> $GITHUB_ENV
echo "TS_FEATURES=release-ci-beta, airdrop-env, telemetry-env" >> $GITHUB_ENV
# numeric-only and cannot be greater than 65535 for msi target
export BETA_DATE=$(date +%m%d)
cd "${GITHUB_WORKSPACE}/src-tauri"
Expand Down
1,439 changes: 840 additions & 599 deletions package-lock.json

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,58 +16,58 @@
"dependencies": {
"@floating-ui/react": "^0.26.28",
"@lottiefiles/dotlottie-react": "^0.12.0",
"@sentry/react": "^8.42.0",
"@tauri-apps/api": "^2.1.1",
"@tauri-apps/plugin-os": "^2.0.0",
"@tauri-apps/plugin-process": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.1",
"@tauri-apps/plugin-updater": "^2.0.0",
"@sentry/react": "^8.48.0",
"@tauri-apps/api": "^2.2.0",
"@tauri-apps/plugin-os": "^2.2.0",
"@tauri-apps/plugin-process": "^2.2.0",
"@tauri-apps/plugin-shell": "^2.2.0",
"@tauri-apps/plugin-updater": "^2.3.1",
"emoji-regex": "^10.4.0",
"framer-motion": "^11.13.1",
"globals": "^15.13.0",
"framer-motion": "^11.16.1",
"globals": "^15.14.0",
"i18next": "^23.16.8",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-browser-languagedetector": "^8.0.2",
"i18next-http-backend": "^2.7.1",
"linkify-react": "^4.2.0",
"react": "^18.3.1",
"react-dom": "^18.2.0",
"react-hook-form": "^7.53.2",
"react-i18next": "^15.1.3",
"react-hook-form": "^7.54.2",
"react-i18next": "^15.4.0",
"react-icons": "^5.4.0",
"react-markdown": "^9.0.1",
"react-markdown": "^9.0.3",
"socket.io-client": "^4.8.1",
"styled-components": "^6.1.12",
"styled-components": "^6.1.14",
"tauri-plugin-sentry-api": "^0.2.0",
"use-sync-external-store": "^1.4.0",
"uuid": "^10.0.0",
"vite-tsconfig-paths": "^5.1.3",
"zustand": "^5.0.2"
"vite-tsconfig-paths": "^5.1.4",
"zustand": "^5.0.3"
},
"devDependencies": {
"@eslint/js": "^9.9.0",
"@nabla/vite-plugin-eslint": "^2.0.5",
"@sentry/vite-plugin": "^2.22.7",
"@taplo/cli": "^0.7.0",
"@tauri-apps/cli": "^2.1.0",
"@tauri-apps/cli": "^2.2.2",
"@types/eslint__js": "^8.42.3",
"@types/node": "^22.10.1",
"@types/react": "^18.3.14",
"@types/react-dom": "^18.3.2",
"@types/node": "^22.10.5",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@types/uuid": "^10.0.0",
"@typescript-eslint/parser": "^8.3.0",
"@vitejs/plugin-react": "^4.3.4",
"babel-plugin-styled-components": "^2.1.4",
"eslint": "^9.16.0",
"eslint": "^9.17.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-i18next": "^6.1.1",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react": "^7.37.3",
"eslint-plugin-react-hooks": "^5.1.0",
"prettier": "3.3.3",
"prettier-eslint": "^16.3.0",
"react-qr-code": "^2.0.15",
"typescript": "^5.7.2",
"typescript-eslint": "^8.17.0",
"typescript": "^5.7.3",
"typescript-eslint": "^8.19.1",
"vite": "^5.4.11"
}
}
403 changes: 198 additions & 205 deletions public/assets/glApp.js

Large diffs are not rendered by default.

Loading

0 comments on commit 5b7a700

Please sign in to comment.