🔀Merge remote-tracking branch 'origin/alpha' into 108.0

Author: trickypr

.github/workflows/alpha.yml

@@ -11,7 +11,7 @@ jobs:
       build_date: ${{ steps.data.outputs.builddate }}
       version: ${{ steps.data.outputs.version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
           token: ${{ secrets.ROBOT_TOKEN }}
@@ -35,8 +35,8 @@ jobs:
         id: data
         shell: bash
         run: |
-          echo "::set-output name=builddate::$(date +"%Y-%m-%d")"
-          echo "::set-output name=version::$(gluon get version | xargs)"
+          echo "builddate=$(date +"%Y-%m-%d")" >> $GITHUB_OUTPUT
+          echo "version=$(gluon get version | xargs)" >> $GITHUB_OUTPUT
 
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
@@ -49,7 +49,7 @@ jobs:
     needs: [build-data]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
 
@@ -68,21 +68,9 @@ jobs:
         run: |
           sudo apt-get update --fix-missing
           sudo apt-get update
-          sudo apt-get install dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld-10 llvm
+          sudo apt-get install dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
           pip install pycairo testresources
 
-          echo "/usr/lib/llvm-10/bin" >> $GITHUB_PATH
-
-      - name: Install WASI SDK
-        run: |
-          wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/wasi-sdk_14.0_amd64.deb
-          sudo apt install ./wasi-sdk_14.0_amd64.deb
-
-      - name: Install libclang builtins
-        run: |
-          wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/libclang_rt.builtins-wasm32-wasi-14.0.tar.gz
-          sudo tar -xf libclang_rt.builtins-wasm32-wasi-14.0.tar.gz --strip-components=1 -C /usr/lib/llvm-10/lib/clang/10.0.0/lib/
-
       - name: Disable wasm sandboxing for the sake of my sanity
         run: |
           echo "ac_add_options --without-wasm-sandboxed-libraries" >> mozconfig
@@ -106,20 +94,12 @@ jobs:
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Save sccache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         continue-on-error: false
         with:
           path: /home/runner/.cache/sccache
           key: ${{ runner.os }}-sccache
 
-      - name: Get System Info
-        run: |
-          llc --version
-          ls /usr/lib/llvm-10/bin
-          wasm-ld --version
-          cargo --version
-          ls /opt/wasi-sdk/share/wasi-sysroot
-
       - name: Setup gluon
         run: |
           yarn
@@ -173,7 +153,7 @@ jobs:
     needs: [build-data]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
 
@@ -201,7 +181,7 @@ jobs:
           python-version: '3.9'
 
       - name: Save sccache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         continue-on-error: false
         with:
           path: ~/Library/Caches/Mozilla.sccache
@@ -259,7 +239,7 @@ jobs:
     needs: [build-data]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
 
@@ -350,6 +330,8 @@ jobs:
     name: Release
     needs: [build-data, linux, source, mac, windows]
     runs-on: ubuntu-latest
+    if: ${{ github.ref == 'refs/heads/alpha' }}
+
     steps:
       - uses: actions/download-artifact@v2
 
@@ -397,6 +379,7 @@ jobs:
     name: Build flatpak repos
     needs: [build-data, release]
     runs-on: ubuntu-latest
+    if: ${{ github.ref == 'refs/heads/alpha' }}
 
     steps:
       - uses: actions/checkout@v3
@@ -405,14 +388,21 @@ jobs:
           token: ${{ secrets.ROBOT_TOKEN }}
           submodules: recursive
 
+      - name: Ensure repo is on main branch
+        run: |
+          cd repo
+          git checkout main
+          git pull
+
       - name: Install flatpak builder
         run: | 
+           sudo apt-get update
            sudo apt-get install -y flatpak-builder
      
       - name: Install build dependancies
         run: |
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install flathub org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08 org.mozilla.firefox.BaseApp//22.08
+          sudo flatpak install flathub org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08 org.mozilla.firefox.BaseApp//22.08 -y
   
       - name: Import GPG keys
         run: |
@@ -433,3 +423,11 @@ jobs:
           commit_user_name: Fushra Robot
           commit_user_email: trickypr@gmail.com
           repository: ./repo
+          
+      - name: Update repo version in package
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 📦 Upload flatpak for ${{ needs.build-data.outputs.version }}
+          commit_user_name: Fushra Robot
+          commit_user_email: trickypr@gmail.com
+          repository: .

.vscode/settings.json

@@ -5,7 +5,8 @@
     "moz.configure": "python",
     "app.mozbuild": "python",
     "Makefile.in": "makefile",
-    "mozconfig": "shellscript"
+    "mozconfig": "shellscript",
+    "src/browser/themes/**.json": "jsonc"
   },
   "files.watcherExclude": {
     "**/.git/objects/**": true,

README.md

@@ -8,7 +8,7 @@
 # Pulse Browser
 An experimental Firefox fork that enhances focus and increases work productivity due to its Hyper minimalistic UI and built-in tools.
 
-[![Discord](https://img.shields.io/discord/835714549545828352?style=flat-square)](https://discord.gg/xNkretH7sD)  ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/pulse-browser/browser/Alpha%20builds?style=flat-square) ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/pulse-browser/browser?style=flat-square) ![GitHub Repo stars](https://img.shields.io/github/stars/pulse-browser/browser?style=flat-square)
+[![Discord](https://img.shields.io/discord/835714549545828352?style=flat-square)](https://discord.gg/xNkretH7sD)  ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pulse-browser/browser/alpha.yml?branch=alpha&style=flat-square) ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/pulse-browser/browser?style=flat-square) ![GitHub Repo stars](https://img.shields.io/github/stars/pulse-browser/browser?style=flat-square)
 
 
 </div>

gluon.json

@@ -80,7 +80,7 @@
       "brandShortName": "Pulse Browser",
       "brandFullName": "Pulse Browser Alpha",
       "release": {
-        "displayVersion": "1.0.0-a.39",
+        "displayVersion": "1.0.0-a.48",
         "github": {
           "repo": "pulse-browser/browser"
         },

package.json

@@ -7,17 +7,18 @@
   "license": "MPL-2.0",
   "private": true,
   "dependencies": {
-    "gluon-build": "^1.0.0-rc.2"
+    "gluon-build": "^1.0.0-rc.4"
   },
   "scripts": {
     "build": "gluon build",
     "build:ui": "gluon build --ui",
     "bs": "yarn build && yarn start",
     "bus": "yarn build:ui && yarn start",
-    "start": "gluon run",
+    "start": "yarn clearStartupCache && gluon run",
     "export": "gluon export-file",
     "imp": "gluon import",
     "clearProfile": "rm -rf engine/obj-x86_64-pc-linux-gnu/tmp/profile-default",
+    "clearStartupCache": "rm -rf engine/obj-x86_64-pc-linux-gnu/tmp/profile-default/startupCache",
     "download": "gluon download",
     "package": "gluon package",
     "ff-version": "gluon ff-version",

src/browser/base/content/aboutRobots-xhtml.patch

@@ -0,0 +1,12 @@
+diff --git a/browser/base/content/aboutRobots.xhtml b/browser/base/content/aboutRobots.xhtml
+index 767b31067d6d82c1ddfdbf633ececc459c6480ae..21d09dfb758477930096b6c1b070642464a09e69 100644
+--- a/browser/base/content/aboutRobots.xhtml
++++ b/browser/base/content/aboutRobots.xhtml
+@@ -14,6 +14,7 @@
+     <linkset>
+       <link rel="localization" href="browser/aboutRobots.ftl"/>
+     </linkset>
++    <script src="chrome://browser/content/contentTheme.js"></script>
+   </head>
+ 
+   <body>

src/browser/base/content/browser-js.patch

@@ -0,0 +1,12 @@
+diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
+index a9d4fc4abe1d3b5d5213d3afd90fd0128ee0d032..f2eb4888521deefa7da2b7666ec6012af2a27a4e 100644
+--- a/browser/base/content/browser.js
++++ b/browser/base/content/browser.js
+@@ -1841,6 +1841,7 @@ var gBrowserInit = {
+     gPrivateBrowsingUI.init();
+     BrowserSearch.init();
+     BrowserPageActions.init();
++    VerticalTabs.init();
+     if (gToolbarKeyNavEnabled) {
+       ToolbarKeyboardNavigator.init();
+     }

src/browser/base/content/browser-sidebar-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
-index f09e37fc42f7754f7f3687884ead25124c1b2076..e1833bbfd8a8ed7da767349f886d554f3dd795f3 100644
+index c5ac301416d2d820ba95e21c0ce1fe305e63b554..ef82cb7bf931d7601c2116ee0d1828d6aa593cae 100644
 --- a/browser/base/content/browser-sidebar.js
 +++ b/browser/base/content/browser-sidebar.js
 @@ -11,6 +11,10 @@ var SidebarUI = {
@@ -165,18 +165,21 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..e1833bbfd8a8ed7da767349f886d554f
        }
      }
    },
-@@ -573,6 +652,10 @@ var SidebarUI = {
+@@ -570,6 +649,13 @@ var SidebarUI = {
        this._box.setAttribute("sidebarcommand", commandID);
        this.lastOpenedId = commandID;
 
 +      // Pulse: Reset sidebar margin to zero to allow for correct animations to
 +      // take place (adapted from dot browser, se below)
 +      this._box.style.marginLeft = "0px";
++
++      // Pulse: Add checked to the sidebar-icons class to enable more css latter
++      this._sidebarIcons.setAttribute("checked", "true");
 +
        let { url, title, sourceL10nEl } = this.sidebars.get(commandID);
        this.title = title;
        // Keep the title element in sync with any l10n changes.
-@@ -618,6 +701,26 @@ var SidebarUI = {
+@@ -615,6 +701,27 @@ var SidebarUI = {
 
      this.selectMenuItem("");
 
@@ -198,12 +201,21 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..e1833bbfd8a8ed7da767349f886d554f
 +      this._splitter.hidden = true;
 +
 +      this._box.removeAttribute("checked");
++      this._sidebarIcons.removeAttribute("checked");
 +    }, 170);
 +
      // Replace the document currently displayed in the sidebar with about:blank
      // so that we can free memory by unloading the page. We need to explicitly
      // create a new content viewer because the old one doesn't get destroyed
-@@ -641,25 +744,112 @@ var SidebarUI = {
+@@ -625,6 +732,7 @@ var SidebarUI = {
+ 
+     this._box.removeAttribute("checked");
+     this._box.hidden = this._splitter.hidden = true;
++    this._sidebarIcons.removeAttribute("checked");
+ 
+     let selBrowser = gBrowser.selectedBrowser;
+     selBrowser.focus();
+@@ -638,25 +746,112 @@ var SidebarUI = {
     * none if the argument is an empty string.
     */
    selectMenuItem(commandID) {

src/browser/base/content/browser-verticaltabs.js

@@ -0,0 +1,105 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// @ts-check
+
+const VERTICAL_TABS_POSITION = 'pulse.tabs.vertical'
+
+var VerticalTabs = {
+  /**
+   * @return {Boolean} true if the vertical tabs feature is enabled.
+   */
+  get verticalTabsEnabled() {
+    return Services.prefs.getBoolPref(VERTICAL_TABS_POSITION, false)
+  },
+
+  /**
+   * @return {HTMLElement?}
+   */
+  get tabsToolbar() {
+    return document.getElementById('TabsToolbar')
+  },
+
+  /**
+   * @return {HTMLElement?}
+   */
+  get titlebarContainer() {
+    return document.getElementById('titlebar')
+  },
+
+  /**
+   * @return {HTMLElement?}
+   */
+  get browserContainer() {
+    return document.getElementById('browser')
+  },
+
+  /** @type {HTMLElement?} */
+  arrowScrollbox: null,
+  /** @type {HTMLElement?} */
+  tabBrowserTabs: null,
+
+  _initialized: false,
+
+  init() {
+    if (this._initialized) {
+      return
+    }
+
+    this.arrowScrollbox = document.getElementById('tabbrowser-arrowscrollbox')
+    this.tabBrowserTabs = document.getElementById('tabbrowser-tabs')
+
+    Services.prefs.addObserver(VERTICAL_TABS_POSITION, this)
+
+    if (this.verticalTabsEnabled) {
+      this.enableVerticalTabs()
+    }
+
+    this._initialized = true
+  },
+
+  enableVerticalTabs() {
+    this.browserContainer?.prepend(this.tabsToolbar || '')
+
+    this.arrowScrollbox?.setAttribute('orient', 'vertical')
+    this.tabBrowserTabs?.setAttribute('orient', 'vertical')
+
+    document
+      .getElementById('navigator-toolbox-background')
+      ?.setAttribute('verticaltabs', 'true')
+    document
+      .querySelector('#TabsToolbar .toolbar-items')
+      ?.setAttribute('align', 'start')
+  },
+
+  disableVerticalTabs() {
+    this.titlebarContainer?.prepend(this.tabsToolbar || '')
+
+    this.arrowScrollbox?.setAttribute('orient', 'horizontal')
+    this.tabBrowserTabs?.setAttribute('orient', 'horizontal')
+
+    document
+      .getElementById('navigator-toolbox-background')
+      ?.removeAttribute('verticaltabs')
+    document
+      .querySelector('#TabsToolbar .toolbar-items')
+      ?.setAttribute('align', 'end')
+  },
+
+  /**
+   * The handler for `Services.prefs.addObserver`.
+   */
+  observe(_subject, topic, data) {
+    switch (topic) {
+      case 'nsPref:changed':
+        if (data === VERTICAL_TABS_POSITION) {
+          if (this.verticalTabsEnabled) {
+            this.enableVerticalTabs()
+          } else {
+            this.disableVerticalTabs()
+          }
+        }
+        break
+    }
+  },
+}