Skip to content

Commit 4b0c6f2

Browse files
authored
Merge pull request #8512 from zen-browser/firefox-139
2 parents 9132019 + c32dc7e commit 4b0c6f2

File tree

113 files changed

+888
-1123
lines changed

Some content is hidden

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

113 files changed

+888
-1123
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
Zen is currently built using Firefox version `138.0.4`! 🚀
3333

34-
- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 138.0.4`!
34+
- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 139.0`!
3535
- Check out the latest [release notes](https://zen-browser.app/release-notes)!
3636
- Part of our mission is to keep Zen up-to-date with the latest version of Firefox, so you can enjoy the latest features and security updates!
3737

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f5fd58c29d2c9bfcc5dcfc8f4abbe69016e13b44
1+
82a08ea3ce2d17f21f3d45f4b5607a37590b0158

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
"lint": "npx prettier . --check && autopep8 --diff scripts/ src/",
2424
"prepare": "husky",
2525
"reset-ff": "surfer reset",
26-
"surfer": "surfer"
26+
"surfer": "surfer",
27+
"test": "python3 scripts/run_tests.py",
28+
"test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure"
2729
},
2830
"repository": {
2931
"type": "git",

scripts/run_tests.py

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import os
2+
import sys
3+
import subprocess
4+
from pathlib import Path
5+
6+
7+
def main():
8+
project_root = Path(__file__).resolve().parent.parent
9+
package_json = project_root / 'package.json'
10+
11+
# Ensure script is run from project root
12+
if not package_json.exists():
13+
print("Please run this script from the root of the project", file=sys.stderr)
14+
sys.exit(1)
15+
16+
args = sys.argv[1:]
17+
path = ""
18+
for arg in args:
19+
if not arg.startswith("--"):
20+
path = arg
21+
break
22+
23+
# Collect any additional arguments
24+
other_args = [arg for arg in args if arg != path]
25+
26+
engine_dir = project_root / 'engine'
27+
os.chdir(engine_dir)
28+
29+
def run_mach_with_paths(test_paths):
30+
command = ['./mach', 'mochitest'] + other_args + test_paths
31+
subprocess.run(command, check=True)
32+
33+
if path in ("", "all"):
34+
test_dirs = [p for p in Path("zen/tests").iterdir() if p.is_dir()]
35+
test_paths = [str(p) for p in test_dirs]
36+
run_mach_with_paths(test_paths)
37+
else:
38+
run_mach_with_paths([f"zen/tests/{path}"])
39+
40+
# Return to original directory
41+
os.chdir(project_root)
42+
43+
44+
if __name__ == "__main__":
45+
main()

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 38508fffccbce801a02d4a4211f368674307c4d3..5ce56c36da2e242ad81621c2032eb68dcd26e960 100644
2+
index f7ebed9b2a71da90c5751cfd5d5f018cc8b73612..96e881c7782198f1e58be2578f167c7079a8191e 100644
33
--- a/Cargo.lock
44
+++ b/Cargo.lock
5-
@@ -3931,8 +3931,6 @@ dependencies = [
5+
@@ -4014,8 +4014,6 @@ dependencies = [
66
[[package]]
77
name = "mime_guess"
88
version = "2.0.4"

src/Cargo-toml.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/Cargo.toml b/Cargo.toml
2-
index d3d529b487f80d4b4f3bfa13cdd3f62946352db8..b35a9e0e3339d48d1cd0cab7b22d030f330e40d1 100644
2+
index 8c6b99bc629ec26e01ab3746f2ae46174bfaa0b1..5791c7470923c7c15986089b40357ce80365e942 100644
33
--- a/Cargo.toml
44
+++ b/Cargo.toml
5-
@@ -217,6 +217,9 @@ rure = { path = "third_party/rust/rure" }
5+
@@ -233,6 +233,9 @@ rure = { path = "third_party/rust/rure" }
66
# Patch `plist` to work with `indexmap` 2.*
77
plist = { path = "third_party/rust/plist" }
88

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 40e3a057a1d4b2f9bcfb73fa5ff96b2555865434..a92bed06766dd930bd336d56cd9ddcf3c6c0eeca 100644
2+
index 4ed2dd19207fc38b9e5cc22ea2947aba94b2f5ad..ffc88d62dc46683399c68cdfd35f1b1efde70902 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/app/profile/browser.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ pref("browser.tabs.closeWindowWithLastTab", false);
99
pref("browser.tabs.loadBookmarksInTabs", false);
1010
pref("browser.tabs.hoverPreview.enabled", false);
1111
pref("browser.tabs.dragdrop.moveOverThresholdPercent", 50);
12+
pref("browser.tabs.unloadTabInContextMenu", true);
13+
pref("browser.tabs.fadeOutExplicitlyUnloadedTabs", true);
14+
1215
pref('browser.toolbars.bookmarks.visibility', 'never');
1316
pref("browser.bookmarks.openInTabClosesMenu", false);
1417
pref("browser.menu.showViewImageInfo", true);

src/browser/app/profile/features.inc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@ pref('zen.urlbar.show-domain-only-in-sidebar', true);
6464
pref('zen.urlbar.hide-one-offs', true);
6565
pref('zen.urlbar.enable-overrides', false);
6666

67-
// Exoerimental: Apply a blend mode to the websites so they can render rounded corners
68-
// IMPORTANT: Remove once firefox 139 is released
69-
#ifdef XP_MACOSX
70-
pref('zen.view.experimental-rounded-view', false);
71-
#else
72-
pref('zen.view.experimental-rounded-view', true);
73-
#endif
74-
7567
// Glance
7668
pref('zen.glance.enabled', true);
7769
pref('zen.glance.hold-duration', 300); // in ms
@@ -99,18 +91,12 @@ pref('zen.view.grey-out-inactive-windows', true);
9991
pref('zen.view.hide-window-controls', true);
10092
pref('zen.view.experimental-no-window-controls', false);
10193

102-
pref('zen.tabs.dim-pending', true);
103-
10494
pref('zen.keyboard.shortcuts.enabled', true);
10595
pref('zen.keyboard.shortcuts.version', 0); // Empty string means default shortcuts
10696
pref('zen.keyboard.shortcuts.disable-mainkeyset-clear', false); // for debugging
10797

10898
pref('zen.themes.updated-value-observer', false);
10999

110-
pref('zen.tab-unloader.enabled', true);
111-
pref('zen.tab-unloader.timeout-minutes', 40);
112-
pref('zen.tab-unloader.excluded-urls', "example.com,example.org");
113-
114100
pref('zen.pinned-tab-manager.debug', false);
115101
pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
116102
pref('zen.pinned-tab-manager.close-shortcut-behavior', 'reset-unload-switch');

0 commit comments

Comments
 (0)