Skip to content

Commit af5f11a

Browse files
authored
feat: configure pnpm and remove phantom deps (#2665)
## What's the purpose of this pull request? - Configure pnpm - Remove yarn - Remove all phantom deps 👻
1 parent 3fe3201 commit af5f11a

File tree

18 files changed

+23834
-19702
lines changed

18 files changed

+23834
-19702
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,31 @@ jobs:
2121
with:
2222
fetch-depth: 2
2323

24+
- name: Setup pnpm
25+
uses: pnpm/action-setup@v4
26+
with:
27+
version: 9.15.5
28+
cache: 'pnpm'
29+
2430
- name: Setup Node.js environment
2531
uses: actions/setup-node@v4
2632
with:
2733
node-version: 18
28-
cache: 'yarn'
2934

3035
- name: Install dependencies
31-
run: yarn --frozen-lockfile
36+
run: pnpm i
3237

3338
- name: Build
34-
run: yarn build
39+
run: pnpm build
3540

3641
- name: Size
37-
run: yarn size
42+
run: pnpm size
3843

3944
- name: Lint
40-
run: yarn lint
45+
run: pnpm lint
4146

4247
- name: Test
43-
run: yarn test
48+
run: pnpm test
4449

4550
- name: Publish to Chromatic
4651
uses: chromaui/action@latest
@@ -64,6 +69,12 @@ jobs:
6469
- name: Clone starter
6570
run: git clone https://github.com/vtex-sites/starter.store.git starter
6671

72+
- name: Install specific Yarn version
73+
run: npm install -g [email protected] # https://github.com/yarnpkg/yarn/issues/9015
74+
75+
- name: Verify Yarn version
76+
run: yarn --version
77+
6778
- name: Install the packages on starter
6879
run: |
6980
cd starter
@@ -74,7 +85,7 @@ jobs:
7485
- name: Install dependencies in starter
7586
run: |
7687
cd starter
77-
yarn install --frozen-lockfile
88+
yarn install
7889
7990
- name: Build starter
8091
run: |

.github/workflows/release.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,16 @@ jobs:
2323
token: ${{ secrets.VTEX_GITHUB_BOT_TOKEN }}
2424
fetch-depth: 2
2525

26+
- name: Setup pnpm
27+
uses: pnpm/action-setup@v4
28+
with:
29+
version: 9.15.5
30+
2631
- name: Setup Node.js environment
2732
uses: actions/setup-node@v4
2833
with:
2934
node-version: 18
30-
cache: 'yarn'
35+
cache: 'pnpm'
3136
registry-url: 'https://registry.npmjs.org'
3237

3338
- name: Configure CI Git User
@@ -36,22 +41,22 @@ jobs:
3641
git config user.email [email protected]
3742
3843
- name: Install dependencies
39-
run: yarn
44+
run: pnpm i
4045

4146
- name: Build
42-
run: yarn build
47+
run: pnpm build
4348

4449
- name: Size
45-
run: yarn size
50+
run: pnpm size
4651

4752
- name: Lint
48-
run: yarn lint
53+
run: pnpm lint
4954

5055
- name: Test
51-
run: yarn test
56+
run: pnpm test
5257

5358
- name: Publish
54-
run: yarn release
59+
run: pnpm release
5560
env:
5661
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
5762

.husky/pre-commit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
yarn install
2-
yarn lint-staged
1+
pnpm i
2+
pnpm lint-staged

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
link-workspace-packages=true

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"version": "3.15.2",
3-
"npmClient": "yarn",
3+
"npmClient": "pnpm",
44
"command": {
55
"publish": {
66
"message": "[no ci] Release: %v"

package.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"license": "MIT",
66
"private": true,
77
"scripts": {
8+
"preinstall": "npx only-allow pnpm",
89
"build": "turbo run build --log-order=grouped",
910
"dev": "turbo run dev --parallel --no-cache",
1011
"lint": "biome check .",
@@ -17,9 +18,6 @@
1718
"clean": "turbo run clean && rm -rf node_modules",
1819
"prepare": "husky"
1920
},
20-
"workspaces": [
21-
"packages/*"
22-
],
2321
"devDependencies": {
2422
"@biomejs/biome": "1.9.4",
2523
"husky": "9.1.7",
@@ -38,12 +36,12 @@
3836
"version": "0.0.0",
3937
"volta": {
4038
"node": "18.19.0",
41-
"yarn": "1.22.22"
39+
"pnpm": "9.15.5"
4240
},
4341
"dependencies": {},
44-
"packageManager": "[email protected]",
42+
"packageManager": "[email protected]",
4543
"lint-staged": {
46-
"*.{ts,js,tsx,jsx,json}": "yarn lint:fix",
44+
"*.{ts,js,tsx,jsx,json}": "pnpm lint:fix",
4745
"*.scss": "stylelint --fix"
4846
}
4947
}

packages/api/package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"node": ">=18"
2424
},
2525
"scripts": {
26-
"dev": "concurrently \"yarn generate -w\" \"tsc --watch\" \"yarn dev:graphql\"",
26+
"dev": "concurrently \"pnpm run generate -w\" \"tsc --watch\" \"pnpm run dev:graphql\"",
2727
"dev:graphql": "nodemon --watch src --ext graphql --exec \"copyfiles \"src/**/*.graphql\" dist/esm\"",
2828
"dev:server": "tsx --no-cache ./local/server.ts",
29-
"build": "graphql-codegen --config codegen.yml && (yarn build:cjs && yarn build:esm)",
29+
"build": "graphql-codegen --config codegen.yml && (pnpm build:cjs && pnpm build:esm)",
3030
"build:cjs": "tsc --module commonjs --moduleResolution node10 --outDir dist/cjs && copyfiles \"src/**/*.graphql\" dist/cjs",
3131
"build:esm": "tsc && copyfiles \"src/**/*.graphql\" dist/esm",
3232
"test": "jest",
@@ -36,10 +36,14 @@
3636
"@envelop/on-resolve": "^4.1.1",
3737
"@graphql-tools/load-files": "^7.0.0",
3838
"@graphql-tools/schema": "^9.0.0",
39+
"@graphql-tools/utils": "^10.2.0",
3940
"@opentelemetry/exporter-logs-otlp-grpc": "^0.39.1",
4041
"@opentelemetry/exporter-trace-otlp-grpc": "^0.39.1",
4142
"@opentelemetry/sdk-logs": "^0.39.1",
4243
"@opentelemetry/sdk-trace-base": "^1.13.0",
44+
"@opentelemetry/api-logs": "^0.39.1",
45+
"@opentelemetry/api": "^1.4.1",
46+
"@opentelemetry/resources": "^1.13.0",
4347
"@rollup/plugin-graphql": "^1.0.0",
4448
"cookie": "^0.7.0",
4549
"dataloader": "^2.1.0",
@@ -56,6 +60,7 @@
5660
"@types/cookie": "^0.6.0",
5761
"@types/express": "^4.17.16",
5862
"@types/sanitize-html": "^2.9.1",
63+
"@types/jest": "29.1.0",
5964
"concurrently": "^6.2.1",
6065
"copyfiles": "^2.4.1",
6166
"express": "^4.17.3",

packages/cli/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"@types/degit": "^2.8.6",
3737
"@types/fs-extra": "^9.0.13",
3838
"@types/node": "^16.11.63",
39+
"@types/jest": "29.1.0",
3940
"chai": "^4",
4041
"jest": "^29.7.0",
4142
"oclif": "^3",

packages/components/package.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,25 @@
3333
"react": "^18.2.0",
3434
"react-dom": "^18.2.0"
3535
},
36+
"dependencies": {
37+
"react-intersection-observer": "^8.32.5",
38+
"react-swipeable": "^7.0.0",
39+
"tabbable": "^5.2.1"
40+
},
3641
"devDependencies": {
3742
"@testing-library/jest-dom": "^6.5.0",
3843
"@testing-library/react": "^14.3.0",
3944
"@types/jest-axe": "^3.5.9",
4045
"@types/react": "^18.2.42",
4146
"@types/react-dom": "^18.2.17",
47+
"@types/tabbable": "^3.1.1",
48+
"@types/jest": "29.1.0",
49+
"@jest/globals": "29.7.0",
4250
"jest": "^29.7.0",
4351
"jest-axe": "^9.0.0",
4452
"jest-environment-jsdom": "^29.7.0",
45-
"ts-jest": "^29.1.2"
53+
"ts-jest": "^29.1.2",
54+
"tslib": "^2.3.1"
4655
},
4756
"volta": {
4857
"extends": "../../package.json"

packages/core/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
},
3434
"volta": {
3535
"node": "18.19.0",
36-
"yarn": "1.22.22"
36+
"pnpm": "9.15.1"
3737
},
3838
"sideEffects": false,
3939
"dependencies": {
@@ -91,6 +91,7 @@
9191
"@types/cypress": "^1.1.3",
9292
"@types/fs-extra": "^9.0.13",
9393
"@types/jest": "29.1.0",
94+
"@jest/globals": "29.7.0",
9495
"@vtex/prettier-config": "1.0.0",
9596
"axe-core": "^4.8.1",
9697
"cypress": "12.17.4",

packages/lighthouse/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@
2121
"scripts": {
2222
"dev": "tsc --watch",
2323
"build": "tsc"
24+
},
25+
"devDependencies": {
26+
"@types/node": "^18.11.16"
2427
}
2528
}

packages/sdk/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
"devDependencies": {
3939
"@size-limit/preset-small-lib": "^7.0.8",
4040
"@testing-library/react": "^14.3.0",
41+
"@types/node": "^18.11.16",
42+
"@types/jest": "29.1.0",
4143
"fake-indexeddb": "^3.1.3",
4244
"jest": "^29.7.0",
4345
"jest-environment-jsdom": "^29.7.0",
@@ -47,6 +49,7 @@
4749
"tslib": "^2.3.1"
4850
},
4951
"dependencies": {
50-
"idb-keyval": "^5.1.3"
52+
"idb-keyval": "^5.1.3",
53+
"@types/react": "^18.2.42"
5154
}
5255
}

packages/storybook/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"volta": {
2020
"node": "18.19.0",
21-
"yarn": "1.22.22"
21+
"pnpm": "9.15.1"
2222
},
2323
"scripts": {
2424
"dev": "storybook dev -p 6006",

packages/ui/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,11 @@
6060
"devDependencies": {
6161
"@size-limit/preset-small-lib": "^7.0.8",
6262
"@types/tabbable": "^3.1.1",
63+
"@types/node": "^18.11.16",
64+
"@types/react": "^18.2.42",
6365
"babel-loader": "^8.2.5",
64-
"size-limit": "^7.0.8"
66+
"size-limit": "^7.0.8",
67+
"tslib": "^2.3.1"
6568
},
6669
"volta": {
6770
"extends": "../../package.json"

0 commit comments

Comments
 (0)