diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3ea5706..ef7d3a88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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/action-setup@v2.2.4 - 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 @@ -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+=($!) @@ -97,15 +90,8 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2.2.4 - 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 diff --git a/.nvmrc b/.nvmrc deleted file mode 100644 index c842f1ab..00000000 --- a/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -18.16 \ No newline at end of file diff --git a/apps/web/package.json b/apps/web/package.json index 6972c75f..9ba0a2b0 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -47,5 +47,8 @@ "postcss": "^8.4.24", "tailwindcss": "^3.3.2", "vitest": "^0.32.0" + }, + "volta": { + "extends": "../../package.json" } } diff --git a/package.json b/package.json index 6df76f18..835f853b 100644 --- a/package.json +++ b/package.json @@ -46,10 +46,14 @@ "prettier-plugin-tailwindcss": "^0.3.0", "typescript": "^5.1.3" }, - "packageManager": "pnpm@8.6.1", + "packageManager": "pnpm@8.6.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": { diff --git a/packages/config/eslint/package.json b/packages/config/eslint/package.json index 1ea95b77..5e5332b9 100644 --- a/packages/config/eslint/package.json +++ b/packages/config/eslint/package.json @@ -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" } } diff --git a/packages/config/storybook/package.json b/packages/config/storybook/package.json index 7ebebae1..5279d65e 100644 --- a/packages/config/storybook/package.json +++ b/packages/config/storybook/package.json @@ -36,5 +36,8 @@ }, "devDependencies": { "@noodle/tsconfig": "workspace:^" + }, + "volta": { + "extends": "../../../package.json" } } diff --git a/packages/config/tailwind/package.json b/packages/config/tailwind/package.json index 82f8c5a0..04c65700 100644 --- a/packages/config/tailwind/package.json +++ b/packages/config/tailwind/package.json @@ -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" } } diff --git a/packages/config/tsconfig/package.json b/packages/config/tsconfig/package.json index 649b9f47..f87b6e77 100644 --- a/packages/config/tsconfig/package.json +++ b/packages/config/tsconfig/package.json @@ -9,5 +9,8 @@ "./base.json", "./nextjs.json", "./react.json" - ] + ], + "volta": { + "extends": "../../../package.json" + } } diff --git a/packages/config/vitest/package.json b/packages/config/vitest/package.json index 8c798862..8ab1c00b 100644 --- a/packages/config/vitest/package.json +++ b/packages/config/vitest/package.json @@ -26,5 +26,8 @@ "happy-dom": "^9.20.3", "vite-tsconfig-paths": "^4.2.0", "vitest": "^0.32.0" + }, + "volta": { + "extends": "../../../package.json" } } diff --git a/packages/storybook/package.json b/packages/storybook/package.json index 64f6fd5f..2781da4c 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -32,5 +32,8 @@ "storybook-addon-pseudo-states": "^2.0.1", "tailwindcss": "^3.3.2", "vite": "^4.3.9" + }, + "volta": { + "extends": "../../package.json" } } diff --git a/packages/ui/package.json b/packages/ui/package.json index 2748217a..63401208 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -58,5 +58,8 @@ "tailwindcss": "^3.3.2", "vite": "^4.3.9", "vitest": "^0.32.0" + }, + "volta": { + "extends": "../../package.json" } }