v4.10.0

.env

@@ -1,2 +1,4 @@
 VITE_I18N_LOCALE=en
 VITE_I18N_FALLBACK_LOCALE=en
+VITE_PUBLIC_PATH=
+VITE_ROUTER_HISTORY_MODE=

.github/workflows/capacitor-android.yml

@@ -13,7 +13,6 @@ env:
   ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
   ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
   ANDROID_KEYSTORE_ALIAS_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_ALIAS_PASSWORD }}
-  ANDROID_RELEASE_TYPE: 'AAB' # APK or AAB
 
 jobs:
   release:
@@ -51,21 +50,32 @@ jobs:
           base64 -d android/keystore.base64 > android/app.keystore
           rm android/keystore.base64
 
-      - name: Build and Sign Android App 🛠️
+      - name: Build and Sign Android App (APK) 🛠️
         run: |
           npx cap sync
           npx cap build android \
             --keystorepath $ANDROID_KEYSTORE_PATH \
             --keystorepass $ANDROID_KEYSTORE_PASSWORD \
             --keystorealias $ANDROID_KEYSTORE_ALIAS \
             --keystorealiaspass $ANDROID_KEYSTORE_ALIAS_PASSWORD \
-            --androidreleasetype $ANDROID_RELEASE_TYPE
+            --androidreleasetype APK
+
+      - name: Build and Sign Android App (AAB) 🛠️
+        run: |
+          npx cap sync
+          npx cap build android \
+            --keystorepath $ANDROID_KEYSTORE_PATH \
+            --keystorepass $ANDROID_KEYSTORE_PASSWORD \
+            --keystorealias $ANDROID_KEYSTORE_ALIAS \
+            --keystorealiaspass $ANDROID_KEYSTORE_ALIAS_PASSWORD \
+            --androidreleasetype AAB
 
       - name: Save artifacts 💾
         uses: actions/upload-artifact@v4
         with:
           name: android-release-app
           path: |
+            android/app/build/outputs/apk/release/*
             android/app/build/outputs/bundle/release/*
 
       - name: Clean Keystore file 🧹

.github/workflows/github-pages.yml

@@ -0,0 +1,51 @@
+name: GitHub Pages
+on:
+  push:
+    branches:
+      - master
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Setup Node version 🍀
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Configure GitHub Pages ⚙️
+        uses: actions/configure-pages@v5
+
+      - name: Install dependencies 📦
+        run: npm ci
+
+      - name: Build PWA 🛠️
+        run: |
+          npm run schema:generate
+          npm run build
+        env:
+          VITE_PUBLIC_PATH: ${{ github.event.repository.name }}
+          VITE_ROUTER_HISTORY_MODE: hash
+
+      - name: Upload artifacts 📁
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: dist
+
+      - name: Deploy to GitHub Pages 🚀
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/pwa-testnet.yml

@@ -0,0 +1,43 @@
+name: PWA Testnet Workflow
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+
+env:
+  SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }}
+  PREVIEW_DOMAIN: https://${{ github.ref_name }}-adamant-testnet.surge.sh
+
+jobs:
+  build-and-deploy-to-surge:
+    name: Build and Deploy with Testnet ADM nodes to surge
+    runs-on: ubuntu-latest
+    environment: testnet
+    steps:
+      - name: Checkout repository 🛎️
+        uses: actions/checkout@v4
+
+      - name: Setup Node version 🍀
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install dependencies ⚙️
+        run: npm ci
+
+      - name: Build PWA 🛠️
+        run: |
+          npm run schema:generate
+          npm run build:testnet
+
+      - name: Archive artifacts 📁
+        uses: actions/upload-artifact@v4
+        with:
+          path: dist
+
+      - name: Deploy to surge 🚀
+        run: |
+          npm install --global surge
+          surge ./dist ${{ env.PREVIEW_DOMAIN }} --token ${{ secrets.SURGE_TOKEN }}

README.md

@@ -116,3 +116,25 @@ $ npm run android:build
 To build on Windows you must install build tools for windows, it is easier to do this with [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools) npm package.
 
 For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+
+## Self-hosted
+
+If you are unable to access [adm.im](https://adm.im) (e.g., due to censorship), you can run a self-hosted version of ADAMANT Messenger. We always encourage people to build it from source.
+
+You can build and deploy the app to GitHub Pages. Follow the instructions below.
+
+### Enable GH Actions
+
+1. Fork the repository.
+2. Go to the repository **Settings**.
+3. Navigate to the **Pages** tab.
+4. Set the source as **GitHub Actions**.
+
+### Run GH Workflow
+
+1. Go to the **Actions** tab.
+2. Enable workflows.
+3. Select the **GitHub Pages** workflow.
+4. Click **Run workflow**.
+5. Wait until the build succeeds.
+6. Open ADAMANT Messenger at `username.github.io/adamant-im`

commitlint.config.ts

@@ -0,0 +1,7 @@
+import type { UserConfig } from '@commitlint/types'
+
+const config: UserConfig = {
+  extends: ['@commitlint/config-conventional']
+}
+
+export default config

electron-builder.yml

@@ -43,6 +43,8 @@ mac:
       - arm64
 
 afterSign: 'scripts/electron/notarize.cjs'
+afterPack: 'scripts/electron/sandboxFix.mjs'
+
 
 # Config for OSX dmg
 dmg:

index.html

@@ -2,69 +2,68 @@
 <!-- Disables pull-to-refresh but allows overscroll glow effects.
 overscroll-behavior-y: contain;  -->
 <html lang="en" style="overscroll-behavior-y: contain;">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <meta name="apple-itunes-app" content="app-id=1341473829">
-    <link rel="icon" href="favicon.ico">
-    <link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="apple-touch-icon-precomposed" sizes="57x57" href="/img/icons/apple-touch-icon-57x57.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/img/icons/apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/img/icons/apple-touch-icon-72x72.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/img/icons/apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="60x60" href="/img/icons/apple-touch-icon-60x60.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="/img/icons/apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="76x76" href="/img/icons/apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="/img/icons/apple-touch-icon-152x152.png" />
-    <link rel="apple-touch-icon-precomposed" sizes="180x180" href="/img/icons/apple-touch-icon-180x180.png" />
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta name="apple-itunes-app" content="app-id=1341473829">
+  <link rel="icon" href="/favicon.ico">
+  <link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#5bbad5">
+  <link rel="apple-touch-icon-precomposed" sizes="57x57" href="/img/icons/apple-touch-icon-57x57.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/img/icons/apple-touch-icon-114x114.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/img/icons/apple-touch-icon-72x72.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/img/icons/apple-touch-icon-144x144.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="60x60" href="/img/icons/apple-touch-icon-60x60.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="120x120" href="/img/icons/apple-touch-icon-120x120.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="76x76" href="/img/icons/apple-touch-icon-76x76.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="152x152" href="/img/icons/apple-touch-icon-152x152.png" />
+  <link rel="apple-touch-icon-precomposed" sizes="180x180" href="/img/icons/apple-touch-icon-180x180.png" />
 
-    <link rel="icon" type="image/png" href="/img/icons/favicons/favicon-96x96.png" sizes="96x96" />
-    <link rel="icon" type="image/png" href="/img/icons/favicons/favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="/img/icons/favicons/favicon-16x16.png" sizes="16x16" />
-    <link rel="icon" type="image/png" href="/img/icons/favicons/favicon-128x128.png" sizes="128x128" />
+  <link rel="icon" type="image/png" href="/img/icons/favicons/favicon-96x96.png" sizes="96x96" />
+  <link rel="icon" type="image/png" href="/img/icons/favicons/favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="/img/icons/favicons/favicon-16x16.png" sizes="16x16" />
+  <link rel="icon" type="image/png" href="/img/icons/favicons/favicon-128x128.png" sizes="128x128" />
 
-    <meta name="application-name" content="ADAMANT Messenger"/>
-    <meta name="msapplication-TileColor" content="#2b5797" />
-    <meta name="msapplication-TileImage" content="/img/icons/mstile-144x144.png" />
-    <meta name="msapplication-square70x70logo" content="/img/icons/mstile-70x70.png" />
-    <meta name="msapplication-square150x150logo" content="/img/icons/mstile-150x150.png" />
-    <meta name="msapplication-wide310x150logo" content="/img/icons/mstile-310x150.png" />
-    <meta name="msapplication-square310x310logo" content="/img/icons/mstile-310x310.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-    <title>ADAMANT Messenger</title>
+  <meta name="application-name" content="ADAMANT Messenger"/>
+  <meta name="msapplication-TileColor" content="#2b5797" />
+  <meta name="msapplication-TileImage" content="/img/icons/mstile-144x144.png" />
+  <meta name="msapplication-square70x70logo" content="/img/icons/mstile-70x70.png" />
+  <meta name="msapplication-square150x150logo" content="/img/icons/mstile-150x150.png" />
+  <meta name="msapplication-wide310x150logo" content="/img/icons/mstile-310x150.png" />
+  <meta name="msapplication-square310x310logo" content="/img/icons/mstile-310x310.png" />
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+  <title>ADAMANT Messenger</title>
 
-    <meta name="theme-color" content="#ffffff">
+  <meta name="theme-color" content="#ffffff">
 
-    <!--[if IE]><link rel="shortcut icon" href="/favicon.ico?v=2"><![endif]-->
+  <!--[if IE]><link rel="shortcut icon" href="/favicon.ico?v=2"><![endif]-->
 
-    <!-- Add to home screen for Safari on iOS -->
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="#4A4A4A">
-    <meta name="apple-mobile-web-app-title" content="ADAMANT Messenger">
+  <!-- Add to home screen for Safari on iOS -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="#4A4A4A">
+  <meta name="apple-mobile-web-app-title" content="ADAMANT Messenger">
 
-
-  </head>
 
-  <body style="background: repeating-linear-gradient(140deg, #191919, #191919 0.7px, #212121 0, #212121 5px);">
-    <noscript>
-      <strong>We're sorry but adamant-im doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app">
+</head>
 
-    <div class="preloader">
-       <img src="/img/adamant-logo-transparent-512x512.png"
-       style="display: block;
-       max-width: 75%;
-       margin: auto;
-       max-height: 75%;
-       padding-top: 70px;
-       filter: invert(1);">
-       </img>
-    </div>
+<body style="background: repeating-linear-gradient(140deg, #191919, #191919 0.7px, #212121 0, #212121 5px);">
+  <noscript>
+    <strong>We're sorry but adamant-im doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+  </noscript>
 
+  <div id="app">
+    <div class="preloader">
+      <img src="/img/adamant-logo-transparent-512x512.png"
+           style="display: block;
+         max-width: 75%;
+         margin: auto;
+         max-height: 75%;
+         padding-top: 70px;
+         filter: invert(1);"
+      />
     </div>
+  </div>
 
-    <script type="module" src="/src/main.ts"></script>
-  </body>
+  <script type="module" src="/src/main.ts"></script>
+</body>
 </html>