Merge pull request #1354 from session-foundation/dev

Session 1.15.1

Author: Bilb

.eslintignore

@@ -17,3 +17,10 @@ compiled.d.ts
 playwright.config.js
 
 ts/localization/locales.ts
+
+about_preload.js
+commitlint.config.js
+libsession.worker.config.js
+password_preload.js
+sass.config.js
+utils.worker.config.js

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,7 +14,7 @@ Remember, you can preview this before saving it.
 ### Contributor checklist:
 
 - [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/)
-- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`unstable`](https://github.com/session-foundation/session-desktop/tree/unstable) branch
+- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`dev`](https://github.com/session-foundation/session-desktop/tree/dev) branch
 - [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/session-foundation/session-desktop/blob/master/CONTRIBUTING.md#tests))
 - [ ] My changes are ready to be shipped to users
 

.github/workflows/build-binaries.yml

@@ -8,12 +8,12 @@ on:
   push:
     branches:
       - master
-      - unstable
+      - dev
       - 'release/**'
       - 'ci/**'
   pull_request:
     branches:
-      - unstable
+      - dev
       - 'release/**'
       - 'ci/**'
 
@@ -52,7 +52,6 @@ jobs:
         run: yarn lint-full
 
       - name: Enforce yarn.lock has no duplicates
-        # no need to dedup yarn.lock on all platforms
         uses: ./actions/deduplicate_fail
 
         # we want to test on all platforms since some are testing the rendered menus (and are dependent on the platform)
@@ -63,7 +62,7 @@ jobs:
         # we want this to run always, except on "push" to "master"
         if: ${{ env.SHOULD_PUBLISH == 'false' }}
         run: |
-          sed -i 's/"target": \["deb"\]/"target": "${{ matrix.pkg_to_build }}"/g' package.json && yarn build-release
+          sed -i 's/"target": "deb"/"target": "${{ matrix.pkg_to_build }}"/g' package.json && yarn build-release
 
       - name: Upload artefacts ${{ matrix.pkg_to_build }}
         # we want this to run always, except on "push" to "master"
@@ -76,7 +75,7 @@ jobs:
         # we want this to run only when on "push" to "master"
         if: ${{ env.SHOULD_PUBLISH == 'true' }}
         run: |
-          sed -i 's/"target": \["deb"\]/"target": "${{ matrix.pkg_to_build }}"/g' package.json && yarn build-release-publish
+          sed -i 's/"target": "deb"/"target": "${{ matrix.pkg_to_build }}"/g' package.json && yarn build-release-publish
 
   build_windows:
     runs-on: windows-2022

.husky/commit-msg

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx --no -- commitlint --edit "$1"

.husky/pre-commit

@@ -9,3 +9,4 @@ spec:
   - './ts/test/**/*_test.js' # the positional arguments!
 timeout: 1000
 watch: false
+reporter: min

.mocharc.yml

@@ -1 +1 @@
-18.15.0
+20.18.2

.nvmrc

@@ -0,0 +1 @@
+indent-string="  "

.pylintrc

@@ -21,7 +21,7 @@ Of course we encourage community developers to work on ANY issue filed on our Gi
 
 ### Node.js
 
-You'll need a [Node.js](https://nodejs.org/) version which matches our current version. You can check [`.nvmrc` in the `unstable` branch](https://github.com/session-foundation/session-desktop/blob/unstable/.nvmrc) to see what the current version is.
+You'll need a [Node.js](https://nodejs.org/) version which matches our current version. You can check [`.nvmrc` in the `dev` branch](https://github.com/session-foundation/session-desktop/blob/dev/.nvmrc) to see what the current version is.
 
 If you use other node versions you might have or need a node version manager.
 
@@ -31,7 +31,7 @@ If you use other node versions you might have or need a node version manager.
 
 ### Python
 
-You will need a [Python](https://www.python.org) version which matches our current version. You can check [`.tool-versions` in the `unstable` branch](https://github.com/session-foundation/session-desktop/blob/unstable/.tool-versions) to see what the current version is.
+You will need a [Python](https://www.python.org) version which matches our current version. You can check [`.tool-versions` in the `dev` branch](https://github.com/session-foundation/session-desktop/blob/dev/.tool-versions) to see what the current version is.
 
 If you use other python versions you might have or need a python version manager.
 
@@ -382,10 +382,10 @@ So you wanna make a pull request? Please observe the following guidelines.
 - Please do not submit pull requests for pure translation fixes. Anyone can update
   the translations at [Crowdin](https://getsession.org/translate).
 - [Rebase](https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/) your
-  changes on the latest `unstable` branch, resolving any conflicts.
+  changes on the latest `dev` branch, resolving any conflicts.
   This ensures that your changes will merge cleanly when you open your PR.
 - Be sure to add and run tests!
-- Make sure the diff between `unstable` and your branch contains only the
+- Make sure the diff between `dev` and your branch contains only the
   minimal set of changes needed to implement your feature or bug fix. This will
   make it easier for the person reviewing your code to approve the changes.
   Please do not submit a PR with commented out code or unfinished features.
@@ -424,6 +424,6 @@ The binaries will be placed inside the `release/` folder.
 <details>
 <summary>Linux</summary>
 
-You can change in [package.json](./package.json) `"target": ["deb"],` to any of the [electron-builder targets](https://www.electron.build/linux#target) to build for another target.
+You can change in [package.json](./package.json) `"target": "deb",` to any of the [electron-builder targets](https://www.electron.build/linux#target) to build for another target.
 
 </details>

CONTRIBUTING.md

@@ -96,6 +96,6 @@ The binaries will be placed inside the `release/` folder.
 <details>
 <summary>Linux</summary>
 
-You can change in [package.json](./package.json) `"target": ["deb"],` to any of the [electron-builder targets](https://www.electron.build/linux#target) to build for another target.
+You can change in [package.json](./package.json) `"target": "deb",` to any of the [electron-builder targets](https://www.electron.build/linux#target) to build for another target.
 
 </details>