diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml index d90777acdf..56af1bd3d7 100644 --- 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 index 490ae7d32a..8a8b0fd498 100644 --- 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 index 777248470a..eb6e54d664 100644 --- 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 index 5894e5c1a5..52bf9d5316 100644 --- 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/backend-bundle@2.0.1-alpha.2...backend-bundle@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/backend-bundle@1.6.1...backend-bundle@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 index fc0f6ab4ee..a921e84b70 100644 --- a/packages/backend-bundle/package-lock.json +++ b/packages/backend-bundle/package-lock.json @@ -1,12 +1,12 @@ { "name": "backend-bundle", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "backend-bundle", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "ISC" } } diff --git a/packages/backend-bundle/package.json b/packages/backend-bundle/package.json index 60f847aa8a..dd5cbb62da 100644 --- 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 deleted file mode 100644 index 2271e38305..0000000000 --- a/packages/backend/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -# Set the default behavior, in case people don't have core.autocrlf set. -* text=auto - -# Declare files that will always have CRLF line endings on checkout. -electron-fetch-git.patch text eol=crlf \ No newline at end of file diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md index 0e5a476501..54e056f02a 100644 --- 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/backend@2.0.1-alpha.2...@quiet/backend@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package @quiet/backend + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.4...@quiet/backend@2.0.1-alpha.2) (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 deleted file mode 100644 index 68534bfed9..0000000000 --- a/packages/backend/electron-fetch-git.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/packages/backend/node_modules/electron-fetch/lib/index.js b/packages/backend/node_modules/electron-fetch/lib/index.js -index c9ea590d9..74c0757a8 100644 ---- a/packages/backend/node_modules/electron-fetch/lib/index.js -+++ b/packages/backend/node_modules/electron-fetch/lib/index.js -@@ -1283,12 +1283,7 @@ function getNodeRequestOptions(request) { - - let electron; // istanbul ignore else - --if (process.versions.electron) { -- electron = require('electron'); --} -- --const isReady = electron && electron.app && !electron.app.isReady() ? new Promise(resolve => electron.app.once('ready', resolve)) : Promise.resolve(); -- -+const isReady = Promise.resolve(); - /** - * Fetch function - * diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json index ae6e0430d6..72f441ec71 100644 --- a/packages/backend/package-lock.json +++ b/packages/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/backend", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/backend", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "MIT", "dependencies": { "@chainsafe/libp2p-gossipsub": "6.1.0", diff --git a/packages/backend/package.json b/packages/backend/package.json index 294568124b..e630615fe7 100644 --- 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 index 0f5b61a775..e6d79f70cf 100644 --- 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/common@2.0.1-alpha.2...@quiet/common@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package @quiet/common + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/common@2.0.1-alpha.1...@quiet/common@2.0.1-alpha.2) (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 index 1c7d1069b5..5c07f1fc24 100644 --- a/packages/common/package-lock.json +++ b/packages/common/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/common", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/common", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "ISC", "dependencies": { "cross-env": "^5.2.0", diff --git a/packages/common/package.json b/packages/common/package.json index ac7b81004b..e745994166 100644 --- 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,7 +18,7 @@ "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", @@ -26,7 +26,7 @@ "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 index b4bde7c4ce..f1199a7b77 100644 --- 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/desktop@2.0.1-alpha.2...@quiet/desktop@2.0.1-alpha.3) (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 index ca80365377..2ad572c2fc 100644 --- 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 index 12370c6f59..ba2119ec07 100644 --- a/packages/desktop/package-lock.json +++ b/packages/desktop/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/desktop", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/desktop", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "ISC", "dependencies": { "@electron/remote": "^2.0.8", @@ -134,7 +134,6 @@ "redux-saga-test-plan": "^4.0.3", "redux-thunk": "^2.3.0", "reselect": "^4.1.5", - "run-script-os": "1.1.6", "socket.io-mock": "^1.3.2", "source-map-loader": "^4.0.1", "standard": "^12.0.1", @@ -40259,16 +40258,6 @@ "aproba": "^1.1.1" } }, - "node_modules/run-script-os": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz", - "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==", - "dev": true, - "bin": { - "run-os": "index.js", - "run-script-os": "index.js" - } - }, "node_modules/rxjs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", @@ -76835,12 +76824,6 @@ "aproba": "^1.1.1" } }, - "run-script-os": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz", - "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==", - "dev": true - }, "rxjs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 57d050383c..e1dbad1d49 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -80,7 +80,7 @@ }, "homepage": "https://github.com/TryQuiet", "@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "description": "Decentralized team chat", "main": "dist/main/main.js", "scripts": { @@ -120,18 +120,16 @@ "rmDist": "rimraf dist/", "setMainEnvs": "node scripts/setMainEnvs.js", "copyMainEnvs": "cp mainEnvs.json dist/main", - "copyFonts": "run-script-os", - "copyFonts:windows": "xcopy src\\renderer\\fonts\\* dist\\main /Y", - "copyFonts:default": "cp src/renderer/fonts/* dist/main" + "copyFonts": "cp src/renderer/fonts/* dist/main" }, "dependencies": { "@electron/remote": "^2.0.8", "@peculiar/webcrypto": "1.4.3", - "@quiet/common": "^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/logger": "^2.0.1-alpha.3", + "@quiet/types": "^2.0.1-alpha.3", "@sentry/electron": "^2.5.4", - "backend-bundle": "^2.0.1-alpha.2", + "backend-bundle": "^2.0.1-alpha.3", "electron-debug": "^3.0.1", "electron-localshortcut": "^3.2.1", "electron-store": "^8.0.1", @@ -157,9 +155,9 @@ "@mui/icons-material": "^5.10.15", "@mui/lab": "^5.0.0-alpha.109", "@mui/material": "~5.10.15", - "@quiet/eslint-config": "^2.0.1-alpha.2", - "@quiet/identity": "^2.0.1-alpha.2", - "@quiet/state-manager": "^2.0.1-alpha.2", + "@quiet/eslint-config": "^2.0.1-alpha.3", + "@quiet/identity": "^2.0.1-alpha.3", + "@quiet/state-manager": "^2.0.1-alpha.3", "@redux-saga/types": "^1.1.0", "@reduxjs/toolkit": "^1.9.1", "@sentry/browser": "^6.19.7", @@ -258,7 +256,6 @@ "redux-saga-test-plan": "^4.0.3", "redux-thunk": "^2.3.0", "reselect": "^4.1.5", - "run-script-os": "1.1.6", "socket.io-mock": "^1.3.2", "source-map-loader": "^4.0.1", "standard": "^12.0.1", diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md index 6cad554933..d4eee5aed9 100644 --- a/packages/e2e-tests/CHANGELOG.md +++ b/packages/e2e-tests/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/e2e-tests@2.0.1-alpha.2...e2e-tests@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package e2e-tests + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/e2e-tests@1.8.2...e2e-tests@2.0.1-alpha.2) (2023-10-09) **Note:** Version bump only for package e2e-tests diff --git a/packages/e2e-tests/package-lock.json b/packages/e2e-tests/package-lock.json index 11b7aa1578..834bfe5799 100644 --- a/packages/e2e-tests/package-lock.json +++ b/packages/e2e-tests/package-lock.json @@ -1,12 +1,12 @@ { "name": "e2e-tests", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "e2e-tests", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "ISC", "dependencies": { "cross-env": "^5.2.0", diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index d595cfc57b..79144ad280 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "e2e-tests", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "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, @@ -16,7 +16,7 @@ "test:watch": "jest --watchAll" }, "devDependencies": { - "@quiet/eslint-config": "^2.0.1-alpha.2", + "@quiet/eslint-config": "^2.0.1-alpha.3", "@types/jest": "^29.2.6", "@types/selenium-webdriver": "^4.1.10", "babel-jest": "^29.3.1", @@ -24,10 +24,10 @@ "typescript": "^4.9.3" }, "dependencies": { - "@quiet/common": "^2.0.1-alpha.2", - "@quiet/logger": "^2.0.1-alpha.2", - "@quiet/types": "^2.0.1-alpha.2", - "backend-bundle": "^2.0.1-alpha.2", + "@quiet/common": "^2.0.1-alpha.3", + "@quiet/logger": "^2.0.1-alpha.3", + "@quiet/types": "^2.0.1-alpha.3", + "backend-bundle": "^2.0.1-alpha.3", "cross-env": "^5.2.0", "electron-chromedriver": "22.0.0", "get-port": "^5.1.1", diff --git a/packages/e2e-tests/src/utils.ts b/packages/e2e-tests/src/utils.ts index 7379e81199..cc95364feb 100644 --- a/packages/e2e-tests/src/utils.ts +++ b/packages/e2e-tests/src/utils.ts @@ -61,8 +61,7 @@ export class BuildSetup { case 'linux': return `${__dirname}/../Quiet/${this.fileName ? this.fileName : process.env.FILE_NAME}` case 'win32': - // return `${process.env.LOCALAPPDATA}\\Programs\\${this.fileName ? 'quiet' : 'quiet2'}\\Quiet.exe` - return `${process.env.LOCALAPPDATA}\\Programs\\quiet\\Quiet.exe` + return `${process.env.LOCALAPPDATA}\\Programs\\@quietdesktop\\Quiet.exe` case 'darwin': return '/Applications/Quiet.app/Contents/MacOS/Quiet' default: @@ -73,7 +72,7 @@ export class BuildSetup { public getVersionFromEnv() { const envFileName = process.env.FILE_NAME if (!envFileName) { - throw new Error('file name not specyfied') + throw new Error('file name not specified') } switch (process.platform) { case 'linux': diff --git a/packages/eslint-config-custom/CHANGELOG.md b/packages/eslint-config-custom/CHANGELOG.md index 0eec67e211..84de66834f 100644 --- a/packages/eslint-config-custom/CHANGELOG.md +++ b/packages/eslint-config-custom/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/eslint-config@2.0.1-alpha.2...@quiet/eslint-config@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package @quiet/eslint-config + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/eslint-config@2.0.1-alpha.1...@quiet/eslint-config@2.0.1-alpha.2) (2023-10-09) **Note:** Version bump only for package @quiet/eslint-config diff --git a/packages/eslint-config-custom/package-lock.json b/packages/eslint-config-custom/package-lock.json index 4b92844357..7f69ed2527 100644 --- a/packages/eslint-config-custom/package-lock.json +++ b/packages/eslint-config-custom/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/eslint-config", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/eslint-config", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "devDependencies": { "@typescript-eslint/eslint-plugin": "5.59.11", "@typescript-eslint/parser": "^5.59.11", diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json index f02723b88a..c4acd50d10 100644 --- a/packages/eslint-config-custom/package.json +++ b/packages/eslint-config-custom/package.json @@ -1,7 +1,7 @@ { "name": "@quiet/eslint-config", "main": "index.js", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "private": true, "devDependencies": { "@typescript-eslint/eslint-plugin": "5.59.11", diff --git a/packages/identity/CHANGELOG.md b/packages/identity/CHANGELOG.md index 9fa34ebaf5..2cfee34d0c 100644 --- a/packages/identity/CHANGELOG.md +++ b/packages/identity/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/identity/compare/@quiet/identity@2.0.1-alpha.2...@quiet/identity@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package @quiet/identity + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/identity/compare/@quiet/identity@2.0.1-alpha.1...@quiet/identity@2.0.1-alpha.2) (2023-10-09) **Note:** Version bump only for package @quiet/identity diff --git a/packages/identity/package-lock.json b/packages/identity/package-lock.json index 7532616bbe..21d687ab3a 100644 --- a/packages/identity/package-lock.json +++ b/packages/identity/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/identity", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/identity", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "MIT", "dependencies": { "@peculiar/webcrypto": "1.4.3", diff --git a/packages/identity/package.json b/packages/identity/package.json index 703b9ddc46..c8ae5a0afe 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/identity", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "description": "Quiet tools for creating certificates and signing messages", "main": "lib/index.js", "types": "lib/index.d.js", @@ -50,9 +50,9 @@ }, "dependencies": { "@peculiar/webcrypto": "1.4.3", - "@quiet/eslint-config": "^2.0.1-alpha.2", - "@quiet/logger": "^2.0.1-alpha.2", - "@quiet/types": "^2.0.1-alpha.2", + "@quiet/eslint-config": "^2.0.1-alpha.3", + "@quiet/logger": "^2.0.1-alpha.3", + "@quiet/types": "^2.0.1-alpha.3", "pkijs": "^3.0.8" }, "devDependencies": { diff --git a/packages/integration-tests/CHANGELOG.md b/packages/integration-tests/CHANGELOG.md index 7025a7db97..4c986badc1 100644 --- a/packages/integration-tests/CHANGELOG.md +++ b/packages/integration-tests/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/integration-tests@2.0.1-alpha.2...integration-tests@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package integration-tests + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.1...integration-tests@2.0.1-alpha.2) (2023-10-09) **Note:** Version bump only for package integration-tests diff --git a/packages/integration-tests/package-lock.json b/packages/integration-tests/package-lock.json index 4fc63aec00..1d3a5c84e0 100644 --- a/packages/integration-tests/package-lock.json +++ b/packages/integration-tests/package-lock.json @@ -1,12 +1,12 @@ { "name": "integration-tests", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "integration-tests", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "ISC", "dependencies": { "@peculiar/webcrypto": "1.4.3", diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 2cd06c3f6b..c76d268840 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -1,6 +1,6 @@ { "name": "integration-tests", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "description": "", "types": "lib/index.d.ts", "main": "lib/index.js", @@ -23,7 +23,7 @@ "@babel/core": "^7.22.5", "@babel/preset-env": "^7.22.5", "@babel/preset-typescript": "^7.22.5", - "@quiet/eslint-config": "^2.0.1-alpha.2", + "@quiet/eslint-config": "^2.0.1-alpha.3", "@types/jest": "^26.0.24", "@types/redux-saga": "^0.10.5", "@types/tmp": "^0.2.2", @@ -34,9 +34,9 @@ }, "dependencies": { "@peculiar/webcrypto": "1.4.3", - "@quiet/identity": "^2.0.1-alpha.2", - "@quiet/logger": "^2.0.1-alpha.2", - "@quiet/state-manager": "^2.0.1-alpha.2", + "@quiet/identity": "^2.0.1-alpha.3", + "@quiet/logger": "^2.0.1-alpha.3", + "@quiet/state-manager": "^2.0.1-alpha.3", "@reduxjs/toolkit": "^1.6.1", "commander": "^9.1.0", "debug": "^4.3.2", diff --git a/packages/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md index f1b6762060..396956f138 100644 --- a/packages/logger/CHANGELOG.md +++ b/packages/logger/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/logger@2.0.1-alpha.2...@quiet/logger@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package @quiet/logger + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/logger@2.0.1-alpha.1...@quiet/logger@2.0.1-alpha.2) (2023-10-09) **Note:** Version bump only for package @quiet/logger diff --git a/packages/logger/package-lock.json b/packages/logger/package-lock.json index 475378ed38..ea38fbf170 100644 --- a/packages/logger/package-lock.json +++ b/packages/logger/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/logger", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/logger", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "ISC", "dependencies": { "cross-env": "^5.2.0", diff --git a/packages/logger/package.json b/packages/logger/package.json index b3e09bf385..774721e12e 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/logger", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "description": "Logger", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -17,7 +17,7 @@ "rmDist": "rimraf lib/" }, "devDependencies": { - "@quiet/eslint-config": "^2.0.1-alpha.2", + "@quiet/eslint-config": "^2.0.1-alpha.3", "@types/debug": "^4.1.7", "@types/node": "^17.0.21", "typescript": "^4.9.3" diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index 663934a30e..566e7d9dcd 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/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/mobile@2.0.1-alpha.2...@quiet/mobile@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package @quiet/mobile + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.8...@quiet/mobile@2.0.1-alpha.2) (2023-10-09) diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle index f6ce436592..bc48f480a2 100644 --- a/packages/mobile/android/app/build.gradle +++ b/packages/mobile/android/app/build.gradle @@ -166,8 +166,8 @@ android { applicationId "com.quietmobile" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 340 - versionName "2.0.1-alpha.2" + versionCode 341 + versionName "2.0.1-alpha.3" resValue "string", "build_config_package", "com.quietmobile" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/packages/mobile/ios/Quiet/Info.plist b/packages/mobile/ios/Quiet/Info.plist index d28dfa528c..0e2193d0ca 100644 --- a/packages/mobile/ios/Quiet/Info.plist +++ b/packages/mobile/ios/Quiet/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 320 + 321 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist index 6c2a759b1b..1be92e1ecd 100644 --- a/packages/mobile/ios/QuietTests/Info.plist +++ b/packages/mobile/ios/QuietTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 320 + 321 diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json index d9be3397f9..1e4bcbbd6a 100644 --- a/packages/mobile/package-lock.json +++ b/packages/mobile/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/mobile", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/mobile", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "dependencies": { "@peculiar/webcrypto": "^1.4.3", "@react-native-clipboard/clipboard": "^1.11.2", @@ -98,7 +98,6 @@ "react-native-version": "^4.0.0", "react-test-renderer": "18.1.0", "redux-saga-test-plan": "^4.0.1", - "run-script-os": "1.1.6", "socket.io-mock": "^1.3.2", "typescript": "^4.9.3", "wait-for-expect": "^3.0.2" @@ -22420,16 +22419,6 @@ "aproba": "^1.1.1" } }, - "node_modules/run-script-os": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz", - "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==", - "dev": true, - "bin": { - "run-os": "index.js", - "run-script-os": "index.js" - } - }, "node_modules/rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -43264,12 +43253,6 @@ "aproba": "^1.1.1" } }, - "run-script-os": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz", - "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==", - "dev": true - }, "rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", diff --git a/packages/mobile/package.json b/packages/mobile/package.json index a27a3efa0b..d3bfc92bac 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/mobile", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "scripts": { "build": "tsc -p tsconfig.build.json --noEmit", "storybook-android": "ENVFILE=.env.storybook react-native run-android --variant=storybookDebug --appIdSuffix=storybook.debug", @@ -12,27 +12,21 @@ "lint": "eslint --ext .jsx,.js,.ts,.tsx ./src/ --fix", "lint-ci": "eslint --ext .jsx,.js,.ts,.tsx ./src/", "gen": "plop", - "prepare-backend-assets": "run-script-os", - "prepare-backend-assets:default": "mkdir -p ./nodejs-assets/nodejs-project && cp ../backend/lib/bundle.cjs ./nodejs-assets/nodejs-project/bundle.cjs", - "prepare-backend-assets:windows": "mkdir .\\nodejs-assets\\nodejs-project || cd . && xcopy ..\\backend\\lib\\bundle.cjs .\\nodejs-assets\\nodejs-project\\ /Y", + "prepare-backend-assets": "mkdir -p ./nodejs-assets/nodejs-project && cp ../backend/lib/bundle.cjs ./nodejs-assets/nodejs-project/bundle.cjs", "patch-state-manager": "node -e \"if (process.env.NODE_ENV !== 'production'){process.exit(1)} \" || patch -f -d ../state-manager -p0 < ./factory-girl.patch || true", "patch-react-native": "patch -f -p0 --forward --binary < ./react-native.patch || true", "patch-webview-crypto": "patch -f -p0 --forward --binary < ./react-native-webview-crypto.patch || true", - "override-dlopen": "run-script-os", - "override-dlopen:default": "cd ./nodejs-assets/nodejs-project && cp ../override-dlopen-paths-preload.js ./ && cp ../override-dlopen-paths-data.json ./", - "override-dlopen:windows": "cd ./nodejs-assets/nodejs-project && xcopy ..\\override-dlopen-paths-preload.js .\\ /Y && xcopy ..\\override-dlopen-paths-data.json .\\ /Y", - "prepare": "run-script-os", - "prepare:default": "npm run prepare-backend-assets && npm run override-dlopen && npm run patch-state-manager && npm run patch-react-native && npm run patch-webview-crypto && npm run build", - "prepare:windows": "npm run prepare-backend-assets && npm run override-dlopen && npm run build", + "override-dlopen": "cd ./nodejs-assets/nodejs-project && cp ../override-dlopen-paths-preload.js ./ && cp ../override-dlopen-paths-data.json ./", + "prepare": "npm run prepare-backend-assets && npm run override-dlopen && npm run patch-state-manager && npm run patch-react-native && npm run patch-webview-crypto && npm run build", "version": "react-native-version --skip-tag" }, "dependencies": { "@peculiar/webcrypto": "^1.4.3", - "@quiet/backend": "^2.0.1-alpha.2", - "@quiet/common": "^2.0.1-alpha.2", - "@quiet/identity": "^2.0.1-alpha.2", - "@quiet/state-manager": "^2.0.1-alpha.2", - "@quiet/types": "^2.0.1-alpha.2", + "@quiet/backend": "^2.0.1-alpha.3", + "@quiet/common": "^2.0.1-alpha.3", + "@quiet/identity": "^2.0.1-alpha.3", + "@quiet/state-manager": "^2.0.1-alpha.3", + "@quiet/types": "^2.0.1-alpha.3", "@react-native-clipboard/clipboard": "^1.11.2", "@react-navigation/native": "^6.0.0", "@react-navigation/native-stack": "^6.9.0", @@ -88,7 +82,7 @@ "@babel/plugin-transform-flow-strip-types": "^7.22.5", "@babel/preset-env": "^7.22.5", "@babel/runtime": "^7.22.5", - "@quiet/eslint-config": "^2.0.1-alpha.2", + "@quiet/eslint-config": "^2.0.1-alpha.3", "@react-native-async-storage/async-storage": "^1.18.1", "@react-native-community/eslint-config": "^2.0.0", "@react-native-community/push-notification-ios": "^1.10.1", diff --git a/packages/state-manager/CHANGELOG.md b/packages/state-manager/CHANGELOG.md index 7f62c69067..b2db960fd5 100644 --- a/packages/state-manager/CHANGELOG.md +++ b/packages/state-manager/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/state-manager@2.0.1-alpha.2...@quiet/state-manager@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package @quiet/state-manager + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.1...@quiet/state-manager@2.0.1-alpha.2) (2023-10-09) **Note:** Version bump only for package @quiet/state-manager diff --git a/packages/state-manager/package-lock.json b/packages/state-manager/package-lock.json index d7790a18b5..f656d50c45 100644 --- a/packages/state-manager/package-lock.json +++ b/packages/state-manager/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/state-manager", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/state-manager", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "ISC", "dependencies": { "@reduxjs/toolkit": "^1.9.1", diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json index 58ad6c3195..174becc579 100644 --- a/packages/state-manager/package.json +++ b/packages/state-manager/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/state-manager", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "description": "", "main": "lib/index.js", "private": true, @@ -23,9 +23,9 @@ "author": "", "license": "ISC", "dependencies": { - "@quiet/common": "^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/logger": "^2.0.1-alpha.3", + "@quiet/types": "^2.0.1-alpha.3", "@reduxjs/toolkit": "^1.9.1", "factory-girl": "^5.0.4", "get-port": "^5.1.1", @@ -44,8 +44,8 @@ "@babel/preset-env": "^7.22.5", "@babel/preset-typescript": "^7.22.5", "@peculiar/webcrypto": "1.4.3", - "@quiet/eslint-config": "^2.0.1-alpha.2", - "@quiet/identity": "^2.0.1-alpha.2", + "@quiet/eslint-config": "^2.0.1-alpha.3", + "@quiet/identity": "^2.0.1-alpha.3", "@types/factory-girl": "^5.0.8", "@types/jest": "^26.0.24", "@types/luxon": "^2.0.0", diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index e1f3e5db6d..4e45aa8f7b 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/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/types@2.0.1-alpha.2...@quiet/types@2.0.1-alpha.3) (2023-10-10) + +**Note:** Version bump only for package @quiet/types + + + + + ## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/types@2.0.1-alpha.1...@quiet/types@2.0.1-alpha.2) (2023-10-09) **Note:** Version bump only for package @quiet/types diff --git a/packages/types/package-lock.json b/packages/types/package-lock.json index e4bdf124db..a678fa5b49 100644 --- a/packages/types/package-lock.json +++ b/packages/types/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/types", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/types", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "license": "ISC", "dependencies": { "cross-env": "^5.2.0", diff --git a/packages/types/package.json b/packages/types/package.json index 35027aa87e..e5e9212465 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/types", - "version": "2.0.1-alpha.2", + "version": "2.0.1-alpha.3", "description": "Common monorepo types", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -18,7 +18,7 @@ "rmDist": "rimraf lib/" }, "devDependencies": { - "@quiet/eslint-config": "^2.0.1-alpha.2", + "@quiet/eslint-config": "^2.0.1-alpha.3", "@reduxjs/toolkit": "^1.9.1", "@types/jest": "^26.0.23", "@types/node": "^17.0.21",