Skip to content

Commit

Permalink
Merge branch 'develop' into chore/move-linter-config
Browse files Browse the repository at this point in the history
  • Loading branch information
EmiM committed Jun 19, 2023
2 parents 80783cd + f352e45 commit 31284a1
Show file tree
Hide file tree
Showing 224 changed files with 155,406 additions and 1,524 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NodeMobile filter=lfs diff=lfs merge=lfs -text
2 changes: 2 additions & 0 deletions .github/workflows/deploy-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
run: echo ${{ matrix.os }}

- uses: actions/checkout@v2
with:
lfs: true

- name: Install gpg
run: brew install gnupg
Expand Down
11 changes: 11 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"semi": false,
"trailingComma": "es5",
"singleQuote": true,
"jsxSingleQuote": true,
"spaceBeforeFunctionParen": true,
"printWidth": 120,
"tabWidth": 2,
"arrowParens": "avoid",
"parser": "typescript"
}
8 changes: 8 additions & 0 deletions packages/backend-bundle/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

# [1.4.0-alpha.0](https://github.com/ZbayApp/monorepo/compare/[email protected]@1.4.0-alpha.0) (2023-06-19)

**Note:** Version bump only for package backend-bundle





## [1.3.1](https://github.com/TryQuiet/quiet/compare/[email protected]@1.3.1) (2023-06-13)

**Note:** Version bump only for package backend-bundle
Expand Down
2 changes: 1 addition & 1 deletion packages/backend-bundle/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backend-bundle",
"version": "1.3.1",
"version": "1.4.0-alpha.0",
"description": "",
"main": "bundle.cjs",
"scripts": {},
Expand Down
8 changes: 8 additions & 0 deletions packages/backend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

# [1.4.0-alpha.0](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-06-19)

**Note:** Version bump only for package @quiet/backend





## [1.3.1](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-06-13)

**Note:** Version bump only for package @quiet/backend
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/classic_level.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const require = createRequire(import.meta.url)
let bindings = null
let arch = process.arch

if (process.platform === 'darwin') {
if (process.platform === 'darwin' || process.platform === 'ios') {
arch = 'universal'
}

Expand Down
4 changes: 2 additions & 2 deletions packages/backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quiet/backend",
"version": "1.3.1",
"version": "1.4.0-alpha.0",
"description": "tlg-manager",
"types": "lib/index.d.ts",
"type": "module",
Expand Down Expand Up @@ -48,7 +48,7 @@
"testEnvironment": "jest-environment-node"
},
"devDependencies": {
"@quiet/state-manager": "^1.3.1",
"@quiet/state-manager": "^1.4.0-alpha.0",
"@quiet/eslint-config": "^1.0.0",
"@types/crypto-js": "^4.0.2",
"@types/express": "^4.17.9",
Expand Down Expand Up @@ -79,10 +79,10 @@
"@chainsafe/libp2p-gossipsub": "6.1.0",
"@chainsafe/libp2p-noise": "11.0.0",
"@peculiar/webcrypto": "1.4.3",
"@quiet/common": "^1.3.1",
"@quiet/identity": "^1.3.1",
"@quiet/logger": "^1.3.1",
"@quiet/types": "^1.3.1",
"@quiet/common": "^1.4.0-alpha.0",
"@quiet/identity": "^1.4.0-alpha.0",
"@quiet/logger": "^1.4.0-alpha.0",
"@quiet/types": "^1.4.0-alpha.0",
"abortable-iterator": "^3.0.0",
"class-validator": "^0.13.1",
"cli-table": "^0.3.6",
Expand Down
8 changes: 8 additions & 0 deletions packages/common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

# [1.4.0-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-06-19)

**Note:** Version bump only for package @quiet/common





## [1.3.1](https://github.com/TryQuiet/quiet/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-06-13)

**Note:** Version bump only for package @quiet/common
Expand Down
Loading

0 comments on commit 31284a1

Please sign in to comment.