chore: Started updating for firefox 138.0 beta 9, b=(no-bug), c=common

mauro-balades · mauro-balades · commit 1713c0483413 · 2025-04-18T19:54:40.000+02:00
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@
 
 ## 🖥️ Compatibility
 
-Zen is currently built using Firefox version `137.0.2`! 🚀
+Zen is currently built using Firefox version `138.0b9`! 🚀
 
 - [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 137.0.2`!
 - Check out the latest [release notes](https://zen-browser.app/release-notes)!
diff --git a/src/Cargo-toml.patch b/src/Cargo-toml.patch
@@ -1,14 +1,14 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index a99b447250d36dd0146e031fa22503bc88eeae39..86829fc7075054f832a04825c98325a925cf5b0f 100644
+index d3d529b487f80d4b4f3bfa13cdd3f62946352db8..b35a9e0e3339d48d1cd0cab7b22d030f330e40d1 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -205,6 +205,9 @@ rure = { path = "third_party/rust/rure" }
+@@ -217,6 +217,9 @@ rure = { path = "third_party/rust/rure" }
  # Patch `plist` to work with `indexmap` 2.*
  plist = { path = "third_party/rust/plist" }
  
 +# Patch mime_guess to add missing mime types
 +mime_guess = { path = "third_party/rust/mime_guess" }
 +
- # To-be-published changes.
- unicode-bidi = { git = "https://github.com/servo/unicode-bidi", rev = "ca612daf1c08c53abe07327cb3e6ef6e0a760f0c" }
- nss-gk-api = { git = "https://github.com/beurdouche/nss-gk-api", rev = "e48a946811ffd64abc78de3ee284957d8d1c0d63" }
+ # Patch `unicode-width` 0.1.* to 0.2.
+ unicode-width = { path = "build/rust/unicode-width" }
+ 
diff --git a/src/browser/base/content/browser-box-inc-xhtml.patch b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,14 +1,14 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 2ca8bdd2674fb4addf3bbf94ff17abc5c93c6293..dd965d8d190e8cdacbeb3d80995ad1a906e64079 100644
+index 7d7e8697f02f90d4f336c9ab0a73a89848e0c21c..d113b439888d26629ce5f6b5d35f8fa12249774b 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
-@@ -26,7 +26,13 @@
-     <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
-     <box id="after-splitter"></box>
-   </div>
+@@ -23,7 +23,13 @@
+     <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
+   </vbox>
+   <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
 +<vbox flex="1" id="zen-appcontent-wrapper">
-+<html:div id="zen-appcontent-navbar-container"></html:div>
-+<hbox id="zen-tabbox-wrapper" flex="1">
++  <html:div id="zen-appcontent-navbar-container"></html:div>
++  <hbox id="zen-tabbox-wrapper" flex="1">
    <tabbox id="tabbrowser-tabbox" flex="1" tabcontainer="tabbrowser-tabs">
 +#include zen-tabbrowser-elements.inc.xhtml
      <tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0"/>
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 0d0a559a6473149b50f4bf18d059e86907c4acd3..25ad798eb26f04262d069fdaf1f3fb00adec9807 100644
+index 51a25aaa5558e6e17246d54a7ed95d5ddf3ecdab..b49984c8711fc9f5f19f0cf6ecca07a8cca0d125 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -26,6 +26,7 @@
@@ -10,35 +10,28 @@ index 0d0a559a6473149b50f4bf18d059e86907c4acd3..25ad798eb26f04262d069fdaf1f3fb00
          persist="screenX screenY width height sizemode"
          data-l10n-sync="true">
  <head>
-@@ -104,6 +105,8 @@
+@@ -104,8 +105,11 @@
  
    <title data-l10n-id="browser-main-window-default-title"></title>
  
 +#include zen-preloaded.inc.xhtml
 +
- # All JS files which are needed by browser.xhtml and other top level windows to
- # support MacOS specific features *must* go into the global-scripts.inc file so
- # that they can be shared with macWindow.inc.xhtml.
-@@ -148,6 +151,7 @@
-   window.addEventListener("DOMContentLoaded",
-     gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
- </script>
+   <script src="chrome://browser/content/global-scripts.js"></script>
+   <script src="chrome://browser/content/browser-main.js"></script>
 +#include zen-assets.inc.xhtml
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -169,9 +173,11 @@
+@@ -127,9 +131,12 @@
      </vbox>
    </html:template>
  
--#include navigator-toolbox.inc.xhtml
--
--#include browser-box.inc.xhtml
-+  <hbox id="zen-main-app-wrapper" flex="1" persist="zen-compact-mode">
-+    <vbox id="zen-toast-container"></vbox>
-+    #include navigator-toolbox.inc.xhtml
-+    #include browser-box.inc.xhtml
-+  </hbox>
++<hbox id="zen-main-app-wrapper" flex="1" persist="zen-compact-mode">
++  <vbox id="zen-toast-container"></vbox>
+ #include navigator-toolbox.inc.xhtml
+ 
+ #include browser-box.inc.xhtml
++</hbox>
  
    <html:template id="customizationPanel">
      <box id="customization-container" flex="1" hidden="true"><![CDATA[
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index feb9e4ef7e872b4cfbf0d55f24a34db275951c66..3ce9b9919ff736885b8aa8943bbbce3c5d0f33a6 100644
+index 00c8976d3e258c0875d7da2f3ec823d8907a84c9..3ce6fea52f8170f6cd821a66684248b4c0a765c6 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -11,46 +11,29 @@ index feb9e4ef7e872b4cfbf0d55f24a34db275951c66..3ce9b9919ff736885b8aa8943bbbce3c
    <script src="chrome://browser/content/navigator-toolbox.js" />
  
    <!-- Menu -->
-@@ -17,9 +17,8 @@
+@@ -17,9 +17,9 @@
  #include browser-menubar.inc
      </toolbaritem>
      <spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
 -#include titlebar-items.inc.xhtml
    </toolbar>
--
+ 
 +<hbox id="titlebar">
    <toolbar id="TabsToolbar"
             class="browser-toolbar browser-titlebar"
             fullscreentoolbar="true"
-@@ -32,7 +31,7 @@
- 
-     <hbox class="titlebar-spacer" type="pre-tabs"/>
- 
--    <hbox flex="1" align="end" class="toolbar-items">
-+    <hbox flex="1" align="start" class="toolbar-items">
-       <toolbartabstop/>
-       <hbox id="TabsToolbar-customization-target" flex="1">
-         <toolbarbutton id="firefox-view-button"
-@@ -40,6 +39,7 @@
-                        data-l10n-id="toolbar-button-firefox-view-2"
-                        role="button"
-                        aria-pressed="false"
-+                       hidden="true"
-                        cui-areatype="toolbar"
-                        removable="true"/>
- 
 @@ -50,6 +50,10 @@
                tooltip="tabbrowser-tab-tooltip"
                orient="horizontal"
-               stopwatchid="FX_TAB_CLICK_MS">
+               stopwatchid="tabClick">
 +<html:div id="zen-essentials-container" skipintoolbarset="true"></html:div>
 +<hbox id="zen-current-workspace-indicator-container"></hbox>
 +<html:div id="zen-tabs-wrapper">
 +<html:div id="zen-browser-tabs-container">
            <hbox class="tab-drop-indicator" hidden="true"/>
+           <html:span id="tab-drag-empty-feedback" role="presentation"/>
  # If the name (tabbrowser-arrowscrollbox) or structure of this changes
- # significantly, there is an optimization in
-@@ -75,6 +79,8 @@
+@@ -76,6 +80,8 @@
                                tooltip="dynamic-shortcut-tooltip"
                                data-l10n-id="tabs-toolbar-new-tab"/>
            <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
@@ -59,28 +42,15 @@ index feb9e4ef7e872b4cfbf0d55f24a34db275951c66..3ce9b9919ff736885b8aa8943bbbce3c
          </tabs>
  
          <toolbarbutton id="new-tab-button"
-@@ -100,10 +106,10 @@
+@@ -101,9 +107,10 @@
  #include private-browsing-indicator.inc.xhtml
      <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
  
 -#include titlebar-items.inc.xhtml
 +#include zen-sidebar-icons.inc.xhtml
  
    </toolbar>
--
 +</hbox>
+ 
    <toolbar id="nav-bar"
             class="browser-toolbar chromeclass-location"
-            data-l10n-id="navbar-accessible"
-@@ -489,10 +495,10 @@
-                      consumeanchor="PanelUI-button"
-                      data-l10n-id="appmenu-menu-button-closed2"/>
-     </toolbaritem>
-+#include titlebar-items.inc.xhtml
-     <hbox class="titlebar-spacer" type="post-tabs"/>
- #include private-browsing-indicator.inc.xhtml
-     <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
--#include titlebar-items.inc.xhtml
-   </toolbar>
- 
-   <toolbar id="PersonalToolbar"
diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch
@@ -1,20 +1,19 @@
 diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index b8b6d30f0b3c968a8615ca601e06e50261d0dae6..5c2b718b902aed2ef8d7a4b622ba882ee937c655 100644
+index a6a7f9165aece774c3f1c15f7e352b11a4bf90f4..a4b6124b85f099c6f12d297fc26f2040370c337c 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
-@@ -106,6 +106,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
-   WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.sys.mjs",
-   clearTimeout: "resource://gre/modules/Timer.sys.mjs",
-   setTimeout: "resource://gre/modules/Timer.sys.mjs",
-+  gZenUIMigration: "chrome://browser/content/zen-components/ZenUIMigration.mjs",
- });
+@@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
+ const lazy = {};
  
- XPCOMUtils.defineLazyServiceGetters(lazy, {
-@@ -1896,7 +1897,7 @@ BrowserGlue.prototype = {
-     lazy.TabCrashHandler.init();
+ ChromeUtils.defineESModuleGetters(lazy, {
++  gZenUIMigration: "chrome://browser/content/zen-components/ZenUIMigration.mjs",
+   AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs",
+   AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
+   AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",
+@@ -1886,6 +1887,7 @@ BrowserGlue.prototype = {
  
      lazy.ProcessHangMonitor.init();
--
+ 
 +    lazy.gZenUIMigration.init(this._isNewProfile, aWindow);
      // A channel for "remote troubleshooting" code...
      let channel = new lazy.WebChannel(
diff --git a/src/zen/common/ZenStartup.mjs b/src/zen/common/ZenStartup.mjs
@@ -29,6 +29,7 @@
         }
 
         this._initSidebarScrolling();
+        this._hideUnusedElements();
 
         ZenWorkspaces.init();
         gZenVerticalTabsManager.init();
@@ -128,6 +129,18 @@
       }
     },
 
+    _hideUnusedElements() {
+      const kElements = [
+        'firefox-view-button',
+      ];
+      for (let id of kElements) {
+        const elem = document.getElementById(id);
+        if (elem) {
+          elem.setAttribute('hidden', 'true');
+        }
+      }
+    },
+
     _initSidebarScrolling() {
       // Disable smooth scroll
       const canSmoothScroll = Services.prefs.getBoolPref('zen.startup.smooth-scroll-in-tabs', false);
diff --git a/surfer.json b/surfer.json
@@ -4,8 +4,8 @@
   "appId": "zen",
   "binaryName": "zen",
   "version": {
-    "product": "firefox",
-    "version": "137.0.2",
+    "product": "firefox-beta",
+    "version": "138.0b9",
     "candidate": "137.0.2"
   },
   "buildOptions": {
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}
