Merge branch 'alpha' into beta

.github/PULL_REQUEST_TEMPLATE/ff_update.md

@@ -22,7 +22,7 @@ This bumps Firefox up to `{NEW_VERSION}` for security and performance reasons. R
   - [ ] Tabliss is loading correctly
   - [ ] Tabliss does not have the webextention symbol in the title bar
   - [ ] uBlock origin is loading correctly
-  - [ ] QR Code Generator is loading correctly
+  - [ ] QRCode generator is loading correctly
 
 - [ ] About dialog
 

.github/workflows/alpha.yml

@@ -316,10 +316,15 @@ jobs:
         run: yarn imp
 
       - name: Build
-        run: yarn build -- --skip-patch-check
+        shell: powershell.exe C:\mozilla-build\start-shell.bat "{0}"
+        run: |
+          cd /c/actions-runner/_work/browser/browser # mozillabuild defaults to ~
+          yarn build --skip-patch-check
 
       - name: Package
+        shell: powershell.exe C:\mozilla-build\start-shell.bat "{0}"
         run: |
+          cd /c/actions-runner/_work/browser/browser # mozillabuild defaults to ~
           yarn package
           mv ./dist/output.mar windows.mar
 
@@ -402,8 +407,13 @@ jobs:
 
       - name: Install flatpak builder
         run: | 
-           sudo apt-get install -y flatpak-builder 
-
+           sudo apt-get install -y flatpak-builder
+     
+      - name: Install build dependancies
+        run: |
+          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install flathub org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08 org.mozilla.firefox.BaseApp//22.08 --assumeyes
+  
       - name: Import GPG keys
         run: |
           mkdir ~/.gpg

README.md

@@ -51,6 +51,7 @@ For bug reports, support, and just having a friendly chat with the team, feel fr
 ## 🏗️ Credits
 
 - Dot HQ's [melon build tool](https://github.com/dothq/melon), which was extracted from Dot Browser. They have been driving development of firefox forks and have made incredible progress. - [MPL-2.0 License](https://github.com/dothq/melon/blob/main/LICENSE)
+  - We maintain our own fork, [Gluon](https://github.com/pulse-browser/gluon) which is used by this project
 - The [BetterFox](https://github.com/yokoffing/Better-Fox) user.js tweaks, which are used throughout the browser. - [MIT License](https://github.com/yokoffing/Better-Fox/blob/master/LICENSE) 
 - [uBlock](https://github.com/gorhill/uBlock) extension from GitHub for blocking ads. - [GNU General Public License v3.0](https://github.com/gorhill/uBlock/blob/master/LICENSE.txt)
 - [Firefox-QR-Code-Generator](https://github.com/pulse-browser/firefox-qr-generator) extension from GitHub for a QR Code generator. - [MPL-2.0 License](https://github.com/pulse-browser/firefox-qr-generator/blob/main/LICENSE)

gluon.json

@@ -5,7 +5,7 @@
   "binaryName": "pulse-browser",
   "version": {
     "product": "firefox",
-    "version": "106.0.5"
+    "version": "107.0"
   },
   "buildOptions": {
     "generateBranding": true
@@ -15,7 +15,7 @@
       "platform": "github",
       "id": "[email protected]",
       "repo": "gorhill/uBlock",
-      "version": "1.44.4",
+      "version": "1.45.2",
       "fileGlob": "uBlock0_*.firefox(.signed)?.xpi"
     },
     "tabliss": {
@@ -80,7 +80,7 @@
       "brandShortName": "Pulse Browser",
       "brandFullName": "Pulse Browser Alpha",
       "release": {
-        "displayVersion": "1.0.0-a.32",
+        "displayVersion": "1.0.0-a.37",
         "github": {
           "repo": "pulse-browser/browser"
         },

src/browser/app/profile/firefox-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d746984613 100644
+index 14ecab77149f5645e24c8bffff57c223f64730bb..09bf8bebc166fb1e316e2c0c425f8117468281fc 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
 @@ -19,6 +19,8 @@
@@ -19,32 +19,36 @@ index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d7
  pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing");
 
  // Enable extensionStorage storage actor by default
-@@ -773,7 +774,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
+@@ -774,7 +775,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
  pref("browser.tabs.tooltipsShowPidAndActiveness", false);
  #endif
 
 -pref("browser.tabs.firefox-view", true);
 +pref("browser.tabs.firefox-view", false);
  pref("browser.tabs.firefox-view.logLevel", "Warn");
+ pref("browser.tabs.firefox-view.notify-for-tabs", false);
 
- // allow_eval_* is enabled on Firefox Desktop only at this
-@@ -1937,7 +1938,6 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f
+@@ -1945,7 +1946,7 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f
  pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua");
 
  // Default to enabling VPN promo messages to be shown when specified and allowed
 -pref("browser.vpn_promo.enabled", true);
++pref("browser.vpn_promo.enabled", false);
  // Only show vpn card to certain regions. Comma separated string of two letter ISO 3166-1 country codes.
  // The most recent list of supported countries can be found at https://support.mozilla.org/en-US/kb/mozilla-vpn-countries-available-subscribe
  // The full list of supported country codes can also be found at https://github.com/mozilla/bedrock/search?q=VPN_COUNTRY_CODES
-@@ -2060,7 +2060,6 @@ pref("browser.tabs.crashReporting.includeURL", false);
+@@ -2066,10 +2067,6 @@ pref("browser.tabs.remote.warmup.unloadDelayMs", 2000);
+ pref("browser.tabs.crashReporting.sendReport", true);
+ pref("browser.tabs.crashReporting.includeURL", false);
 
- // If true, unprivileged extensions may use experimental APIs on
- // nightly and developer edition.
+-// If true, unprivileged extensions may use experimental APIs on
+-// nightly and developer edition.
 -pref("extensions.experiments.enabled", false);
- 
+-
  #if defined(XP_LINUX) || defined(XP_WIN)
    // Allows us to adjust the priority of child processes at the OS level
-@@ -2108,13 +2107,6 @@ pref("browser.migrate.chrome.history.limit", 2000);
+   pref("dom.ipc.processPriorityManager.enabled", true);
+@@ -2116,13 +2113,6 @@ pref("browser.migrate.chrome.history.limit", 2000);
  pref("browser.migrate.chrome.history.maxAgeInDays", 180);
  pref("browser.migrate.showBookmarksToolbarAfterMigration", true);
 
@@ -58,13 +62,17 @@ index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d7
  // Enable Pocket button home panel for non link pages.
  pref("extensions.pocket.showHome", true);
 
-@@ -2243,9 +2235,6 @@ pref("toolkit.coverage.enabled", false);
+@@ -2251,9 +2241,10 @@ pref("toolkit.coverage.enabled", false);
  pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
 
  // Discovery prefs
 -pref("browser.discovery.enabled", true);
 -pref("browser.discovery.containers.enabled", true);
 -pref("browser.discovery.sites", "addons.mozilla.org");
++//
++// From memory, these connect to Google Analytics, so they are a no go
++pref("browser.discovery.enabled", false);
++pref("browser.discovery.containers.enabled", false);
 
  pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds)
  pref("browser.engagement.downloads-button.has-used", false);

src/browser/themes/BuiltInThemeConfig-jsm.patch → src/browser/themes/BuiltInThemeConfig-sys-mjs.patch

@@ -1,8 +1,8 @@
-diff --git a/browser/themes/BuiltInThemeConfig.jsm b/browser/themes/BuiltInThemeConfig.jsm
-index 05bc07ac54fa43dd6bcce1f4ab619bc054cb8084..8ace74cac976889ca0e92910388fb5128436d013 100644
---- a/browser/themes/BuiltInThemeConfig.jsm
-+++ b/browser/themes/BuiltInThemeConfig.jsm
-@@ -32,6 +32,20 @@ const BuiltInThemeConfig = new Map([
+diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs
+index 9c93c0d39ad11d95ecb4ad119d3c21da2528af23..e00efac497130363a41c0ecdbe07df761076b368 100644
+--- a/browser/themes/BuiltInThemeConfig.sys.mjs
++++ b/browser/themes/BuiltInThemeConfig.sys.mjs
+@@ -32,6 +32,20 @@ export const BuiltInThemeConfig = new Map([
        path: "resource://builtin-themes/dark/",
      },
    ],

src/browser/themes/ThemeVariableMap-sys-mjs.patch

@@ -0,0 +1,15 @@
+diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs
+index f2fd99193ddd0c24b7ad3ec953216973b162aaed..2d07c599152d8b0329f84a6cb626a1a40fdd241d 100644
+--- a/browser/themes/ThemeVariableMap.sys.mjs
++++ b/browser/themes/ThemeVariableMap.sys.mjs
+@@ -126,7 +126,9 @@ export const ThemeVariableMap = [
+     "--sidebar-background-color",
+     {
+       lwtProperty: "sidebar",
+-      optionalElementID: "sidebar-box",
++      // Pulse: we want to use the sidebar color in the sidebar tabs, which are
++      // under the `browser` parent rather than the `sidebar-box` parent
++      optionalElementID: "browser",
+       processColor(rgbaChannels, element) {
+         if (!rgbaChannels) {
+           element.removeAttribute("lwt-sidebar");

src/browser/themes/pulse/sidebar_tabs.css

@@ -18,7 +18,7 @@
   background-color: -moz-Dialog;
   overflow: hidden;
 
-  max-width: var(--tab-min-height);
+  max-width: calc(var(--tab-min-height) + var(--tab-block-margin) * 2);
 
   /* Makes the sidebar slide out from below */
   position: relative;

src/browser/themes/shared/browser-shared-css.patch

@@ -1,12 +1,12 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index ea4e59523027b51ecea12a45dc3844f17136c918..b542ece71a64cfe8747f494e67362f188b618321 100644
+index b3f83092c310fe2378f79d5a07726ad8c215e2a3..c4b32e71b153a02c8505a2f879321c7006fd76a2 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
 @@ -23,6 +23,8 @@
  @import url("chrome://browser/skin/customizableui/customizeMode.css");
  @import url("chrome://browser/skin/UITour.css");
 
-+@import url("chrome://browser/skin/sidebar_tabs.css");
++@import url("chrome://browser/skin/pulse/sidebar_tabs.css");
 +
  @namespace html url("http://www.w3.org/1999/xhtml");
 

src/browser/themes/shared/jar-inc-mn.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index 26f209ad704739db88ead4ccfc7075d23b4b666d..31a1e45a8f7729f50b95fb4ea68962faaee02446 100644
+index 14ef7ff731145a42b28cbb9afe192bf56f756ed5..25d12586b7e8ce29d694dd6c0028ad176da96b1d 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
 @@ -7,6 +7,8 @@
@@ -9,5 +9,5 @@ index 26f209ad704739db88ead4ccfc7075d23b4b666d..31a1e45a8f7729f50b95fb4ea68962fa
 +#include ../pulse/jar.inc.mn
 +
    skin/classic/browser/aboutFrameCrashed.css                   (../shared/aboutFrameCrashed.css)
-   skin/classic/browser/aboutNetError.css                       (../shared/aboutNetError.css)
    skin/classic/browser/aboutRestartRequired.css                (../shared/aboutRestartRequired.css)
+   skin/classic/browser/aboutSessionRestore.css                 (../shared/aboutSessionRestore.css)

src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch

@@ -0,0 +1,19 @@
+diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs
+index 3a3ac065afb636d6ceb1ca568c3eabd10a7127f6..db44fb7b9bc4c0f5b714154be0cc00d91e3ef44b 100644
+--- a/toolkit/modules/LightweightThemeConsumer.sys.mjs
++++ b/toolkit/modules/LightweightThemeConsumer.sys.mjs
+@@ -183,6 +183,14 @@ const toolkitVariableMap = [
+       lwtProperty: "toolbar_field_highlight_text",
+     },
+   ],
++  // Pulse browser: Sidebar colors
++  // Expose some light weight theme variables to be available for use within css
++  [
++    '--lwt-sidebar-background-color',
++    {
++      lwtProperty: "sidebar",
++    }
++  ]
+ ];
+
+ export function LightweightThemeConsumer(aDocument) {

src/toolkit/modules/moz-build.patch

@@ -1,12 +1,12 @@
 diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
-index 26acb92b37b7c0989a117a082de1861710ca65d7..ff7101147f0e14ec32ec2bd0d4afff535cd14a9a 100644
+index c0c6e76515978b05ae9ed0281f0106469df2b573..12f3a1820f79430f5baeaf7ad51dcf61c1bb0c29 100644
 --- a/toolkit/modules/moz.build
 +++ b/toolkit/modules/moz.build
-@@ -163,6 +163,7 @@ EXTRA_JS_MODULES += [
-     "Color.jsm",
+@@ -160,6 +160,7 @@ EXTRA_JS_MODULES += [
+     "Color.sys.mjs",
      "Console.jsm",
      "ContentDOMReference.jsm",
 +    "ContextMenu.jsm",
-     "CreditCard.jsm",
-     "DateTimePickerPanel.jsm",
+     "CreditCard.sys.mjs",
+     "DateTimePickerPanel.sys.mjs",
      "DeferredTask.jsm",