Skip to content

Commit 199da1f

Browse files
authored
chore: Updated to firefox 142.0, p=#9870
* chore: Updateed to firefox 142.0, b=no-bug, c=l10n, folders * chore: Finish updating to firefox, b=no-bug, c=tabs * chore: Fixed mods builds, b=no-bug, c=mods * feat: Small changes to tabs layout, b=no-bug, c=tabs, compact-mode, folders, workspaces * test: Fixed tests, b=no-bug, c=scripts, tests, folders * test: Fixed tests, b=no-bug, c=tabs, tests, welcome
1 parent 2d54e9f commit 199da1f

File tree

73 files changed

+464
-447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+464
-447
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
3030
### Firefox Versions
3131

3232
- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `141.0.3`! 🚀
33-
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 141.0.3`!
33+
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 142.0`!
3434

3535
### Contributing
3636

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4a784a2037bf44d4fcacf70fd69c86ff30825ec1
1+
aeeb12ebf5e8312e56bf0126778460f7a5fa607a

scripts/recalculate-patches.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
# License, v. 2.0. If a copy of the MPL was not distributed with this
44
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
55

6+
IGNORE_FILES=(
7+
"shared.nsh"
8+
"ignorePrefs.json"
9+
)
10+
611
# Recursively find all .patch files in the current directory and its subdirectories
712
find src -type f -name "*.patch" | while read -r patch_file; do
813
# Replace all - with . and remove the .patch extension
@@ -17,8 +22,10 @@ find src -type f -name "*.patch" | while read -r patch_file; do
1722
new_file="${new_file/-ftl/.ftl}"
1823
fi
1924

20-
# Create the new file with the same content as the original
21-
npm run export ${new_file} &
25+
new_file_base=$(basename "$new_file")
26+
if [[ ! " ${IGNORE_FILES[@]} " =~ " ${new_file_base} " ]]; then
27+
npm run export ${new_file}
28+
fi
2229
done
2330

2431
for job in $(jobs -p); do

scripts/run_tests.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,33 @@
44

55
import os
66
import sys
7+
import json
78
from pathlib import Path
89

10+
IGNORE_PREFS_FILE_IN = os.path.join(
11+
'src', 'zen', 'tests', 'ignorePrefs.json'
12+
)
13+
IGNORE_PREFS_FILE_OUT = os.path.join(
14+
'engine', 'testing', 'mochitest', 'ignorePrefs.json'
15+
)
16+
17+
18+
def copy_ignore_prefs():
19+
print("Copying ignorePrefs.json from src/zen/tests to engine/testing/mochitest...")
20+
# if there are prefs that dont exist on output file, copy them from input file
21+
all_prefs = []
22+
with open(IGNORE_PREFS_FILE_OUT, 'r') as f:
23+
all_prefs = json.load(f)
24+
with open(IGNORE_PREFS_FILE_IN, 'r') as f_in:
25+
new_prefs = json.load(f_in)
26+
all_prefs.extend(p for p in new_prefs if p not in all_prefs)
27+
with open(IGNORE_PREFS_FILE_OUT, 'w') as f_out:
28+
json.dump(all_prefs, f_out, indent=2)
29+
930

1031
def main():
32+
copy_ignore_prefs()
33+
1134
project_root = Path(__file__).resolve().parent.parent
1235
package_json = project_root / 'package.json'
1336

src/Cargo-lock.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/Cargo.lock b/Cargo.lock
2-
index f223ba9af3edd60a42730a606aca2c48bbdddc0c..501cf2de684532203bfb2e96f8add919f3d6e739 100644
2+
index fe4eff865884fb79983f636861897648c36491b5..a9516246ffacfd50b7e4198967bebb71b2c73eca 100644
33
--- a/Cargo.lock
44
+++ b/Cargo.lock
5-
@@ -4049,8 +4049,6 @@ dependencies = [
5+
@@ -4067,8 +4067,6 @@ dependencies = [
66
[[package]]
77
name = "mime_guess"
88
version = "2.0.4"

src/Cargo-toml.patch

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
diff --git a/Cargo.toml b/Cargo.toml
2-
index d402d783e2bbc30b87b2c59cf02e38b74d0484c1..b718ee7ed0519cac20d2828fee0350b44fc3f45a 100644
2+
index c41cc4f4e68e5b30e1a290e07b2c5061db4400cc..7fa5402b32116922766ee1463b441d3fc86c1eff 100644
33
--- a/Cargo.toml
44
+++ b/Cargo.toml
5-
@@ -227,6 +227,9 @@ rure = { path = "third_party/rust/rure" }
6-
# Patch `plist` to work with `indexmap` 2.*
7-
plist = { path = "third_party/rust/plist" }
5+
@@ -218,6 +218,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" }
6+
# Workaround for https://github.com/rust-lang/cargo/issues/11232
7+
rure = { path = "third_party/rust/rure" }
88

9-
+# Patch mime_guess to add missing mime types
109
+mime_guess = { path = "third_party/rust/mime_guess" }
1110
+
1211
# Patch `unicode-width` 0.1.* to 0.2.

src/browser/actors/WebRTCParent-sys-mjs.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs
2-
index 4ed2dd19207fc38b9e5cc22ea2947aba94b2f5ad..ffc88d62dc46683399c68cdfd35f1b1efde70902 100644
2+
index 49ba7724801e699c60fac72d67b3b2d11b6c8c93..5a9f209b3e6b625c6346083ab7eace552a81a3b4 100644
33
--- a/browser/actors/WebRTCParent.sys.mjs
44
+++ b/browser/actors/WebRTCParent.sys.mjs
55
@@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
2-
index 8e839c497bba9de04948ad8759679b6a6f61a65f..d79bd14443d94b91309f0add133e35ab87d7fbf3 100644
2+
index 05f6aec3dac31231e15cb316f6e06d66ee87bea9..3bbbe8553777056798ea9ddce1744a8e48848a37 100644
33
--- a/browser/base/content/browser.js
44
+++ b/browser/base/content/browser.js
55
@@ -29,6 +29,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -10,7 +10,7 @@ index 8e839c497bba9de04948ad8759679b6a6f61a65f..d79bd14443d94b91309f0add133e35ab
1010
DevToolsSocketStatus:
1111
"resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
1212
DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
13-
@@ -2282,6 +2283,8 @@ var XULBrowserWindow = {
13+
@@ -2287,6 +2288,8 @@ var XULBrowserWindow = {
1414
AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
1515
TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
1616

@@ -19,7 +19,7 @@ index 8e839c497bba9de04948ad8759679b6a6f61a65f..d79bd14443d94b91309f0add133e35ab
1919
PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
2020

2121
if (!gMultiProcessBrowser) {
22-
@@ -4617,7 +4620,7 @@ function switchToTabHavingURI(
22+
@@ -4630,7 +4633,7 @@ function switchToTabHavingURI(
2323
ignoreQueryString || replaceQueryString,
2424
ignoreFragmentWhenComparing
2525
);
@@ -28,7 +28,7 @@ index 8e839c497bba9de04948ad8759679b6a6f61a65f..d79bd14443d94b91309f0add133e35ab
2828
for (let i = 0; i < browsers.length; i++) {
2929
let browser = browsers[i];
3030
let browserCompare = cleanURL(
31-
@@ -4660,7 +4663,7 @@ function switchToTabHavingURI(
31+
@@ -4673,7 +4676,7 @@ function switchToTabHavingURI(
3232
}
3333

3434
if (!doAdopt) {
@@ -37,7 +37,7 @@ index 8e839c497bba9de04948ad8759679b6a6f61a65f..d79bd14443d94b91309f0add133e35ab
3737
}
3838

3939
return true;
40-
@@ -5476,6 +5479,9 @@ var ConfirmationHint = {
40+
@@ -5489,6 +5492,9 @@ var ConfirmationHint = {
4141
MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
4242
MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");
4343
document.l10n.setAttributes(this._message, messageId, options.l10nArgs);

src/browser/base/content/nsContextMenu-sys-mjs.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
2-
index e5ae99edff6cef4964ff15a7d32b0f9c80625425..6b7b6e75c76b25319334113bf2f17817f67e1073 100644
2+
index b12427b3c23447ab26499120f8395c716dae9e82..934f5c1f1b38d035cd7d3a5253a8d3cecad385f8 100644
33
--- a/browser/base/content/nsContextMenu.sys.mjs
44
+++ b/browser/base/content/nsContextMenu.sys.mjs
5-
@@ -1050,6 +1050,8 @@ export class nsContextMenu {
5+
@@ -1054,6 +1054,8 @@ export class nsContextMenu {
66
!this.isSecureAboutPage()
77
);
88

src/browser/base/content/zen-panels/folders-search.inc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
<panel id="zen-folder-tabs-popup" type="arrow" orient="vertical">
66
<hbox class="tabs-list-header">
77
<image class="zen-folder-tabs-list-search-icon" src="chrome://global/skin/icons/search-glass.svg"/>
8-
<html:input id="zen-folder-tabs-list-search" data-l10n-id="zen-folders-search-placeholder" type="search"/>
8+
<html:input id="zen-folder-tabs-list-search"
9+
data-l10n-id="zen-folders-search-placeholder"
10+
data-l10n-args="{&quot;folder-name&quot;:&quot;&quot;}"
11+
type="search" />
912
</hbox>
1013
<scrollbox class="zen-folder-tabs-list-scrollbox" flex="1">
1114
<vbox id="zen-folder-tabs-list"></vbox>

0 commit comments

Comments
 (0)