Skip to content

Commit

Permalink
Merge pull request #1275 from brave/master
Browse files Browse the repository at this point in the history
Production Release 2024-07-29
  • Loading branch information
tackley authored Jul 29, 2024
2 parents d159dea + 74afb5b commit 77d8066
Show file tree
Hide file tree
Showing 10 changed files with 409 additions and 5,184 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
3 changes: 2 additions & 1 deletion lingui.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { LinguiConfig } from "@lingui/conf";
import { formatter } from "@lingui/format-po";

const config: LinguiConfig = {
locales: ["en", "es", "pt", "test"],
Expand All @@ -14,7 +15,7 @@ const config: LinguiConfig = {
include: ["src"],
},
],
format: "po",
format: formatter({ lineNumbers: false, origins: false }),
};

export default config;
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"type": "module",
"dependencies": {
"@apollo/client": "3.10.8",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@emotion/react": "11.12.0",
"@emotion/styled": "11.12.0",
"@fontsource/inter": "5.0.19",
"@fontsource/mulish": "5.0.18",
"@fontsource/poppins": "5.0.14",
Expand All @@ -15,15 +15,16 @@
"@lingui/conf": "4.11.2",
"@lingui/core": "4.11.2",
"@lingui/detect-locale": "4.11.2",
"@lingui/format-po": "4.11.2",
"@lingui/macro": "4.11.2",
"@lingui/react": "4.11.2",
"@mui/icons-material": "5.16.1",
"@mui/icons-material": "5.16.4",
"@mui/lab": "5.0.0-alpha.172",
"@mui/material": "5.16.1",
"@mui/x-data-grid": "7.10.0",
"@mui/x-date-pickers": "7.10.0",
"@mui/material": "5.16.4",
"@mui/x-data-grid": "7.11.0",
"@mui/x-date-pickers": "7.11.0",
"bignumber.js": "9.1.2",
"dayjs": "1.11.11",
"dayjs": "1.11.12",
"formik": "2.4.6",
"graphql": "16.9.0",
"highcharts": "11.4.6",
Expand Down Expand Up @@ -67,7 +68,7 @@
"@lingui/cli": "4.11.2",
"@lingui/vite-plugin": "4.11.2",
"@parcel/watcher": "2.4.1",
"@types/lodash": "4.17.6",
"@types/lodash": "4.17.7",
"@types/papaparse": "5.3.14",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
Expand All @@ -79,19 +80,19 @@
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-lingui": "0.3.0",
"eslint-plugin-react": "7.34.4",
"eslint-plugin-react": "7.35.0",
"eslint-plugin-react-hooks": "4.6.2",
"husky": "9.0.11",
"husky": "9.1.1",
"knip": "5.26.0",
"lint-staged": "15.2.7",
"npm-run-all2": "6.2.2",
"prettier": "3.3.3",
"typescript": "5.5.3",
"typescript-eslint": "7.16.0",
"vite": "5.3.3",
"vite-plugin-checker": "0.7.1",
"typescript-eslint": "7.16.1",
"vite": "5.3.4",
"vite-plugin-checker": "0.7.2",
"vite-tsconfig-paths": "4.3.2",
"vitest": "2.0.2"
"vitest": "2.0.3"
},
"engines": {
"node": ">=20",
Expand Down
633 changes: 378 additions & 255 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

Loading

0 comments on commit 77d8066

Please sign in to comment.