Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@ jobs:
uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@

- name: Establish SSH Connection
uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.PV_CONTRACTS_SSH_KEY }}

- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Install Dependencies
run: |
git config --global url."ssh://".insteadOf https://
pnpm install --frozen-lockfile

- name: Run build
run: pnpm build
11 changes: 9 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,15 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3

- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Establish SSH Connection
uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.PV_CONTRACTS_SSH_KEY }}

- name: Install Dependencies
run: |
git config --global url."ssh://".insteadOf https://
pnpm install --frozen-lockfile

- name: Run Eslint
run: pnpm lint-ci
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,15 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v3

- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Establish SSH Connection
uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.PV_CONTRACTS_SSH_KEY }}

- name: Install Dependencies
run: |
git config --global url."ssh://".insteadOf https://
pnpm install --frozen-lockfile

- name: Run tests
run: pnpm test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ node_modules/
#misc
.direnv
shell.nix
.eslintcache
28 changes: 23 additions & 5 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,41 @@ import nextTypescript from "eslint-config-next/typescript";
import globals from 'globals'
import tseslint from 'typescript-eslint'
import js from '@eslint/js'
import eslintPluginIndex from '@progressive-victory/eslint-plugin-index-file'

export default defineConfig([
{
ignores: ['*.config.{js,mjs,ts,mts}', 'src/components/map/index.tsx'] //fix this later pls
},
{

export default defineConfig([{
files: ['**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
plugins: { js },
extends: ['js/recommended'],
}, {
},
{
files: ['**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
languageOptions: { globals: { ...globals.browser, ...globals.node } },
},
tseslint.configs.recommendedTypeChecked,
tseslint.configs.stylisticTypeChecked,
tseslint.configs.stylisticTypeChecked,
{
ignores: ['src/app/**', '**/*.helpers.*', 'src/*'],
extends: [eslintPluginIndex.configs.recommended],
},
...nextCoreWebVitals,
...nextTypescript,
...tailwind.configs['flat/recommended'], {
...tailwind.configs['flat/recommended'],
{
languageOptions: {
parserOptions: {
projectService: true,
tsconfigRootDir: import.meta.dirname,
},
},
}, {
},

{
rules: {
'object-shorthand': 'warn',
'@typescript-eslint/no-unsafe-assignment': 'warn',
Expand All @@ -36,6 +50,10 @@ tseslint.configs.recommendedTypeChecked,
'@typescript-eslint/no-unsafe-call': 'warn',
'@typescript-eslint/no-unsafe-return': 'warn',
'tailwindcss/no-custom-classname': 'off',
'react-hooks/set-state-in-effect': 'warn', // temporary. All 13 instances should be fixed,
'react-hooks/preserve-manual-memoization': 'warn', // temporary
'react-hooks/refs': 'warn', // temporary
'react-hooks/immutability': 'warn' //temporary
},
}, {
files: ['**/*.{js,mjs}'],
Expand Down
53 changes: 0 additions & 53 deletions eslint.config.mjs

This file was deleted.

54 changes: 28 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,48 @@
"build": "next build",
"postbuild": "next-sitemap",
"start": "next start",
"lint": "eslint --fix .",
"lint-ci": "eslint --max-warnings 0 .",
"lint": "eslint --cache --fix src",
"lint-ci": "eslint --cache --max-warnings 0 .",
"test": "vitest",
"prettier": "prettier --write --ignore-path .prettierignore .",
"prettier-ci": "prettier --check --ignore-path .prettierignore ."
},
"dependencies": {
"@auth/core": "^0.40.0",
"@headlessui/react": "^2.2.9",
"@headlessui/react": "^2.2.10",
"@heroicons/react": "^2.2.0",
"@react-three/postprocessing": "^3.0.4",
"@tanstack/react-query": "^5.90.19",
"@tanstack/react-query": "^5.101.0",
"@uidotdev/usehooks": "^2.4.1",
"@vercel/analytics": "^1.6.1",
"classnames": "^2.5.1",
"csv-parser": "^3.2.0",
"csv-parser": "^3.2.1",
"deep-equal": "^2.2.3",
"framer-motion": "^12.29.0",
"framer-motion": "^12.40.0",
"leaflet": "^1.9.4",
"leaflet.markercluster": "^1.5.3",
"leva": "^0.10.1",
"motion": "^12.29.0",
"motion": "^12.40.0",
"next": "15.5.18",
"next-sitemap": "^4.2.3",
"phone": "^3.1.70",
"phone": "^3.1.71",
"postal-code-validator": "^1.0.3",
"react": "^19.2.3",
"react-dom": "^19.2.3",
"react-icons": "^5.5.0",
"pv-contracts": "github:Progressive-Victory/the-contracts",
"react": "^19.2.7",
"react-dom": "^19.2.7",
"react-icons": "^5.6.0",
"react-leaflet": "5.0.0-rc.2",
"react-leaflet-cluster": "^2.1.0",
"react-social-icons": "^6.25.0",
"react-social-icons": "^6.26.0",
"react-spinners": "^0.17.0",
"usehooks-ts": "^3.1.1",
"zod": "^4.3.6"
"zod": "^4.4.3"
},
"devDependencies": {
"@eslint/js": "^9.39.2",
"@next/eslint-plugin-next": "^15.5.9",
"@playwright/test": "^1.60.0",
"@eslint/js": "^9.39.4",
"@next/eslint-plugin-next": "^15.5.19",
"@playwright/test": "^1.61.0",
"@progressive-victory/eslint-plugin-index-file": "^1.2.4",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2",
"@testing-library/user-event": "^14.6.1",
Expand All @@ -59,28 +61,28 @@
"@types/jest": "^30.0.0",
"@types/leaflet": "^1.9.21",
"@types/leaflet.markercluster": "^1.5.6",
"@types/node": "^20.19.30",
"@types/react": "^19.2.9",
"@types/node": "^20.19.43",
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^4.7.0",
"eslint": "^9.39.2",
"eslint": "^9.39.4",
"eslint-config-next": "^16.2.9",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-tailwindcss": "^3.18.2",
"eslint-plugin-tailwindcss": "^3.18.3",
"globals": "^16.5.0",
"jest": "^30.2.0",
"jest-environment-jsdom": "^30.2.0",
"prettier": "^3.8.1",
"jest": "^30.4.2",
"jest-environment-jsdom": "^30.4.1",
"prettier": "^3.8.4",
"prettier-plugin-tailwindcss": "^0.6.14",
"tailwindcss": "^3.4.19",
"ts-node": "^10.9.2",
"typescript": "^5.9.3",
"typescript-eslint": "^8.53.1",
"typescript-eslint": "^8.61.1",
"vite-plugin-node-polyfills": "^0.24.0",
"vite-tsconfig-paths": "^6.0.4",
"vitest": "^4.1.0"
"vite-tsconfig-paths": "^6.1.1",
"vitest": "^4.1.9"
},
"pnpm": {
"overrides": {
Expand Down
Loading
Loading