Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: replaces nvm with volta #100

Merged
merged 2 commits into from
Jun 18, 2023
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: 6 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT: 3
NX_BRANCH: ${{ github.event.number || github.ref_name }}
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
VOLTA_FEATURE_PNPM: 1

jobs:
main:
Expand All @@ -29,20 +30,13 @@ jobs:
with:
fetch-depth: 0

- name: Derive appropriate SHAs for base and head for `nx affected` commands
- name: Derive SHAs for `nx affected` commands
uses: nrwl/nx-set-shas@v3
with:
main-branch-name: 'main'

- uses: pnpm/[email protected]
with:
version: 8.6.1

- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: 18
cache: 'pnpm'
- name: Setup volta
uses: volta-cli/action@v4

- name: Install dependencies
run: pnpm install
Expand All @@ -57,7 +51,6 @@ jobs:
run: |
pids=()

# list of commands to be run on main has env flag NX_CLOUD_DISTRIBUTED_EXECUTION set to false
NX_CLOUD_DISTRIBUTED_EXECUTION=false pnpm nx-cloud record -- pnpm nx format:check & pids+=($!)

pnpm nx affected -t lint --parallel=3 & pids+=($!)
Expand Down Expand Up @@ -97,15 +90,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- uses: pnpm/[email protected]
with:
version: 8.6.1

- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: 18
cache: 'pnpm'
- name: Setup volta
uses: volta-cli/action@v4

- name: Install dependencies
run: pnpm install
Expand Down
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

3 changes: 3 additions & 0 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,8 @@
"postcss": "^8.4.24",
"tailwindcss": "^3.3.2",
"vitest": "^0.32.0"
},
"volta": {
"extends": "../../package.json"
}
}
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@
"prettier-plugin-tailwindcss": "^0.3.0",
"typescript": "^5.1.3"
},
"packageManager": "[email protected].1",
"packageManager": "[email protected].2",
"engines": {
"node": ">=18.16.0",
"pnpm": ">=8.6.1"
"pnpm": ">=8.6.2"
},
"volta": {
"node": "18.16.0",
"pnpm": "8.6.2"
},
"pnpm": {
"patchedDependencies": {
Expand Down
3 changes: 3 additions & 0 deletions packages/config/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@
"eslint-plugin-storybook": "^0.6.12",
"eslint-plugin-testing-library": "^5.11.0",
"eslint-plugin-vitest": "^0.2.5"
},
"volta": {
"extends": "../../../package.json"
}
}
3 changes: 3 additions & 0 deletions packages/config/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,8 @@
},
"devDependencies": {
"@noodle/tsconfig": "workspace:^"
},
"volta": {
"extends": "../../../package.json"
}
}
3 changes: 3 additions & 0 deletions packages/config/tailwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@
"tailwindcss-animate": "^1.0.5",
"windy-radix-palette": "^0.6.1",
"windy-radix-typography": "^0.2.1"
},
"volta": {
"extends": "../../../package.json"
}
}
5 changes: 4 additions & 1 deletion packages/config/tsconfig/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@
"./base.json",
"./nextjs.json",
"./react.json"
]
],
"volta": {
"extends": "../../../package.json"
}
}
3 changes: 3 additions & 0 deletions packages/config/vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,8 @@
"happy-dom": "^9.20.3",
"vite-tsconfig-paths": "^4.2.0",
"vitest": "^0.32.0"
},
"volta": {
"extends": "../../../package.json"
}
}
3 changes: 3 additions & 0 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@
"storybook-addon-pseudo-states": "^2.0.1",
"tailwindcss": "^3.3.2",
"vite": "^4.3.9"
},
"volta": {
"extends": "../../package.json"
}
}
3 changes: 3 additions & 0 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,8 @@
"tailwindcss": "^3.3.2",
"vite": "^4.3.9",
"vitest": "^0.32.0"
},
"volta": {
"extends": "../../package.json"
}
}