Merged develop

TryQuiet · Oct 10, 2023 · 7a8003c · 7a8003c
2 parents 7af8c09 + 0811ea3
commit 7a8003c
Show file tree

Hide file tree

Showing 46 changed files with 194 additions and 189 deletions.
diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
@@ -51,7 +51,6 @@ runs:
       shell: bash
 
     - name: "Bootstrap project"
-      if: ${{ runner.os != 'Windows' }}
       run: |
         if [[ ! -z "${{ inputs.bootstrap-packages }}" ]]
         then
@@ -60,13 +59,3 @@ runs:
             lerna bootstrap
         fi
       shell: bash
-
-    - name: "Bootstrap project on windows"
-      if: ${{ runner.os == 'Windows' }}
-      run: |
-        if ( "${{ inputs.bootstrap-packages }}" ) {
-          lerna bootstrap --scope '{${{ inputs.bootstrap-packages }},}'
-        } else {
-          lerna bootstrap
-        }
-      shell: powershell
diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
@@ -66,10 +66,15 @@ jobs:
         run: Start-Process "Quiet Setup ${{ steps.extract_version.outputs.version }}.exe" -Wait
         working-directory: ./packages/desktop/dist
         shell: powershell
+
+      - name: Check if Quiet installed properly
+        run: Get-ChildItem -Path C:\Users\runneradmin\AppData\Local\Programs\@quietdesktop
+        shell: powershell
 
       - name: Kill Quiet
         run: Get-Process -Name "Quiet" -ErrorAction SilentlyContinue | Stop-Process -Force
         shell: powershell
+        if: always()
 
       - name: Kill tor
         run: Get-Process -Name "tor" -ErrorAction SilentlyContinue | Stop-Process -Force

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
-
-[unreleased]
+[Unreleased]
 
 * Removed registration attempts selector and corresponding usage.
 
+* Revert adjusting bootstrap scripts for developing on Windows
+
 [2.0.1-alpha.2]
 
 * UI layer for taken usernames for desktop and mobile

diff --git a/packages/backend-bundle/CHANGELOG.md b/packages/backend-bundle/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/[email protected]@2.0.1-alpha.3) (2023-10-10)
+
+**Note:** Version bump only for package backend-bundle
+
+
+
+
+
 ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/[email protected]@2.0.1-alpha.2) (2023-10-09)
 
 **Note:** Version bump only for package backend-bundle

diff --git a/packages/backend-bundle/package-lock.json b/packages/backend-bundle/package-lock.json
diff --git a/packages/backend-bundle/package.json b/packages/backend-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend-bundle",
-  "version": "2.0.1-alpha.2",
+  "version": "2.0.1-alpha.3",
   "description": "",
   "main": "bundle.cjs",
   "scripts": {},

diff --git a/packages/backend/.gitattributes b/packages/backend/.gitattributes
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.3](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-10)
+
+**Note:** Version bump only for package @quiet/backend
+
+
+
+
+
 ## [2.0.1-alpha.2](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-09)
 
 **Note:** Version bump only for package @quiet/backend

diff --git a/packages/backend/electron-fetch-git.patch b/packages/backend/electron-fetch-git.patch
diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@quiet/backend",
-	"version": "2.0.1-alpha.2",
+	"version": "2.0.1-alpha.3",
 	"description": "tlg-manager",
 	"types": "lib/index.d.ts",
 	"type": "module",
@@ -10,14 +10,9 @@
 	"private": true,
 	"scripts": {
 		"build": "tsc -p tsconfig.build.json",
-		"webpack": "run-script-os",
-		"webpack:default": "webpack --env mode=development && cp ./lib/bundle.cjs ../backend-bundle/bundle.cjs",
+		"webpack": "webpack --env mode=development && cp ./lib/bundle.cjs ../backend-bundle/bundle.cjs",
 		"webpack:prod": "webpack --env mode=production && cp ./lib/bundle.cjs ../backend-bundle/bundle.cjs",
-		"webpack:windows": "webpack --env mode=development && xcopy .\\lib\\bundle.cjs ..\\backend-bundle\\ /Y",
-		"webpack:prod:windows": "webpack --env mode=production && xcopy .\\lib\\bundle.cjs ..\\backend-bundle\\ /Y",
-		"applyPatches": "run-script-os",
-		"applyPatches:default": "patch -f -p0 < ./electron-fetch.patch || true && patch -f -p0 --forward --binary < ./parse-duration.patch || true && patch -f -p0 --forward --binary < ./parse-duration-esm.patch || true",
-		"applyPatches:windows": "git apply ./electron-fetch-git.patch --whitespace=fix --reject --verbose --no-index --ignore-space-change --inaccurate-eof || cd .",
+		"applyPatches": "patch -f -p0 < ./electron-fetch.patch || true && patch -f -p0 --forward --binary < ./parse-duration.patch || true && patch -f -p0 --forward --binary < ./parse-duration-esm.patch || true",
 		"prepare": "npm run applyPatches && npm run webpack",
 		"version": "git add -A src",
 		"lint": "eslint --ext .jsx,.js,.ts,.tsx ./src/ --fix",
@@ -58,8 +53,8 @@
 		"@nestjs/cli": "^10.0.0",
 		"@nestjs/schematics": "^10.0.0",
 		"@nestjs/testing": "^10.0.0",
-		"@quiet/eslint-config": "^2.0.1-alpha.2",
-		"@quiet/state-manager": "^2.0.1-alpha.2",
+		"@quiet/eslint-config": "^2.0.1-alpha.3",
+		"@quiet/state-manager": "^2.0.1-alpha.3",
 		"@types/crypto-js": "^4.0.2",
 		"@types/express": "^4.17.9",
 		"@types/jest": "28.1.8",
@@ -77,7 +72,6 @@
 		"fetch-mock-jest": "^1.5.1",
 		"jest": "^29.4.2",
 		"mock-fs": "^5.1.2",
-		"run-script-os": "1.1.6",
 		"tmp": "^0.2.1",
 		"ts-jest": "^29.0.3",
 		"ts-loader": "9.4.2",
@@ -95,10 +89,10 @@
 		"@nestjs/core": "^10.0.0",
 		"@nestjs/platform-express": "^10.0.0",
 		"@peculiar/webcrypto": "1.4.3",
-		"@quiet/common": "^2.0.1-alpha.2",
-		"@quiet/identity": "^2.0.1-alpha.2",
-		"@quiet/logger": "^2.0.1-alpha.2",
-		"@quiet/types": "^2.0.1-alpha.2",
+		"@quiet/common": "^2.0.1-alpha.3",
+		"@quiet/identity": "^2.0.1-alpha.3",
+		"@quiet/logger": "^2.0.1-alpha.3",
+		"@quiet/types": "^2.0.1-alpha.3",
 		"abortable-iterator": "^3.0.0",
 		"class-transformer": "^0.5.1",
 		"class-validator": "^0.13.1",

diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-10)
+
+**Note:** Version bump only for package @quiet/common
+
+
+
+
+
 ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-09)
 
 **Note:** Version bump only for package @quiet/common

diff --git a/packages/common/package-lock.json b/packages/common/package-lock.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/common",
-  "version": "2.0.1-alpha.2",
+  "version": "2.0.1-alpha.3",
   "description": "Common monorepo utils",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,15 +18,15 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.1-alpha.2",
+    "@quiet/eslint-config": "^2.0.1-alpha.3",
     "@types/jest": "^26.0.23",
     "@types/node": "^17.0.21",
     "jest": "^26.6.3",
     "ts-jest": "^26.5.2",
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@quiet/types": "^2.0.1-alpha.2",
+    "@quiet/types": "^2.0.1-alpha.3",
     "cross-env": "^5.2.0",
     "debug": "^4.3.1"
   },

diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-10)
+
+**Note:** Version bump only for package @quiet/desktop
+
+
+
+
+
 ## 2.0.1-alpha.2 (2023-10-09)
 
 

diff --git a/packages/desktop/README.md b/packages/desktop/README.md
@@ -1,6 +1,7 @@
 # Quiet Desktop
 
-Running the desktop version of Quiet should be straightforward on Mac, Windows, and Linux. Here are the steps:
+Running the desktop version of Quiet should be straightforward on Mac and Linux. On Windows we recommend using git-bash or just wsl.
+Here are the steps:
 
 0. Use `Node 18.12.1` and `npm 8.19.2`. We recommend [nvm](https://github.com/nvm-sh/nvm) for easily switching Node versions, and if this README gets out of date you can see the actual version used by CI [here](https://github.com/TryQuiet/quiet/blob/master/.github/actions/setup-env/action.yml). If you are using nvm, you can run `nvm use` in the project's root to switch to the correct version.
 1. In `quiet/` (project's root) install monorepo's dependencies and bootstrap the project with lerna. It will take care of the package's dependencies and trigger a prepublish script which builds them.
@@ -20,20 +21,6 @@ npm run start
 ```
 ----
 
-## Running dev desktop on Windows
-
-Bootstrap scripts has been adjusted to work on Windows (powershell or cmd) hovewer there still may be a problem with patching.
-Getting error:
-
-```
-webpack://@quiet/backend/./node_modules/electron/index.js?:9
-  throw new Error('Electron failed to install correctly, please delete node_modules/electron and try installing again')
-```
-
-while running desktop may mean that applying patch in packages/backend (`npm run applyPatches`) did not work correctly.
-If that's the case file must be patched manually according to `electron-fetch-git.patch` and backend must be rebuilt by running  `npm run webpack` in packages/backend.
-
-
 ## Versioning packages
 
 Before trying to release a new version, make sure you have `GH_TOKEN` env set.

diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json