Skip to content

Commit 2fad122

Browse files
authored
Merge (#632) (#634)
1 parent 3c968a2 commit 2fad122

31 files changed

+19849
-20376
lines changed

.changeset/nasty-schools-camp.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@status-im/eslint-config': patch
3+
'@status-im/components': patch
4+
'@status-im/js': patch
5+
'@status-im/colors': patch
6+
'@status-im/icons': patch
7+
---
8+
9+
use pnpm and update node

.github/workflows/ci.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,28 @@ jobs:
2424
with:
2525
fetch-depth: 2
2626

27+
- name: Setup pnpm
28+
uses: pnpm/action-setup@v4
29+
with:
30+
version: 9.12.3
31+
2732
- name: Setup Node.js
28-
uses: actions/setup-node@v3
33+
uses: actions/setup-node@v4
2934
with:
30-
node-version: 18
31-
cache: 'yarn'
35+
node-version: 20.18.0
36+
cache: 'pnpm'
3237

3338
- name: Install dependencies
34-
run: yarn --frozen-lockfile
39+
run: pnpm install --frozen-lockfile
3540

3641
- name: Build
37-
run: yarn build
42+
run: pnpm build
3843

3944
- name: Typecheck
40-
run: yarn typecheck
45+
run: pnpm typecheck
4146

4247
- name: Lint
43-
run: yarn lint && yarn format --check
48+
run: pnpm lint && pnpm format --check
4449

4550
- name: Test
46-
run: yarn test
51+
run: pnpm test

.github/workflows/release.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,21 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v3
24-
- uses: actions/setup-node@v3
24+
- uses: pnpm/action-setup@v4
2525
with:
26-
node-version: 18
27-
- run: yarn install --frozen-lockfile
28-
- run: yarn build
26+
version: 9.12.3
27+
- uses: actions/setup-node@v4
28+
with:
29+
node-version: 20.18.0
30+
- run: pnpm install --frozen-lockfile
31+
- run: pnpm build
2932
- uses: changesets/action@v1
3033
id: changesets
3134
with:
3235
title: Release
3336
commit: Release
34-
version: yarn changeset version
35-
publish: yarn changeset publish
37+
version: pnpm changeset version
38+
publish: pnpm changeset publish
3639
createGithubReleases: true
3740
env:
3841
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.husky/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
npx lint-staged
4+
pnpm lint-staged

.node-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20.18.0

.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
!.npmrc
2+
#!pnpm-lock.yaml

.npmrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
; https://pnpm.io/cli/run#enable-pre-post-scripts
2+
enable-pre-post-scripts=true
3+
; https://pnpm.io/npmrc#node-linker
4+
; node-linker=hoisted
5+
; https://pnpm.io/npmrc#shamefully-hoist
6+
;shamefully-hoist=true
7+
;auto-install-peers=true
8+
; https://pnpm.io/npmrc#node-version
9+
node-version=20.18.0
10+
; https://pnpm.io/npmrc#engine-strict
11+
engine-strict=true

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pnpm-lock.yaml

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"typescript.tsdk": "node_modules/typescript/lib",
3-
"npm.packageManager": "yarn",
3+
"npm.packageManager": "pnpm",
44
"eslint.workingDirectories": [
55
{
66
"mode": "auto",

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ This monorepo contains packages for building web applications in the Status ecos
2424

2525
Required:
2626

27-
- **[Node.js](https://nodejs.org/)** v18.x
28-
- **[Yarn](https://yarnpkg.com/)** v1.22.x
27+
- **[Node.js](https://nodejs.org/)** v20.x
28+
- **[pnpm](https://pnpm.io)** v9.12.x
2929

3030
Recommended:
3131

@@ -57,32 +57,32 @@ Recommended:
5757
2. Install dependencies:
5858

5959
```
60-
yarn install
60+
pnpm install
6161
```
6262

6363
3. Build all packages:
6464

6565
```
66-
yarn build
66+
pnpm build
6767
```
6868

6969
4. Run tests:
7070

7171
```
72-
yarn test
72+
pnpm test
7373
```
7474

7575
5. Start development mode:
7676
```
77-
yarn dev
77+
pnpm dev
7878
```
7979

8080
## Storybook
8181

8282
To view and interact with the components, you can run Storybook:
8383

8484
```
85-
yarn storybook
85+
pnpm storybook
8686
```
8787

8888
This will start the Storybook server, allowing you to browse and test components in isolation.

0 commit comments

Comments
 (0)