From 9902c9dbc7c9362aedbe03111f348f3f49b9bf83 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 13:40:11 +0200 Subject: [PATCH 01/21] Mark packages private --- packages/backend-bundle/package.json | 3 ++- packages/backend/package.json | 1 + packages/common/package.json | 1 + packages/e2e-tests/package.json | 1 + packages/eslint-config-custom/package.json | 1 + packages/identity/package.json | 1 + packages/integration-tests/package.json | 1 + packages/logger/package.json | 1 + packages/state-manager/package.json | 1 + packages/types/package.json | 1 + 10 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/backend-bundle/package.json b/packages/backend-bundle/package.json index e8fa9798f3..6abf21f4c0 100644 --- a/packages/backend-bundle/package.json +++ b/packages/backend-bundle/package.json @@ -6,5 +6,6 @@ "scripts": {}, "keywords": [], "author": "", - "license": "ISC" + "license": "ISC", + "private": true } diff --git a/packages/backend/package.json b/packages/backend/package.json index 0fb305c40a..4b1f850f99 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -7,6 +7,7 @@ "exports": "lib/index.js", "author": "", "license": "MIT", + "private": true, "scripts": { "build": "tsc -p tsconfig.build.json", "webpack": "webpack --env mode=development && cp ./lib/bundle.cjs ../backend-bundle/bundle.cjs", diff --git a/packages/common/package.json b/packages/common/package.json index b16151d680..3ac6ef2b63 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -7,6 +7,7 @@ "files": [ "lib/**/*" ], + "private": true, "scripts": { "build": "tsc -p tsconfig.build.json", "prepare": "npm run build", diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index e1be75b006..b21f1c542e 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -3,6 +3,7 @@ "version": "2.0.1-alpha.1", "description": "For running end to end tests we use Selenium WebDriver (https://www.selenium.dev/documentation/webdriver/) with Electron ChromeDriver (https://www.npmjs.com/package/electron-chromedriver) in Jest", "main": "index.js", + "private": true, "scripts": { "build": "tsc -p tsconfig.build.json", "prepare": "npm run build", diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json index a07d3acd70..24df7c7d50 100644 --- a/packages/eslint-config-custom/package.json +++ b/packages/eslint-config-custom/package.json @@ -2,6 +2,7 @@ "name": "@quiet/eslint-config", "main": "index.js", "version": "2.0.1-alpha.1", + "private": true, "devDependencies": { "@typescript-eslint/eslint-plugin": "5.59.11", "@typescript-eslint/parser": "^5.59.11", diff --git a/packages/identity/package.json b/packages/identity/package.json index 61dc6e3a83..454339760d 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -4,6 +4,7 @@ "description": "Quiet tools for creating certificates and signing messages", "main": "lib/index.js", "types": "lib/index.d.js", + "private": true, "scripts": { "build": "tsc -p tsconfig.build.json", "prepare": "npm run build", diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 3de8fb67c9..a61ca17d45 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -6,6 +6,7 @@ "main": "lib/index.js", "author": "", "license": "ISC", + "private": true, "scripts": { "build": "tsc -p tsconfig.build.json", "prepare": "npm run build", diff --git a/packages/logger/package.json b/packages/logger/package.json index e9bbdbfb50..0e21fa22c3 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -7,6 +7,7 @@ "files": [ "lib/**/*" ], + "private": true, "scripts": { "build": "tsc -p tsconfig.build.json", "prepare": "npm run build", diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json index 22c85f4e15..53d25d93e2 100644 --- a/packages/state-manager/package.json +++ b/packages/state-manager/package.json @@ -3,6 +3,7 @@ "version": "2.0.1-alpha.1", "description": "", "main": "lib/index.js", + "private": true, "scripts": { "build": "tsc -p tsconfig.build.json", "prepare": "npm run build", diff --git a/packages/types/package.json b/packages/types/package.json index a1778c2253..8473daab09 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -7,6 +7,7 @@ "files": [ "lib/**/*" ], + "private": true, "scripts": { "build": "tsc -p tsconfig.build.json", "prepare": "npm run build", From fe4d41b9ab42ea158aca58cec4bc18668610b3d0 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 13:40:59 +0200 Subject: [PATCH 02/21] Lerna config draft --- lerna.json | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 2501ad2db2..a90cfcc9c2 100644 --- a/lerna.json +++ b/lerna.json @@ -5,7 +5,7 @@ "version": "independent", "command": { "version": { - "allowBranch": ["master", "develop", "workflows/require-e2e-before-build-release"], + "allowBranch": ["master", "develop", "workflows/require-e2e-before-build-release", "chore/lerna-publishing-config"], "conventionalCommits": true, "createRelease": "github" }, diff --git a/package.json b/package.json index 0db928eea1..48c2f4fa82 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,8 @@ "name": "root", "private": true, "scripts": { - "lerna": "lerna" + "lerna": "lerna", + "publish": "lerna run version --no-private" }, "engines": { "node": "18.12.1", From 9c92acc6a96754c68a39f1a770b42b9013187144 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 13:42:27 +0200 Subject: [PATCH 03/21] Dummy change --- packages/desktop/src/renderer/sagas/socket/socket.saga.ts | 2 +- .../src/store/init/startConnection/startConnection.saga.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/desktop/src/renderer/sagas/socket/socket.saga.ts b/packages/desktop/src/renderer/sagas/socket/socket.saga.ts index 03646371b5..7cfdbde1e0 100644 --- a/packages/desktop/src/renderer/sagas/socket/socket.saga.ts +++ b/packages/desktop/src/renderer/sagas/socket/socket.saga.ts @@ -46,7 +46,7 @@ function subscribeSocketLifecycle(socket?: Socket) { ReturnType | ReturnType >(emit => { socket?.on('connect', async () => { - console.log('websocket connected') + console.log('web socket connected') emit(socketActions.setConnected()) }) socket?.on('disconnect', () => { diff --git a/packages/mobile/src/store/init/startConnection/startConnection.saga.ts b/packages/mobile/src/store/init/startConnection/startConnection.saga.ts index a40b4671e1..19c67080e7 100644 --- a/packages/mobile/src/store/init/startConnection/startConnection.saga.ts +++ b/packages/mobile/src/store/init/startConnection/startConnection.saga.ts @@ -35,7 +35,7 @@ function subscribeSocketLifecycle(socket: Socket, dataPort: number) { ReturnType | ReturnType >(emit => { socket.on('connect', async () => { - console.log('websocket connected') + console.log('web socket connected') emit( initActions.setWebsocketConnected({ dataPort, From c028288d03c9271fd9ad341610c6cd79d7758061 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 13:45:30 +0200 Subject: [PATCH 04/21] Lerna config draft --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48c2f4fa82..ac20845765 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "scripts": { "lerna": "lerna", - "publish": "lerna run version --no-private" + "publish": "lerna version --no-private --force-publish" }, "engines": { "node": "18.12.1", From c974804605c4dea9e84f3bee506d8e5bdc715374 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 14:00:36 +0200 Subject: [PATCH 05/21] Unified command for publishing --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ac20845765..c106ff9c4b 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "scripts": { "lerna": "lerna", - "publish": "lerna version --no-private --force-publish" + "publish": "lerna version $npm_config_stage --no-private --force-publish" }, "engines": { "node": "18.12.1", From 4e465b5ce3d90cc10b98d919a825b297323d80e7 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 14:54:12 +0200 Subject: [PATCH 06/21] Skip desktop jobs on mobile tags --- .github/workflows/build-release.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index cccdbde5a0..4dee058868 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -17,7 +17,8 @@ jobs: # needs: run-e2e-tests-linux runs-on: ubuntu-22.04 if: | - startsWith(github.ref, 'refs/tags/quiet') + startsWith(github.ref, 'refs/tags/quiet') && + !contains(github.ref, '/mobile') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} @@ -89,7 +90,8 @@ jobs: # needs: run-e2e-tests-mac runs-on: macos-latest if: | - startsWith(github.ref, 'refs/tags/quiet') + startsWith(github.ref, 'refs/tags/quiet') && + !contains(github.ref, '/mobile') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} @@ -162,7 +164,8 @@ jobs: # needs: run-e2e-tests-win runs-on: windows-2019 if: | - startsWith(github.ref, 'refs/tags/quiet') + startsWith(github.ref, 'refs/tags/quiet') && + !contains(github.ref, '/mobile') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} From dbd863b756f3a383b9af0bc8ca9d482168f29b51 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 15:24:29 +0200 Subject: [PATCH 07/21] Add suffix to desktop package name --- .github/workflows/build-release.yml | 15 ++++++--------- .github/workflows/check-visual-regression.yml | 2 +- .github/workflows/check.yml | 4 ++-- .github/workflows/e2e-linux.yml | 2 +- .github/workflows/e2e-mac.yml | 2 +- .github/workflows/e2e-win.yml | 2 +- .github/workflows/frontend-tests.yml | 2 +- .github/workflows/nectar-tests.yml | 2 +- .github/workflows/regression-test.yml | 2 +- package.json | 2 +- packages/desktop/package.json | 2 +- 11 files changed, 17 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 4dee058868..88e5283a13 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -17,8 +17,7 @@ jobs: # needs: run-e2e-tests-linux runs-on: ubuntu-22.04 if: | - startsWith(github.ref, 'refs/tags/quiet') && - !contains(github.ref, '/mobile') + startsWith(github.ref, 'refs/tags/@quiet/desktop') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} @@ -31,7 +30,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-env with: - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle" - name: Install libfuse run: sudo apt install libfuse2 @@ -90,8 +89,7 @@ jobs: # needs: run-e2e-tests-mac runs-on: macos-latest if: | - startsWith(github.ref, 'refs/tags/quiet') && - !contains(github.ref, '/mobile') + startsWith(github.ref, 'refs/tags/@quiet/desktop') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} @@ -113,7 +111,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-env with: - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle" - name: Before build uses: ./.github/actions/before-build @@ -164,8 +162,7 @@ jobs: # needs: run-e2e-tests-win runs-on: windows-2019 if: | - startsWith(github.ref, 'refs/tags/quiet') && - !contains(github.ref, '/mobile') + startsWith(github.ref, 'refs/tags/@quiet/desktop') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} @@ -192,7 +189,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-env with: - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle,e2e-tests" - name: Before build uses: ./.github/actions/before-build diff --git a/.github/workflows/check-visual-regression.yml b/.github/workflows/check-visual-regression.yml index c0002933fb..5cb9448943 100644 --- a/.github/workflows/check-visual-regression.yml +++ b/.github/workflows/check-visual-regression.yml @@ -24,7 +24,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-env with: - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle" - name: "Publish to Chromatic" uses: chromaui/action@v1 diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 863782b5e1..196f13e73b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -27,14 +27,14 @@ jobs: uses: ./.github/actions/setup-env if: ${{ runner.os != 'Windows' }} with: - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,@quiet/mobile,e2e-tests,backend-bundle" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,@quiet/mobile,e2e-tests,backend-bundle" - name: "Setup environment for Windows" uses: ./.github/actions/setup-env if: ${{ runner.os == 'Windows' }} with: - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,e2e-tests,backend-bundle" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,e2e-tests,backend-bundle" - name: "Lint" if: ${{ runner.os != 'Windows' }} diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml index e2dd29f39a..adca0030d3 100644 --- a/.github/workflows/e2e-linux.yml +++ b/.github/workflows/e2e-linux.yml @@ -30,7 +30,7 @@ jobs: uses: ./.github/actions/setup-env with: cachePrefix: "e2e-crossplatform-linux" - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle,e2e-tests" - name: Run X11 run: | diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml index 8e1b0c5e17..0bf9718477 100644 --- a/.github/workflows/e2e-mac.yml +++ b/.github/workflows/e2e-mac.yml @@ -17,7 +17,7 @@ jobs: uses: ./.github/actions/setup-env with: cachePrefix: "e2e-crossplatform-mac" - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle,e2e-tests" - name: Before build uses: ./.github/actions/before-build diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml index 9f3fa52e37..9f06c84c28 100644 --- a/.github/workflows/e2e-win.yml +++ b/.github/workflows/e2e-win.yml @@ -19,7 +19,7 @@ jobs: uses: ./.github/actions/setup-env with: cachePrefix: "e2e-crossplatform-windows" - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle,e2e-tests" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle,e2e-tests" - name: "Fetch jsign" shell: bash diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index fbdbdf19d9..95daea12cd 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -24,7 +24,7 @@ jobs: uses: ./.github/actions/setup-env with: cachePrefix: "desktop-tests" - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle" - name: "Unit tests" run: lerna run test --scope quiet --stream diff --git a/.github/workflows/nectar-tests.yml b/.github/workflows/nectar-tests.yml index b5e3b966bb..75f8de4b59 100644 --- a/.github/workflows/nectar-tests.yml +++ b/.github/workflows/nectar-tests.yml @@ -23,7 +23,7 @@ jobs: - name: "Setup environment" uses: ./.github/actions/setup-env with: - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle" - name: "Unit tests" run: lerna run test --scope @quiet/state-manager --stream diff --git a/.github/workflows/regression-test.yml b/.github/workflows/regression-test.yml index 1eb554931e..fb996dbcd0 100644 --- a/.github/workflows/regression-test.yml +++ b/.github/workflows/regression-test.yml @@ -23,7 +23,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-env with: - bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,quiet,backend-bundle" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle" - name: "Install libs" run: sudo apt-get update && sudo apt-get install -y libgtk2.0-0 libgtk-3-0 libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb diff --git a/package.json b/package.json index c106ff9c4b..32553f1a41 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "scripts": { "lerna": "lerna", - "publish": "lerna version $npm_config_stage --no-private --force-publish" + "publish": "lerna version $npm_config_stage" }, "engines": { "node": "18.12.1", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index d5b5dd0d8d..304ab70e02 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,5 +1,5 @@ { - "name": "quiet", + "name": "@quiet/desktop", "productName": "Quiet", "author": { "name": "Zbay LLC", From e39c3366346f0078cd7d86b45888fe15aac3b764 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 15:27:31 +0200 Subject: [PATCH 08/21] Update desktop package-lock --- packages/desktop/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json index 3ba957e99d..9b82465534 100644 --- a/packages/desktop/package-lock.json +++ b/packages/desktop/package-lock.json @@ -1,11 +1,11 @@ { - "name": "quiet", + "name": "@quiet/desktop", "version": "2.0.1-alpha.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "quiet", + "name": "@quiet/desktop", "version": "2.0.1-alpha.1", "license": "ISC", "dependencies": { From 6301f025680dc48db65e9da816bb5b0277868cc2 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 15:30:29 +0200 Subject: [PATCH 09/21] Revert "Dummy change" This reverts commit 9c92acc6a96754c68a39f1a770b42b9013187144. --- packages/desktop/src/renderer/sagas/socket/socket.saga.ts | 2 +- .../src/store/init/startConnection/startConnection.saga.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/desktop/src/renderer/sagas/socket/socket.saga.ts b/packages/desktop/src/renderer/sagas/socket/socket.saga.ts index 7cfdbde1e0..03646371b5 100644 --- a/packages/desktop/src/renderer/sagas/socket/socket.saga.ts +++ b/packages/desktop/src/renderer/sagas/socket/socket.saga.ts @@ -46,7 +46,7 @@ function subscribeSocketLifecycle(socket?: Socket) { ReturnType | ReturnType >(emit => { socket?.on('connect', async () => { - console.log('web socket connected') + console.log('websocket connected') emit(socketActions.setConnected()) }) socket?.on('disconnect', () => { diff --git a/packages/mobile/src/store/init/startConnection/startConnection.saga.ts b/packages/mobile/src/store/init/startConnection/startConnection.saga.ts index 19c67080e7..a40b4671e1 100644 --- a/packages/mobile/src/store/init/startConnection/startConnection.saga.ts +++ b/packages/mobile/src/store/init/startConnection/startConnection.saga.ts @@ -35,7 +35,7 @@ function subscribeSocketLifecycle(socket: Socket, dataPort: number) { ReturnType | ReturnType >(emit => { socket.on('connect', async () => { - console.log('web socket connected') + console.log('websocket connected') emit( initActions.setWebsocketConnected({ dataPort, From da6cb09d3c81dd0f9c54f1b804f29f52dabec1fa Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 26 Sep 2023 15:35:57 +0200 Subject: [PATCH 10/21] Remove unified script --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 32553f1a41..0db928eea1 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,7 @@ "name": "root", "private": true, "scripts": { - "lerna": "lerna", - "publish": "lerna version $npm_config_stage" + "lerna": "lerna" }, "engines": { "node": "18.12.1", From 2d96281af53ba972d665f138591dddd608495843 Mon Sep 17 00:00:00 2001 From: siepra Date: Mon, 2 Oct 2023 15:47:37 +0200 Subject: [PATCH 11/21] Don't trigger desktop e2e tests on mobile changes --- .github/workflows/e2e-crossplatform.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 42f4065efb..b45d5caddb 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -1,6 +1,14 @@ name: E2E cross platform -on: [pull_request] +on: + pull_request: + paths: + - packages/desktop/** + - packages/backend/** + - packages/state-manager/** + - packages/identity/** + - packages/common/** + jobs: mac: uses: ./.github/workflows/e2e-mac.yml From dbaa8b80d25f2673e2c02524de105234f0985fa6 Mon Sep 17 00:00:00 2001 From: siepra Date: Mon, 2 Oct 2023 15:54:27 +0200 Subject: [PATCH 12/21] Unify workflows naming --- .github/workflows/{waggle-tests.yml => backend-tests.yml} | 0 ...isual-regression.yml => check-desktop-visual-regression.yml} | 2 +- .github/workflows/check.yml | 1 - .github/workflows/{build-release.yml => desktop-build.yml} | 2 +- .../workflows/{regression-test.yml => desktop-test-scroll.yml} | 2 +- .github/workflows/{frontend-tests.yml => desktop-tests.yml} | 0 .../{deploy-android.yaml => mobile-deploy-android.yaml} | 2 +- .github/workflows/{deploy-ios.yml => mobile-deploy-ios.yml} | 0 .github/workflows/{nectar-tests.yml => state-manager-tests.yml} | 0 9 files changed, 4 insertions(+), 5 deletions(-) rename .github/workflows/{waggle-tests.yml => backend-tests.yml} (100%) rename .github/workflows/{check-visual-regression.yml => check-desktop-visual-regression.yml} (96%) rename .github/workflows/{build-release.yml => desktop-build.yml} (99%) rename .github/workflows/{regression-test.yml => desktop-test-scroll.yml} (97%) rename .github/workflows/{frontend-tests.yml => desktop-tests.yml} (100%) rename .github/workflows/{deploy-android.yaml => mobile-deploy-android.yaml} (98%) rename .github/workflows/{deploy-ios.yml => mobile-deploy-ios.yml} (100%) rename .github/workflows/{nectar-tests.yml => state-manager-tests.yml} (100%) diff --git a/.github/workflows/waggle-tests.yml b/.github/workflows/backend-tests.yml similarity index 100% rename from .github/workflows/waggle-tests.yml rename to .github/workflows/backend-tests.yml diff --git a/.github/workflows/check-visual-regression.yml b/.github/workflows/check-desktop-visual-regression.yml similarity index 96% rename from .github/workflows/check-visual-regression.yml rename to .github/workflows/check-desktop-visual-regression.yml index cb481224b0..eb8fd2512e 100644 --- a/.github/workflows/check-visual-regression.yml +++ b/.github/workflows/check-desktop-visual-regression.yml @@ -1,4 +1,4 @@ -name: Visual regressions +name: Desktop visual regressions on: pull_request: diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index df6796a953..c10b33331c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -29,7 +29,6 @@ jobs: with: bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,@quiet/mobile,e2e-tests,backend-bundle" - - name: "Setup environment for Windows" uses: ./.github/actions/setup-env if: ${{ runner.os == 'Windows' }} diff --git a/.github/workflows/build-release.yml b/.github/workflows/desktop-build.yml similarity index 99% rename from .github/workflows/build-release.yml rename to .github/workflows/desktop-build.yml index 9a8a1e91cc..cabfc7e6e3 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/desktop-build.yml @@ -1,4 +1,4 @@ -name: Build release +name: Desktop release build on: release: diff --git a/.github/workflows/regression-test.yml b/.github/workflows/desktop-test-scroll.yml similarity index 97% rename from .github/workflows/regression-test.yml rename to .github/workflows/desktop-test-scroll.yml index 7227a92599..b3ba373a2c 100644 --- a/.github/workflows/regression-test.yml +++ b/.github/workflows/desktop-test-scroll.yml @@ -1,4 +1,4 @@ -name: Scroll regression tests +name: Desktop scroll regression tests on: pull_request: diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/desktop-tests.yml similarity index 100% rename from .github/workflows/frontend-tests.yml rename to .github/workflows/desktop-tests.yml diff --git a/.github/workflows/deploy-android.yaml b/.github/workflows/mobile-deploy-android.yaml similarity index 98% rename from .github/workflows/deploy-android.yaml rename to .github/workflows/mobile-deploy-android.yaml index 192e83131a..9ffad90237 100644 --- a/.github/workflows/deploy-android.yaml +++ b/.github/workflows/mobile-deploy-android.yaml @@ -1,4 +1,4 @@ -name: Deploy Android to Google Play (internal testing) +name: Deploy Android to Google Play on: release: diff --git a/.github/workflows/deploy-ios.yml b/.github/workflows/mobile-deploy-ios.yml similarity index 100% rename from .github/workflows/deploy-ios.yml rename to .github/workflows/mobile-deploy-ios.yml diff --git a/.github/workflows/nectar-tests.yml b/.github/workflows/state-manager-tests.yml similarity index 100% rename from .github/workflows/nectar-tests.yml rename to .github/workflows/state-manager-tests.yml From 70818690ed260f70b1bfa14bf537aa6c2fe8de01 Mon Sep 17 00:00:00 2001 From: siepra Date: Mon, 2 Oct 2023 15:57:47 +0200 Subject: [PATCH 13/21] Enhance PR checklist with mobile specific checks --- .github/pull_request_template.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1087841c9b..80a688c61e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,4 +2,11 @@ ### Pull Request Checklist - [ ] I have linked this PR to related GitHub issue. -- [ ] I have updated the CHANGELOG.md file with relevant changes (the file is located at the root of monorepo). \ No newline at end of file +- [ ] I have updated the CHANGELOG.md file with relevant changes (the file is located at the root of monorepo). + +### (Optional) Mobile checklist + +Please ensure you completed the following checks if you did any changes to the mobile package: + +- [ ] I have run e2e tests for mobile +- [ ] I have updated base screenshots for visual regression tests From 141d92a72679084eb7c5cb31dc90f1cd9fe36204 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 3 Oct 2023 10:27:41 +0200 Subject: [PATCH 14/21] Extract Desktop RTL tests --- .github/workflows/desktop-rtl-tests.yml | 31 +++++++++++++++++++++++ .github/workflows/desktop-tests.yml | 5 +--- .github/workflows/state-manager-tests.yml | 3 --- 3 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/desktop-rtl-tests.yml diff --git a/.github/workflows/desktop-rtl-tests.yml b/.github/workflows/desktop-rtl-tests.yml new file mode 100644 index 0000000000..8e8343b736 --- /dev/null +++ b/.github/workflows/desktop-rtl-tests.yml @@ -0,0 +1,31 @@ +name: Desktop - state-manager bracket tests (RTL) + +on: + pull_request: + paths: + - packages/desktop/** + - packages/state-manager/** + +jobs: + desktop-tests: + timeout-minutes: 25 + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [ubuntu-20.04, macos-latest] + + steps: + - name: "Print OS" + run: echo ${{ matrix.os }} + + - uses: actions/checkout@v3 + + - name: "Setup environment" + uses: ./.github/actions/setup-env + with: + cachePrefix: "desktop-tests" + bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle" + + - name: "Desktop - state-manager bracket tests" + run: lerna run rtl-test --scope @quiet/desktop --stream diff --git a/.github/workflows/desktop-tests.yml b/.github/workflows/desktop-tests.yml index 96bf856c0e..0a3f7eb9c9 100644 --- a/.github/workflows/desktop-tests.yml +++ b/.github/workflows/desktop-tests.yml @@ -27,7 +27,4 @@ jobs: bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/desktop,backend-bundle" - name: "Unit tests" - run: lerna run test --scope quiet --stream - - - name: "desktop-state-manager bracket tests" - run: lerna run rtl-test --scope quiet --stream + run: lerna run test --scope @quiet/desktop --stream diff --git a/.github/workflows/state-manager-tests.yml b/.github/workflows/state-manager-tests.yml index 0b5674febc..7fb7c14911 100644 --- a/.github/workflows/state-manager-tests.yml +++ b/.github/workflows/state-manager-tests.yml @@ -27,6 +27,3 @@ jobs: - name: "Unit tests" run: lerna run test --scope @quiet/state-manager --stream - - - name: "desktop-state-manager bracket tests" - run: lerna run rtl-test --scope quiet --stream From e58c90ce5dc19d442e41f2b8badaeadf0e271925 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 3 Oct 2023 12:11:32 +0200 Subject: [PATCH 15/21] Change scope name in build actions --- .github/actions/before-build/action.yml | 2 +- .github/workflows/desktop-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/before-build/action.yml b/.github/actions/before-build/action.yml index a0f74cbaa6..9dbb3e1a4d 100644 --- a/.github/actions/before-build/action.yml +++ b/.github/actions/before-build/action.yml @@ -36,5 +36,5 @@ runs: shell: bash - name: "Build the project" - run: lerna run build:prod --scope quiet + run: lerna run build:prod --scope @quiet/desktop shell: bash diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index cabfc7e6e3..38761be017 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -52,7 +52,7 @@ jobs: run: cd packages/desktop && USE_HARD_LINKS=false node_modules/.bin/electron-builder -p always --linux ${{ env.ELECTRON_BUILDER_PROPS }} - name: "Calculate new checksum for electron updater" - run: lerna run postBuild --scope quiet + run: lerna run postBuild --scope @quiet/desktop - name: "Push electron-updater new checksum to S3" uses: vinkabuki/upload-s3-action@master From b491c373bc6db4e5092bb4f4a988dc0d16396ca6 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 3 Oct 2023 12:14:41 +0200 Subject: [PATCH 16/21] Remove extra branches from lerna config --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index a90cfcc9c2..aca35a8710 100644 --- a/lerna.json +++ b/lerna.json @@ -5,7 +5,7 @@ "version": "independent", "command": { "version": { - "allowBranch": ["master", "develop", "workflows/require-e2e-before-build-release", "chore/lerna-publishing-config"], + "allowBranch": ["master", "develop"], "conventionalCommits": true, "createRelease": "github" }, From 1d56aba20b5e65961eb0cacb08b3bc904f1a1b10 Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 3 Oct 2023 13:23:54 +0200 Subject: [PATCH 17/21] Change APPDIR project path --- packages/desktop/scripts/setEnvs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/desktop/scripts/setEnvs.js b/packages/desktop/scripts/setEnvs.js index 16989b9382..72bfca197f 100644 --- a/packages/desktop/scripts/setEnvs.js +++ b/packages/desktop/scripts/setEnvs.js @@ -19,7 +19,8 @@ exports.default = async function (context) { childProcess.execSync(`${context.artifactPaths[0]} --appimage-extract`) childProcess.execSync(`mv ./squashfs-root ${context.outDir}/squashfs-root`) const data = fs.readFileSync(`${context.outDir}/squashfs-root/AppRun`, 'utf8').split('\n') - const index = data.findIndex(text => text === 'BIN="$APPDIR/quiet"') + console.log('APPDIR', $APPDIR) + const index = data.findIndex(text => text === 'BIN="$APPDIR/@quiet/desktop"') if (index !== -1) { data[index - 1] = 'export LD_PRELOAD="${APPDIR}/usr/lib/libssl.so"' fs.writeFileSync(`${context.outDir}/squashfs-root/AppRun`, data.join('\n'), 'utf8') From cc75b6de7a496f6a5be74ec0c679447b2fe6922d Mon Sep 17 00:00:00 2001 From: siepra Date: Tue, 3 Oct 2023 13:34:05 +0200 Subject: [PATCH 18/21] Remove console.log with env --- packages/desktop/scripts/setEnvs.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/desktop/scripts/setEnvs.js b/packages/desktop/scripts/setEnvs.js index 72bfca197f..1fa3d74543 100644 --- a/packages/desktop/scripts/setEnvs.js +++ b/packages/desktop/scripts/setEnvs.js @@ -19,7 +19,6 @@ exports.default = async function (context) { childProcess.execSync(`${context.artifactPaths[0]} --appimage-extract`) childProcess.execSync(`mv ./squashfs-root ${context.outDir}/squashfs-root`) const data = fs.readFileSync(`${context.outDir}/squashfs-root/AppRun`, 'utf8').split('\n') - console.log('APPDIR', $APPDIR) const index = data.findIndex(text => text === 'BIN="$APPDIR/@quiet/desktop"') if (index !== -1) { data[index - 1] = 'export LD_PRELOAD="${APPDIR}/usr/lib/libssl.so"' From fc52d621dd6d327dfe6203f1acd1e3894e158b18 Mon Sep 17 00:00:00 2001 From: Vin Kabuki Date: Tue, 3 Oct 2023 15:51:11 +0200 Subject: [PATCH 19/21] Update setEnvs script --- packages/desktop/scripts/setEnvs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/desktop/scripts/setEnvs.js b/packages/desktop/scripts/setEnvs.js index 1fa3d74543..de94f06d28 100644 --- a/packages/desktop/scripts/setEnvs.js +++ b/packages/desktop/scripts/setEnvs.js @@ -19,7 +19,7 @@ exports.default = async function (context) { childProcess.execSync(`${context.artifactPaths[0]} --appimage-extract`) childProcess.execSync(`mv ./squashfs-root ${context.outDir}/squashfs-root`) const data = fs.readFileSync(`${context.outDir}/squashfs-root/AppRun`, 'utf8').split('\n') - const index = data.findIndex(text => text === 'BIN="$APPDIR/@quiet/desktop"') + const index = data.findIndex(text => text === 'BIN="$APPDIR/@quietdesktop"') if (index !== -1) { data[index - 1] = 'export LD_PRELOAD="${APPDIR}/usr/lib/libssl.so"' fs.writeFileSync(`${context.outDir}/squashfs-root/AppRun`, data.join('\n'), 'utf8') From e32e536a2fbb182c1b7889971c1b41f3263f4ef4 Mon Sep 17 00:00:00 2001 From: siepra Date: Wed, 4 Oct 2023 13:53:52 +0200 Subject: [PATCH 20/21] Prevent running desktop e2e tests on wrong tag --- .github/workflows/desktop-build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 38761be017..49bbb4d3a6 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -4,6 +4,8 @@ on: release: types: [released, prereleased] + if: | + startsWith(github.ref, 'refs/tags/@quiet/desktop') jobs: run-e2e-tests-linux: @@ -16,8 +18,6 @@ jobs: build-linux: # needs: run-e2e-tests-linux runs-on: ubuntu-22.04 - if: | - startsWith(github.ref, 'refs/tags/@quiet/desktop') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} @@ -88,8 +88,6 @@ jobs: build-macos: # needs: run-e2e-tests-mac runs-on: macos-latest - if: | - startsWith(github.ref, 'refs/tags/@quiet/desktop') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} @@ -161,8 +159,6 @@ jobs: build-windows: # needs: run-e2e-tests-win runs-on: windows-2019 - if: | - startsWith(github.ref, 'refs/tags/@quiet/desktop') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} From d9a51c0c4390c75dcdb38b64992e5d3355571807 Mon Sep 17 00:00:00 2001 From: siepra Date: Thu, 5 Oct 2023 14:48:18 +0200 Subject: [PATCH 21/21] Revert "Prevent running desktop e2e tests on wrong tag" This reverts commit e32e536a2fbb182c1b7889971c1b41f3263f4ef4. --- .github/workflows/desktop-build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 49bbb4d3a6..38761be017 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -4,8 +4,6 @@ on: release: types: [released, prereleased] - if: | - startsWith(github.ref, 'refs/tags/@quiet/desktop') jobs: run-e2e-tests-linux: @@ -18,6 +16,8 @@ jobs: build-linux: # needs: run-e2e-tests-linux runs-on: ubuntu-22.04 + if: | + startsWith(github.ref, 'refs/tags/@quiet/desktop') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} @@ -88,6 +88,8 @@ jobs: build-macos: # needs: run-e2e-tests-mac runs-on: macos-latest + if: | + startsWith(github.ref, 'refs/tags/@quiet/desktop') env: TEST_MODE: ${{ github.event.action == 'prereleased' }} @@ -159,6 +161,8 @@ jobs: build-windows: # needs: run-e2e-tests-win runs-on: windows-2019 + if: | + startsWith(github.ref, 'refs/tags/@quiet/desktop') env: TEST_MODE: ${{ github.event.action == 'prereleased' }}