Merge (#632) (#634)

.changeset/nasty-schools-camp.md

@@ -0,0 +1,9 @@
+---
+'@status-im/eslint-config': patch
+'@status-im/components': patch
+'@status-im/js': patch
+'@status-im/colors': patch
+'@status-im/icons': patch
+---
+
+use pnpm and update node

.github/workflows/ci.yml

@@ -24,23 +24,28 @@ jobs:
         with:
           fetch-depth: 2
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9.12.3
+
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
-          cache: 'yarn'
+          node-version: 20.18.0
+          cache: 'pnpm'
 
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: pnpm install --frozen-lockfile
 
       - name: Build
-        run: yarn build
+        run: pnpm build
 
       - name: Typecheck
-        run: yarn typecheck
+        run: pnpm typecheck
 
       - name: Lint
-        run: yarn lint && yarn format --check
+        run: pnpm lint && pnpm format --check
 
       - name: Test
-        run: yarn test
+        run: pnpm test

.github/workflows/release.yml

@@ -21,18 +21,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v4
         with:
-          node-version: 18
-      - run: yarn install --frozen-lockfile
-      - run: yarn build
+          version: 9.12.3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.18.0
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm build
       - uses: changesets/action@v1
         id: changesets
         with:
           title: Release
           commit: Release
-          version: yarn changeset version
-          publish: yarn changeset publish
+          version: pnpm changeset version
+          publish: pnpm changeset publish
           createGithubReleases: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx lint-staged
+pnpm lint-staged

.node-version

@@ -0,0 +1 @@
+20.18.0

.npmignore

@@ -0,0 +1,2 @@
+!.npmrc
+#!pnpm-lock.yaml

.npmrc

@@ -0,0 +1,11 @@
+; https://pnpm.io/cli/run#enable-pre-post-scripts
+enable-pre-post-scripts=true
+; https://pnpm.io/npmrc#node-linker
+; node-linker=hoisted
+; https://pnpm.io/npmrc#shamefully-hoist
+;shamefully-hoist=true
+;auto-install-peers=true
+; https://pnpm.io/npmrc#node-version
+node-version=20.18.0
+; https://pnpm.io/npmrc#engine-strict
+engine-strict=true

.prettierignore

@@ -0,0 +1 @@
+pnpm-lock.yaml

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
-  "npm.packageManager": "yarn",
+  "npm.packageManager": "pnpm",
   "eslint.workingDirectories": [
     {
       "mode": "auto",

README.md

@@ -24,8 +24,8 @@ This monorepo contains packages for building web applications in the Status ecos
 
 Required:
 
-- **[Node.js](https://nodejs.org/)** v18.x
-- **[Yarn](https://yarnpkg.com/)** v1.22.x
+- **[Node.js](https://nodejs.org/)** v20.x
+- **[pnpm](https://pnpm.io)** v9.12.x
 
 Recommended:
 
@@ -57,32 +57,32 @@ Recommended:
 2. Install dependencies:
 
    ```
-   yarn install
+   pnpm install
    ```
 
 3. Build all packages:
 
    ```
-   yarn build
+   pnpm build
    ```
 
 4. Run tests:
 
    ```
-   yarn test
+   pnpm test
    ```
 
 5. Start development mode:
    ```
-   yarn dev
+   pnpm dev
    ```
 
 ## Storybook
 
 To view and interact with the components, you can run Storybook:
 
 ```
-yarn storybook
+pnpm storybook
 ```
 
 This will start the Storybook server, allowing you to browse and test components in isolation.

apps/connector/Jenkinsfile

@@ -48,7 +48,7 @@ pipeline {
           dir("${env.WORKSPACE}/apps/connector") {
             script {
               nix.shell(
-                'yarn install --frozen-lockfile',
+                'pnpm install --frozen-lockfile',
                 pure: false,
                 entryPoint: "${env.WORKSPACE}/apps/connector/shell.nix"
               )
@@ -65,7 +65,7 @@ pipeline {
           dir("${env.WORKSPACE}/apps/connector") {
             script {
               nix.shell(
-                'yarn build:chrome',
+                'pnpm build:chrome',
                 pure: false,
                 entryPoint: "${env.WORKSPACE}/apps/connector/shell.nix"
               )
@@ -121,15 +121,15 @@ pipeline {
     success {
       script {
         if(changesDetected) {
-          github.notifyPR(true) 
-        } 
+          github.notifyPR(true)
+        }
       }
     }
     failure {
       script {
         if(changesDetected) {
-          github.notifyPR(false) 
-        } 
+          github.notifyPR(false)
+        }
       }
     }
     cleanup { cleanWs() }

apps/connector/README.md

@@ -20,13 +20,13 @@ Tested with these browsers:
 #### Develop
 
 ```bash
-yarn dev:chrome
+pnpm dev:chrome
 ```
 
 #### Build
 
 ```bash
-yarn build:chrome
+pnpm build:chrome
 ```
 
 #### Load
@@ -42,7 +42,7 @@ Google Chrome > Window > Extensions > Load unpacked > select build (build/chrome
 #### Develop
 
 ```bash
-yarn dev:safari
+pnpm dev:safari
 ```
 
 #### Convert
@@ -70,13 +70,13 @@ Safari > Settings... > Extensions > check Status
 #### Develop
 
 ```bash
-yarn dev:firefox
+pnpm dev:firefox
 ```
 
 #### Build
 
 ```bash
-yarn build:firefox
+pnpm build:firefox
 ```
 
 #### Load

apps/connector/package.json

@@ -9,6 +9,7 @@
     "directory": "apps/connector"
   },
   "scripts": {
+    "preinstall": "npx only-allow pnpm",
     "dev:chrome": "plasmo dev --target=chrome-mv3",
     "dev:safari": "plasmo dev --target=safari-mv3",
     "dev:firefox": "plasmo dev --target=firefox-mv3",

apps/connector/shell.nix

@@ -1,7 +1,7 @@
 {
   source ? builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/614b4613980a522ba49f0d194531beddbb7220d3.tar.gz";
-    sha256 = "sha256:1kipdjdjcd1brm5a9lzlhffrgyid0byaqwfnpzlmw3q825z7nj6w";
+    url = "https://github.com/NixOS/nixpkgs/archive/df27247e6f3e636c119e2610bf12d38b5e98cc79.tar.gz";
+    sha256 = "sha256:0bbvimk7xb7akrx106mmsiwf9nzxnssisqmqffla03zz51d0kz2n";
   },
   pkgs ? import (source) {}
 }:
@@ -11,6 +11,6 @@ pkgs.mkShell {
 
   buildInputs = with pkgs; [
     nodejs_20
-    yarn
+    pnpm
   ];
 }