Merge pull request #3149 from oxen-io/clearnet

Session v1.13.0
oxen-io · Aug 12, 2024 · f46ba60 · f46ba60
2 parents 2f6d071 + 3cd55b1
commit f46ba60
Show file tree

Hide file tree

Showing 441 changed files with 11,380 additions and 10,141 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -23,7 +23,7 @@ module.exports = {
     'airbnb-base',
     'prettier',
     'plugin:@typescript-eslint/recommended',
-    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
     'plugin:react-hooks/recommended',
     'plugin:import/recommended',
     'plugin:import/typescript',
@@ -79,7 +79,7 @@ module.exports = {
     // make imports without file extensions
     'import/extensions': ['warn', 'never'],
 
-    // NOTE Remove this line when debugging cyclic dependencies
+    // NOTE Comment out this line when debugging cyclic dependencies / circular imports
     'import/no-cycle': 'off',
 
     // Prettier overrides:
@@ -122,6 +122,19 @@ module.exports = {
         ignoreRegExpLiterals: true,
       },
     ],
+    'no-restricted-imports': [
+      'error',
+      {
+        paths: [
+          // There is an issue with the current version of react-use where it requires an arbitrary 'Locale' package on the window object which causes random app crashes on startup in some cases
+          {
+            name: 'react-use',
+            message:
+              "Don't import from 'react-use' directly. Please use a default import for each hook from 'react-use/lib' instead.",
+          },
+        ],
+      },
+    ],
   },
   overrides: [
     {

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
@@ -6,10 +6,12 @@ on:
     branches:
       - clearnet
       - unstable
+      - release/
   pull_request:
     branches:
       - clearnet
       - unstable
+      - release/
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - clearnet
       - unstable
-      - unstable1
+      - release/
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

diff --git a/.mocharc.json b/.mocharc.json
@@ -0,0 +1,7 @@
+{
+  "exit": true,
+  "spec": ["ts/test/**/*_test.js"],
+  "require": "jsdom-global/register",
+  "timeout": "10000",
+  "recursive": true
+}
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Please search for any [existing issues](https://github.com/oxen-io/session-deskt
 
 ## Supported platforms
 
-Session requires Windows 10 or later, macOS Catalina (10.15) or later, or a linux distribution with glibc 2.28 or later like Debian 10 or Ubuntu 20.04.
+Session requires Windows 10 or later, macOS Monterey (12) or later, or a linux distribution with glibc 2.28 or later like Debian 10 or Ubuntu 20.04.
 
 ## Build instruction
 

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
diff --git a/about.html b/about.html
@@ -14,6 +14,8 @@
             script-src 'self' 'unsafe-inline';
             style-src 'self' 'unsafe-inline';"
     />
+    <!-- Load first to prevent font swapping on start -->
+    <link href="stylesheets/fonts.css" rel="stylesheet" type="text/css" />
     <link href="stylesheets/dist/manifest.css" rel="stylesheet" type="text/css" />
   </head>
 

diff --git a/about_preload.js b/about_preload.js
@@ -3,18 +3,18 @@
 
 const { ipcRenderer } = require('electron');
 const url = require('url');
+const os = require('os');
 const i18n = require('./ts/util/i18n');
 
 const config = url.parse(window.location.toString(), true).query;
 const { locale } = config;
 const localeMessages = ipcRenderer.sendSync('locale-data');
 
-window.React = require('react');
-window.ReactDOM = require('react-dom');
-
 window.theme = config.theme;
 window.i18n = i18n.setupi18n(locale, localeMessages);
 
+window.getOSRelease = () =>
+  `${os.type()} ${os.release()}, Node.js ${config.node_version} ${os.platform()} ${os.arch()}`;
 window.getEnvironment = () => config.environment;
 window.getVersion = () => config.version;
 window.getCommitHash = () => config.commitHash;
@@ -28,6 +28,4 @@ window.Signal = {
   },
 };
 
-window.closeAbout = () => ipcRenderer.send('close-about');
-
 require('./ts/util/logging');
diff --git a/background.html b/background.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
@@ -25,13 +25,15 @@
     />
     <title>Session</title>
     <link href="images/session/session_icon.png" rel="shortcut icon" />
+    <!-- Load first to prevent font swapping on start -->
+    <link href="stylesheets/fonts.css" rel="stylesheet" type="text/css" />
     <link href="stylesheets/dist/manifest.css" rel="stylesheet" type="text/css" />
   </head>
 
   <body id="body">
     <div id="root">
       <div class="app-loading-screen">
-        <div class="content session-full-logo">
+        <div class="session-full-logo">
           <img src="images/session/brand.svg" class="session-brand-logo" />
           <img src="images/session/session-text.svg" class="session-text-logo" />
         </div>

diff --git a/debug_log.html b/debug_log.html
@@ -14,6 +14,8 @@
             script-src 'self' 'unsafe-inline';
             style-src 'self' 'unsafe-inline';"
     />
+    <!-- Load first to prevent font swapping on start -->
+    <link href="stylesheets/fonts.css" rel="stylesheet" type="text/css" />
     <link href="stylesheets/dist/manifest.css" rel="stylesheet" type="text/css" />
   </head>
 

diff --git a/debug_log_preload.js b/debug_log_preload.js
@@ -14,9 +14,6 @@ const localeMessages = ipcRenderer.sendSync('locale-data');
 
 window._ = require('lodash');
 
-window.React = require('react');
-window.ReactDOM = require('react-dom');
-
 window.getVersion = () => config.version;
 window.theme = config.theme;
 window.i18n = i18n.setupi18n(locale, localeMessages);
@@ -29,7 +26,8 @@ window.getEnvironment = () => config.environment;
 
 require('./ts/util/logging');
 
-window.getOSRelease = () => `${os.type()} ${os.release} ${os.platform()}`;
+window.getOSRelease = () =>
+  `${os.type()} ${os.release()}, Node.js ${config.node_version} ${os.platform()} ${os.arch()}`;
 window.getCommitHash = () => config.commitHash;
 
 window.closeDebugLog = () => ipcRenderer.send('close-debug-log');

diff --git a/images/hero.png b/images/hero.png
diff --git a/images/party-popper.svg b/images/party-popper.svg
diff --git a/images/session/session-text.svg b/images/session/session-text.svg
diff --git a/images/session/session_shield.svg b/images/session/session_shield.svg