Merge pull request oxen-io#2491 from oxen-io/clearnet

Session 1.10.1

Author: Bilb

.github/workflows/build-binaries.yml

@@ -61,7 +61,7 @@ jobs:
         run: yarn install --frozen-lockfile --network-timeout 600000 --force
 
       - name: Generate and concat files
-        run: yarn generate && yarn transpile
+        run: yarn build-everything
 
       - name: Lint Files
         # no need to lint files on all platforms. Just do it once on the quicker one

.github/workflows/pull-request.yml

@@ -58,7 +58,7 @@ jobs:
         run: yarn install --frozen-lockfile --network-timeout 600000 --force
 
       - name: Generate and concat files
-        run: yarn generate && yarn transpile
+        run: yarn build-everything
 
       - name: Lint Files
         # no need to lint files on all platforms. Just do it once on the quicker one

.github/workflows/release.yml

@@ -58,7 +58,7 @@ jobs:
         run: yarn install --frozen-lockfile --network-timeout 600000 --force
 
       - name: Generate and concat files
-        run: yarn generate && yarn transpile
+        run: yarn build-everything
 
       - name: Lint Files
         # no need to lint files on all platforms. Just do it once on the quicker one

BUILDING.md

@@ -66,7 +66,7 @@ nvm install # install the current node version used in this project
 nvm use # use the current node version used in this project
 npm install -g yarn # install yarn globally for this node version
 yarn install --frozen-lockfile # install all dependecies of this project
-yarn grunt # transpile and assemble files
+yarn build-everything # transpile and assemble files
 yarn start-prod # start the app on production mode (currently this is the only one supported)
 ```
 
@@ -116,7 +116,7 @@ nvm install # install the current node version used in this project
 nvm use # use the current node version used in this project
 npm install -g yarn # install yarn globally for this node version
 yarn install --frozen-lockfile # install all dependecies of this project
-yarn grunt # transpile and assemble files
+yarn build-everything # transpile and assemble files
 yarn start-prod # start the app on production mode (currently this is the only one supported)
 ```
 
@@ -125,20 +125,21 @@ yarn start-prod # start the app on production mode (currently this is the only o
 ### Commands
 
 The `rpm` package is required for running the build-release script. Run the appropriate command to install the `rpm` package:
+
 ```sh
 sudo pacman -S rpm    # Arch
 ```
+
 ```sh
 sudo apt install rpm  # Ubuntu/Debian
 ```
 
-
 Run the following to build the binaries for your specific system OS.
 
 ```
 npm install yarn --no-save
 yarn install --frozen-lockfile
-yarn generate
+yarn build-everything
 yarn build-release
 ```
 

CONTRIBUTING.md

@@ -60,10 +60,9 @@ git clone https://github.com/oxen-io/session-desktop.git
 cd session-desktop
 npm install --global yarn      # (only if you don’t already have `yarn`)
 yarn install --frozen-lockfile # Install and build dependencies (this will take a while)
-yarn grunt                     # Generate final JS and CSS assets
-yarn icon-gen                  # Generate full set of icons for Electron
+yarn build-everything
 yarn test                      # A good idea to make sure tests run first
-yarn start                     # Start Session!
+yarn start-prod                # Start Session!
 ```
 
 You'll need to restart the application regularly to see your changes, as there
@@ -72,14 +71,10 @@ is no automatic restart mechanism. Alternatively, keep the developer tools open
 <kbd>Cmd</kbd> + <kbd>R</kbd> (macOS) or <kbd>Ctrl</kbd> + <kbd>R</kbd>
 (Windows & Linux).
 
-Also, note that the assets loaded by the application are not necessarily the same files
-you’re touching. You may not see your changes until you run `yarn grunt` on the
-command-line like you did during setup. You can make it easier on yourself by generating
-the latest built assets when you change a file. Run this in its own terminal instance
-while you make changes:
-
 ```
-yarn grunt dev # runs until you stop it, re-generating built assets on file changes
+yarn build-everything:watch # runs until you stop it, re-generating built assets on file changes
+# Once this command is waiting for changes, you will need to run in another terminal `yarn parcel-util-worker` to fix the "exports undefined" error on start.
+# If you do change the sass while this command is running, it won't pick it up. You need to either run `yarn sass` or have `yarn sass:watch` running in a separate terminal.
 ```
 
 ## Multiple instances
@@ -93,8 +88,6 @@ directory from `%appData%/Session` to `%appData%/Session-{environment}-{instance
 There are a few scripts which you can use:
 
 ```
-yarn start - Start development
-MULTI=1 yarn start - Start second instance of development
 yarn start-prod - Start production but in development mode
 MULTI=1 yarn start-prod - Start another instance of production
 ```
@@ -103,7 +96,7 @@ For more than 2 clients, you may run the above command with `NODE_APP_INSTANCE`
 For example, running:
 
 ```
-NODE_APP_INSTANCE=alice yarn start
+NODE_APP_INSTANCE=alice yarn start-prod
 ```
 
 Will run the development environment with the `alice` instance and thus create a seperate storage profile.
@@ -188,6 +181,6 @@ see how they did things.
 You can build a production binary by running the following:
 
 ```
-yarn generate
+yarn build-everything
 yarn build-release
 ```

Gruntfile.js

@@ -3,14 +3,6 @@
 module.exports = grunt => {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
-    exec: {
-      transpile: {
-        cmd: 'yarn transpile',
-      },
-      'build-protobuf': {
-        cmd: 'yarn build-protobuf',
-      },
-    },
     gitinfo: {}, // to be populated by grunt gitinfo
   });
 
@@ -45,5 +37,5 @@ module.exports = grunt => {
   });
 
   grunt.registerTask('date', ['gitinfo']);
-  grunt.registerTask('default', ['exec:build-protobuf', 'exec:transpile', 'date', 'getCommitHash']);
+  grunt.registerTask('default', ['date', 'getCommitHash']);
 };

_locales/ar/messages.json

@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "هل انت متأكد من تنزيل الوسيط المرسل من طرف $name$؟",
   "pinConversation": "ثَبِت المحادثة",
   "unpinConversation": "ألغِي تثبيت المحادثة",
-  "pinConversationLimitTitle": "حدود المحادثات المثبتة",
-  "pinConversationLimitToastDescription": "يمكنك تثبيت $number$ محادثات فقط",
   "showUserDetails": "اظهر تفاصيل المستخدم",
   "sendRecoveryPhraseTitle": "أرسل جملة الاسترجاع",
   "sendRecoveryPhraseMessage": "انت تحاول ارسال جملة الاسترجاع التي تسمح بالوصول للحساب. متاكد من ارسالها؟",

_locales/bg/messages.json

@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",

_locales/ca/messages.json

@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",
   "pinConversation": "Pin Conversation",
   "unpinConversation": "Unpin Conversation",
-  "pinConversationLimitTitle": "Pinned conversations limit",
-  "pinConversationLimitToastDescription": "You can only pin $number$ conversations",
   "showUserDetails": "Show User Details",
   "sendRecoveryPhraseTitle": "Sending Recovery Phrase",
   "sendRecoveryPhraseMessage": "You are attempting to send your recovery phrase which can be used to access your account. Are you sure you want to send this message?",

_locales/cs/messages.json

@@ -384,8 +384,6 @@
   "trustThisContactDialogDescription": "Určitě chceš stáhnout obsah odeslán uživatelem $name$?",
   "pinConversation": "Připnout konverzaci",
   "unpinConversation": "Odepnout konverzaci",
-  "pinConversationLimitTitle": "Limit připnutých konverzací",
-  "pinConversationLimitToastDescription": "Můžete připnout jen $number$ konverzací",
   "showUserDetails": "Zobrazit podrobnosti uživatele",
   "sendRecoveryPhraseTitle": "Odesílání fráze pro obnovení",
   "sendRecoveryPhraseMessage": "Pokoušíš se odeslat svou frázu pro obnovení, díky které se lze přihlásit do tvého účtu. Opravdu chceš tuto zprávu odeslat?",