Skip to content
Merged
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
26 changes: 8 additions & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,18 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 21
- name: ⚙️ Setup pnpm
uses: pnpm/action-setup@v2
- name: ⚙️ Setup Bun
uses: oven-sh/setup-bun@v2
with:
version: 8
run_install: false
- name: 🔍 Get pnpm store directory
shell: bash
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: ⚙️ Setup pnpm cache
uses: actions/cache@v3
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: ${{ runner.os }}-pnpm-store-
- name: 📥 Restore dependencies
run: pnpm install
bun-version: latest
- name: 📥 Install dependencies
run: bun install
- name: ⚒ Build project
run: |
echo "VITE_API_URL=${{ vars.VITE_API_URL }}" >> .env
pnpm build
bun run build
- name: ⬆️ Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build
path: 'dist/**'
path: dist/**
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ dist-ssr
# Yarn
.yarn
.yarnrc.yml
/bun.lock
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

pnpm lint-staged
bun lint-staged
4 changes: 2 additions & 2 deletions components.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"rsc": false,
"tsx": true,
"tailwind": {
"config": "tailwind.config.js",
"css": "src/app/styles/index.scss",
"config": "",
"css": "src/styles.css",
"baseColor": "neutral",
"cssVariables": true,
"prefix": ""
Expand Down
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<link rel="icon" type="image/svg+xml" href="./src/assets/logo.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Crowd Parlay</title>
<link href="/src/styles.css" rel="stylesheet" />
</head>
<body>
<div id="root"></div>
Expand Down
80 changes: 48 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,69 +13,83 @@
"build-storybook": "storybook build"
},
"dependencies": {
"@hookform/resolvers": "^5.0.1",
"@mere1y/effector-openapi-preset": "^0.4.0",
"@microsoft/signalr": "^8.0.7",
"@radix-ui/react-avatar": "^1.1.1",
"@radix-ui/react-context-menu": "^2.2.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-dialog": "^1.1.14",
"@radix-ui/react-dropdown-menu": "^2.1.15",
"@radix-ui/react-label": "^2.1.7",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-toggle": "^1.1.9",
"@radix-ui/react-tooltip": "^1.1.4",
"@types/lodash": "^4.17.13",
"atomic-router": "^0.8.0",
"atomic-router-react": "^0.8.5",
"autoprefixer": "^10.4.20",
"axios": "^1.5.0",
"class-variance-authority": "^0.7.0",
"axios": "^1.6.0",
"class-variance-authority": "^0.7.1",
"classnames": "^2.3.2",
"clsx": "^2.1.1",
"effector": "^22.8.6",
"effector": "^22.8.7",
"effector-forms": "^1.3.4",
"effector-react": "^22.5.4",
"effector-storage": "^7.0.0",
"esbuild": "^0.24.0",
"history": "^5.3.0",
"immer": "^10.0.3",
"lodash": "^4.17.21",
"lucide-react": "^0.454.0",
"lucide-react": "^0.515.0",
"motion": "^11.11.17",
"next-themes": "^0.4.3",
"patronum": "^1.19.2",
"ogl": "^1.0.11",
"patronum": "^1.20.0",
"postcss": "^8.4.47",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.56.4",
"react-jwt": "^1.2.0",
"react-markdown": "^10.1.0",
"react-stack-grid": "^0.7.1",
"react-waypoint": "^10.3.0",
"sass": "^1.68.0",
"remark-directive": "^4.0.0",
"sass": "^1.69.5",
"sonner": "^1.7.0",
"string-to-color": "^2.2.2",
"tailwind-merge": "^2.5.4",
"tailwindcss": "^3.4.14",
"tailwindcss-animate": "^1.0.7"
"tailwind-merge": "^3.3.1",
"tailwindcss": "^4.1.10",
"tailwindcss-animate": "^1.0.7",
"unist-util-visit": "^5.0.0",
"zod": "^3.25.30"
},
"devDependencies": {
"@babel/core": "^7.22.20",
"@babel/preset-env": "^7.22.20",
"@babel/core": "^7.23.2",
"@babel/preset-env": "^7.23.2",
"@babel/preset-react": "^7.22.15",
"@babel/preset-typescript": "^7.22.15",
"@mere1y/effector-openapi-preset": "^0.4.0",
"@rollup/plugin-babel": "^6.0.3",
"@babel/preset-typescript": "^7.23.2",
"@rollup/plugin-babel": "^6.0.4",
"@storybook/addon-essentials": "^7.6.10",
"@storybook/addon-interactions": "^7.6.10",
"@storybook/addon-links": "^7.6.10",
"@storybook/blocks": "^7.6.10",
"@storybook/react": "^7.6.10",
"@storybook/react-vite": "^7.6.10",
"@storybook/testing-library": "^0.2.2",
"@trivago/prettier-plugin-sort-imports": "^4.2.0",
"@tailwindcss/vite": "^4.1.10",
"@trivago/prettier-plugin-sort-imports": "^4.2.1",
"@types/node": "^22.9.0",
"@types/react": "^18.2.22",
"@types/react-dom": "^18.2.7",
"@types/react-stack-grid": "^0.7.3",
"@typescript-eslint/eslint-plugin": "^6.7.2",
"@typescript-eslint/parser": "^6.7.2",
"@vitejs/plugin-react": "^4.0.4",
"eslint": "^8.50.0",
"@types/react": "^18.2.36",
"@types/react-dom": "^18.2.14",
"@types/react-stack-grid": "^0.7.5",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"@vitejs/plugin-react": "^4.1.1",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-effector": "^0.11.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"eslint-plugin-react-refresh": "^0.4.4",
"eslint-plugin-storybook": "^0.6.15",
"husky": "^8.0.3",
"lint-staged": "^14.0.1",
Expand All @@ -84,17 +98,19 @@
"prop-types": "^15.8.1",
"storybook": "^7.6.10",
"storybook-dark-mode": "^3.0.3",
"stylelint": "^15.10.3",
"stylelint": "^15.11.0",
"stylelint-config-idiomatic-order": "^9.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-config-standard-scss": "^11.0.0",
"stylelint-config-standard-scss": "^11.1.0",
"stylelint-order": "^6.0.3",
"tailwind-scrollbar": "^4.0.2",
"tw-animate-css": "^1.3.4",
"typed-contracts": "^3.0.0",
"typescript": "^5.2.2",
"vite": "^4.4.9",
"vite-plugin-stylelint": "^5.1.1",
"vite-plugin-svgr": "^4.0.0",
"vitest": "^0.34.5"
"vite": "^6.3.5",
"vite-plugin-stylelint": "^5.2.0",
"vite-plugin-svgr": "^4.1.0",
"vitest": "^0.34.6"
},
"lint-staged": {
"**/*": "prettier --write --ignore-unknown"
Expand Down
Loading
Loading