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
36 changes: 22 additions & 14 deletions .github/workflows/_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,50 @@ jobs:
setup:
runs-on: ubuntu-latest
outputs:
yarn-cache-path: ${{ steps.yarn-cache-path.outputs.dir }}
pnpm-cache-path: ${{ steps.pnpm-cache-path.outputs.store }}
steps:
- uses: actions/checkout@v4
- name: install pnpm
uses: pnpm/action-setup@v4
with:
run_install: false
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: yarn
- name: Get yarn cache directory path
id: yarn-cache-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
cache: pnpm
- name: Get pnpm store directory
run: |
echo "store=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
- uses: actions/cache@v4
id: yarn-cache
id: pnpm-cache
with:
path: |
${{ github.workspace }}/node_modules
${{ steps.yarn-cache-path.outputs.dir }}
${{ steps.pnpm-cache-path.outputs.store }}
${{ github.workspace }}/.next/cache
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}

- name: Install packages
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: yarn install --immutable
if: steps.pnpm-cache.outputs.cache-hit != 'true'
run: pnpm install --frozen-lockfile

check:
runs-on: ubuntu-latest
needs: setup
steps:
- uses: actions/checkout@v4
- name: install pnpm
uses: pnpm/action-setup@v4
with:
run_install: false
- uses: actions/cache@v4
with:
path: |
${{ github.workspace }}/node_modules
${{needs.setup.outputs.yarn-cache-path}}
${{needs.setup.outputs.pnpm-cache-path}}
${{ github.workspace }}/.next/cache
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
- name: tsc
run: yarn tsc
run: pnpm tsc
- name: lint, prettier
run: yarn turbo lint prettier:check
run: pnpm turbo lint prettier:check
20 changes: 12 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,25 @@ jobs:
needs: ci
steps:
- uses: actions/checkout@v4
- name: Get yarn cache directory path
id: yarn-cache-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
- name: install pnpm
uses: pnpm/action-setup@v4
with:
run_install: false
- name: Get pnpm cache directory path
id: pnpm-cache-path
run: echo "store=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
- uses: actions/cache@v4
id: yarn-cache
id: pnpm-cache
with:
path: |
${{ github.workspace }}/node_modules
${{ steps.yarn-cache-path.outputs.dir }}
${{ steps.pnpm-cache-path.outputs.dir }}
${{ github.workspace }}/.next/cache
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
restore-keys: |
${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-
${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}-
- name: Run build
run: yarn build
run: pnpm build
env:
NEXT_PUBLIC_AIRTABLE_PAT: ${{ secrets.NEXT_PUBLIC_AIRTABLE_PAT }}
NEXT_PUBLIC_AIRTABLE_BASE_INQUIRYFORM: ${{ secrets.NEXT_PUBLIC_AIRTABLE_BASE_INQUIRYFORM }}
Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,29 @@ jobs:
needs: ci
steps:
- uses: actions/checkout@v4
- name: install pnpm
uses: pnpm/action-setup@v4
with:
run_install: false
- uses: actions/configure-pages@v5
with:
# Automatically inject basePath in next.config.js
static_site_generator: next
- name: Get yarn cache directory path
id: yarn-cache-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
- name: Get pnpm cache directory path
id: pnpm-cache-path
run: echo "store=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
- uses: actions/cache@v4
id: yarn-cache
id: pnpm-cache
with:
path: |
${{ github.workspace }}/node_modules
${{ steps.yarn-cache-path.outputs.dir }}
${{ steps.pnpm-cache-path.outputs.store }}
${{ github.workspace }}/.next/cache
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
restore-keys: |
${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-
${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}-
- name: build
run: yarn build
run: pnpm build
env:
NODE_ENV: production
NEXT_PUBLIC_AIRTABLE_PAT: ${{ secrets.NEXT_PUBLIC_AIRTABLE_PAT }}
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/node_modules
/.pnp
.pnp.js
pnpm-lock.yaml

# hardhat
/libs/hardhat/*
Expand Down
873 changes: 0 additions & 873 deletions .yarn/releases/yarn-3.5.1.cjs

This file was deleted.

3 changes: 0 additions & 3 deletions .yarnrc.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ CI Status: [![CI status (main)](https://github.com/unchain-tech/website/actions/
Setup

```zsh
yarn install
yarn simple-git-hooks
pnpm install
pnpm simple-git-hooks
```

Local environment

```zsh
yarn dev
pnpm dev
```

## Contributing
Expand Down
2 changes: 1 addition & 1 deletion next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
58 changes: 29 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,43 +14,43 @@
"bugs": {
"url": "https://github.com/neila/unchain-lp/issues"
},
"packageManager": "[email protected]",
"packageManager": "[email protected]",
"dependencies": {
"airtable": "^0.12.2",
"lru-cache": "^10.2.0",
"next": "^14.1.4",
"lru-cache": "^11.0.2",
"next": "^15.1.0",
"next-language-detector": "^1.1.0",
"next-translate": "^2.6.2",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.14",
"@mui/material": "^5.15.14",
"@tailwindcss/typography": "^0.5.12",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/node": "^20.11.30",
"@types/react": "^18.2.73",
"@types/react-dom": "^18.2.23",
"@typescript-eslint/eslint-plugin": "^7.4.0",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-config-next": "^14.1.4",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@mui/icons-material": "^6.2.0",
"@mui/material": "^6.2.0",
"@tailwindcss/typography": "^0.5.15",
"@trivago/prettier-plugin-sort-imports": "^5.2.0",
"@types/node": "^22.10.2",
"@types/react": "^19.0.1",
"@types/react-dom": "^19.0.2",
"@typescript-eslint/eslint-plugin": "^8.18.0",
"autoprefixer": "^10.4.20",
"eslint": "^9.17.0",
"eslint-config-next": "^15.1.0",
"eslint-config-prettier": "^9.1.0",
"hamburger-react": "^2.5.0",
"lint-staged": "^15.2.2",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.13",
"react-hook-form": "^7.51.2",
"react-icons": "^5.0.1",
"react-social-icons": "^6.15.0",
"hamburger-react": "^2.5.1",
"lint-staged": "^15.2.11",
"postcss": "^8.4.49",
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.6.9",
"react-hook-form": "^7.54.1",
"react-icons": "^5.4.0",
"react-social-icons": "^6.18.0",
"simple-git-hooks": "^2.11.1",
"tailwindcss": "^3.4.3",
"turbo": "^1.13.0",
"typescript": "^5.4.3"
"tailwindcss": "^3.4.16",
"turbo": "^2.3.3",
"typescript": "^5.7.2"
},
"simple-git-hooks": {
"pre-commit": "npx lint-staged"
Expand Down
Loading
Loading