Skip to content

Commit

Permalink
Merge pull request #1578 from brave/main
Browse files Browse the repository at this point in the history
Update prod from main
  • Loading branch information
tackley authored Jan 27, 2025
2 parents a7d3f7e + ae55d92 commit 3678a39
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ runs:
# fail the build if any generated javascript contains 'eval' to help mitigate the need for script-src unsafe-eval CSP
if find html -name "*.js" | xargs grep -El "\beval\("; then echo '"eval" found'; exit 99; else echo '"eval" not found'; fi
- name: Upload built outputs
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: build-output
path: html
Expand Down
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@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/init@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
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@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/autobuild@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2

# ℹ️ 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@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/analyze@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.18.1
22.13.1
100 changes: 50 additions & 50 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"url": "git+https://github.com/brave/brave-talk.git"
},
"overrides": {
"yaml": "2.6.1",
"yaml": "2.7.0",
"semver": "7.6.3",
"optionator": "0.9.4",
"cookie": "0.7.2"
Expand All @@ -39,31 +39,31 @@
"css-minimizer-webpack-plugin": "6.0.0",
"eslint": "8.57.1",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-react": "7.37.3",
"eslint-plugin-react": "7.37.4",
"eslint-plugin-react-hooks": "4.6.2",
"html-webpack-plugin": "5.6.3",
"husky": "9.1.7",
"jest": "29.7.0",
"lint-staged": "15.3.0",
"lint-staged": "15.4.1",
"mini-css-extract-plugin": "2.9.2",
"node-forge": "1.3.1",
"npm-run-all2": "6.2.6",
"prettier": "3.4.2",
"style-loader": "3.3.4",
"svgo-loader": "4.0.0",
"ts-jest": "29.2.5",
"ts-loader": "9.5.1",
"typescript": "5.7.2",
"ts-loader": "9.5.2",
"typescript": "5.7.3",
"webpack": "5.97.1",
"webpack-cli": "5.1.4",
"webpack-dev-server": "5.2.0"
},
"dependencies": {
"@brave/leo": "github:brave/leo#17d95906805e9485ba52ae4d8b34cc63c124dfc6",
"@brave/leo": "github:brave/leo#68c587f25300ca48e5fc87a5611a1a8a52f057b0",
"@emotion/react": "11.14.0",
"@types/dom-screen-wake-lock": "1.0.3",
"buffer": "6.0.3",
"ethers": "6.13.4",
"ethers": "6.13.5",
"i18next": "23.16.8",
"jest-environment-jsdom": "29.7.0",
"react": "18.3.1",
Expand Down

0 comments on commit 3678a39

Please sign in to comment.