Skip to content

Commit 07bb4fe

Browse files
authored
Merge pull request #15546 from ethereum/pnpm
feat: upgrade package manager to pnpm
2 parents 9cb1441 + f7e12a3 commit 07bb4fe

File tree

66 files changed

+17579
-16254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+17579
-16254
lines changed

.github/labeler.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"dependencies 📦":
1313
- package.json
1414
- yarn.lock
15+
- pnpm-lock.yaml
1516

1617
"config ⚙️":
1718
- i18n.config.json

.github/workflows/chromatic.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,18 @@ jobs:
3131
uses: actions/checkout@v2
3232
with:
3333
fetch-depth: 0 # 👈 Required to retrieve git history
34+
- name: Setup pnpm
35+
uses: pnpm/action-setup@v2
36+
with:
37+
version: 8
38+
- name: Setup Node.js
39+
uses: actions/setup-node@v3
40+
with:
41+
node-version: 20
42+
cache: 'pnpm'
3443
- name: Install deps
3544
# 👇 Install dependencies with the same package manager used in the project (replace it as needed), e.g. yarn, npm, pnpm
36-
run: yarn
45+
run: pnpm install
3746
- name: Publish to Chromatic
3847
# 👇 Adds Chromatic as a step in the workflow
3948
uses: chromaui/action@v1

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/node_modules
55
/.pnp
66
.pnp.js
7+
.pnpm-store/
78

89
# testing
910
/coverage
@@ -23,6 +24,9 @@
2324
npm-debug.log*
2425
yarn-debug.log*
2526
yarn-error.log*
27+
.pnpm-debug.log
28+
29+
pnpm-lock.yaml.bak
2630

2731
# local env files
2832
.env*.local
@@ -60,4 +64,3 @@ src/data/crowdin/bucketsAwaitingReviewReport.csv
6064
# Storybook
6165
build-storybook.log
6266
storybook-static
63-

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ yarn.lock
44
package-lock.json
55
public
66
build
7+
pnpm-lock.yaml

.storybook/main.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,10 @@ import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin"
44
import type { StorybookConfig } from "@storybook/nextjs"
55

66
/**
7-
* Note regarding package.json settings related to Storybook:
8-
*
9-
* There is a resolutions option set for the package `jackspeak`. This is related to a
10-
* workaround provided to make sure storybook ( as of v7.5.2) works correctly with
11-
* Yarn v1
12-
*
13-
* Reference: https://github.com/storybookjs/storybook/issues/22431#issuecomment-1630086092
14-
*
15-
* The primary recommendation is to upgrade to Yarn 3 if possible
7+
* Storybook configuration for the ethereum.org website
8+
* This loads our components as stories and configures the necessary
9+
* webpack settings for proper rendering
1610
*/
17-
1811
const config: StorybookConfig = {
1912
stories: [
2013
"../src/components/**/*.stories.{ts,tsx}",

.storybook/modes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import pickBy from "lodash/pickBy"
1+
import { pickBy } from "lodash"
22

33
import { baseLocales } from "./next-intl"
44
import { breakpointSet } from "./preview"

README.md

Lines changed: 42 additions & 4 deletions

app/[locale]/[...slug]/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import pick from "lodash.pick"
1+
import { pick } from "lodash"
22
import { notFound } from "next/navigation"
33
import { getMessages, setRequestLocale } from "next-intl/server"
44

app/[locale]/assets/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import pick from "lodash.pick"
1+
import { pick } from "lodash"
22
import {
33
getMessages,
44
getTranslations,

app/[locale]/bug-bounty/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import pick from "lodash.pick"
1+
import { pick } from "lodash"
22
import {
33
getMessages,
44
getTranslations,

0 commit comments

Comments
 (0)