diff --git a/package-lock.json b/package-lock.json index bea11ce9..e2438cb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@zen-browser/surfer": "^1.10.0" + "@zen-browser/surfer": "^1.10.2" }, "devDependencies": { "husky": "^9.1.7", @@ -270,9 +270,9 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "node_modules/@zen-browser/surfer": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.10.0.tgz", - "integrity": "sha512-mW/MAuEy+nzIyNJf3q8dV6xjmmEacX0ftECmW12xJmES9xVmP2VnFuSi1AzmFRmlm3Y4TumZodTnq0IvSJbJ7w==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.10.2.tgz", + "integrity": "sha512-ltD4T/OM1JCxvJPssaYqmHAjb/cT8U9DJNg3Hg2QrMJSIXYWugvl61GiGDRS3/SINEaSxZM7A6oOWNjYWthiaQ==", "dependencies": { "@resvg/resvg-js": "^1.4.0", "async-icns": "^1.0.2", @@ -2810,9 +2810,9 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "@zen-browser/surfer": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.10.0.tgz", - "integrity": "sha512-mW/MAuEy+nzIyNJf3q8dV6xjmmEacX0ftECmW12xJmES9xVmP2VnFuSi1AzmFRmlm3Y4TumZodTnq0IvSJbJ7w==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.10.2.tgz", + "integrity": "sha512-ltD4T/OM1JCxvJPssaYqmHAjb/cT8U9DJNg3Hg2QrMJSIXYWugvl61GiGDRS3/SINEaSxZM7A6oOWNjYWthiaQ==", "requires": { "@resvg/resvg-js": "^1.4.0", "async-icns": "^1.0.2", diff --git a/package.json b/package.json index 2561bd9a..c847e57d 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ }, "homepage": "https://github.com/zen-browser/core#readme", "dependencies": { - "@zen-browser/surfer": "^1.10.0" + "@zen-browser/surfer": "^1.10.2" }, "devDependencies": { "husky": "^9.1.7", diff --git a/scripts/update-surfer.sh b/scripts/update-surfer.sh new file mode 100644 index 00000000..6f3a5e78 --- /dev/null +++ b/scripts/update-surfer.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# make sure we are on root +if [ ! -f "package.json" ]; then + echo "Please run this script from the root of the project" + exit 1 +fi + +npm update @zen-browser/surfer +npm i @zen-browser/surfer@latest diff --git a/src/browser/base/moz-build.patch b/src/browser/base/moz-build.patch new file mode 100644 index 00000000..f043e9cc --- /dev/null +++ b/src/browser/base/moz-build.patch @@ -0,0 +1,10 @@ +diff --git a/browser/base/moz.build b/browser/base/moz.build +index 636e0841786735a63ddea00e819c0b6f0b8a5d4d..6685d857180944d68bf4f049919f81361084c481 100644 +--- a/browser/base/moz.build ++++ b/browser/base/moz.build +@@ -87,3 +87,5 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("windows", "gtk"): + DEFINES["MENUBAR_CAN_AUTOHIDE"] = 1 + + JAR_MANIFESTS += ["jar.mn"] ++ ++DIRS += ["zen-components"] diff --git a/src/browser/base/zen-components/ZenSidebarManager.mjs b/src/browser/base/zen-components/ZenSidebarManager.mjs index 00dca945..29207101 100644 --- a/src/browser/base/zen-components/ZenSidebarManager.mjs +++ b/src/browser/base/zen-components/ZenSidebarManager.mjs @@ -27,7 +27,6 @@ class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature { this.onlySafeWidthAndHeight(); this.initProgressListener(); - this.update(); this.close(); // avoid caching this.tabBox.prepend(this.sidebarWrapper); this.listenForPrefChanges(); diff --git a/src/browser/base/zen-components/moz.build b/src/browser/base/zen-components/moz.build new file mode 100644 index 00000000..cf1ec0a2 --- /dev/null +++ b/src/browser/base/zen-components/moz.build @@ -0,0 +1,4 @@ + +BROWSER_CHROME_MANIFESTS += [ + "tests/browser.toml", +] diff --git a/tests/browser.toml b/tests/browser.toml index d3126d43..4f13eca6 100644 --- a/tests/browser.toml +++ b/tests/browser.toml @@ -1,2 +1,2 @@ -["basic-workspace-change.js"] +["browser_zen_workspaces.js"] diff --git a/tests/workspaces/basic-workspace-change.js b/tests/browser_zen_workspaces.js similarity index 100% rename from tests/workspaces/basic-workspace-change.js rename to tests/browser_zen_workspaces.js diff --git a/tests/run.sh b/tests/run.sh new file mode 100644 index 00000000..fffe1ebe --- /dev/null +++ b/tests/run.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# make sure we are on root +if [ ! -f "package.json" ]; then + echo "Please run this script from the root of the project" + exit 1 +fi + +rm -rf engine/browser/base/zen-components/tests/ + +npm run import +npm run build:ui +cd ./engine +./mach mochitest browser/base/zen-components/tests +cd ..