Migrate to monorepo and pnpm

.github/workflows/publish_branch.yml

@@ -1,11 +1,10 @@
-name: "publish-branch"
+name: "Publish development branch packages"
 
 on:
-  workflow_dispatch:
+  push:
 
 jobs:
-  npm-publish:
-    name: "Publish"
+  publish-branch:
     runs-on: ubuntu-latest
 
     permissions:
@@ -14,15 +13,21 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+
+      - uses: pnpm/action-setup@v2.2.2
+        with:
+            version: 7
 
       - name: "Setup node with self-hosted npm registry"
         uses: actions/setup-node@v2
         with:
           node-version: "16"
           registry-url: "https://npm.fluence.dev"
 
-      - run: npm ci
-      - run: npm run build
+      - name: "Build packages"
+        run: |
+            pnpm i
+            pnpm -r build
 
       - name: "Import secrets"
         uses: hashicorp/vault-action@v2.4.2
@@ -53,8 +58,12 @@ jobs:
           RUN: ${{ github.run_number }}
           ATTEMPT: ${{ github.run_attempt }}
         run: |
-            npm version prerelease --no-git-tag-version \
-              --preid ${{ env.BRANCH }}-${{ env.SHA }}-${{ env.RUN }}-${{ env.ATTEMPT }}
+            for package in packages/*; do
+              cd $package
+              pnpm version prepatch --no-git-tag-version \
+                --preid ${{ env.BRANCH }}-${{ env.SHA }}-${{ env.RUN }}-${{ env.ATTEMPT }}
+              cd -
+            done
 
       - name: "Publish to self-hosted npm repo"
-        run: npm publish --tag snapshot --registry https://npm.fluence.dev
+        run: pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag snapshot -filter '@fluencelabs/*'

.github/workflows/release.yml → .github/workflows/release_github.yml

@@ -1,13 +1,12 @@
-name: "release"
+name: "Make github release"
 
 on:
   push:
     tags:
       - "v*"
 
 jobs:
-  npm-publish:
-    name: "Publish"
+  release-github:
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -20,23 +19,6 @@ jobs:
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-     ### Set version
-      - name: Set version to ${{ env.RELEASE_VERSION }}
-        run: npm version --new-version --allow-same-version ${{ env.RELEASE_VERSION }} --no-git-tag-version
-
-      ### Publish to NPM registry
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '16'
-          registry-url: 'https://registry.npmjs.org'
-
-      - run: npm i
-      - run: npm run build
-
-      - run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
       ### Create a release
       - name: Build Changelog
         id: changelog
@@ -56,4 +38,4 @@ jobs:
           draft: false
           prerelease: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release_packages.yml

@@ -0,0 +1,50 @@
+name: "Release packages"
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release-packages:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: pnpm/action-setup@v2.2.2
+        with:
+            version: 7
+
+      - name: "Setup node"
+        uses: actions/setup-node@v2
+        with:
+          node-version: "16"
+
+      - name: "Build packages"
+        run: |
+            pnpm i
+            pnpm -r build
+
+      - name: "Publish to npmjs.com"
+        run: |
+            result=$(pnpm --no-git-checks -r publish -filter '@fluencelabs/*')
+            if [[ $result == "There are no new packages that should be published" ]]
+            then
+                echo ERROR: no packages have been published. Did you forget to bump version?
+                exit 1
+            fi
+        env:
+            CI: true
+            NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: "Get the version of fluence-js package"
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@main
+        with:
+            path: packages/fluence-js
+
+      - name: "Create tag for release"
+        uses: rickstaa/action-create-tag@v1
+        with:
+          tag: "v${{ steps.package-version.outputs.current-version }}"
+          message: ""
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/js_sdk_ci.yml → .github/workflows/run_tests.yml

@@ -18,24 +18,27 @@ jobs:
         steps:
             - uses: actions/checkout@v2
 
-            - uses: actions/cache@v2
+            - uses: pnpm/action-setup@v2.2.2
               with:
-                  path: ~/.npm
-                  key: ${{ runner.os }}-v1-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
-                  restore-keys: |
-                      ${{ runner.os }}-v1-node-${{ matrix.node-version }}
+                  version: 7
 
             - name: Setup Node.js ${{ matrix.node-version }}
               uses: actions/setup-node@v1
               with:
                   node-version: ${{ matrix.node-version }}
+                  cache: 'pnpm'
 
             - name: Run container with Fluence node
               run: |
                   docker pull fluencelabs/fluence
                   docker run -d --rm -e RUST_LOG="info" -p 1210:1210 -p 4310:4310 fluencelabs/fluence -t 1210 -w 4310 -k gKdiCSUr1TFGFEgu2t8Ch1XEUsrN5A2UfBLjSZvfci9SPR3NvZpACfcpPGC3eY4zma1pk7UvYv5zb1VjvPHwCjj --local --aqua-pool-size 2
 
-            - run: npm install
-            - run: npm run test:all
+            - name: Install deps
+              run: pnpm i
+
+            - name: Run tests
+              run: |
+                  pnpm -r build
+                  pnpm -r test
               env:
                   CI: true

.gitignore

@@ -1,18 +1,6 @@
-# Logs
-logs
 *.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-bundle/
+.idea
 
 # Dependency directories
 node_modules/
-jspm_packages/
-/dist/
 
-.idea

.npmrc

@@ -0,0 +1 @@
+auto-install-peers=true

README.md

@@ -14,11 +14,28 @@ While the project is still in the early stages of development, you are welcome t
 
 ### Setting up dev environment
 
-Install node packages
+Fluence JS uses pnpm to manage monorepo packages. See [pnpm.io](https://pnpm.io/installation) for installation instructions.
+
+Install dependencies
 
 ```bash
-npm install
+pnpm install
+```
+
+Build all packages
+
 ```
+pnpm -r build
+```
+
+### Repository structure
+
+| Folder                      | Package                 | Description                                   |
+| --------------------------- | ----------------------- | --------------------------------------------- |
+| packages/fluence-js         | @fluencelabs/fluence-js | TypeScript implementation of the Fluence Peer |
+| packages/fluence-interfaces | @fluencelabs/interfaces | Common interfaces used in Fluence Peer        |
+| packages/fluence-connection | @fluencelabs/connection | Connectivity layer used in Fluence Peer       |
+| packages/fluence-keypair    | @fluencelabs/keypair    | Key Pair implementation                       |
 
 ### Running tests
 
@@ -28,28 +45,22 @@ Tests are split into unit and integration categories. By default integration tes
  docker run --rm -e RUST_LOG="info" -p 1210:1210 -p 4310:4310 fluencelabs/fluence -t 1210 -w 4310 -k gKdiCSUr1TFGFEgu2t8Ch1XEUsrN5A2UfBLjSZvfci9SPR3NvZpACfcpPGC3eY4zma1pk7UvYv5zb1VjvPHwCjj
 ```
 
-To run all tests in interactive mode
+To run all tests
 
 ```bash
-npm run test
+pnpm -r test
 ```
 
 To run only unit tests
 
 ```bash
-npm run test:unit
+pnpm -r test:unit
 ```
 
 To run only integration tests
 
 ```bash
-npm run test:unit
-```
-
-To run all tests
-
-```bash
-npm run test:all
+pnpm -r test:integration
 ```
 
 ## License