Skip to content

Commit

Permalink
Merge pull request #319 from BootNodeDev/staging
Browse files Browse the repository at this point in the history
chore: merge latest changes into main
  • Loading branch information
gabitoesmiapodo authored Sep 20, 2024
2 parents a81795d + 64dc1bc commit a1d45a3
Show file tree
Hide file tree
Showing 24 changed files with 334 additions and 326 deletions.
7 changes: 7 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ module.exports = {
root: true,
env: { browser: true, es2020: true },
ignorePatterns: [
'src/hooks/generated.ts',
'src/subgraphs/queries/aave',
'src/subgraphs/queries/uniswap',
'**/*.css',
'**/*.html',
'**/*.scss',
Expand All @@ -12,6 +15,7 @@ module.exports = {
'docs',
'logs',
'node_modules',
'pnpm-lock.yaml',
'src/hooks/generated.ts',
'src/routeTree.gen.ts',
'src/subgraphs/gql',
Expand Down Expand Up @@ -90,6 +94,9 @@ module.exports = {
],
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/no-unused-vars': 'warn',
"@typescript-eslint/consistent-type-imports": ["error", {
"prefer": "type-imports"
}],
'no-use-before-define': 'off',
'@typescript-eslint/no-use-before-define': ['error', { functions: false }],
'jsx-a11y/label-has-associated-control': 'warn',
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
3 changes: 1 addition & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2
updates:
- package-ecosystem: "pnpm"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "monthly"
Expand All @@ -19,4 +19,3 @@ updates:
- "paterson1"
- "tloffler"
- "gabitoesmiapodo"

14 changes: 14 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh

# Run tsc
echo "Running TS checks..."
pnpm tsc --pretty --noEmit --verbatimModuleSyntax

# Check result
if [ $? -ne 0 ]; then
echo "TS checks failed. Push aborted."
exit 1
fi

echo "TS checks passed. Proceeding with push."
exit 0
1 change: 0 additions & 1 deletion .lintstagedrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module.exports = {
'prettier --write --ignore-unknown',
'eslint --fix',
'stylelint --fix',
'tsc-files --noEmit',
'vitest related --run --coverage=false',
],
}
5 changes: 4 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.github
**/*.css
**/*.html
**/*.scss
Expand All @@ -9,7 +10,9 @@ dist-ssr
docs
logs
node_modules
pnpm-lock.yaml
src/hooks/generated.ts
src/routeTree.gen.ts
src/subgraphs/gql
src/subgraphs/gql
src/subgraphs/queries/aave
src/subgraphs/queries/uniswap
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dappbooster",
"private": true,
"version": "0.9.10",
"version": "0.9.11",
"type": "module",
"scripts": {
"build": "tsc --noEmit && vite build",
Expand Down Expand Up @@ -29,7 +29,7 @@
"@faceless-ui/modal": "3.0.0-beta.2",
"@lifi/sdk": "^3.0.1",
"@t3-oss/env-core": "^0.10.1",
"@tanstack/react-query": "^5.36.0",
"@tanstack/react-query": "^5.56.2",
"@tanstack/react-router": "^1.32.5",
"@tanstack/react-virtual": "^3.7.0",
"@uniswap/default-token-list": "^11.19.0",
Expand All @@ -42,7 +42,7 @@
"react-error-boundary": "^4.0.13",
"react-hot-toast": "^2.4.1",
"react-jazzicon": "^1.0.4",
"react-number-format": "^5.4.0",
"react-number-format": "^5.4.2",
"styled-components": "^6.1.13",
"use-debounce": "^10.0.1",
"viem": "~2.10.9",
Expand All @@ -59,9 +59,9 @@
"@tanstack/router-devtools": "^1.32.5",
"@tanstack/router-vite-plugin": "^1.32.2",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^16.0.0",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/react": "^18.3.2",
"@types/react": "^18.3.8",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^7.17.0",
"@typescript-eslint/parser": "^7.17.0",
Expand All @@ -75,7 +75,7 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-no-relative-import-paths": "^1.5.5",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react": "^7.36.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.9",
"eslint-plugin-sort-destructure-keys": "^2.0.0",
Expand All @@ -87,7 +87,6 @@
"stylelint": "^16.7.0",
"stylelint-config-standard": "^36.0.1",
"ts-node": "^10.9.2",
"tsc-files": "^1.1.4",
"typedoc": "^0.26.5",
"typedoc-plugin-inline-sources": "^1.0.2",
"typedoc-plugin-missing-exports": "^3.0.0",
Expand Down
Loading

0 comments on commit a1d45a3

Please sign in to comment.