Merge branch 'main' of https://github.com/JosueGalRe/desktop

.gitattributes

@@ -1,2 +1 @@
 *.patch linguist-language=C++
-.github/workflows/object/*.tar.gz filter=lfs diff=lfs merge=lfs -text

.github/workflows/alpha.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Bump version
         if: ${{ github.event.inputs.update_version == 'true' }}
         run: |
-          pnpm surfer ci --brand alpha --bump prepatch
+          pnpm surfer ci --brand alpha --bump prerelease
 
       - name: Bump version without new version
         if: ${{ github.event.inputs.update_version == 'false' }}
@@ -317,23 +317,16 @@ jobs:
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
-          lfs: true
 
       - name: Git Pull
         run: |
           git pull
-          git lfs pull
 
       - uses: actions/download-artifact@v4
 
       - name: List
         run: find .
 
-      - name: Unpack windows build (.tar.gz)
-        run: |
-          tar -xvf .github/workflows/object/windows-x64-signed-generic.tar.gz -C .
-          tar -xvf .github/workflows/object/windows-x64-signed-specific.tar.gz -C .
-
       - name: Clone updates repo
         uses: actions/checkout@v4
         with:
@@ -348,8 +341,8 @@ jobs:
           cp -a ../linux_update_manifest_generic/.  updates/
           cp -a ../linux_update_manifest_specific/.  updates/
 
-          cp -a ../windows-x64-signed-generic/update_manifest/.  updates/
-          cp -a ../windows-x64-signed-specific/update_manifest/.  updates/
+          cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/.  updates/
+          cp -a ../.github/workflows/object/windows-x64-signed-specific/update_manifest/.  updates/
 
           cp -a ../macos_update_manifest_aarch64/.  updates/
           cp -a ../macos_update_manifest_x64/.  updates/
@@ -376,16 +369,16 @@ jobs:
             zen-generic.AppImage.zsync
             zen-specific.AppImage
             zen-specific.AppImage.zsync
-            windows-x64-signed-generic/zen.win-generic.zip
-            windows-x64-signed-specific/zen.win-specific.zip
+            .github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip
+            .github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip
             linux.mar
             linux-generic.mar
-            windows-x64-signed-generic/windows-generic.mar
-            windows-x64-signed-specific/windows.mar
+            .github/workflows/object/windows-x64-signed-generic/windows-generic.mar
+            .github/workflows/object/windows-x64-signed-specific/windows.mar
             macos-x64.mar
             macos-aarch64.mar
-            windows-x64-signed-specific/zen.installer.exe
-            windows-x64-signed-generic/zen.installer-generic.exe
+            .github/workflows/object/windows-x64-signed-specific/zen.installer.exe
+            .github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe
             zen.macos-x64.dmg
             zen.macos-aarch64.dmg
 

.github/workflows/object/windows-x64-signed-generic.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6eae13d446c4326d555f9470e7773b367e7d9e2f3ef2b051a8fbd64bf7ebffaf
-size 237737135

.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<updates>
+  <update type="minor" displayVersion="1.0.1-a" appVersion="1.0.1-a" platformVersion="130.0" buildID="20240916093302">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a/windows-generic.mar" hashFunction="sha512" hashValue="1d57da64dfe08f84093cb58ee28037880740541757a2cab73e5ac2adcc5ea67b33783e2947c955bca50e74d8b7203ba54f71e61395d95fa2c43f2a9ce2c7b1c6" size="72337408"/>
+  </update>
+</updates>

.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<updates>
+  <update type="minor" displayVersion="1.0.1-a" appVersion="1.0.1-a" platformVersion="130.0" buildID="20240916093302">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a/windows-generic.mar" hashFunction="sha512" hashValue="1d57da64dfe08f84093cb58ee28037880740541757a2cab73e5ac2adcc5ea67b33783e2947c955bca50e74d8b7203ba54f71e61395d95fa2c43f2a9ce2c7b1c6" size="72337408"/>
+  </update>
+</updates>

.github/workflows/object/windows-x64-signed-specific.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:474d09353b1ef5e8f16d4785d8084b264630a7a8072a6cd4532904f923fff7ba
-size 237641008

.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<updates>
+  <update type="minor" displayVersion="1.0.1-a" appVersion="1.0.1-a" platformVersion="130.0" buildID="20240916093142">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a/windows-generic.mar" hashFunction="sha512" hashValue="ed11d2af249f3c6290943c9a8bc7a4eab7a2bfc24268b927a4ea003e168cf509760782d01e974492b4af477ec649d627c6c69290f1e0c91849f44b09cc85febe" size="72214812"/>
+  </update>
+</updates>

.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<updates>
+  <update type="minor" displayVersion="1.0.1-a" appVersion="1.0.1-a" platformVersion="130.0" buildID="20240916093142">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a/windows-generic.mar" hashFunction="sha512" hashValue="ed11d2af249f3c6290943c9a8bc7a4eab7a2bfc24268b927a4ea003e168cf509760782d01e974492b4af477ec649d627c6c69290f1e0c91849f44b09cc85febe" size="72214812"/>
+  </update>
+</updates>

README.md

@@ -40,6 +40,24 @@ Zen is built with performance in mind, and we have optimized the browser to be a
 
 Zen is available for Linux, macOS, and Windows. You can download the latest version from the official website at [zen-browser.app](https://zen-browser.app/download), or from the [GitHub Releases](https://github.com/zen-browser/desktop/releases) page.
 
+### Windows
+
+#### Winget
+
+- Generic
+
+```
+winget install --id Zen-Team.Zen-Browser
+```
+
+- Optimized
+
+```
+winget install --id Zen-Team.Zen-Browser.Optimized
+```
+
+#### 
+
 ### macOS
 
 - Requires macOS 10.15 or later

build/winsign/sign.ps1

@@ -34,8 +34,11 @@ function SignAndPackage($name) {
     $env:MAR="$PWD\\build\\winsign\\mar.exe"
     if ($name -eq "generic") {
         $env:SURFER_COMPAT="true"
+    } else {
+        rm env:SURFER_COMPAT -ErrorAction SilentlyContinue
     }
 
+    echo "Compat Mode? $env:SURFER_COMPAT"
     pnpm surfer package --verbose
 
     # In the release script, we do the following:
@@ -67,14 +70,22 @@ function SignAndPackage($name) {
     # Move the zip
     mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
 
+    # Extract the zip, sign everything inside, and repackage it
+    Expand-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name.zip -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name
+    rm windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
+    $files = Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.exe
+    $files += Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.dll
+    signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha1 /v $files
+    Compress-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
+    rmdir windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -ErrorAction SilentlyContinue
+
     # Move the manifest
-    foreach ($file in Get-ChildItem .\dist\update\) {
-        mv ".\\dist\\update\\$file" windsign-temp\windows-x64-signed-$name\update_manifest
-    }
+    mv .\dist\update\. windsign-temp\windows-x64-signed-$name\update_manifest
 
     echo "Invoking tar for $name"
     # note: We need to sign it into a parent folder, called windows-x64-signed-$name
-    tar -czvf .\.github\workflows\object\windows-x64-signed-$name.tar.gz -C .\windsign-temp\ windows-x64-signed-$name
+    rmdir .\.github\workflows\object\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
+    mv .\windsign-temp\windows-x64-signed-$name .\.github\workflows\object\windows-x64-signed-$name -Force
 
     echo "Finished $name"
 }

package.json

@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.4.18"
+    "@zen-browser/surfer": "^1.4.20"
   },
   "devDependencies": {
     "husky": "^9.1.5",

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.4.18
-        version: 1.4.18
+        specifier: ^1.4.20
+        version: 1.4.20
     devDependencies:
       husky:
         specifier: ^9.1.5
@@ -119,8 +119,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.4.18':
-    resolution: {integrity: sha512-NFqF5amqa4TuGFk+uVQNY4FngIvyhXvtZdpHUbU8Oeq3nfKE+bsLUHbFz8j9I5sFLQkuHmCsfTtR5gKA5el4YA==}
+  '@zen-browser/surfer@1.4.20':
+    resolution: {integrity: sha512-M9+Jax/B+UQsebJ0K3BaNEKUi/EelKufvG2frWQ4uVAQF9LzFwyyliS5wbcUTs3Ufit4b8xQK7ddt02DmK/Lng==}
     hasBin: true
 
   ansi-escapes@7.0.0:
@@ -1003,7 +1003,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.4.18':
+  '@zen-browser/surfer@1.4.20':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2

src/browser/app/profile/zen-browser.js

@@ -202,4 +202,4 @@ pref('media.ffmpeg.vaapi.enabled', true);
 pref('media.ffmpeg.encoder.enabled', true);
 
 pref("media.hardware-video-decoding.enabled", true);
-pref("gfx.canvas.accelerated", true);
+pref("gfx.canvas.accelerated", true);

src/browser/base/content/zen-styles/zen-browser-container.css

@@ -32,7 +32,7 @@
        * same shadow from the browser window on top. */
       box-shadow:
         var(--uc-tweak-rounded-corners-shadow, 0 0 transparent),
-        0 0 0 16px var(--zen-themed-toolbar-bg) !important;
+        0 0 0 16px var(--zen-main-browser-background) !important;
       clip-path: inset(0);
       pointer-events: none;
     }

src/browser/base/content/zen-styles/zen-compact-mode.css

@@ -30,6 +30,8 @@
     margin: 0;
     padding: var(--zen-compact-toolbox-margin) !important;
 
+    min-width: 500px !important;
+
     & #titlebar {
       border: 1px solid var(--zen-colors-border);
       transition-delay: 200ms;
@@ -48,6 +50,11 @@
     }
   }
 
+  #tabbrowser-tabpanels {
+    padding: var(--zen-element-separation) !important;
+    padding-top: 0 !important;
+  }
+
   @media not (-moz-bool-pref: 'zen.view.sidebar-expanded') {
     #navigator-toolbox {
       width: fit-content !important;
@@ -86,12 +93,10 @@
        *  3. Add element separation variable, to avoid overlaping with the toolbar
        *  4. Calculate toolbar height, taken from zen-urlbar.css
        */
-      --zen-compact-toolbox-margin: calc(
-          var(--zen-compact-toolbox-margin-single) + 0.15rem + var(--zen-element-separation) +
-            (18px + (var(--toolbarbutton-inner-padding) * 2))
-        )
-        var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single)
-        var(--zen-compact-toolbox-margin-single);
+      --zen-compact-toolbox-margin: calc( 
+        var(--zen-element-separation) + 0.8rem + 
+        (18px + (var(--toolbarbutton-inner-padding) * 2)) 
+      ) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
 
       :root[zen-sidebar-legacy='true'] & {
         --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2)

src/browser/base/content/zen-styles/zen-sidebar.css

@@ -54,3 +54,8 @@ toolbar {
     }
   }
 }
+
+/* Menubar */
+#toolbar-menubar {
+  display: none !important;
+}

src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css

@@ -22,6 +22,8 @@
 
     padding: var(--zen-toolbox-padding);
     padding-top: var(--zen-toolbox-top-align);
+
+    margin-top: 0 !important;
   }
 
 
@@ -42,8 +44,14 @@
       max-width: unset !important;
       padding: 0 !important;
 
+      overflow: hidden;
+      position: relative;
+
+      border-radius: var(--border-radius-medium);
+
       & .tab-background {
         overflow: hidden;
+        margin: 2px 2px;
 
         & .tab-context-line {
           margin: 0 0px !important;
@@ -72,6 +80,7 @@
     margin-inline-end: 0 !important;
     padding-top: 0 !important;
     border-top: solid transparent 0px !important;
+    margin: 0 2px !important;
 
     &[showborder] {
       padding-top: 4px !important;
@@ -196,6 +205,7 @@
       display: flex;
       flex-direction: column;
       padding-top: calc(var(--zen-toolbox-padding) * 2);
+      align-items: center;
     }
 
     :root:has(&) #zen-sidebar-splitter {
@@ -349,4 +359,13 @@
       order: 2;
     }
   }
+
+  /* Mark: Override the default tab close button */
+  #tabbrowser-tabs {
+    & .tabbrowser-tab {
+      &[pinned] .tab-close-button {
+        display: none !important;
+      }
+    }
+  }
 }

src/browser/components/tabbrowser/content/tabbrowser-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df236fcefae7 100644
+index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..c776348e776c1f9efc9b9f2ca479b1050f0a750b 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -453,10 +453,13 @@
+@@ -453,10 +453,12 @@
      },
  
      get _numPinnedTabs() {
@@ -13,12 +13,11 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
 +        if (!tab.pinned) {
            break;
          }
-+        if (tab.hidden) continue;
 +        i++;
        }
        return i;
      },
-@@ -2704,6 +2707,11 @@
+@@ -2704,6 +2706,11 @@
          );
        }
  
@@ -30,7 +29,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2771,6 +2779,9 @@
+@@ -2771,6 +2778,9 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -40,7 +39,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -3248,6 +3259,14 @@
+@@ -3248,6 +3258,14 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -55,7 +54,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3297,6 +3316,13 @@
+@@ -3297,6 +3315,13 @@
              preferredRemoteType,
            });
  
@@ -69,7 +68,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
            if (select) {
              tabToSelect = tab;
            }
-@@ -4184,6 +4210,7 @@
+@@ -4184,6 +4209,7 @@
          isLastTab ||
          aTab.pinned ||
          aTab.hidden ||
@@ -77,7 +76,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
          this._removingTabs.size >
            3 /* don't want lots of concurrent animations */ ||
          !aTab.hasAttribute(
-@@ -5117,10 +5144,10 @@
+@@ -5117,10 +5143,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      },
  

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

@@ -0,0 +1,13 @@
+diff --git a/toolkit/modules/UpdateUtils.sys.mjs b/toolkit/modules/UpdateUtils.sys.mjs
+index be9ce9d5402c30bf4a9712f1ce9026503c191a53..230882363b3e1bbe7f0977567db61f72494a19ea 100644
+--- a/toolkit/modules/UpdateUtils.sys.mjs
++++ b/toolkit/modules/UpdateUtils.sys.mjs
+@@ -81,7 +81,7 @@ export var UpdateUtils = {
+           replacement = Services.appinfo.name;
+           break;
+         case "VERSION":
+-          replacement = Services.appinfo.version;
++          replacement = AppConstants.ZEN_FIREFOX_VERSION;
+           break;
+         case "BUILD_ID":
+           replacement = Services.appinfo.appBuildID;

surfer.json

@@ -18,7 +18,7 @@
       "brandShortName": "Zen Browser",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.0.1-a",
+        "displayVersion": "1.0.1-a.1",
         "github": {
           "repo": "zen-browser/desktop"
         },