Merge branch 'dev' into window-sync

* fix: hide firefox themes option in customize toolbar

* Update zen-single-components.css

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>

---------

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>
Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>

.dockerignore

@@ -0,0 +1,5 @@
+node_modules
+.git
+.DS_Store
+*.log
+engine

.editorconfig

@@ -0,0 +1,16 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.formal-git/components

@@ -0,0 +1,21 @@
+split-view
+kbs
+folders
+workspaces
+mods
+tests
+glance
+media
+images
+vendor
+tabs
+compact-mode
+common
+fonts
+welcome
+scripts
+workflows
+winsign
+flatpak
+configs
+l10n

.formal-git/template

@@ -0,0 +1 @@
+{type}: {message}, b={bugId}, c={components}

.gitattributes

@@ -1 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 *.patch linguist-language=C++
+*.d.ts linguist-language=TypeScript
+
+src/zen/tests/*.js linguist-language=Test

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-patreon: zen_browser
-ko_fi: zen_browser

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -4,42 +4,82 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for filing a bug report.
+        <p align="center">
+          <a href="https://zen-browser.app">
+            <picture>
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-light.svg">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-dark.svg">
+              <img src="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-light.svg" alt="Zen Logo" width="64" height="64">
+            </picture>
+            <img src="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-browser.svg" alt="Zen Browser Text" width="156" height="64">
+          </a>
+        </p>
 
-        ## Important
-        - Please search existing issues to avoid creating duplicates.
-        - For enhancement requests, please use GitHub Discussions.
-        - Please fill out the template below to the best of your ability.
+        <p align="center"><em>Thank you for filing a bug report!</em></p>
+
+        > [!IMPORTANT]
+        > - Please provide descriptive titles. Bad titles do more harm than good.
+        > - Please search existing issues to avoid creating duplicates.
+        > - For enhancement requests, please use GitHub Discussions.
+        > - Please fill out the template below to the best of your ability.
+        > - Please describe the issue as much as possible and provide steps to reproduce it along with visual aids if possible.
   - type: checkboxes
     id: captchas
     attributes:
-      label: Captchas
-      description: Just making sure you did actually read the instructions.
+      label: Preliminary Checks
+      description: Please confirm the following before submitting a bug report. This helps us triage and resolve issues more efficiently.
       options:
-        - label: I have read the instructions.
+        - label: I have read and understood the important section above.
+          required: true
         - label: I have searched existing issues and avoided creating duplicates.
+          required: true
         - label: I am not filing an enhancement request.
+          required: true
+        - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
+          required: true
+        - label: I have checked that this issue can be reproduced once I removed all my Mods and Custom CSS.
+          required: true
   - type: textarea
     id: what-happened
     attributes:
       label: What happened?
-      description: Also tell us, what did you expect to happen?
+      description: Describe the bug clearly and concisely.
       placeholder: Tell us what you see!
     validations:
       required: true
-  - type: checkboxes
-    id: firefox
+  - type: input
+    id: expected-behavior
     attributes:
-      label: Reproducible?
-      description: Is this issue reproducible on Firefox?
-      options:
-        - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
+      label: Expected behavior
+      description: Please write a description of what was supposed to happen.
+    validations:
+      required: true
+  - type: input
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: Please write a description of what actually happened.
+    validations:
+      required: true
+  - type: textarea
+    id: how-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Please Provide numbered steps to reproduce this issue so developers can replicate them easily.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots and videos
+      description: |
+        If applicable, add screenshots or videos to help explain your problem.
   - type: input
     id: version
     attributes:
       label: Version
-      description: What version of our software are you running? Please DO NOT report Classic bugs.
-      placeholder: 1.0.0
+      description: What version of our software are you running? Please do not use "latest" or "newest" as version numbers. Go to `Help -> About Zen` to find the version number.
+      placeholder: 1.0.0b
     validations:
       required: true
   - type: dropdown
@@ -48,15 +88,48 @@ body:
       label: What platform are you seeing the problem on?
       multiple: true
       options:
-        - Linux
+        - Linux (AppImage)
+        - Linux (Flatpak)
+        - Linux (Tarball)
         - macOS - aarch64
         - macOS - Intel
-        - Windows
+        - Windows - aarch64
+        - Windows - x64
+        - Other
     validations:
       required: true
+  - type: dropdown
+    id: component
+    attributes:
+      label: What component is this issue related to?
+      options:
+        - Other
+        - Bookmarks
+        - Compact Mode
+        - Customizable UI / Toolbars
+        - Extensions
+        - Glance
+        - Keyboard Shortcuts
+        - Localization
+        - Media Controler
+        - Mods / Themes
+        - Performance
+        - Privacy
+        - Security
+        - Settings
+        - Split View
+        - Sync
+        - Tab Folders
+        - Tab unloading
+        - Tabs
+        - URL Bar
+        - Workspaces
+    validations:
+      required: true
+
   - type: textarea
     id: logs
     attributes:
-      label: Relevant log output
+      label: Relevant log output if applicable
       description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
       render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+  - name: Feature Request
+    url: https://github.com/zen-browser/desktop/discussions
+    about: Please use GitHub discussions for feature requests.

.github/advanced-issue-labeler.yml

@@ -0,0 +1,58 @@
+policy:
+  - section:
+      - id: [component]
+        label:
+          # Make sure it's in sync with the dropdown in the issue template
+          - name: 'component: sync'
+            keys: ['Sync']
+          - name: 'component: compact-mode'
+            keys: ['Compact Mode']
+          - name: 'component: workspaces'
+            keys: ['Workspaces']
+          - name: 'component: mods-themes'
+            keys: ['Mods / Themes']
+          - name: 'component: bookmarks'
+            keys: ['Bookmarks']
+          - name: 'component: glance'
+            keys: ['Glance']
+          - name: 'component: url-bar'
+            keys: ['URL Bar']
+          - name: 'component: tabs'
+            keys: ['Tabs']
+          - name: 'component: settings'
+            keys: ['Settings']
+          - name: 'component: privacy'
+            keys: ['Privacy']
+          - name: 'component: split-view'
+            keys: ['Split View']
+          - name: 'component: performance'
+            keys: ['Performance']
+          - name: 'component: media-controller'
+            keys: ['Media Controler']
+          - name: 'component: tab-unloading'
+            keys: ['Tab unloading']
+          - name: 'component: tab-folders'
+            keys: ['Tab Folders']
+          - name: 'component: keyboard-shortcuts'
+            keys: ['Keyboard Shortcuts']
+          - name: 'component: security'
+            keys: ['Security']
+          - name: 'component: extensions'
+            keys: ['Extensions']
+          - name: 'component: customizable-ui-toolbars'
+            keys: ['Customizable UI / Toolbars']
+          - name: 'component: localization'
+            keys: ['Localization']
+          - name: 'component: other'
+            keys: ['Other']
+
+      - id: [platform]
+        block-list: ['Other']
+        label:
+          # Make sure it's in sync with the dropdown in the issue template
+          - name: 'platform: linux'
+            keys: ['Linux (AppImage)', 'Linux (Flatpak)', 'Linux (Tarball)']
+          - name: 'platform: macOS'
+            keys: ['macOS - aarch64', 'macOS - Intel']
+          - name: 'platform: windows'
+            keys: ['Windows - x64', 'Windows - aarch64']

.github/workflows/build.yml

@@ -16,11 +16,16 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'alpha'
+        default: 'release'
         type: 'choice'
         options:
-          - 'alpha'
+          - 'release'
           - 'twilight'
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: 'boolean'
+        default: false
   workflow_call:
     inputs:
       create_release:
@@ -36,100 +41,126 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'alpha'
+        default: 'release'
         type: 'string'
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: 'boolean'
+        default: false
 
 jobs:
-  debug-inputs:
-    name: Debug inputs
+  buildid:
+    name: Generate build ID
     runs-on: ubuntu-latest
+    outputs:
+      buildids: ${{ steps.get.outputs.bid }}
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - id: get
+        shell: bash -xe {0}
+        run: |
+          bdat=`date +"%Y%m%d%I%M%S"`
+          echo "bid=${bdat}" >> $GITHUB_OUTPUT
+
       - name: Debug
         run: |
           echo "create_release: ${{ inputs.create_release }}"
           echo "update_version: ${{ inputs.update_version }}"
+          echo "use sccache: ${{ inputs.use-sccache }}"
           echo "update_branch: ${{ inputs.update_branch }}"
           echo "GITHUB_REPOSITORY: ${{ github.repository }}"
           echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"
-          echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"
           echo "GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}"
 
-  check-build-is-correct:
-    runs-on: ubuntu-latest
-    needs: [debug-inputs]
-    steps:
-
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.DEPLOY_KEY }}
-          fetch-depth: 0
-
       - name: Check if correct branch
+        if: ${{ inputs.create_release }}
         run: |
           echo "Checking if we are on the correct branch"
           git branch
           git status
           git branch --show-current
           branch="${{ inputs.update_branch }}"
-          if [[ $branch == "alpha" ]]; then
-            branch="stable"
-          elif [[ $branch == "twilight" ]]; then
+          if [[ $branch == "twilight" ]]; then
             branch="dev"
+          elif [[ $branch == "release" ]]; then
+            branch="stable"
           fi
           if [[ $(git branch --show-current) != $branch ]]; then
             echo ">>> Branch mismatch"
-            exit 1
+          # exit 1
           else
             echo ">>> Branch matches"
           fi
 
+  start-self-host:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download aws-cli
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install --update
+
+      - name: Start self-hosted runner
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Starting self-hosted runner"
+          echo "${{ secrets.SELF_HOSTED_RUNNER_START_SCRIPT }}" | base64 -d > start.sh
+          sudo chmod +x start.sh
+          bash ./start.sh
+
+      - name: Remove self-hosted runner script
+        if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Removing self-hosted runner script"
+          rm start.sh || true
+
   build-data:
     permissions:
       contents: write
     name: Generate build data
-    runs-on: ubuntu-latest
-    needs: check-build-is-correct
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    needs: buildid
     outputs:
       build_date: ${{ steps.data.outputs.builddate }}
       version: ${{ steps.data.outputs.version }}
       build_time: ${{ steps.data.outputs.buildtime }}
     steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
 
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          npm install
 
       - name: Setup Surfer
         run: |
           npm i -g @zen-browser/surfer
 
       - name: Bump version
-        if: ${{ inputs.update_version && inputs.update_branch == 'alpha' }}
+        if: ${{ inputs.update_version && inputs.update_branch == 'release' }}
         run: |
-          pnpm surfer ci --brand ${{ inputs.update_branch }} --bump prerelease
+          npm run surfer -- ci --brand ${{ inputs.update_branch }} --bump prerelease
 
       - name: Bump version without new version
         if: ${{ !inputs.update_version || inputs.update_branch == 'twilight' }}
         run: |
-          pnpm surfer ci --brand ${{ inputs.update_branch }}
+          npm run surfer -- ci --brand ${{ inputs.update_branch }}
 
       - name: Debug
         run: |
@@ -145,54 +176,52 @@ jobs:
           echo "version=$(surfer get version | xargs)" >> $GITHUB_OUTPUT
           echo "buildtime=$(date +"%H:%M:%S")" >> $GITHUB_OUTPUT
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
         if: ${{ inputs.update_version }}
         with:
           commit_message: 🔖 Update version to ${{ steps.data.outputs.version }}
           commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
+          commit_user_email: zen-browser-auto@users.noreply.github.com
+
+  lint:
+    uses: ./.github/workflows/code-linter.yml
+    needs: [build-data]
+    name: Lint
 
   check-release:
-    runs-on: ubuntu-latest
-    needs: [build-data]
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    needs: [build-data, lint]
     steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
 
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          npm install
 
-      - name: Setup surfer
+      - name: Setup Surfer
         run: |
           npm i -g @zen-browser/surfer
 
-      - name: Activate surfer CLI
+      - name: Activate Surfer CLI
         run: |
-          echo "There's a bug in the surfer CLI, we run this so that surfer sets everything up correctly"
-          pnpm surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
+          npm run surfer -- ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
 
       - name: Check version
         run: |
           echo "$(pwd)"
-          ls .
-          echo "version=$(pnpm surfer get version | xargs)" >> $GITHUB_OUTPUT
-          if [[ $(pnpm surfer get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
+          echo $(npm run --silent surfer -- get version | xargs)
+          echo "version=$(npm run --silent surfer -- get version | xargs)" >> $GITHUB_OUTPUT
+          if [[ $(npm run --silent surfer -- get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
             echo ">>> Version matches"
           else
             echo ">>> Version mismatch"
@@ -202,71 +231,66 @@ jobs:
   source:
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     needs: [build-data, check-release]
-    
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
 
-      - uses: actions/checkout@v4
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Setup git
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
 
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          npm install
 
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
+      - name: Load Surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
 
-      - name: Download firefox source and dependancies
-        run: pnpm surfer download --verbose
+      - name: Download Firefox source and dependencies
+        run: npm run download --verbose
 
       - name: Import
-        run: pnpm surfer import --verbose
+        run: npm run import -- --verbose
 
       - name: Compress
         run: |
           cd engine
-          # -h is used to dereference symlinks
-          tar --use-compress-program=zstd -hcf ../zen.source.tar.gz *
+          tar --use-compress-program=zstd -hcf ../zen.source.tar.zst *
           cd ..
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: zen.source.tar.gz
-          path: ./zen.source.tar.gz
+          retention-days: 5
+          name: zen.source.tar.zst
+          path: ./zen.source.tar.zst
 
   windows-step-1:
     name: Windows build step 1 (PGO build)
     uses: ./.github/workflows/windows-release-build.yml
-    needs: [build-data]
+    needs: [build-data, buildid]
     permissions:
       contents: write
     secrets: inherit
     with:
+      use-sccache: ${{ inputs.use-sccache }}
       build-version: ${{ needs.build-data.outputs.version }}
       generate-gpo: true
-      profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip
+      profile-data-path-archive: zen-windows-profile-data-and-jarlog.zip
       release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
 
   windows-step-2:
     name: Windows build step 2 (Generate profile data)
@@ -286,11 +310,13 @@ jobs:
     permissions:
       contents: write
     secrets: inherit
-    needs: [build-data, windows-step-2]
+    needs: [build-data, windows-step-2, start-self-host, buildid]
     with:
       build-version: ${{ needs.build-data.outputs.version }}
       generate-gpo: false
       release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+      use-sccache: ${{ inputs.use-sccache }}
 
   linux:
     name: Linux build
@@ -298,10 +324,12 @@ jobs:
     permissions:
       contents: write
     secrets: inherit
-    needs: [build-data]
+    needs: [build-data, start-self-host, buildid]
     with:
       build-version: ${{ needs.build-data.outputs.version }}
       release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+      use-sccache: ${{ inputs.use-sccache }}
 
   mac:
     name: macOS build
@@ -309,210 +337,278 @@ jobs:
     permissions:
       contents: write
     secrets: inherit
-    needs: [build-data]
+    needs: [build-data, buildid]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+      use-sccache: ${{ inputs.use-sccache }}
+
+  mac-uni:
+    name: macOS build (Universal)
+    uses: ./.github/workflows/macos-universal-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data, mac]
     with:
       build-version: ${{ needs.build-data.outputs.version }}
       release-branch: ${{ inputs.update_branch }}
 
   appimage:
-    name: AppImage build - Linux ${{ matrix.generic == true && 'generic' || 'specific' }}
+    name: AppImage build - Linux ${{ matrix.arch }}
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     strategy:
       matrix:
-        generic: [true, false]
+        arch: [x86_64, aarch64]
     needs: [linux]
     steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+
       - name: Install dependencies
         run: |
-          npm install -g pnpm
+          npm install
           sudo apt-get update
-          sudo apt-get -y install libfuse2 desktop-file-utils appstream 
+          sudo apt-get -y install libfuse2 desktop-file-utils appstream
 
-      - name: Download linux build
+      - name: Download Linux build
         uses: actions/download-artifact@v4
         with:
-          name: zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
+          name: zen.linux-${{ matrix.arch }}.tar.xz
 
       - name: Execute AppImage build
         run: |
           set -eux
-          rm AppDir/.DirIcon || true
-          cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
-          cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/zen.png && ln -s zen.png AppDir/.DirIcon
+          export ARCH=${{ matrix.arch }}
+          UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-$ARCH.AppImage.zsync"
+          rm build/AppDir/.DirIcon || true
+          cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
+          cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/zen.png && ln -s zen.png build/AppDir/.DirIcon
 
           if [ "${{ inputs.update_branch }}" = "twilight" ]; then
-            sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop
+            sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' build/AppDir/zen.desktop
+            sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' build/AppDir/zen.desktop
           fi
 
-          APPDIR=AppDir
+          APPDIR=build/AppDir
           tar -xvf *.tar.* && rm -rf *.tar.*
           mv zen/* $APPDIR/
-          wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
+          wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+          wget "https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-squashfs-lite-$ARCH"
           chmod +x *.AppImage
-          chmod +x ./AppDir/AppRun
+          chmod +x ./uruntime-appimage-squashfs-lite-"$ARCH"
+          chmod +x ./build/AppDir/AppRun
+
+          # keep the uruntime mountpoint (massively speeds up launch time)
+          sed -i 's|URUNTIME_MOUNT=[0-9]|URUNTIME_MOUNT=0|' ./uruntime-appimage-squashfs-lite-"$ARCH"
+
           echo "AppDir: $APPDIR"
           ls -al
           find .
           ls -al "$APPDIR"
-          ARCH=x86_64 ./appimagetool-x86_64.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 10 \
-          -u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync" \
-          "$APPDIR" zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
+          ./appimagetool-x86_64.AppImage -u "$UPINFO" "$APPDIR" zen-"$ARCH".AppImage --runtime-file ./uruntime-appimage-squashfs-lite-"$ARCH"
           mkdir dist
           mv zen*AppImage* dist/.
+          unset ARCH
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
-          path: ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
+          retention-days: 5
+          name: zen-${{ matrix.arch }}.AppImage
+          path: ./dist/zen-${{ matrix.arch }}.AppImage
 
       - name: Upload artifact (ZSync)
         uses: actions/upload-artifact@v4
         with:
-          name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync
-          path: ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync
+          retention-days: 5
+          name: zen-${{ matrix.arch }}.AppImage.zsync
+          path: ./dist/zen-${{ matrix.arch }}.AppImage.zsync
+
+  stop-self-hosted:
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    needs: [windows-step-3, linux]
+    if: always()
+    steps:
+      - name: Download aws-cli
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install --update
+
+      - name: Stop self-hosted runner
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Stopping self-hosted runner"
+          echo "${{ secrets.SELF_HOSTED_RUNNER_STOP_SCRIPT }}" | base64 -d > stop.sh
+          sudo chmod +x stop.sh
+          bash ./stop.sh > /dev/null
+
+      - name: Remove self-hosted runner script
+        if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Removing self-hosted runner script"
+          rm stop.sh || true
 
   release:
     if: ${{ inputs.create_release || inputs.update_branch == 'twilight' }}
     permissions: write-all
     name: Release
-    needs: [build-data, linux, windows-step-3, check-release, mac, appimage, source]
-    runs-on: ubuntu-latest
+    needs:
+      [
+        build-data,
+        linux,
+        windows-step-3,
+        check-release,
+        mac-uni,
+        appimage,
+        source,
+        lint,
+        stop-self-hosted,
+      ]
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     environment:
-      name: ${{ inputs.update_branch == 'alpha' && 'Deploy-Release' || 'Deploy-Twilight' }}
+      name: ${{ inputs.update_branch == 'release' && 'Deploy-Release' || 'Deploy-Twilight' }}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Git Pull
-        run: |
-          git pull
+      - name: Download artifact
+        uses: actions/download-artifact@v4
 
-      - uses: actions/download-artifact@v4
-
-      - name: List
-        run: find .
-
-      - name: Clone updates repo
+      - name: Checkout updates repository
         uses: actions/checkout@v4
         with:
           repository: zen-browser/updates-server
           path: updates-server
           token: ${{ secrets.DEPLOY_KEY }}
 
+      - name: Download object files
+        if: ${{ inputs.update_branch == 'release' }}
+        run: |
+          git clone https://github.com/zen-browser/windows-binaries.git .github/workflows/object --depth 1
+
       - name: Copy update manifests
         env:
           RELEASE_BRANCH: ${{ inputs.update_branch }}
         run: |
           cd updates-server
           mkdir -p updates
-          cp -a ../linux_update_manifest_generic/.  updates/
-          cp -a ../linux_update_manifest_specific/.  updates/
+          cp -a ../linux_update_manifest_x86_64/.  updates/
+          cp -a ../linux_update_manifest_aarch64/.  updates/
 
-          if [[ $RELEASE_BRANCH == 'alpha' ]]; then
-            cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/.  updates/
-            cp -a ../.github/workflows/object/windows-x64-signed-specific/update_manifest/.  updates/
+          if [[ $RELEASE_BRANCH == 'release' ]]; then
+            cp -a ../.github/workflows/object/windows-x64-signed-x86_64/update_manifest/.  updates/
+            cp -a ../.github/workflows/object/windows-x64-signed-arm64/update_manifest/.  updates/
           else
-            cp -a ../windows_update_manifest_generic/.  updates/
-            cp -a ../windows_update_manifest_specific/.  updates/
+            cp -a ../windows_update_manifest_x86_64/.  updates/
+            cp -a ../windows_update_manifest_arm64/.  updates/
           fi
 
-          cp -a ../macos_update_manifest_aarch64/.  updates/
-          cp -a ../macos_update_manifest_x64/.  updates/
+          cp -a ../macos_update_manifest/.  updates/
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: 🚀 Update update manifests
           commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
+          commit_user_email: zen-browser-auto@users.noreply.github.com
           repository: ./updates-server
 
-        # If we are on twilight, we want to just update the twilight tag's release
-      - name: Update twilight tag
+      - name: Generate Release Notes
+        env:
+          RELEASE_BRANCH: ${{ inputs.update_branch }}
+        run: bash .github/workflows/src/generate_release_notes.sh
+
+        # If we are on Twilight, we want to just update the Twilight tag's release
+      - name: Update Twilight tag
         if: ${{ inputs.update_branch == 'twilight' }}
-        uses: 'marvinpinto/action-automatic-releases@latest'
+        uses: softprops/action-gh-release@v2.2.2
         with:
+          body_path: release_notes.md
           files: |
-            zen.source.tar.gz
-            zen.linux-generic.tar.bz2
-            zen.linux-specific.tar.bz2
-            zen-generic.AppImage
-            zen-generic.AppImage.zsync
-            zen-specific.AppImage
-            zen-specific.AppImage.zsync
-            zen.win-generic.zip
-            zen.win-specific.zip
-            linux.mar
-            linux-generic.mar
-            windows-generic.mar
-            windows.mar
-            macos-x64.mar
-            macos-aarch64.mar
-            zen.installer.exe
-            zen.installer-generic.exe
-            zen.macos-x64.dmg
-            zen.macos-aarch64.dmg
-          automatic_release_tag: 'twilight'
-          title: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
+            ./zen.source.tar.zst/*
+            ./zen.linux-x86_64.tar.xz/*
+            ./zen.linux-aarch64.tar.xz/*
+            ./zen-x86_64.AppImage/*
+            ./zen-x86_64.AppImage.zsync/*
+            ./zen-aarch64.AppImage/*
+            ./zen-aarch64.AppImage.zsync/*
+            ./zen.win-x86_64.zip/*
+            ./zen.win-arm64.zip/*
+            ./linux.mar/*
+            ./linux-aarch64.mar/*
+            ./windows.mar/*
+            ./windows-arm64.mar/*
+            ./macos.mar/*
+            ./zen.installer.exe/*
+            ./zen.installer-arm64.exe/*
+            ./zen.macos-universal.dmg/*
+          tag_name: 'twilight'
+          name: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
           draft: false
+          generate_release_notes: false
           prerelease: true
-          repo_token: ${{ github.token }}
+          token: ${{ secrets.DEPLOY_KEY }}
+          fail_on_unmatched_files: false
         env:
           GITHUB_REPOSITORY: ${{ github.repository }}
 
-      - name: release-github
-        uses: 'marvinpinto/action-automatic-releases@latest'
-        if: ${{ inputs.update_branch == 'alpha' }}
+      - name: Release
+        uses: softprops/action-gh-release@v2.2.2
+        if: ${{ inputs.update_branch == 'release' }}
         with:
-          repo_token: '${{ secrets.DEPLOY_KEY }}'
-          automatic_release_tag: ${{ needs.build-data.outputs.version }}
+          token: ${{ secrets.DEPLOY_KEY }}
+          tag_name: ${{ needs.build-data.outputs.version }}
           prerelease: false
-          title: 'Alpha build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          fail_on_unmatched_files: false
+          generate_release_notes: false
+          name: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          body_path: release_notes.md
           files: |
-            zen.source.tar.gz
-            zen.linux-generic.tar.bz2
-            zen.linux-specific.tar.bz2
-            zen-generic.AppImage
-            zen-generic.AppImage.zsync
-            zen-specific.AppImage
-            zen-specific.AppImage.zsync
-            .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
-            .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
-            .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
+            ./zen.source.tar.zst/*
+            ./zen.linux-x86_64.tar.xz/*
+            ./zen.linux-aarch64.tar.xz/*
+            ./zen-x86_64.AppImage/*
+            ./zen-x86_64.AppImage.zsync/*
+            ./zen-aarch64.AppImage/*
+            ./zen-aarch64.AppImage.zsync/*
+            ./.github/workflows/object/windows-x64-signed-x86_64/zen.win-x86_64.zip
+            ./.github/workflows/object/windows-x64-signed-arm64/zen.win-arm64.zip
+            ./linux.mar/*
+            ./linux-aarch64.mar/*
+            ./.github/workflows/object/windows-x64-signed-x86_64/windows.mar
+            ./.github/workflows/object/windows-x64-signed-arm64/windows-arm64.mar
+            ./macos.mar/*
+            ./.github/workflows/object/windows-x64-signed-x86_64/zen.installer.exe
+            ./.github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
+            ./zen.macos-universal.dmg/*
 
   prepare-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'alpha' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all
     name: Prepare Flatpak
     needs: [release, linux, build-data]
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
 
     steps:
-      - name: Clone flatpak repo
+      - name: Checkout Flatpak repository
         uses: actions/checkout@v4
         with:
           repository: zen-browser/release-utils
@@ -524,18 +620,19 @@ jobs:
           sudo apt-get update
           npm install
 
-      - name: Generate new flatpak release
+      - name: Generate new Flatpak release
         run: |
           npm run build-flatpak -- \
             --version ${{ needs.build-data.outputs.version }}
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: 🚀 Update releases for flatpak
+          commit_message: 🚀 Update releases for Flatpak
           commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
+          commit_user_email: zen-browser-auto@users.noreply.github.com
 
-      - name: Clone flatpak repo
+      - name: Checkout Flatpak repository
         uses: actions/checkout@v4
         with:
           repository: zen-browser/flatpak
@@ -547,82 +644,91 @@ jobs:
           pwd
           ls .
           ls ..
-          mv releases.xml ./flatpak/io.github.zen_browser.zen.metainfo.xml
+          mv releases.xml ./flatpak/app.zen_browser.zen.metainfo.xml
           # output the version to the file
           echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: '[release]: Update flatpak manifest'
+          commit_message: '[release]: Update Flatpak manifest'
           commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
+          commit_user_email: zen-browser-auto@users.noreply.github.com
           repository: ./flatpak
 
-      - name: Wait 4 minutes for the flatpak repo to update
-        run: sleep 240
+      - name: Wait 2 minutes for the Flatpak repo to update
+        run: sleep 120
 
   release-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'alpha' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all
     name: Release Flatpak
     needs: [prepare-flatpak, build-data]
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
 
     steps:
-      - name: Clone flatpak repo
+      - name: Checkout Flatpak repository
         uses: actions/checkout@v4
         with:
-          repository: flathub/io.github.zen_browser.zen
+          repository: flathub/app.zen_browser.zen
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Download linux generic build
+      - name: Download Linux x86_64 build
         uses: actions/download-artifact@v4
         with:
-          name: zen.linux-generic.tar.bz2
+          name: zen.linux-x86_64.tar.xz
 
-      - name: Update repo
+      - name: Download Linux aarch64 build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.linux-aarch64.tar.xz
+
+      - name: Update repository
         uses: actions/checkout@v4
         with:
           path: zen-browser
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Download flatpak archive
+      - name: Download Flatpak archive
         run: |
           wget https://github.com/zen-browser/flatpak/releases/latest/download/archive.tar -O archive.tar
 
-      - name: Setup git
+      - name: Setup Git
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Prepare flatpak manifest
+      - name: Prepare Flatpak manifest
         run: |
           python3 ./zen-browser/scripts/prepare-flatpak-release.py \
             --flatpak-archive archive.tar \
             --version ${{ needs.build-data.outputs.version }} \
-            --linux-archive zen.linux-generic.tar.bz2 \
-            --output io.github.zen_browser.zen.yml \
-            --template-root ./zen-browser/flatpak
+            --linux-archive zen.linux-x86_64.tar.xz \
+            --linux-aarch64-archive zen.linux-aarch64.tar.xz \
+            --output app.zen_browser.zen.yml \
+            --template-root ./zen-browser/build/flatpak
 
       - name: Commit changes
         run: |
-          git add io.github.zen_browser.zen.yml
+          git add app.zen_browser.zen.yml
           git commit -m "Update to version ${{ needs.build-data.outputs.version }}"
 
       - name: Clean up
         run: |
           rm -rf zen-browser
           rm -rf archive.tar
-          rm -rf zen.linux-generic.tar.bz2
+          rm -rf zen.linux-x86_64.tar.xz
+          rm -rf zen.linux-aarch64.tar.xz
 
-      - name: Upload flatpak manifest
+      - name: Upload Flatpak manifest
         uses: actions/upload-artifact@v4
         with:
-          name: io.github.zen_browser.zen.yml
-          path: ./io.github.zen_browser.zen.yml
+          retention-days: 5
+          name: app.zen_browser.zen.yml
+          path: ./app.zen_browser.zen.yml
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         env:
           GIT_TRACE: 1
           GIT_CURL_VERBOSE: 1
@@ -638,28 +744,3 @@ jobs:
           base: master
           git-token: ${{ secrets.DEPLOY_KEY }}
           delete-branch: true
-
-  release-homebrew:
-    if: ${{ inputs.create_release && inputs.update_branch == 'alpha' }}
-    permissions: write-all
-    name: Homebrew release
-    needs: [release, mac, build-data]
-    runs-on: macos-latest
-
-    steps:
-      - name: Set up Homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-        with:
-          cask: true
-          test-bot: false
-
-      - name: Setup git
-        uses: Homebrew/actions/git-user-config@master
-        with:
-          username: zen-browser-bot
-
-      - name: Bump zen-browser
-        uses: Homebrew/actions/bump-packages@master
-        with:
-          token: ${{ secrets.DEPLOY_KEY }}
-          casks: zen-browser

.github/workflows/check-candidate-release.yml

@@ -0,0 +1,24 @@
+name: Check Firefox Candidate Release
+
+on:
+  schedule:
+    - cron: '59 4 * * 2'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  check_candidates:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Check for any updates
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          DISCORD_PING_IDS: ${{ secrets.DISCORD_PING_IDS }}
+        run: |
+          python3 scripts/check_rc_response.py

.github/workflows/clear-all-cache.yml

@@ -0,0 +1,25 @@
+name: Cleanup cache
+on:
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - name: Cleanup
+        run: |
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh cache list --limit 1000 --json id --jq '.[].id')
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh cache delete $cacheKey
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}

.github/workflows/clear-cache.yml

@@ -1,30 +0,0 @@
-name: Clear cache
-
-on:
-  workflow_dispatch:
-
-permissions:
-  actions: write
-
-jobs:
-  clear-cache:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clear cache
-        uses: actions/github-script@v6
-        with:
-          script: |
-            console.log("About to clear")
-            const caches = await github.rest.actions.getActionsCacheList({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-            for (const cache of caches.data.actions_caches) {
-              console.log(cache)
-              github.rest.actions.deleteActionsCacheById({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                cache_id: cache.id,
-              })
-            }
-            console.log("Clear completed")

.github/workflows/code-linter.yml

@@ -0,0 +1,37 @@
+name: Code Linter
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_call:
+  pull_request:
+    branches:
+      - dev
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.head_commit.message, '[no-lint]') }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup autopep8
+        run: sudo apt install python3-autopep8
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Lint
+        run: npm run lint

.github/workflows/issue-labeler.yml

@@ -0,0 +1,34 @@
+name: Issue labeler
+on:
+  issues:
+    types: [opened]
+
+permissions:
+  contents: read
+
+jobs:
+  label-component:
+    runs-on: ubuntu-latest
+
+    permissions:
+      # required for all workflows
+      issues: write
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Parse issue form
+        uses: stefanbuck/github-issue-parser@v3
+        id: issue-parser
+        with:
+          template-path: .github/ISSUE_TEMPLATE/bug_report.yml
+
+      - name: Set labels based on animals field
+        uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
+        with:
+          issue-form: ${{ steps.issue-parser.outputs.jsonString }}
+          token: ${{ secrets.DEPLOY_KEY }}

.github/workflows/issue-metrics.yml

@@ -0,0 +1,67 @@
+name: Monthly issue metrics
+permissions:
+  contents: write
+  issues: read
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '3 2 1 * *'
+
+jobs:
+  build:
+    name: issue metrics
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Get dates for last month
+        shell: bash
+        run: |
+          # Get the current date
+          current_date=$(date +'%Y-%m-%d')
+
+          # Calculate the previous month
+          previous_date=$(date -d "$current_date -1 month" +'%Y-%m-%d')
+
+          # Extract the year and month from the previous date
+          previous_year=$(date -d "$previous_date" +'%Y')
+          previous_month=$(date -d "$previous_date" +'%m')
+
+          # Calculate the first day of the previous month
+          first_day=$(date -d "$previous_year-$previous_month-01" +'%Y-%m-%d')
+
+          # Calculate the last day of the previous month
+          last_day=$(date -d "$first_day +1 month -1 day" +'%Y-%m-%d')
+
+          echo "$first_day..$last_day"
+          echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
+          echo "last_month_year=$previous_year" >> "$GITHUB_ENV"
+
+      - name: Run issue-metrics tool
+        uses: github/issue-metrics@v2
+        env:
+          GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
+          HIDE_AUTHOR: true
+          HIDE_TIME_TO_ANSWER: true
+          SEARCH_QUERY: 'repo:zen-browser/desktop is:issue created:${{ env.last_month }}'
+
+      - name: Move metrics to docs folder
+        run: |
+          mkdir -p docs/issue-metrics
+          rm -f docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
+          mv issue_metrics.md docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
+
+      - name: Remove metrisc JSON
+        run: |
+          rm -f issue_metrics.json
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'docs: Update monthly issue metrics, b=(no bug), c={docs}'
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-auto@users.noreply.github.com

.github/workflows/linux-release-build.yml

@@ -1,4 +1,5 @@
 name: Linux Release Build
+
 on:
   workflow_call:
     inputs:
@@ -10,38 +11,64 @@ on:
         description: 'The branch to build'
         required: true
         type: string
+      MOZ_BUILD_DATE:
+        type: string
+        required: true
+        default: ''
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: boolean
+        default: false
 
 jobs:
   build-linux:
-    
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    # aarch64 does not need full 16x
+    runs-on: ${{ (inputs.release-branch == 'release' && matrix.arch == 'x86_64') && 'self-hosted' || 'blacksmith-8vcpu-ubuntu-2404' }}
     strategy:
       fail-fast: false
       matrix:
-        generic: [true, false]
-    name: Build Linux - ${{ matrix.generic == true && 'Generic' || 'Specific' }}
+        arch: [x86_64, aarch64]
+    env:
+      SCCACHE_GHA_ENABLED: ${{ inputs.use-sccache && 'true' || 'false' }}
+      CARGO_TERM_COLOR: always
+      RUSTC_WRAPPER: ${{ inputs.use-sccache && 'sccache' || '' }}
+      CARGO_INCREMENTAL: 0
+    name: Build Linux - ${{ matrix.arch }}
 
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
         with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
           tool-cache: false
 
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Setup git
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@main
+        if: ${{ inputs.use-sccache }}
+        with:
+          disable_annotations: true
+
+      - name: Expose actions cache variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env['ACTIONS_CACHE_URL'])
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env['ACTIONS_RUNTIME_TOKEN'])
+
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
@@ -51,55 +78,36 @@ jobs:
           set -x
           sudo apt-get update --fix-missing
           sudo apt-get update
-          sudo apt-get install dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
-
-      - name: Configure sccache
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Install sccache
-        env:
-          LINK: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: 0.2.13
-        run: |
-          SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
-          mkdir -p $HOME/.local/bin
-          curl -L "$LINK/$SCCACHE_VERSION/$SCCACHE_FILE.tar.gz" | tar xz
-          mv -f $SCCACHE_FILE/sccache $HOME/.local/bin/sccache
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Save sccache
-        uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: /home/runner/.cache/sccache
-          key: ${{ runner.os }}-sccache
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+          sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
 
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          npm install
 
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+      - name: Load Surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
-      - name: Download firefox source and dependencies
-        run: pnpm surfer download
+      - name: Download Firefox source and dependencies
+        run: npm run download
+
+      - name: Fix Rust version
+        run: |
+          # Install a rust version compatible with LLVM 18
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
+          source $HOME/.cargo/env
+
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-unknown-linux-gnu
+          else
+            rustup target add x86_64-unknown-linux-gnu
+          fi
 
       - name: Import
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
-        run: pnpm surfer import
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          . "$HOME/.cargo/env"
+          npm run import
 
       - name: Build language packs
         run: sh scripts/download-language-packs.sh
@@ -107,45 +115,62 @@ jobs:
       - name: Bootstrap
         run: |
           cd engine
+          export SURFER_PLATFORM="linux"
           ./mach --no-interactive bootstrap --application-choice browser
           cd ..
 
+      - name: Insert API Keys
+        run: |
+          mkdir -p ~/.zen-keys
+          echo "${{ secrets.ZEN_SAFEBROWSING_API_KEY }}" > ~/.zen-keys/safebrowsing.dat
+
       - name: Build
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
         continue-on-error: true
-        run: sh .github/workflows/src/release-build.sh
-
-      - name: Build again if it failed
-        if: failure()
-        env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
-        run: sh .github/workflows/src/release-build.sh
+        run: |
+          export SURFER_PLATFORM="linux"
+          if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
+            export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
+          fi
+          bash .github/workflows/src/release-build.sh
 
       - name: Package
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
-        run: pnpm package
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_GA_DISABLE_PGO: true
+        run: |
+          export SURFER_PLATFORM="linux"
+          export ZEN_RELEASE=1
+          npm run package
+
+      - name: Remove API Keys
+        run: |
+          rm -rf ~/.zen-keys
 
       - name: Rename artifacts
         run: |
-          mv dist/zen-*.tar.bz2 "zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2"
-          mv dist/output.mar linux${{ matrix.generic == true && '-generic' || '' }}.mar
+          mv dist/zen-*.tar.xz "zen.linux-${{ matrix.arch }}.tar.xz"
+          mv dist/output.mar linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
 
-      - name: Upload binary
+      - name: Upload build artifact (binary)
         uses: actions/upload-artifact@v4
         with:
-          name: zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
-          path: ./zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
+          retention-days: 5
+          name: zen.linux-${{ matrix.arch }}.tar.xz
+          path: ./zen.linux-${{ matrix.arch }}.tar.xz
 
-      - name: Upload mar
+      - name: Upload build artifact (.mar)
         uses: actions/upload-artifact@v4
         with:
-          name: linux${{ matrix.generic == true && '-generic' || '' }}.mar
-          path: ./linux${{ matrix.generic == true && '-generic' || '' }}.mar
+          retention-days: 5
+          name: linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
+          path: ./linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
 
-      - name: Upload update manifests
+      - name: Upload build artifact (update manifests)
         uses: actions/upload-artifact@v4
         with:
-          name: linux_update_manifest_${{ matrix.generic == true && 'generic' || 'specific' }}
+          retention-days: 5
+          name: linux_update_manifest_${{ matrix.arch }}
           path: ./dist/update

.github/workflows/macos-release-build.yml

@@ -1,4 +1,7 @@
 name: macOS Release Build
+permissions:
+  contents: read
+
 on:
   workflow_call:
     inputs:
@@ -10,166 +13,181 @@ on:
         description: 'The branch to build'
         required: true
         type: string
+      MOZ_BUILD_DATE:
+        type: string
+        required: true
+        default: ''
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: boolean
+        default: false
 
 jobs:
   mac-build:
     name: Build macOS - ${{ matrix.arch }}
-    
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-15
+
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - arch: aarch64
-            os: macos-14
-          - arch: x64
-            os: macos-13
-
+        arch: [x86_64, aarch64]
+    env:
+      SCCACHE_GHA_ENABLED: ${{ inputs.use-sccache && 'true' || 'false' }}
+      CARGO_TERM_COLOR: always
+      RUSTC_WRAPPER: ${{ inputs.use-sccache && 'sccache' || '' }}
+      CARGO_INCREMENTAL: 0
     steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Setup git
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@main
+        if: ${{ inputs.use-sccache }}
+        with:
+          disable_annotations: true
+
+      - name: Expose actions cache variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env['ACTIONS_CACHE_URL'])
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env['ACTIONS_RUNTIME_TOKEN'])
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        # note: This will use the version defined in '.python-version' by default
+
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
 
       - name: Install system dependencies
         run: |
-          brew install cairo sccache gnu-tar mercurial
+          brew update
+          brew install cairo gnu-tar mercurial
           sudo pip install setuptools
 
-          # completly uninstall python3 and python3.12
           brew uninstall --ignore-dependencies python3.12 -f
 
           export PATH="$(python3 -m site --user-base)/bin":$PATH
           python3 -m pip install --user mercurial
 
-          rm '/usr/local/bin/2to3-3.11' # fix Could not symlink bin/2to3-3.11
-          rm '/usr/local/bin/2to3-3.12' # fix Could not symlink bin/2to3-3.12
-          rm /usr/local/bin/2to3 # fix Could not symlink bin/2to3
-          rm '/usr/local/bin/idle3.11' #fix Could not symlink bin/idle3.11
-          rm '/usr/local/bin/idle3.12' # fix Could not symlink bin/idle3.12
-          rm '/usr/local/bin/idle3' # fix Could not symlink bin/idle3
-          rm '/usr/local/bin/pydoc3.11' # fix Could not symlink bin/pydoc3.11
-          rm '/usr/local/bin/pydoc3.12' # fix Could not symlink bin/pydoc3.12
-          rm '/usr/local/bin/pydoc3' # fix Could not symlink bin/pydoc3
-          rm '/usr/local/bin/python3.11' # fix Could not symlink bin/python3.11
-          rm '/usr/local/bin/python3.12' # fix Could not symlink bin/python3.12
-          rm '/usr/local/bin/python3' # fix Could not symlink bin/python3
-          rm '/usr/local/bin/python3.11-config' # fix Could not symlink bin/python3.11-config
-          rm '/usr/local/bin/python3.12-config' # fix Could not symlink bin/python3.12-config
-          rm '/usr/local/bin/python3-config' # fix Could not symlink bin/python3-config
+          rm '/usr/local/bin/2to3-3.11' '/usr/local/bin/2to3-3.12' '/usr/local/bin/2to3'
+          rm '/usr/local/bin/idle3.11' '/usr/local/bin/idle3.12' '/usr/local/bin/idle3'
+          rm '/usr/local/bin/pydoc3.11' '/usr/local/bin/pydoc3.12' '/usr/local/bin/pydoc3'
+          rm '/usr/local/bin/python3.11' '/usr/local/bin/python3.12' '/usr/local/bin/python3'
+          rm '/usr/local/bin/python3.11-config' '/usr/local/bin/python3.12-config' '/usr/local/bin/python3-config'
 
           brew install watchman
 
-      - name: Force usage fo gnu-tar
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
+          source $HOME/.cargo/env
+
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-apple-darwin
+          else
+            rustup target add x86_64-apple-darwin
+          fi
+
+      - name: Force usage of gnu-tar
         run: |
           echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.bash_profile
           echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
           source ~/.bash_profile
 
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
       - name: Install dependencies
-        run: pnpm install
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+        run: |
+          npm install
 
-      - name: Download firefox source and dependancies
-        run: pnpm surfer download
+      - name: Load surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download Firefox source and dependencies
+        run: npm run download
+
+      - name: Import
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: npm run import -- --verbose
 
       - name: Bootstrap
         run: |
           cd engine
+          export SURFER_PLATFORM="darwin"
           export PATH="$(python3 -m site --user-base)/bin":$PATH
-          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes
+          # Always exist with 0, even if bootstrap fails
+          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes --exclude macos-sdk || true
           cd ..
 
-      - name: Import
-        env:
-          SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
-        run: |
-          pnpm surfer import --verbose
-
       - name: Build language packs
         run: sh scripts/download-language-packs.sh
 
-      - name: build Zen
-        env:
-          SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
+      - name: Insert API Keys
         run: |
-          if test "${{ matrix.arch }}" = "x64"; then
-            export ZEN_DISABLE_LTO=1
+          mkdir -p ~/.zen-keys
+          echo "${{ secrets.ZEN_SAFEBROWSING_API_KEY }}" > ~/.zen-keys/safebrowsing.dat
+
+      - name: Build Zen
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
+        run: |
+          export SURFER_PLATFORM="darwin"
+          if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
+            export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
           fi
-          sh .github/workflows/src/release-build.sh
-
-      - name: Rebuild Zen if failed
-        if: failure()
-        run: sh .github/workflows/src/release-build.sh
-
-      - name: import APPLE DEVELOPER ID CERTIFICATE for .app
-        uses: apple-actions/import-codesign-certs@v3
-        with:
-          p12-file-base64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}
-          p12-password: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}
+          bash .github/workflows/src/release-build.sh
 
       - name: Package
         env:
-          SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_GA_DISABLE_PGO: true
         run: |
-          export MACOS_APPLE_DEVELOPER_ID="${{ secrets.macOS_AppleDeveloperId }}"
-          pnpm package
+          export SURFER_PLATFORM="darwin"
+          export ZEN_RELEASE=1
+          npm run package
+
+      - name: Remove API Keys
+        run: |
+          rm -rf ~/.zen-keys
 
       - name: Rename artifacts
         run: |
-          mv ./dist/output.mar macos-${{ matrix.arch }}.mar
-
-      - name: Sign to .dmg
-        run: |
+          echo "Tarballing DMG"
           set -ex
-          hdiutil convert ./dist/*.dmg -format UDZO -imagekey zlib-level=9 -o zen.macos-${{ matrix.arch }}.dmg
-          xattr -cr zen.macos-${{ matrix.arch }}.dmg
-          codesign -s "${{ secrets.macOS_AppleDeveloperId }}" zen.macos-${{ matrix.arch }}.dmg
-          xcrun notarytool submit "zen.macos-${{ matrix.arch }}.dmg" \
-            --apple-id "${{ secrets.macOS_AppleAccountId }}" \
-            --team-id "${{ secrets.macOS_AppleDeveloperIdTeamId }}" \
-            --password "${{ secrets.macOS_AppleDeveloperIdPassword }}" \
-            --wait
-          xcrun stapler staple "zen.macos-${{ matrix.arch }}.dmg"
+          mv ./dist/*.dmg ./zen-${{ matrix.arch }}-apple-darwin-dist.dmg
+          mv ./engine/obj-${{ matrix.arch }}-apple-darwin/dist/host/bin/mar ./zen-macos-host-mar
+          mv ./engine/obj-${{ matrix.arch }}-apple-darwin/dist/bin/platform.ini ./platform.ini
 
-      - name: Upload artifact
+      - name: Upload dist dmg
         uses: actions/upload-artifact@v4
         with:
-          name: zen.macos-${{ matrix.arch }}.dmg
-          path: ./zen.macos-${{ matrix.arch }}.dmg
+          retention-days: 1
+          name: zen-${{ matrix.arch }}-apple-darwin-dist.dmg
+          path: ./zen-${{ matrix.arch }}-apple-darwin-dist.dmg
 
-      - name: Upload mar
+      - name: Upload host mar
         uses: actions/upload-artifact@v4
+        if: matrix.arch == 'aarch64'
         with:
-          name: macos-${{ matrix.arch }}.mar
-          path: ./macos-${{ matrix.arch }}.mar
+          retention-days: 1
+          name: zen-macos-host-mar
+          path: ./zen-macos-host-mar
 
-      - name: Upload update manifests
+      - name: Upload platform.ini
         uses: actions/upload-artifact@v4
+        if: matrix.arch == 'x86_64'
         with:
-          name: macos_update_manifest_${{ matrix.arch }}
-          path: ./dist/update
+          retention-days: 1
+          name: platform.ini
+          path: ./platform.ini

.github/workflows/macos-universal-release-build.yml

@@ -0,0 +1,261 @@
+name: macOS Release Build
+
+on:
+  workflow_call:
+    inputs:
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+      release-branch:
+        description: 'The branch to build'
+        required: true
+        type: string
+
+jobs:
+  mac-build:
+    name: Unify macOS (Universal)
+    runs-on: 'macos-15'
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        # note: This will use the version defined in '.python-version' by default
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Install system dependencies
+        run: |
+          brew update
+          brew install cairo gnu-tar mercurial
+          sudo pip install setuptools
+
+          brew uninstall --ignore-dependencies python3.12 -f
+
+          export PATH="$(python3 -m site --user-base)/bin":$PATH
+          python3 -m pip install --user mercurial
+
+          rm '/usr/local/bin/2to3-3.11' '/usr/local/bin/2to3-3.12' '/usr/local/bin/2to3'
+          rm '/usr/local/bin/idle3.11' '/usr/local/bin/idle3.12' '/usr/local/bin/idle3'
+          rm '/usr/local/bin/pydoc3.11' '/usr/local/bin/pydoc3.12' '/usr/local/bin/pydoc3'
+          rm '/usr/local/bin/python3.11' '/usr/local/bin/python3.12' '/usr/local/bin/python3'
+          rm '/usr/local/bin/python3.11-config' '/usr/local/bin/python3.12-config' '/usr/local/bin/python3-config'
+
+          brew install watchman
+
+          cargo install apple-codesign
+
+      - name: Force usage of gnu-tar
+        run: |
+          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.bash_profile
+          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
+          source ~/.bash_profile
+
+      - name: Install dependencies
+        run: |
+          npm install
+
+      - name: Load surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download Firefox source and dependencies
+        run: npm run download
+
+      - name: Bootstrap
+        run: |
+          cd engine
+          export SURFER_PLATFORM="darwin"
+          export PATH="$(python3 -m site --user-base)/bin":$PATH
+          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes || true
+          cd ..
+
+      - name: Import
+        run: npm run import
+
+      - name: Populate mozconfig
+        env:
+          SURFER_MOZCONFIG_ONLY: true
+        run: |
+          npm run build
+          cd engine
+          ./mach configure
+
+      - name: Download x86_64 DMG from artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: zen-x86_64-apple-darwin-dist.dmg
+
+      - name: Download aarch64 DMG from artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: zen-aarch64-apple-darwin-dist.dmg
+
+      - name: Remove any existing .app folders
+        run: |
+          set -x
+          cd engine
+          rm -rf "./obj-x86_64-apple-darwin/" || true
+          rm -rf "./obj-aarch64-apple-darwin/" || true
+
+      - name: Extract .app from dmg
+        run: |
+          set -ex
+          cd engine
+          echo "Extracting x86_64 .app from dmg"
+          mkdir -p ./obj-x86_64-apple-darwin/dist
+          mkdir -p ./obj-aarch64-apple-darwin/dist
+          ./mach python -m mozbuild.action.unpack_dmg \
+            ../zen-x86_64-apple-darwin-dist.dmg \
+            ./obj-x86_64-apple-darwin/dist
+          echo "Extracting aarch64 .app from dmg"
+          ./mach python -m mozbuild.action.unpack_dmg \
+            ../zen-aarch64-apple-darwin-dist.dmg \
+            ./obj-aarch64-apple-darwin/dist
+
+      - name: Find first .app folder name
+        run: |
+          cd engine/obj-x86_64-apple-darwin/dist
+          export APP_NAME=${{ inputs.release-branch == 'twilight' && 'Twilight' || 'Zen' }}
+          echo "APP_NAME=$APP_NAME" >> $GITHUB_ENV
+          echo "APP_NAME=$APP_NAME"
+
+      - name: List .app folders
+        run: |
+          ls engine/
+          echo "--------------------"
+          cd engine/obj-x86_64-apple-darwin/dist
+          find . -maxdepth 1 -name "*.app" -type d
+          cd ../..
+
+      - name: create .p12 for codesign 🖊️
+        run: |
+          cd engine
+          echo "${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}" > cert.txt
+          base64 --decode -i cert.txt -o zenCert.p12
+          echo "${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}" > zenpCertPassword.passwd
+
+      - name: Remove certificate sensitive information
+        run: |
+          rm engine/cert.txt || true
+
+      - name: Import provisioning profile for .app
+        run: |
+          echo "${{ secrets.macOS_PROVISIONING_PROFILE }}" | base64 --decode > ./engine/Zen_Browser.provisionprofile
+          ls -la
+
+      - name: Unify architectures
+        run: |
+          cd engine
+          ./mach python "./toolkit/mozapps/installer/unify.py" "./obj-x86_64-apple-darwin/dist/${{ env.APP_NAME }}.app" "./obj-aarch64-apple-darwin/dist/${{ env.APP_NAME }}.app"
+          echo "Merged aaarch64 into x86_64!"
+
+      - name: Import APPLE DEVELOPER ID CERTIFICATE for .app
+        uses: Apple-Actions/import-codesign-certs@v3
+        with:
+          p12-file-base64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}
+          p12-password: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}
+
+      - name: Copy provisioning profile for .app (embedded in .app)
+        run: |
+          cd engine
+          echo "Copying provisioning profile for .app on both architectures (${{ env.APP_NAME }})"
+          cp ./Zen_Browser.provisionprofile "./embedded.provisionprofile"
+
+      - name: Sign .app
+        run: |
+          cd engine
+          # TODO: Change it to "production" once we figure out the issue with the webauth
+          ./mach macos-sign -v -r -c "release" -e "production" -a "./obj-x86_64-apple-darwin/dist/${{ env.APP_NAME }}.app" --rcodesign-p12-file zenCert.p12 --rcodesign-p12-password-file zenpCertPassword.passwd
+
+      - name: Create DMG
+        run: |
+          cd engine
+          ./mach python -m mozbuild.action.make_dmg \
+            --volume-name "${{ env.APP_NAME }}" \
+            --background ./browser/branding/${{ inputs.release-branch }}/background.png \
+            --icon ./browser/branding/${{ inputs.release-branch }}/firefox.icns \
+            --dsstore ./browser/branding/${{ inputs.release-branch }}/dsstore \
+            ./obj-x86_64-apple-darwin/dist/ ../zen-macOS-universal-temp.dmg
+
+      - name: Remove sensitive information
+        run: |
+          rm -f ./engine/Zen_Browser.provisionprofile
+
+      - name: Sign .dmg
+        run: |
+          set -ex
+          hdiutil convert zen-macOS-universal-temp.dmg -format UDZO -imagekey zlib-level=9 -o zen.macos-universal.dmg
+          codesign -s "${{ secrets.macOS_AppleDeveloperId }}" zen.macos-universal.dmg
+          xcrun notarytool submit "zen.macos-universal.dmg" \
+            --apple-id "${{ secrets.macOS_AppleAccountId }}" \
+            --team-id "${{ secrets.macOS_AppleDeveloperIdTeamId }}" \
+            --password "${{ secrets.macOS_AppleDeveloperIdPassword }}" \
+            --no-s3-acceleration \
+            --wait
+          xcrun stapler staple "zen.macos-universal.dmg"
+
+      - name: Download host mar
+        uses: actions/download-artifact@v4
+        with:
+          name: zen-macos-host-mar
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.macos-universal.dmg
+          path: ./zen.macos-universal.dmg
+
+      - name: Download platform.ini
+        uses: actions/download-artifact@v4
+        with:
+          name: platform.ini
+
+      - name: Package for mar
+        env:
+          JUST_MAR: true
+        run: |
+          # we don't need it anymore
+          set -ex
+          rm -rf ./engine/obj-aarch64-apple-darwin
+          mkdir -p ./engine/obj-x86_64-apple-darwin/dist/bin
+          mv ./platform.ini ./engine/obj-x86_64-apple-darwin/dist/bin/platform.ini
+          export SURFER_PLATFORM="darwin"
+          export ZEN_RELEASE=1
+          # full path to zen-macos-host-mar
+          export MAR=$(pwd)/zen-macos-host-mar
+          chmod +x $MAR
+          echo "MAR=$MAR"
+          npm run package -- --verbose
+          mv ./dist/output.mar ./macos.mar
+
+      - name: Upload build artifact (.mar)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: macos.mar
+          path: ./macos.mar
+
+      - name: Upload build artifact (update manifests)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: macos_update_manifest
+          path: ./dist/update

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

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

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

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

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

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

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

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

.github/workflows/pr-test.yml

@@ -0,0 +1,34 @@
+name: Pull request test
+permissions:
+  contents: read
+
+on:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  pr-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Install Surfer
+        run: npm i -g @zen-browser/surfer
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Download Firefox and dependencies
+        run: surfer download
+
+      - name: Import patches
+        run: surfer i

.github/workflows/src/generate_release_notes.sh

@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+RELEASE_NOTES_URL="https://raw.githubusercontent.com/zen-browser/www/refs/heads/main/src/release-notes/stable.json"
+
+if [ "$RELEASE_BRANCH" = "release" ]; then
+  RELEASE_TYPE="Stable"
+
+  echo "Fetching release notes from GitHub..."
+  RELEASE_NOTES_JSON=$(curl -s --retry 5 --retry-delay 5 "$RELEASE_NOTES_URL")
+
+  if [ -z "$RELEASE_NOTES_JSON" ]; then
+    echo "Error: Failed to fetch release notes from GitHub"
+    exit 1
+  fi
+
+  LATEST_RELEASE=$(echo "$RELEASE_NOTES_JSON" | jq -r 'last')
+  EXTRA_NOTES=$(echo "$LATEST_RELEASE" | jq -r '.extra // ""')
+else
+  RELEASE_TYPE="Twilight"
+fi
+
+{
+  echo "# Zen ${RELEASE_TYPE} Release"
+
+  if [ "$RELEASE_TYPE" = "Twilight" ]; then
+    echo
+    echo "> [!NOTE]"
+    echo "> You're currently in Twilight mode, this means you're downloading the latest experimental features and updates."
+    echo ">"
+    echo "> If you encounter any issues, please report them on the [issues page](https://github.com/zen-browser/desktop/issues)."
+  fi
+
+  if [ "$RELEASE_TYPE" = "Stable" ]; then
+    echo "${EXTRA_NOTES}"
+
+    if echo "$LATEST_RELEASE" | jq -e '.security != null and .security != ""' > /dev/null; then
+      echo
+      echo "## Security"
+      echo "[Various security fixes]($(echo "$LATEST_RELEASE" | jq -r '.security'))"
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.features // []) | length > 0' > /dev/null; then
+      echo
+      echo "## New Features"
+      echo "$LATEST_RELEASE" | jq -r '.features[] | "- " + .'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.fixes // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Fixes"
+      echo "$LATEST_RELEASE" | jq -r '.fixes[] | if type=="object" then "- " + .description + " ([#" + (.issue|tostring) + "](" + "https://github.com/zen-browser/desktop/issues/" + (.issue|tostring) + "))" else "- " + . end'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.breakingChanges // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Breaking Changes"
+      echo "$LATEST_RELEASE" | jq -r '.breakingChanges[] | if type=="string" then "- " + . else "- " + .description + " [Learn more](" + .link + ")" end'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.themeChanges // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Theme Changes"
+      echo "$LATEST_RELEASE" | jq -r '.themeChanges[] | "- " + .'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.changes // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Changes"
+      echo "$LATEST_RELEASE" | jq -r '.changes[] | "- " + .'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.knownIssues // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Known Issues"
+      echo "$LATEST_RELEASE" | jq -r '.knownIssues[] | "- " + .'
+    fi
+  fi
+} > "release_notes.md"
+
+echo "Release notes generated: release_notes.md"

.github/workflows/src/release-build.sh

@@ -1,26 +1,30 @@
-set -ex
+#!/bin/bash
 
-if command -v apt-get &> /dev/null
-then
+set -xe
+
+if command -v apt-get &> /dev/null; then
+  sudo apt-get install python3-launchpadlib
   sudo apt-get update
-  sudo apt-get install -y xvfb
+  sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
 fi
 
+. $HOME/.cargo/env
+
 ulimit -n 4096
 
-# Check if xfvb is installed
-if ! command -v Xvfb &> /dev/null; then
+if command -v Xvfb &> /dev/null; then
   if ! test "$ZEN_CROSS_COMPILING"; then
-    Xvfb :2 -screen 0 1024x768x24 &
+    Xvfb :2 -nolisten tcp -noreset -screen 0 1024x768x24 &
     export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata
     export DISPLAY=:2
   fi
   export ZEN_RELEASE=1
-  pnpm build 
+  npm run build
 else
   echo "Xvfb could not be found, running without it"
   echo "ASSUMING YOU ARE RUNNING THIS ON MACOS"
+
   set -v
   export ZEN_RELEASE=1
-  pnpm build
+  npm run build
 fi

.github/workflows/stale.yml

@@ -1,29 +0,0 @@
-name: Close inactive issues
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-jobs:
-  close-issues:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - uses: actions/stale@v5
-        with:
-          days-before-issue-stale: 30
-          days-before-issue-close: 14
-          stale-issue-label: 'stale'
-          stale-issue-message: |
-            This issue is stale because it has been open for 30 days with no activity.
-
-            Please close this issue if you feel it is no longer relevant, or comment if you have more information to share.
-          close-issue-message: |
-            This issue was closed because it has been inactive for 14 days since being marked as stale.
-
-            If you think this issue should remain open, please comment with a request for it to be re-opened or open a new issue.
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/twilight-release-schedule.yml

@@ -1,8 +1,15 @@
 name: Zen Twilight Scheduled Releases
+
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 23 * * *'
   workflow_dispatch:
+    inputs:
+      create_release:
+        description: 'Whether to do a release'
+        required: false
+        type: boolean
+        default: true
 
 jobs:
   twilight-release-schedule:
@@ -11,8 +18,9 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/build.yml
     with:
-      create_release: true
+      create_release: ${{ github.event_name != 'workflow_dispatch' && true || inputs.create_release }}
       update_branch: twilight
+      use-sccache: false
       update_version: false
 
   post-build:
@@ -20,12 +28,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: twilight-release-schedule
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
-
-      # TODO:
+          node-version-file: '.nvmrc'

.github/workflows/update-submodules.yml

@@ -1,33 +0,0 @@
-
-name: Update Components Submodules
-
-on:
-  push:
-    branches:
-      - dev
-  pull_request:
-    branches:
-      - dev
-  workflow_dispatch:
-  workflow_call: # This is a custom event that we will trigger manually
-
-jobs:
-  update-submodules:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-          token: ${{ secrets.DEPLOY_KEY }}
-
-      - name: Update submodules
-        run: |
-          git submodule update --remote --merge
-
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: "[skip ci] 📦 Update Submodules!"
-          commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com

.github/workflows/windows-profile-build.yml

@@ -1,4 +1,8 @@
 name: Windows PGO Builds
+
+permissions:
+  contents: read
+
 on:
   workflow_call:
     inputs:
@@ -17,82 +21,95 @@ on:
 
 jobs:
   windows-profile-build:
-    name: Windows Profile Build - ${{ matrix.generic == true && 'generic' || 'specific' }}
+    name: |
+      Windows Profile Build - ${{ matrix.arch }}
     strategy:
       fail-fast: false
       matrix:
-        generic: [true, false]
-    runs-on: windows-latest
-    # Script edited from https://github.com/Floorp-Projects/Floorp/blob/ESR115/.github/workflows/window-generate-profile-data-and-jarlog.yml
+        arch: [x86_64, aarch64]
+
+    runs-on: ${{ inputs.release-branch == 'release' && 'windows-latest' || 'windows-latest' }}
+
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: '.nvmrc'
 
-      - name: Setup git
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
-      - name: Install pnpm
-        run: npm install -g pnpm
 
       - name: Install Surfer
-        run: |
-          npm i -g @zen-browser/surfer
-      - uses: actions/download-artifact@v4
-        name: Download artifact
+        run: npm i -g @zen-browser/surfer
+
+      - name: Load Surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download artifact
+        if: ${{ matrix.arch == 'x86_64' }}
+        uses: actions/download-artifact@v4
         with:
           path: C:\artifact
-          name: ${{ matrix.generic == true && 'generic' || 'specific' }}-zen-windows-x86_64-profile-data-and-jarlog.zip
+          name: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-zen-windows-profile-data-and-jarlog.zip
 
       - name: Unpack artifact
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           cd C:\artifact
           ls
           Expand-Archive -Path .\${{ inputs.profile-data-path-archive }} -DestinationPath C:\artifact
           ls
+
       - name: Setup
         run: |
-          (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe","C:\MozillaBuildSetup-Latest.exe")
+          (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe", "C:\MozillaBuildSetup-Latest.exe")
           C:\MozillaBuildSetup-Latest.exe /S | out-null
-      - name: Download firefox
+
+      - name: Download Firefox and dependencies
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
-          git config --global core.safecrlf false  
-          pnpm surfer download
+          git config --global core.safecrlf false
+          npm run download
+
+      - name: Import patches
+        if: ${{ matrix.arch == 'x86_64' }}
+        env:
+          SURFER_NO_BRANDING_PATCH: true
+        run: npm run import
+
       - name: Generate
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           ls
           $Env:USE_MINTTY = "0"
-          $workspace_dir_current = [regex]::replace($env:GITHUB_WORKSPACE, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\","/"
+          $workspace_dir_current = [regex]::replace($env:GITHUB_WORKSPACE, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\", "/"
           $workspace_dir = $workspace_dir_current + "/engine"
           echo $workspace_dir
           echo "cd $workspace_dir" '' >> mozilla-build-run.sh
           echo 'export PATH=/c/mozilla-build/msys2/usr/bin:$PATH' '' >> mozilla-build-run.sh
           echo './mach --no-interactive bootstrap --application-choice browser' '' >> mozilla-build-run.sh
-          echo 'ls /c/Users/runneradmin/.mozbuild/clang/bin' '' >> mozilla-build-run.sh
           echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
           C:\mozilla-build\start-shell.bat $workspace_dir_current\mozilla-build-run.sh
 
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
-
       - name: Move profile data
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           dir
           dir engine
           mv engine/merged.profdata merged.profdata
           mv engine/en-US.log en-US.log
 
-      - name: Publish artifacts
+      - name: Upload artifacts
+        if: ${{ matrix.arch == 'x86_64' }}
         uses: actions/upload-artifact@v4
         with:
+          retention-days: 1
           path: |
             merged.profdata
             en-US.log
-          name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}
+          name: windows-profdata-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}

.github/workflows/windows-release-build.yml

@@ -1,4 +1,8 @@
 name: Windows Release Build
+
+permissions:
+  contents: read
+
 on:
   workflow_call:
     inputs:
@@ -17,151 +21,219 @@ on:
         description: 'The branch to build'
         required: true
         type: string
+      MOZ_BUILD_DATE:
+        type: string
+        required: true
+        default: ''
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: boolean
+        default: false
 
 jobs:
   windows-build:
-    name: Build Windows - ${{ matrix.generic == true && 'Generic' || 'Specific' }}
-    runs-on: ubuntu-latest
+    name: Build Windows - ${{ matrix.arch }}
+    # aarch64 does not need full 16x, and we also dont use full LTO when generating GPO
+    runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'self-hosted' || 'blacksmith-8vcpu-ubuntu-2404' }}
+    env:
+      SCCACHE_GHA_ENABLED: ${{ inputs.use-sccache && 'true' || 'false' }}
+      CARGO_TERM_COLOR: always
+      RUSTC_WRAPPER: ${{ inputs.use-sccache && 'sccache' || '' }}
+      CARGO_INCREMENTAL: 0
     strategy:
       fail-fast: false
       matrix:
-        generic: [true, false]
-    
+        arch: [x86_64, aarch64]
+
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
           tool-cache: false
 
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Install pnpm
-        run: npm install -g pnpm
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
 
-      - name: Setup git
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@main
+        if: ${{ inputs.use-sccache }}
+        with:
+          disable_annotations: true
+
+      - name: Expose actions cache variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env['ACTIONS_CACHE_URL'])
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env['ACTIONS_RUNTIME_TOKEN'])
+
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
 
       - name: Install dependencies
         run: |
-          pnpm i
+          npm install
+          sudo apt-get update
+          sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm --fix-missing
 
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+      - name: Load Surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
-      - name: Download
-        run: pnpm surfer download
+      - name: Download Firefox and dependencies
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        run: npm run download
 
-      - name: 'win-cross Cache'
+      - name: win-cross Cache
         env:
           SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
         id: cache-win-cross
-        uses: actions/cache@v4
+        uses: useblacksmith/cache@v5
         with:
           path: ${HOME}/win-cross
           key: win-cross
 
-      - name: Configure sccache
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Setup For Windows
-        if: steps.cache-win-cross.outputs.cache-hit != 'true'
+      - name: Setup for Windows
+        if: steps.cache-win-cross.outputs.cache-hit != 'true' && !(inputs.generate-gpo && matrix.arch == 'aarch64')
         run: |
           set -x
           mkdir -p ~/win-cross
           cd engine/
-
+          sudo apt-get install python3-launchpadlib
+          sudo add-apt-repository ppa:savoury1/backports
+          sudo apt-get update
+          sudo apt-get install -y python3-pip autoconf \
+            autoconf2.13 \
+            automake \
+            bison \
+            build-essential \
+            cabextract \
+            curl \
+            cmake \
+            flex \
+            gawk \
+            gcc-multilib \
+            git \
+            gnupg \
+            jq \
+            libbz2-dev \
+            libexpat1-dev \
+            libffi-dev \
+            libncursesw5-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            libtool \
+            libucl-dev \
+            libxml2-dev \
+            msitools \
+            ninja-build \
+            openssh-client \
+            p7zip-full \
+            pkg-config \
+            procps \
+            python3-requests \
+            python3-toml \
+            scons \
+            subversion \
+            tar \
+            unzip \
+            uuid \
+            uuid-dev \
+            wget \
+            zip \
+            zlib1g-dev \
+            aria2
           echo Setup wine
           aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst
-          tar --zstd -xvf wine.tar.zst -C ~/win-cross
+          tar --zstd -xf wine.tar.zst -C ~/win-cross
           rm wine.tar.zst
-
           echo Setup Visual Studio
-          sudo apt install -y msitools python3-pip
           ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022
 
+      - name: Import
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          . "$HOME/.cargo/env"
+          npm run import -- --verbose
+
       - name: Bootstrap
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         run: |
           set -x
           cd engine/
-
           chmod -R +x "$(echo ~)/win-cross/vs2022" || true
-
           cd ..
-          npm install -g pnpm
           export SURFER_PLATFORM="win32"
-          pnpm surfer bootstrap
-
+          npm run bootstrap
           cd engine/
           ls ~/.mozbuild/clang/lib/clang/
           echo "export LIB=\"$(cd ~/.mozbuild/clang/lib/clang/* && cd lib/windows && pwd)\"" >> ../configs/common/mozconfig
           cat ../configs/common/mozconfig
-
           sudo apt-get update
           sudo apt-get install dos2unix
-
           ls ~/win-cross/wine || true
           ls ~/win-cross/vs2022 || true
 
-      - name: setup Rust
+      - name: Setup Rust
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         run: |
-          cd engine/
-          # Install a rust version compatible with 17
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
           source $HOME/.cargo/env
-
-          rustup target add x86_64-pc-windows-msvc
-          cargo install cargo-download
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-pc-windows-msvc
+          else
+            rustup target add x86_64-pc-windows-msvc
+          fi
+          cd engine/
+          cargo install cargo-download --locked
           cargo download -x windows=0.58.0
-          #? https://github.com/mozilla/sccache#known-caveats
           export CARGO_INCREMENTAL=0
-
           echo "" >> ../configs/common/mozconfig
           echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.58.0" >> ../configs/common/mozconfig
 
-      - name: Import
-        env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
-        run: pnpm surfer import --verbose
-
       - name: Build language packs
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         run: sh scripts/download-language-packs.sh
 
-      - uses: actions/download-artifact@v4
-        name: Download artifact if use profdata
-        if: ${{ !inputs.generate-gpo }}
+      - name: Download artifact (if use profdata)
+        uses: actions/download-artifact@v4
+        if: ${{ !inputs.generate-gpo && matrix.arch == 'x86_64' }}
         with:
           path: ~/artifact
-          name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}
+          name: windows-profdata-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
 
       - name: Show artifact info
-        if: ${{ !inputs.generate-gpo }}
+        if: ${{ !inputs.generate-gpo && matrix.arch == 'x86_64' }}
         run: |
           ls ~/artifact
           ls ~/artifact/en-US.log
           ls ~/artifact/merged.profdata
-
           chmod +x ~/artifact/en-US.log
           chmod +x ~/artifact/merged.profdata
 
+      - name: Insert API Keys
+        run: |
+          mkdir -p ~/.zen-keys
+          echo "${{ secrets.ZEN_SAFEBROWSING_API_KEY }}" > ~/.zen-keys/safebrowsing.dat
+
       - name: Build
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
         run: |
           set -x
           dos2unix configs/windows/mozconfig
@@ -170,26 +242,32 @@ jobs:
           if test ${{ inputs.generate-gpo }} = true; then
             export ZEN_GA_GENERATE_PROFILE=1
           fi
-          sh .github/workflows/src/release-build.sh
+          if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
+            export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
+          fi
+          bash .github/workflows/src/release-build.sh
 
       - name: Package
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_GA_DISABLE_PGO: true
         run: |
           set -x
           export SURFER_PLATFORM="win32"
-          pnpm package
-          mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64.zip zen.win64.zip
+          export ZEN_CROSS_COMPILING=1
+          export ZEN_RELEASE=1
+          npm run package
+          mv ./dist/zen-$(npm run --silent surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls ./dist
           ls .
 
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
+      - name: Remove API Keys
+        run: |
+          rm -rf ~/.zen-keys
 
       - name: Move package for PGO upload
-        if: ${{ inputs.generate-gpo }}
+        if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
         run: |
           set -x
           mv ./zen.win64.zip ./zen.win64-pgo-stage-1.zip
@@ -197,55 +275,69 @@ jobs:
       - name: Rename artifacts
         if: ${{ !inputs.generate-gpo }}
         run: |
-          mv ./zen.win64.zip zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
-          mv ./dist/output.mar windows${{ matrix.generic == true && '-generic' || '' }}.mar
-          mv ./dist/zen.installer.exe ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+          mv ./zen.win64.zip zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
+          mv ./dist/output.mar windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
+          mv ./dist/zen.installer.exe ./zen.installer${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.exe
 
-      - name: Upload PGO build
+      - name: Upload artifact (PGO)
         uses: actions/upload-artifact@v4
-        if: ${{ inputs.generate-gpo }}
+        if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
         with:
-          name: ${{ matrix.generic == true && 'generic' || 'specific' }}-${{ inputs.profile-data-path-archive }}
+          retention-days: 5
+          name: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-${{ inputs.profile-data-path-archive }}
           path: ./zen.win64-pgo-stage-1.zip
 
       - name: Remove unnecessary files from obj
         if: ${{ !inputs.generate-gpo }}
         run: |
           set -x
-          find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \;
-          find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
-          
+          mkdir obj-${{ matrix.arch }}-pc-windows-msvc/
+
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/_tests
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/config/autoconf.mk
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/config.statusd/substs/
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/dist/install
+
+          find engine/obj-${{ matrix.arch }}-pc-windows-msvc/dist -maxdepth 1 -type f -name "*.zip" -delete
+
+          cp -r --no-dereference engine/obj-${{ matrix.arch }}-pc-windows-msvc/* obj-${{ matrix.arch }}-pc-windows-msvc/ || true
+
       - name: Upload dist object
         if: ${{ !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: windows-x64-obj-${{ matrix.generic == true && 'generic' || 'specific' }}
-          path: engine/obj-x86_64-pc-windows-msvc/
+          retention-days: 2
+          name: windows-x64-obj-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
+          path: obj-${{ matrix.arch }}-pc-windows-msvc
 
-      - name: Upload zip file if twilight branch
+      - name: Upload artifact (if Twilight branch, binary)
         if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
-          path: ./zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
+          retention-days: 5
+          name: zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
+          path: ./zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
 
-      - name: Upload installer if twilight branch
+      - name: Upload artifact (if Twilight branch, installer)
         if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
-          path: ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+          retention-days: 5
+          name: zen.installer${{ matrix.arch == 'aarch64' && '-arm64' ||  '' }}.exe
+          path: ./zen.installer${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.exe
 
-      - name: Upload mar if twilight branch
+      - name: Upload artifact (if Twilight branch, .mar)
         if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: windows${{ matrix.generic == true && '-generic' || '' }}.mar
-          path: ./windows${{ matrix.generic == true && '-generic' || '' }}.mar
+          retention-days: 5
+          name: windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
+          path: ./windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
 
-      - name: Upload update manifests if twilight branch
+      - name: Upload artifact (if Twilight branch, update manifests)
         if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: windows_update_manifest_${{ matrix.generic == true && 'generic' || 'specific' }}
+          retention-days: 5
+          name: windows_update_manifest_${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
           path: ./dist/update

.gitignore

@@ -1,3 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 .dotbuild/
 engine/
@@ -8,4 +11,14 @@ node_modules/
 __pycache__/
 dist/
 
-windsign-temp/
+windsign-temp/
+venv/
+
+!firefox-cache/
+win-cross/
+
+!firefox-patches/
+target/
+.vscode/
+
+locales/firefox-l10n/

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "src/browser/base/content/zen-components"]
-	path = src/browser/base/content/zen-components
-	url = https://github.com/zen-browser/components
-[submodule "l10n"]
-	path = l10n
-	url = https://github.com/zen-browser/l10n-packs

.husky/pre-commit

@@ -1 +1 @@
-# npx lint-staged
+npx lint-staged

.nvmrc

@@ -0,0 +1 @@
+20

.prettierignore

@@ -1,12 +1,37 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 engine/
 
 **/*.html
 **/*.xhtml
 **/*.inc.xhtml
+**/*.bundle.min.js
+**/*.min.js
+**/*.min.mjs
 
 **/*.svg
 
+**/*.inc.css
+
+surfer.json
+
 src/browser/app/profile/*.js
 pnpm-lock.yaml
 
-**/engine/
+**/engine/
+
+docs/issue-metrics/*.md
+
+.husky/
+
+# Some CSS files are preprocessed and prettier doesn't handle them well
+# We also dont want to format the CSS files that are generated by the build
+src/zen/tabs/zen-tabs.css
+src/zen/compact-mode/zen-compact-mode.css
+src/zen/common/ZenEmojis.mjs
+
+src/zen/workspaces/zen-workspaces.css
+
+*.inc

.prettierrc.json

@@ -7,6 +7,6 @@
   "useTabs": false,
   "jsxSingleQuote": false,
   "semi": true,
-  "printWidth": 128,
-  "plugins": []
+  "printWidth": 100,
+  "plugins": ["prettier-plugin-sh"]
 }

.python-version

@@ -0,0 +1 @@
+3.11

.rust-toolchain

@@ -0,0 +1 @@
+1.82

.vscode/settings.json

@@ -1,30 +0,0 @@
-{
-  "files.associations": {
-    "*.inc": "cpp",
-    "typeindex": "cpp",
-    "typeinfo": "cpp",
-    "functional": "cpp",
-    "array": "cpp",
-    "*.tcc": "cpp",
-    "memory": "cpp",
-    "future": "cpp",
-    "istream": "cpp",
-    "tuple": "cpp",
-    "utility": "cpp",
-    "variant": "cpp",
-    "compare": "cpp",
-    "thread": "cpp",
-    "string": "cpp",
-    "string_view": "cpp",
-    "span": "cpp",
-    "vector": "cpp",
-    "charconv": "cpp",
-    "chrono": "cpp",
-    "optional": "cpp",
-    "format": "cpp",
-    "ratio": "cpp",
-    "system_error": "cpp",
-    "regex": "cpp",
-    "type_traits": "cpp"
-  }
-}

.well-known/funding-manifest-urls

@@ -0,0 +1 @@
+https://zen-browser.app/funding.json

AppDir/AppRun

@@ -1,14 +0,0 @@
-#!/bin/sh
-SELF=$(readlink -f "$0")
-HERE=${SELF%/*}
-export PATH="${HERE}:${HERE}/usr/bin/:${HERE}/usr/sbin/:${HERE}/usr/games/:${HERE}/bin/:${HERE}/sbin/${PATH:+:$PATH}"
-export LD_LIBRARY_PATH="${HERE}/usr/lib/:${HERE}/usr/lib/i386-linux-gnu/:${HERE}/usr/lib/x86_64-linux-gnu/:${HERE}/usr/lib32/:${HERE}/usr/lib64/:${HERE}/lib/:${HERE}/lib/i386-linux-gnu/:${HERE}/lib/x86_64-linux-gnu/:${HERE}/lib32/:${HERE}/lib64/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-export PYTHONPATH="${HERE}/usr/share/pyshared/${PYTHONPATH:+:$PYTHONPATH}"
-export MOZ_LEGACY_PROFILES=1 # Prevent per installation profiles
-DEFAULT_XDG_DATA_DIRS='./share/:/usr/share/gnome:/usr/local/share/:/usr/share/'
-export XDG_DATA_DIRS="${HERE}/usr/share/:${XDG_DATA_DIRS:-$DEFAULT_XDG_DATA_DIRS}"
-export PERLLIB="${HERE}/usr/share/perl5/:${HERE}/usr/lib/perl5/${PERLLIB:+:$PERLLIB}"
-export GSETTINGS_SCHEMA_DIR="${HERE}/usr/share/glib-2.0/schemas/${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
-export QT_PLUGIN_PATH="${HERE}/usr/lib/qt4/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt4/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt4/plugins/:${HERE}/usr/lib32/qt4/plugins/:${HERE}/usr/lib64/qt4/plugins/:${HERE}/usr/lib/qt5/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt5/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt5/plugins/:${HERE}/usr/lib32/qt5/plugins/:${HERE}/usr/lib64/qt5/plugins/${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}"
-EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 1)
-exec "${EXEC}" "$@"

CODEOWNERS

@@ -1 +1 @@
-*                    @mauro-balades 
+* @mr-cheffy

CODE_OF_CONDUCT.md

@@ -1,3 +1,9 @@
+<!--
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   -->
+
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
@@ -17,23 +23,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
+- Focusing on what is best not just for us as individuals, but for the
   overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
+- The use of sexualized language or imagery, and sexual attention or
   advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
   address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
@@ -106,7 +112,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
+standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
 **Consequence**: A permanent ban from any sort of public interaction within

README.md

@@ -1,140 +1,52 @@
-<div align="center">
-<picture>
-    <img src="./docs/assets/zen-black.svg" width="128px">
-</picture>
-</div>
-<h1 align="center">
-Zen Browser
-</h1>
+<!--
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   -->
+<!-- TODO: Get a job -->
+<img src="./docs/assets/zen-dark.svg" width="100px" align="left">
 
-Experience tranquillity while browsing the web without people tracking you!
-
-- [Website](https://zen-browser.app)
-- [Download](https://zen-browser.app/download)
-- [Release Notes](https://zen-browser.app/release-notes/latest)
+### `Zen Browser`
 
 [![Downloads](https://img.shields.io/github/downloads/zen-browser/desktop/total.svg)](https://github.com/zen-browser/desktop/releases)
 [![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser)
+[![Zen Release builds](https://github.com/zen-browser/desktop/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/zen-browser/desktop/actions/workflows/build.yml)
 
-[![Flathub](https://flathub.org/api/badge?locale=en)](https://flathub.org/apps/io.github.zen_browser.zen)
+Zen is a firefox-based browser with the aim of pushing your productivity to a new level!
 
-[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/zen_browser)
+<div flex="true">
+  <a href="https://zen-browser.app/download">
+    Download
+  </a>
+  •
+  <a href="https://zen-browser.app">
+    Website
+  </a>
+  •
+  <a href="https://docs.zen-browser.app">
+    Documentation
+  </a>
+  •
+  <a href="https://zen-browser.app/release-notes/latest">
+    Release Notes
+  </a>
+</div>
 
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/zen_browser)
+### Firefox Versions
 
-# Compatibility
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `142.0.1`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 142.0.1`!
 
-Zen is currently built using firefox version `131.0.3`!
+### Contributing
 
-- Check out the latest [release notes](https://zen-browser.app/release-notes)!
+If you'd like to report a bug, please do so on our [GitHub Issues page](https://github.com/zen-browser/desktop/issues/) and for feature requests, you can use [Github Discussions](https://github.com/zen-browser/desktop/discussions).
 
-# Contribution
+Zen is an open-source project, and we welcome contributions from the community! Please take a look at the [contribution guidelines](./docs/contribute.md) before getting started!
 
-Zen is an open-source project, and we welcome contributions from the community!
+#### Partners
 
-- Check out the [contribution guidelines](./docs/contribute.md)!
+Thanks to all the partners of Zen for their support and contributions:
 
-# Performance
-
-Zen is built with performance in mind, and we have optimized the browser to be as fast as possible!
-
-- Checkout the latest [performance benchmarks](https://docs.zen-browser.app/benchmarks)!
-
-# Installation
-
-## Supported Operating Systems
-
-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
-- Available for ARM and Intel architectures
-
-You can also install Zen using Homebrew:
-
-```
-brew install --cask zen-browser
-```
-
-### Linux
-
-#### AppImage
-
-- `zsync` is required for the Update feature of the script below
-
-```
-bash <(curl https://updates.zen-browser.app/appimage.sh)
-```
-
-#### Flatpak
-
-```
-flatpak install flathub io.github.zen_browser.zen
-```
-
-#### Arch-based distributions
-
-##### Generic
-
-```
-yay -S zen-browser-bin
-```
-
-##### Optimized 
-
-```
-yay -S zen-browser-avx2-bin
-```
-
-To upgrade the browser to a newer version, use the embedded update functionality in `About Zen`.
-
-# Core Components
-
-Some components used by @zen-browser as an attempt to make firefox forks a better place, and for other to enjoy the beauty of OSS. You can find them [here](https://github.com/zen-browser/components).
-
-## 🚀 Run Locally
-
-In order to download and run zen locally, please follow [these instructions](https://docs.zen-browser.app/contribute/desktop).
-
-## Special Thanks
-
-Special thanks to... EVERYONE 🎉! Checkout the team and contributors page [here](https://zen-browser.app/about)
-
-## Third Party Code
-
-Zen couldn't be in its current state without the help of these amazing projects!
-
-- Zen's default preferences are based on [BetterFox](https://github.com/yokoffing/Betterfox)
-
-## License
-
-[MPL LICENSE](./LICENSE)
-
-## Star History
-
-<a href="https://star-history.com/#zen-browser/desktop&Date">
- <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date" />
- </picture>
+<a href="https://blacksmith.sh">
+  <img src="./docs/assets/blacksmith-yellow.png" width="350px"/>
 </a>

SECURITY.md

@@ -3,4 +3,9 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<svg xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 -960 960 960"><path d="M200-446.667v-66.666h560v66.666H200Z"/></svg>
+
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security vulnerabilities [here](https://github.com/zen-browser/desktop/security/advisories/new)

babel.config.json

@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-typescript"]
+}

build/AppDir/AppRun

@@ -0,0 +1,10 @@
+#!/bin/sh
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+CURRENTDIR="$(dirname "$(readlink -f "$0")")"
+export PATH="${CURRENTDIR}:${PATH}"
+export MOZ_LEGACY_PROFILES=1          # Prevent per installation profiles
+export MOZ_APP_LAUNCHER="${APPIMAGE}" # Allows setting as default browser
+exec "${CURRENTDIR}/zen" "$@"

build/AppDir/zen.desktop

@@ -5,7 +5,7 @@ Exec=zen %u
 Icon=zen
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
-StartupWMClass=zen-alpha
+StartupWMClass=zen
 Categories=Network;WebBrowser;
 StartupNotify=true
 Terminal=false

build/codesign/browser.developer.entitlements.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<!--
-     Entitlements to apply to the main browser process executable during
-     codesigning of production channel builds.
--->
-<plist version="1.0">
-  <dict>
-    <!-- Firefox needs to create executable pages (without MAP_JIT) -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
-    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
-    <key>com.apple.security.cs.allow-jit</key><true/>
-
-    <!-- Allow loading third party libraries. Needed for Flash and CDMs -->
-    <key>com.apple.security.cs.disable-library-validation</key><true/>
-
-    <!-- Firefox needs to access the microphone on sites the user allows -->
-    <key>com.apple.security.device.audio-input</key><true/>
-
-    <!-- Firefox needs to access the camera on sites the user allows -->
-    <key>com.apple.security.device.camera</key><true/>
-
-    <!-- Firefox needs to access the location on sites the user allows -->
-    <key>com.apple.security.personal-information.location</key><true/>
-
-    <!-- Allow Firefox to send Apple events to other applications. Needed
-         for native messaging webextension helper applications launched by
-         Firefox which rely on Apple Events to signal other processes. -->
-    <key>com.apple.security.automation.apple-events</key><true/>
-  </dict>
-</plist>

build/codesign/codesign.bash

@@ -1,169 +0,0 @@
-#!/bin/bash
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# Runs codesign commands to codesign a Firefox .app bundle and enable macOS
-# Hardened Runtime. Intended to be manually run by developers working on macOS
-# 10.14+ who want to enable Hardened Runtime for manual testing. This is
-# provided as a stop-gap until automated build tooling is available that signs
-# binaries with a certificate generated during builds (bug 1522409). This
-# script requires macOS 10.14 because Hardened Runtime is only available for
-# applications running on 10.14 despite support for the codesign "-o runtime"
-# option being available in 10.13.6 and newer.
-#
-# The script requires an identity string (-i option) from an Apple Developer
-# ID certificate. This can be found in the macOS KeyChain after configuring an
-# Apple Developer ID certificate.
-#
-# Example usage on macOS 10.14:
-#
-#   $ ./mach build
-#   $ ./mach build package
-#   $ open </PATH/TO/DMG/FILE.dmg>
-#   <Drag Nightly.app to ~>
-#   $ ./security/mac/hardenedruntime/codesign.bash \
-#         -a ~/Nightly.app \
-#         -i <MY-IDENTITY-STRING> \
-#         -b security/mac/hardenedruntime/browser.developer.entitlements.xml
-#         -p security/mac/hardenedruntime/plugin-container.developer.entitlements.xml
-#   $ open ~/Nightly.app
-#
-
-usage ()
-{
-  echo  "Usage: $0 "
-  echo  "    -a <PATH-TO-BROWSER.app>"
-  echo  "    -i <IDENTITY>"
-  echo  "    -b <ENTITLEMENTS-FILE>"
-  echo  "    -p <CHILD-ENTITLEMENTS-FILE>"
-  echo  "    [-o <OUTPUT-DMG-FILE>]"
-  exit -1
-}
-
-# Make sure we are running on macOS with the sw_vers command available.
-SWVERS=/usr/bin/sw_vers
-if [ ! -x ${SWVERS} ]; then
-    echo "ERROR: macOS 10.14 or later is required"
-    exit -1
-fi
-
-# Require macOS 10.14 or newer.
-#OSVERSION=`${SWVERS} -productVersion|sed -En 's/[0-9]+\.([0-9]+)\.[0-9]+/\1/p'`;
-#if [ ${OSVERSION} \< 14 ]; then
-#    echo "ERROR: macOS 10.14 or later is required"
-#    exit -1
-#fi
-
-while getopts "a:i:b:o:p:" opt; do
-  case ${opt} in
-    a ) BUNDLE=$OPTARG ;;
-    i ) IDENTITY=$OPTARG ;;
-    b ) BROWSER_ENTITLEMENTS_FILE=$OPTARG ;;
-    p ) PLUGINCONTAINER_ENTITLEMENTS_FILE=$OPTARG ;;
-    o ) OUTPUT_DMG_FILE=$OPTARG ;;
-    \? ) usage; exit -1 ;;
-  esac
-done
-
-if [ -z "${BUNDLE}" ] ||
-   [ -z "${IDENTITY}" ] ||
-   [ -z "${PLUGINCONTAINER_ENTITLEMENTS_FILE}" ] ||
-   [ -z "${BROWSER_ENTITLEMENTS_FILE}" ]; then
-    usage
-    exit -1
-fi
-
-if [ ! -d "${BUNDLE}" ]; then
-  echo "Invalid bundle. Bundle should be a .app directory"
-  usage
-  exit -1
-fi
-
-if [ ! -e "${PLUGINCONTAINER_ENTITLEMENTS_FILE}" ]; then
-  echo "Invalid entitlements file"
-  usage
-  exit -1
-fi
-
-if [ ! -e "${BROWSER_ENTITLEMENTS_FILE}" ]; then
-  echo "Invalid entitlements file"
-  usage
-  exit -1
-fi
-
-# DMG file output flag is optional
-if [ ! -z "${OUTPUT_DMG_FILE}" ] &&
-   [ -e "${OUTPUT_DMG_FILE}" ]; then
-  echo "Output dmg file ${OUTPUT_DMG_FILE} exists. Please delete it first."
-  usage
-  exit -1
-fi
-
-echo "-------------------------------------------------------------------------"
-echo "bundle:                              $BUNDLE"
-echo "identity:                            $IDENTITY"
-echo "browser entitlements file:           $BROWSER_ENTITLEMENTS_FILE"
-echo "plugin-container entitlements file:  $PLUGINCONTAINER_ENTITLEMENTS_FILE"
-echo "output dmg file (optional):          $OUTPUT_DMG_FILE"
-echo "-------------------------------------------------------------------------"
-
-set -x
-
-# Clear extended attributes which cause codesign to fail
-xattr -cr "${BUNDLE}"
-
-# Sign these binaries first. Signing of some binaries has an ordering
-# requirement where other binaries must be signed first.
-codesign --force -o runtime --verbose --sign "$IDENTITY" \
-"${BUNDLE}/Contents/Library/LaunchServices/org.mozilla.updater" \
-"${BUNDLE}/Contents/MacOS/XUL" \
-"${BUNDLE}/Contents/MacOS/pingsender" \
-"${BUNDLE}/Contents/MacOS/*.dylib" \
-
-codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
-"${BUNDLE}"/Contents/MacOS/updater.app
-
-# Sign zen main executable
-codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
---entitlements ${BROWSER_ENTITLEMENTS_FILE} \
-"${BUNDLE}"/Contents/MacOS/zen
-
-# Sign Library/LaunchServices
-codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
-"${BUNDLE}"/Contents/Library/LaunchServices/org.mozilla.updater
-
-# Sign gmp-clearkey files
-find "${BUNDLE}"/Contents/Resources/gmp-clearkey -type f -exec \
-codesign --force -o runtime --verbose --sign "$IDENTITY" {} \;
-
-# Sign the main bundle
-codesign --force -o runtime --verbose --sign "$IDENTITY" \
---entitlements ${BROWSER_ENTITLEMENTS_FILE} "${BUNDLE}"
-
-# Sign the plugin-container bundle with deep
-codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
---entitlements ${PLUGINCONTAINER_ENTITLEMENTS_FILE} \
-"${BUNDLE}"/Contents/MacOS/plugin-container.app
-
-# Validate
-codesign -vvv --deep --strict "${BUNDLE}"
-
-# Create a DMG
-if [ ! -z "${OUTPUT_DMG_FILE}" ]; then
-  DISK_IMAGE_DIR=`mktemp -d`
-  TEMP_FILE=`mktemp`
-  TEMP_DMG=${TEMP_FILE}.dmg
-  NAME=`basename "${BUNDLE}"`
-
-  ditto "${BUNDLE}" "${DISK_IMAGE_DIR}/${NAME}"
-  hdiutil create -size 400m -fs HFS+ \
-    -volname Firefox -srcfolder "${DISK_IMAGE_DIR}" "${TEMP_DMG}"
-  hdiutil convert -format UDZO \
-    -o "${OUTPUT_DMG_FILE}" "${TEMP_DMG}"
-
-  rm ${TEMP_FILE}
-  rm ${TEMP_DMG}
-  rm -rf "${DISK_IMAGE_DIR}"
-fi

build/codesign/plugin-container.developer.entitlements.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<!--
-     Entitlements to apply to the plugin-container.app bundle during
-     codesigning of production channel builds.
--->
-<plist version="1.0">
-  <dict>
-    <!-- Firefox needs to create executable pages (without MAP_JIT) -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
-    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
-    <key>com.apple.security.cs.allow-jit</key><true/>
-
-    <!-- Allow loading third party libraries. Needed for Flash and CDMs -->
-    <key>com.apple.security.cs.disable-library-validation</key><true/>
-
-    <!-- Firefox needs to access the microphone on sites the user allows -->
-    <key>com.apple.security.device.audio-input</key><true/>
-
-    <!-- Firefox needs to access the camera on sites the user allows -->
-    <key>com.apple.security.device.camera</key><true/>
-
-    <!-- Firefox needs to access the location on sites the user allows -->
-    <key>com.apple.security.personal-information.location</key><true/>
-
-    <!-- Allow Firefox to send Apple events to other applications. Needed
-         for native messaging webextension helper applications launched by
-         Firefox which rely on Apple Events to signal other processes. -->
-    <key>com.apple.security.automation.apple-events</key><true/>
-  </dict>
-</plist>

build/firefox-cache/l10n-last-commit-hash

@@ -0,0 +1 @@
+df0d5e625b9e55c502d3e9e81b29a0d52d0f8d20

build/flatpak/app.zen_browser.zen.yml.template

@@ -0,0 +1,76 @@
+app-id: app.zen_browser.zen
+runtime: org.freedesktop.Platform
+runtime-version: '24.08'
+sdk: org.freedesktop.Sdk
+base: org.mozilla.firefox.BaseApp
+base-version: '24.08'
+add-extensions:
+  org.freedesktop.Platform.ffmpeg-full:
+    directory: lib/ffmpeg
+    version: '24.08'
+    add-ld-path: .
+command: launch-script.sh
+finish-args:
+  - --share=ipc
+  - --share=network
+  - --socket=pulseaudio
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --socket=pcsc
+  - --socket=cups
+  - --persist=.zen
+  - --filesystem=xdg-download:rw
+  - --device=all
+  - --talk-name=org.freedesktop.FileManager1
+  - --talk-name=org.freedesktop.ScreenSaver
+  - --own-name=org.mozilla.zen.*
+  - --own-name=org.mpris.MediaPlayer2.firefox.*
+  - --system-talk-name=org.freedesktop.NetworkManager
+  - --talk-name=org.a11y.Bus
+  - --env=GTK_PATH=/app/lib/gtkmodules
+  - --env=MESA_SHADER_CACHE_DIR=/var/cache/mesa_shader_cache_db
+modules:
+  - name: zen_browser
+    buildsystem: simple
+    build-commands:
+      - mv zen /app/
+      - mkdir -p /app/lib/ffmpeg
+
+      - install -Dm0755 metadata/launch-script.sh ${{FLATPAK_DEST}}/bin/launch-script.sh
+      - install -Dm0644 metadata/policies.json ${{FLATPAK_DEST}}/bin/distribution/policies.json
+      - install -Dm0644 metadata/icons/${{FLATPAK_ID}}.svg ${{FLATPAK_DEST}}/share/icons/hicolor/scalable/apps/${{FLATPAK_ID}}.svg
+      - install -Dm0644 metadata/${{FLATPAK_ID}}.metainfo.xml ${{FLATPAK_DEST}}/share/metainfo/${{FLATPAK_ID}}.metainfo.xml
+      - install -Dm0644 metadata/${{FLATPAK_ID}}.desktop ${{FLATPAK_DEST}}/share/applications/${{FLATPAK_ID}}.desktop
+
+    sources:
+      - type: archive
+        url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-x86_64.tar.xz
+        sha256: {linux_sha256}
+        strip-components: 0
+        only-arches:
+          - x86_64
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/zen-browser/desktop/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="zen.linux-x86_64.tar.xz") | .browser_download_url
+          is-main-source: true
+
+      - type: archive
+        url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-aarch64.tar.xz
+        sha256: {linux_aarch64_sha256}
+        strip-components: 0
+        only-arches:
+          - aarch64
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/zen-browser/desktop/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="zen.linux-aarch64.tar.xz") | .browser_download_url
+          is-main-source: true
+
+      - type: archive
+        url: https://github.com/zen-browser/flatpak/releases/download/{version}/archive.tar
+        sha256: {flatpak_sha256}
+        strip-components: 0
+        dest: metadata

build/ts/transform-ts.js

@@ -0,0 +1,14 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+const fs = require('fs');
+const MJS_FILES = ['src/zen/split-view/ZenViewSplitter.ts'];
+
+for (const file of MJS_FILES) {
+  const code = fs.readFileSync(file, 'utf8');
+  require('@babel/core').transformSync(code, {
+    presets: ['@babel/preset-typescript'],
+    filename: file,
+  });
+}

build/winsign/bootstrap.ps1

@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+(New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe", "C:\MozillaBuildSetup-Latest.exe")
+C:\MozillaBuildSetup-Latest.exe /S | out-null
+
+rustup target add aarch64-pc-windows-msvc
+rustup target add x86_64-pc-windows-msvc
+
+cd engine
+./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ../win-cross/vs2022
+cd ..

build/winsign/firefox_update.ps1

@@ -0,0 +1,15 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+Remove-Item -Recurse -Force engine
+Remove-Item -Recurse -Force .surfer
+
+npm run init
+
+$job = Start-Job -ScriptBlock {
+    npm run build
+}
+
+# Wait for job to complete with timeout (in seconds)
+$job | Wait-Job -Timeout 5

build/winsign/sign.ps1

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 param(
     [string][Parameter(Mandatory=$true)]$SignIdentity,
     [string][Parameter(Mandatory=$true)]$GithubRunId
@@ -6,108 +10,222 @@ param(
 $ErrorActionPreference = "Stop"
 
 echo "Preparing environment"
-git pull --recurse-submodules
+git pull origin dev --recurse
 mkdir windsign-temp -ErrorAction SilentlyContinue
 
 # Download in parallel
-gh run download $GithubRunId --name windows-x64-obj-specific -p windsign-temp\windows-x64-obj-specific
-gh run download $GithubRunId --name windows-x64-obj-generic -p windsign-temp\windows-x64-obj-generic
+
+#show output too
+#Start-Job -Name "DownloadGitObjectsRepo" -ScriptBlock {
+#    param($PWD)
+#    echo "Downloading git objects repo to $PWD\windsign-temp\windows-binaries"
+#    git clone https://github.com/zen-browser/windows-binaries.git $PWD\windsign-temp\windows-binaries
+#    echo "Downloaded git objects repo to"
+#} -Verbose -ArgumentList $PWD -Debug
+
+Start-Job -Name "DownloadGitl10n" -ScriptBlock {
+    param($PWD)
+    cd $PWD
+    $env:ZEN_L10N_CURR_DIR=[regex]::replace($PWD, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\", "/"
+    C:\mozilla-build\start-shell.bat $PWD\scripts\download-language-packs.sh
+    echo "Fetched l10n and Firefox's one"
+} -Verbose -ArgumentList $PWD -Debug
+
+Start-Job -Name "SurferInit" -ScriptBlock {
+    param($PWD)
+    cd $PWD
+    npm run import -- --verbose
+    npm run surfer -- ci --brand release
+} -Verbose -ArgumentList $PWD -Debug
+
+echo "Downloading artifacts info"
+$artifactsInfo=gh api repos/zen-browser/desktop/actions/runs/$GithubRunId/artifacts
+$token = gh auth token
+
+function New-TemporaryDirectory {
+    $tmp = [System.IO.Path]::GetTempPath() # Not $env:TEMP, see https://stackoverflow.com/a/946017
+    $name = (New-Guid).ToString("N")
+    New-Item -ItemType Directory -Path (Join-Path $tmp $name)
+}
+
+function DownloadFile($url, $targetFile) {
+   $uri = New-Object "System.Uri" "$url"
+   $request = [System.Net.HttpWebRequest]::Create($uri)
+   $request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3"
+   $request.Headers.Add("Authorization", "Bearer $token")
+   $response = $request.GetResponse()
+   $totalLength = [System.Math]::Floor($response.get_ContentLength()/1024)
+   $responseStream = $response.GetResponseStream()
+   $targetStream = New-Object -TypeName System.IO.FileStream -ArgumentList $targetFile, Create
+   $buffer = new-object byte[] 10KB
+   $count = $responseStream.Read($buffer,0,$buffer.length)
+   $downloadedBytes = $count
+
+    while ($count -gt 0) {
+        $targetStream.Write($buffer, 0, $count)
+        $count = $responseStream.Read($buffer,0,$buffer.length)
+        $downloadedBytes = $downloadedBytes + $count
+        Write-Progress -activity "Downloading file '$($url.split('/') | Select -Last 1)'" -status "Downloaded ($([System.Math]::Floor($downloadedBytes/1024))K of $($totalLength)K): " -PercentComplete ((([System.Math]::Floor($downloadedBytes/1024)) / $totalLength)  * 100)
+    }
+
+   Write-Progress -activity "Finished downloading file '$($url.split('/') | Select -Last 1)'"
+
+   $targetStream.Flush()
+   $targetStream.Close()
+   $targetStream.Dispose()
+   $responseStream.Dispose()
+}
+
+function DownloadArtifacts($name) {
+    echo "Downloading artifacts for $name"
+    $artifactUrl=$($artifactsInfo | jq -r --arg NAME "windows-x64-obj-$name" '.artifacts[] | select(.name == $NAME) | .archive_download_url')
+    echo "Artifact URL: $artifactUrl"
+
+    # download the artifact
+    $outputPath="$PWD\windsign-temp\windows-x64-obj-$name"
+    $tempDir = New-TemporaryDirectory
+    $tempFile = Join-Path $tempDir "artifact-$($name).zip"
+
+    echo "Downloading artifact to $tempFile"
+    DownloadFile $artifactUrl $tempFile
+
+    Start-Job -Name "UnzipArtifact$name" -ScriptBlock {
+        param($tempFile, $outputPath)
+        echo "Unzipping artifact to $outputPath"
+        Expand-Archive -Path $tempFile -DestinationPath $outputPath -Force
+        echo "Unzipped artifact to $outputPath"
+    } -ArgumentList $tempFile, $outputPath -Verbose -Debug
+}
+
+DownloadArtifacts arm64
+DownloadArtifacts x86_64
+
+# Wait for the jobs to finish
+Wait-Job -Name "UnzipArtifactarm64"
+Wait-Job -Name "UnzipArtifactx86_64"
 
 mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
-mkdir .\.github\workflows\object\ -ErrorAction SilentlyContinue
 
-pnpm surfer ci --brand alpha
+# Collect all .exe and .dll files into a list
+$files = Get-ChildItem windsign-temp\windows-x64-obj-x86_64\ -Recurse -Include *.exe
+$files += Get-ChildItem windsign-temp\windows-x64-obj-x86_64\ -Recurse -Include *.dll
+
+$files += Get-ChildItem windsign-temp\windows-x64-obj-arm64\ -Recurse -Include *.exe
+$files += Get-ChildItem windsign-temp\windows-x64-obj-arm64\ -Recurse -Include *.dll
+
+signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
+
+$env:ZEN_RELEASE="true"
+$env:SURFER_SIGNING_MODE="true"
+$env:SCCACHE_GHA_ENABLED="false"
+Wait-Job -Name "SurferInit"
+Wait-Job -Name "DownloadGitl10n"
 
 function SignAndPackage($name) {
     echo "Executing on $name"
     rmdir .\dist -Recurse -ErrorAction SilentlyContinue
-    rmdir engine\obj-x86_64-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
-    cp windsign-temp\windows-x64-obj-$name engine\obj-x86_64-pc-windows-msvc\ -Recurse
-    echo "Signing $name"
-
-    # Collect all .exe and .dll files into a list
-    $files = Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Include *.exe
-    $files += Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Include *.dll
-
-    signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files /ph
-    echo "Packaging $name"
-    $env:SURFER_SIGNING_MODE="sign"
-    $env:MAR="$PWD\\build\\winsign\\mar.exe"
-    if ($name -eq "generic") {
-        $env:SURFER_COMPAT="true"
-    } else {
-        rm env:SURFER_COMPAT -ErrorAction SilentlyContinue
+    rmdir engine\obj-$name-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
+    $objName=$name
+    # instead of arm, use aarch64
+    if ($name -eq "arm64") {
+        $objName="aarch64"
     }
 
+    echo "Removing old obj dir"
+    rmdir engine\obj-$objName-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
+
+    echo "Creating new obj dir"
+    cp windsign-temp\windows-x64-obj-$name engine\obj-$objName-pc-windows-msvc\ -Recurse
+
+    echo "Copying setup.exe into obj dir"
+    $env:ZEN_SETUP_EXE_PATH="$PWD\windsign-temp\windows-x64-obj-$name\browser\installer\windows\instgen\setup.exe"
+
+    if ($name -eq "arm64") {
+        $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\arm64\Microsoft.VC143.CRT"
+    } else {
+        $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT"
+    }
+
+    $env:MAR="..\\build\\winsign\\mar.exe"
+    if ($name -eq "arm64") {
+        $env:SURFER_COMPAT="aarch64"
+    } else {
+        $env:SURFER_COMPAT="x86_64"
+    }
     echo "Compat Mode? $env:SURFER_COMPAT"
-    pnpm surfer package --verbose
+
+    # Configure each time since we are cloning from a linux environment into
+    # a windows environment, and the build system is not smart enough to detect that
+    # we are on a different platform.
+    cd .\engine
+    echo "Configuring for $name"
+    .\mach configure
+    cd ..
+
+    echo "Packaging $name"
+    npm run package -- --verbose
 
     # In the release script, we do the following:
-    #  tar -xvf .github/workflows/object/windows-x64-signed-generic.tar.gz -C windows-x64-signed-generic
+    #  tar -xvf .github/workflows/object/windows-x64-signed-x86_64.tar.gz -C windows-x64-signed-x86_64
     # We need to create a tar with the same structure and no top-level directory
     # Inside, we need:
     #  - update_manifest/*
-    #  - windows.mar or windows-generic.mar
-    #  - zen.installer.exe or zen.installer-generic.exe
-    #  - zen.win-generic.zip or zen.win-specific.zip
+    #  - windows.mar
+    #  - zen.installer.exe
     echo "Creating tar for $name"
     rm .\windsign-temp\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
     mkdir windsign-temp\windows-x64-signed-$name
-    
-    # Move the MAR, add the `-generic` suffix if needed
-    if ($name -eq "generic") {
-        mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows-generic.mar
+
+    # Move the MAR, add the `-arm64` suffix if needed
+    echo "Moving MAR for $name"
+    if ($name -eq "arm64") {
+        mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows-$name.mar
     } else {
         mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows.mar
     }
 
     # Move the installer
-    if ($name -eq "generic") {
-        mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer-generic.exe
+    echo "Moving installer for $name"
+    if ($name -eq "arm64") {
+        mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer-$name.exe
     } else {
         mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer.exe
     }
 
-    # 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 sha256 /v $files /ph
-    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
     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
-    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
+    rmdir .\windsign-temp\windows-binaries\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
+    mv windsign-temp\windows-x64-signed-$name .\windsign-temp\windows-binaries -Force
+    rmdir engine\obj-$objName-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
 
     echo "Finished $name"
 }
 
-SignAndPackage specific
-SignAndPackage generic
+SignAndPackage arm64
+SignAndPackage x86_64
+
+$files = Get-ChildItem .\windsign-temp\windows-binaries -Recurse -Include *.exe
+signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
 
 echo "All artifacts signed and packaged, ready for release!"
 echo "Commiting the changes to the repository"
-git add .\.github\workflows\object
+cd windsign-temp\windows-binaries
+git add .
 git commit -m "Sign and package windows artifacts"
 git push
+cd ..\..
 
 # Cleaning up
 
 echo "All done!"
-echo "All the artifacts (Generic and Specific) are signed and packaged, get a rest now!"
+echo "All the artifacts (x86_64 and arm46) are signed and packaged, get a rest now!"
 Read-Host "Press Enter to continue"
 
-echo "Cleaning up" 
-rmdir windsign-temp -Recurse -ErrorAction SilentlyContinue
+echo "Cleaning up"
+rmdir windsign-temp\windows-x64-obj-x86_64 -Recurse -ErrorAction SilentlyContinue
+rmdir windsign-temp\windows-x64-obj-arm64 -Recurse -ErrorAction SilentlyContinue
 
 echo "Opening visual studio code"
 code .

configs/branding/alpha/content/about-logo-private.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.g{fill:#000;}.g,.h,.i{stroke-width:0px;}.h{fill:url(#e);}.i{fill:#fff;}</style><linearGradient id="e" x1="128" y1="256" x2="128" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><g id="c"><rect class="g" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="d"><rect class="h" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="f"><path class="i" d="M165.9156,146.3156c-15.6016,0-28.6656,11.0055-31.8813,25.6562h-12.0687c-3.2156-14.6508-16.2797-25.6562-31.8813-25.6562-18.0063,0-32.6562,14.65-32.6562,32.6562s14.65,32.6562,32.6562,32.6562c15.6016,0,28.6656-11.0055,31.8813-25.6562h12.0687c3.2156,14.6508,16.2797,25.6562,31.8813,25.6562,18.0063,0,32.6562-14.65,32.6562-32.6562s-14.65-32.6562-32.6562-32.6562ZM90.0844,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562ZM165.9156,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562Z"/><path class="i" d="M214.4,115.6812h-21.8391l-9.2422-65.2906c-.3031-2.1406-1.5813-4.0219-3.4594-5.0969-1.8781-1.0719-4.1469-1.2188-6.1469-.3906l-45.7125,18.8906-45.7125-18.8906c-2-.8281-4.2688-.6813-6.1469.3906-1.8781,1.075-3.1562,2.9562-3.4594,5.0969l-9.2422,65.2906h-21.8391c-3.8656,0-7,3.1344-7,7s3.1344,7,7,7h172.8c3.8656,0,7-3.1344,7-7s-3.1344-7-7-7ZM85.2781,61.2875l40.0469,16.55c1.7125.7063,3.6375.7063,5.35,0l40.0469-16.55,7.6984,54.3937h-100.8406l7.6984-54.3937Z"/></g></svg>

configs/branding/alpha/content/about-logo.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 80 80"><defs><style>.g{fill:#000;}.g,.h,.i{stroke-width:0px;}.h{fill:url(#e);}.i{fill:#fef9fe;}</style><linearGradient id="e" x1="40" y1="80" x2="40" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><g id="c"><rect class="g" width="80" height="80" rx="18.25" ry="18.25"/></g><g id="d"><rect class="h" width="80" height="80" rx="18.25" ry="18.25"/></g><g id="f"><path class="i" d="M63.4352,57.677c-.0536,3.2125-2.7416,5.7589-5.9546,5.7589h-22.0762c-1.1221,0-1.8295-1.2103-1.2751-2.1859,1.4628-2.5738,4.3202-6.7829,8.5529-9.1539.4406-.2468.9366-.3783,1.4416-.3783h13.4532c3.2692,0,5.9129,2.6774,5.8582,5.9591Z"/><path class="i" d="M45.8707,18.7498c-1.4628,2.5738-4.3202,6.7829-8.5529,9.1539-.4406.2468-.9366.3783-1.4416.3783h-13.3567c-3.213,0-5.901-2.5464-5.9546-5.7589-.0547-3.2817,2.589-5.9591,5.8582-5.9591h22.1726c1.1221,0,1.8295,1.2103,1.2751,2.1859Z"/><path class="i" d="M22.4207,63.4375c-.7473,0-1.5065-.1438-2.2398-.4475-2.9896-1.2383-4.4093-4.6657-3.171-7.6551,1.9045-4.5977,4.6342-8.7196,8.1136-12.2511,3.6044-3.6585,7.8551-6.5172,12.6343-8.4968,6.5691-2.7211,11.6853-7.8373,14.4061-14.4061,1.2383-2.9896,4.6658-4.409,7.6551-3.171,2.9896,1.2383,4.4093,4.6657,3.171,7.6551-1.9045,4.5977-4.6342,8.7196-8.1136,12.2511-3.6044,3.6585-7.8551,6.5172-12.6343,8.4968-6.5691,2.7211-11.6853,7.8373-14.4061,14.4061-.9345,2.2562-3.1164,3.6185-5.4153,3.6185Z"/></g></svg>

configs/branding/release/content/about-logo-private.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.h{filter:url(#f);}.i{fill:#202020;}.j{fill:#f2f0e3;}</style><filter id="f" x="-.4" y="1.68" width="256.8" height="256.8" filterUnits="userSpaceOnUse"><feOffset dx="0" dy="2"/><feGaussianBlur result="g" stdDeviation="2"/><feFlood flood-color="#000" flood-opacity=".5"/><feComposite in2="g" operator="in"/><feComposite in="SourceGraphic"/></filter></defs><g class="h"><rect class="i" x="5.75" y="5.7717" width="244.5" height="244.5" rx="46" ry="46"/></g><path class="j" d="M165.9933,146.3748c-15.6335,0-28.7244,11.028-31.9466,25.7088h-12.0935c-3.2222-14.6808-16.313-25.7088-31.9466-25.7088-18.0431,0-32.7232,14.68-32.7232,32.7232s14.68,32.7232,32.7232,32.7232c15.6335,0,28.7244-11.028,31.9466-25.7088h12.0935c3.2222,14.6808,16.313,25.7088,31.9466,25.7088,18.0431,0,32.7232-14.68,32.7232-32.7232s-14.68-32.7232-32.7232-32.7232ZM90.0067,197.7925c-10.3086,0-18.6945-8.3859-18.6945-18.6945s8.3859-18.6945,18.6945-18.6945,18.6945,8.3859,18.6945,18.6945-8.3859,18.6945-18.6945,18.6945ZM165.9933,197.7925c-10.3086,0-18.6945-8.3859-18.6945-18.6945s8.3859-18.6945,18.6945-18.6945,18.6945,8.3859,18.6945,18.6945-8.3859,18.6945-18.6945,18.6945Z"/><path class="j" d="M214.577,115.6777h-21.8838l-9.2611-65.4244c-.3037-2.145-1.5845-4.0301-3.4665-5.1073-1.882-1.0741-4.1554-1.2212-6.1595-.3914l-45.8062,18.9293-45.8062-18.9293c-2.0041-.8298-4.2775-.6826-6.1595.3914-1.882,1.0772-3.1627,2.9623-3.4665,5.1073l-9.2611,65.4244h-21.8838c-3.8735,0-7.0143,3.1408-7.0143,7.0143s3.1408,7.0143,7.0143,7.0143h173.1541c3.8735,0,7.0143-3.1408,7.0143-7.0143s-3.1408-7.0143-7.0143-7.0143ZM85.1906,61.1725l40.1289,16.5839c1.716.7077,3.645.7077,5.361,0l40.1289-16.5839,7.7142,54.5052h-101.0473l7.7142-54.5052Z"/></svg>