Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

- Remove unnecessary comments from mozconfig
- Disable sign-on remembering in preferences
- Ensure popups are rolled up when updating vertical tabs
- Adjust popup hidden event listener to use capture option
- Bump version numbers in surfer.json for releases

.dockerignore

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

.editorconfig

@@ -0,0 +1,12 @@
+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

.gitattributes

@@ -0,0 +1 @@
+*.patch linguist-language=C++

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,62 @@
+name: Bug Report
+description: File a bug report
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for filing a bug report.
+
+        ## 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.
+  - type: checkboxes
+    id: captchas
+    attributes:
+      label: Captchas
+      description: Just making sure you did actually read the instructions.
+      options:
+        - label: I have read the instructions.
+        - label: I have searched existing issues and avoided creating duplicates.
+        - label: I am not filing an enhancement request.
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: checkboxes
+    id: firefox
+    attributes:
+      label: Reproducible?
+      description: Is this issue reproducible on Firefox?
+      options:
+        - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
+  - 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
+    validations:
+      required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you seeing the problem on?
+      multiple: true
+      options:
+        - Linux
+        - macOS - aarch64
+        - macOS - Intel
+        - Windows
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      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

@@ -0,0 +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/workflows/alpha.yml

@@ -1,603 +0,0 @@
-name: Zen Alpha builds
-
-on:
-  workflow_dispatch:
-    inputs:
-      create_release:
-        description: 'Create a new release for this build'
-        required: false
-        default: false
-        type: 'boolean'
-      update_version:
-        description: 'Update the version number'
-        required: false
-        default: true
-        type: 'boolean'
-
-jobs:
-
-  build-data:
-    permissions:
-      contents: write
-    name: Generate build data
-    runs-on: ubuntu-latest
-    outputs:
-      build_date: ${{ steps.data.outputs.builddate }}
-      version: ${{ steps.data.outputs.version }}
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v3
-
-      - 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
-
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Setup Surfer
-        run: |
-          npm i -g @zen-browser/surfer
-
-      - name: Bump version
-        run: |
-          pnpm surfer ci --brand alpha --bump prerelease
-
-      - name: Debug
-        run: |
-          surfer get version
-          surfer get version | xargs
-          echo "$(surfer get version | xargs)"
-
-      - name: Export release date
-        id: data
-        shell: bash
-        run: |
-          echo "builddate=$(date +"%Y-%m-%d")" >> $GITHUB_OUTPUT
-          echo "version=$(surfer get version | xargs)" >> $GITHUB_OUTPUT
-
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        if: ${{ github.event.inputs.update_version == 'true' }}
-        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
-
-  check-release:
-    runs-on: ubuntu-latest
-    needs: [build-data]
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - 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
-
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Setup surfer
-        run: |
-          npm i -g @zen-browser/surfer
-
-      - 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 alpha --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 ">>> Version matches"
-          else
-            echo ">>> Version mismatch"
-            exit 1
-          fi
-
-  linux:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    needs: [build-data, check-release]
-
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v3
-
-        # Give the runner some swap space in an attempt to stop gkrust from crashing the build
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 6
-
-      - 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: |
-          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
-          pip install pycairo testresources
-
-      - name: Disable wasm sandboxing for the sake of my sanity
-        run: |
-          echo "ac_add_options --without-wasm-sandboxed-libraries" >> mozconfig
-
-      - name: Free up space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
-      - 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
-
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
-
-      - name: Download firefox source and dependencies
-        run: pnpm surfer download
-
-      - name: Import
-        run: pnpm surfer import
-
-      - name: Bootstrap
-        run: |
-          cd engine
-          ./mach --no-interactive bootstrap --application-choice browser
-          cd ..
-
-      - name: Build
-        run: pnpm build
-
-      - name: Package
-        run: pnpm package
-
-      - name: Rename artifacts
-        run: |
-          mv dist/zen-*.tar.bz2 "zen.linux.tar.bz2"
-          mv dist/output.mar linux.mar
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: zen.linux.tar.bz2
-          path: ./zen.linux.tar.bz2
-
-      - name: Upload mar
-        uses: actions/upload-artifact@v3
-        with:
-          name: linux.mar
-          path: ./linux.mar
-
-      - name: Upload update manifests
-        uses: actions/upload-artifact@v3
-        with:
-          name: linux_update_manifest
-          path: ./dist/update
-
-  windows:
-    runs-on: ubuntu-latest
-    needs: [build-data, check-release]
-
-    steps:
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v3
-
-      # Give the runner some swap space in an attempt to stop gkrust from crashing the build
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 6
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - 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
-
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
-
-      - name: Download
-        run: pnpm surfer download
-
-      - name: Disable wasm sandboxing for the sake of my sanity
-        run: |
-          cd engine/
-          echo "ac_add_options --without-wasm-sandboxed-libraries" >> mozconfig
-
-      - name: Free up space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
-      - name: Setup For Windows
-        run: |
-          set -x
-          mkdir -p ~/win-cross
-          cd engine/
-  
-          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
-          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
-          
-          chmod -R +x "$(echo ~)/win-cross/vs2022" || true
- 
-          cat ../.github/workflows/src/windows_mozconfig >> ../configs/common/mozconfig
-
-          cd ..
-          npm install -g pnpm
-          pnpm surfer 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
-
-          ls ~/win-cross/nsis || true
-  
-      - name: setup Rust 
-        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.76
-          source $HOME/.cargo/env
-          
-          rustup target add x86_64-pc-windows-msvc
-          cargo install cargo-download
-          cargo download -x windows=0.52.0
-          #? https://github.com/mozilla/sccache#known-caveats
-          export CARGO_INCREMENTAL=0
-          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.52.0" >> ../configs/common/mozconfig
-
-      - name: Import
-        run: pnpm surfer import --verbose  
-
-      - name: Build
-        run: pnpm build
-
-      - name: Package
-        run: |
-          set -x
-          pnpm package
-          mv ./dist/output.mar windows.mar
-          mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64.zip zen.win64.zip
-          ls ./dist
-          ls .
-
-      #- name: Upload artifact
-      #  uses: actions/upload-artifact@v3
-      #  with:
-      #    name: zen.installer.exe
-      #    path: ./dist/zen.installer.exe
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: zen.win64.zip
-          path: ./zen.win64.zip
-
-      - name: Upload mar
-        uses: actions/upload-artifact@v3
-        with:
-          name: windows.mar
-          path: ./windows.mar
-
-      - name: Upload update manifests
-        uses: actions/upload-artifact@v3
-        with:
-          name: windows_update_manifest
-          path: ./dist/update
-
-  source:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    needs: [build-data]
-
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - 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
-
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
-
-      - name: Download firefox source and dependancies
-        run: pnpm surfer download --verbose
-
-      - name: Import
-        run: pnpm surfer import --verbose
-
-      - name: Compress
-        run: |
-          cd engine
-          # -h is used to dereference symlinks
-          tar --use-compress-program=zstd -hcf ../zen.source.tar.gz *
-          cd ..
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: zen.source.tar.gz
-          path: ./zen.source.tar.gz
-
-  mac:
-    if: false
-    runs-on: macos-13
-    needs: [build-data, check-release]
-
-    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@v3
-
-      - 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
-          sudo pip install setuptools
-
-      - name: Force usage fo 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: Save sccache
-        uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: ~/Library/Caches/Mozilla.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
-
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
-      - name: Install dependencies
-        run: pnpm install
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
-
-      - name: Download firefox source and dependancies
-        run: pnpm surfer download
-
-      - name: Import
-        run: pnpm surfer import
-
-      - name: Bootstrap
-        run: |
-          cd engine
-          ./mach --no-interactive bootstrap --application-choice browser 
-          cd ..
-
-      - name: surfer build
-        run: pnpm build --verbose
-
-      - name: Package
-        run: pnpm package
-
-      - name: Rename artifacts
-        run: |
-          mv ./dist/*.dmg "zen.macos.dmg"
-          mv ./dist/output.mar macos.mar
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: zen.macos.dmg
-          path: ./zen.macos.dmg
-
-      - name: Upload mar
-        uses: actions/upload-artifact@v3
-        with:
-          name: macos.mar
-          path: ./macos.mar
-
-      - name: Upload update manifests
-        uses: actions/upload-artifact@v3
-        with:
-          name: macos_update_manifest
-          path: ./dist/update
-
-  release:
-    if: ${{ github.event.inputs.create_release == 'true' }}
-    permissions: write-all
-    name: Release
-    needs: [build-data, linux, source, windows, check-release]
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Update repo
-        uses: actions/checkout@v3
-
-      - name: Git Pull
-        run: git pull
-
-      - uses: actions/download-artifact@v3
-
-      - name: release-github
-        uses: 'marvinpinto/action-automatic-releases@latest'
-        with:
-          repo_token: '${{ secrets.DEPLOY_KEY }}'
-          automatic_release_tag: ${{ needs.build-data.outputs.version }}
-          title: 'Alpha build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
-          files: |
-            zen.linux.tar.bz2
-            zen.win64.zip
-            zen.source.tar.gz
-            linux.mar
-            windows.mar
-
-      - name: List
-        run: find .
-
-      - name: Clone updates repo
-        run: git clone https://github.com/zen-browser/updates-server.git
-
-      - name: Copy update manifests
-        run: |
-          cd updates-server
-          mkdir -p updates
-          cp -a ../linux_update_manifest/. updates/
-          cp -a ../windows_update_manifest/. updates/
-
-      - name: Setup git
-        run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
-
-      - name: Commit update manifests
-        run: |
-          cd updates-server
-          git add .
-          git commit -m "Update manifests for ${{ needs.build-data.outputs.version }}"
-          git push
-          

.github/workflows/build.yml

@@ -0,0 +1,661 @@
+name: Zen Release builds
+
+on:
+  workflow_dispatch:
+    inputs:
+      create_release:
+        description: 'Create a new release for this build'
+        required: false
+        default: false
+        type: 'boolean'
+      update_version:
+        description: 'Update the version number'
+        required: false
+        default: false
+        type: 'boolean'
+      update_branch:
+        description: 'Update branch with new version'
+        required: true
+        default: 'beta'
+        type: 'choice'
+        options:
+          - 'beta'
+          - 'twilight'
+  workflow_call:
+    inputs:
+      create_release:
+        description: 'Create a new release for this build'
+        required: false
+        default: false
+        type: 'boolean'
+      update_version:
+        description: 'Update the version number'
+        required: false
+        default: false
+        type: 'boolean'
+      update_branch:
+        description: 'Update branch with new version'
+        required: true
+        default: 'beta'
+        type: 'string'
+
+jobs:
+  debug-inputs:
+    name: Debug inputs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Debug
+        run: |
+          echo "create_release: ${{ inputs.create_release }}"
+          echo "update_version: ${{ inputs.update_version }}"
+          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:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+          fetch-depth: 0
+
+      - name: Check if correct branch
+        run: |
+          echo "Checking if we are on the correct branch"
+          git branch
+          git status
+          git branch --show-current
+          branch="${{ inputs.update_branch }}"
+          if [[ $branch == "beta" ]]; then
+            branch="stable"
+          elif [[ $branch == "twilight" ]]; then
+            branch="dev"
+          fi
+          if [[ $(git branch --show-current) != $branch ]]; then
+            echo ">>> Branch mismatch"
+            exit 1
+          else
+            echo ">>> Branch matches"
+          fi
+
+  build-data:
+    permissions:
+      contents: write
+    name: Generate build data
+    runs-on: ubuntu-latest
+    needs: check-build-is-correct
+    outputs:
+      build_date: ${{ steps.data.outputs.builddate }}
+      version: ${{ steps.data.outputs.version }}
+      build_time: ${{ steps.data.outputs.buildtime }}
+    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 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: Setup Surfer
+        run: |
+          npm i -g @zen-browser/surfer
+
+      - name: Bump version
+        if: ${{ inputs.update_version && inputs.update_branch == 'beta' }}
+        run: |
+          pnpm 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 }}
+
+      - name: Debug
+        run: |
+          surfer get version
+          surfer get version | xargs
+          echo "$(surfer get version | xargs)"
+
+      - name: Export release date
+        id: data
+        shell: bash
+        run: |
+          echo "builddate=$(date +"%Y-%m-%d")" >> $GITHUB_OUTPUT
+          echo "version=$(surfer get version | xargs)" >> $GITHUB_OUTPUT
+          echo "buildtime=$(date +"%H:%M:%S")" >> $GITHUB_OUTPUT
+
+      - 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-auto@users.noreply.github.com
+
+  check-release:
+    runs-on: ubuntu-latest
+    needs: [build-data]
+    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 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: Setup Surfer
+        run: |
+          npm i -g @zen-browser/surfer
+
+      - 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 }}
+
+      - 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 ">>> Version matches"
+          else
+            echo ">>> Version mismatch"
+            exit 1
+          fi
+
+  source:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    needs: [build-data, check-release]
+
+    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 Git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Setup 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.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
+
+      - name: Download Firefox source and dependencies
+        run: pnpm surfer download --verbose
+
+      - name: Import
+        run: pnpm surfer import --verbose
+
+      - name: Compress
+        run: |
+          cd engine
+          tar --use-compress-program=zstd -hcf ../zen.source.tar.gz *
+          cd ..
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.source.tar.gz
+          path: ./zen.source.tar.gz
+
+  windows-step-1:
+    name: Windows build step 1 (PGO build)
+    uses: ./.github/workflows/windows-release-build.yml
+    needs: [build-data]
+    permissions:
+      contents: write
+    secrets: inherit
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      generate-gpo: true
+      profile-data-path-archive: zen-windows-profile-data-and-jarlog.zip
+      release-branch: ${{ inputs.update_branch }}
+
+  windows-step-2:
+    name: Windows build step 2 (Generate profile data)
+    uses: ./.github/workflows/windows-profile-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [windows-step-1, build-data]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      profile-data-path-archive: zen.win64-pgo-stage-1.zip
+      release-branch: ${{ inputs.update_branch }}
+
+  windows-step-3:
+    name: Windows build step 3 (build with profile data)
+    uses: ./.github/workflows/windows-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data, windows-step-2]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      generate-gpo: false
+      release-branch: ${{ inputs.update_branch }}
+
+  linux:
+    name: Linux build
+    uses: ./.github/workflows/linux-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      release-branch: ${{ inputs.update_branch }}
+
+  mac:
+    name: macOS build
+    uses: ./.github/workflows/macos-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      release-branch: ${{ inputs.update_branch }}
+
+  appimage:
+    name: AppImage build - Linux ${{ matrix.arch }}
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+    needs: [linux]
+    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: Install dependencies
+        run: |
+          npm install -g pnpm
+          sudo apt-get update
+          sudo apt-get -y install libfuse2 desktop-file-utils appstream
+
+      - name: Download Linux build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.linux-${{ matrix.arch }}.tar.bz2
+
+      - 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
+
+          if [ "${{ inputs.update_branch }}" = "twilight" ]; then
+            sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop
+            sed -i -e 's/StartupWMClass=zen-beta/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
+          fi
+
+          APPDIR=AppDir
+          tar -xvf *.tar.* && rm -rf *.tar.*
+          mv zen/* $APPDIR/
+          wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
+          chmod +x *.AppImage
+          chmod +x ./AppDir/AppRun
+          echo "AppDir: $APPDIR"
+          ls -al
+          find .
+          ls -al "$APPDIR"
+          ARCH=${{ matrix.arch }} ./appimagetool-x86_64.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 10 \
+          -u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-${{ matrix.arch }}.AppImage.zsync" \
+          "$APPDIR" zen-${{ matrix.arch }}.AppImage
+          mkdir dist
+          mv zen*AppImage* dist/.
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen-${{ matrix.arch }}.AppImage
+          path: ./dist/zen-${{ matrix.arch }}.AppImage
+
+      - name: Upload artifact (ZSync)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen-${{ matrix.arch }}.AppImage.zsync
+          path: ./dist/zen-${{ matrix.arch }}.AppImage.zsync
+
+  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
+    environment:
+      name: ${{ inputs.update_branch == 'beta' && 'Deploy-Release' || 'Deploy-Twilight' }}
+
+    steps:
+      - 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
+
+      - name: List
+        run: find .
+
+      - 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
+        run: |
+          git clone https://github.com/zen-browser/windows-binaries.git .github/workflows/object
+
+      - name: Copy update manifests
+        env:
+          RELEASE_BRANCH: ${{ inputs.update_branch }}
+        run: |
+          cd updates-server
+          mkdir -p updates
+          cp -a ../linux_update_manifest_x86_64/.  updates/
+          cp -a ../linux_update_manifest_aarch64/.  updates/
+
+          if [[ $RELEASE_BRANCH == 'beta' ]]; 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_x86_64/.  updates/
+            cp -a ../windows_update_manifest_arm64/.  updates/
+          fi
+
+          cp -a ../macos_update_manifest_aarch64/.  updates/
+          cp -a ../macos_update_manifest_x86_64/.  updates/
+
+      - 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-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
+        if: ${{ inputs.update_branch == 'twilight' }}
+        uses: marvinpinto/action-automatic-releases@master
+        with:
+          files: |
+            zen.source.tar.gz
+            zen.linux-x86_64.tar.bz2
+            zen.linux-aarch64.tar.bz2
+            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-x86_64.mar
+            macos-aarch64.mar
+            zen.installer.exe
+            zen.installer-arm64.exe
+            zen.macos-x86_64.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 }})'
+          draft: false
+          prerelease: true
+          repo_token: ${{ github.token }}
+        env:
+          GITHUB_REPOSITORY: ${{ github.repository }}
+
+      - name: Release
+        uses: marvinpinto/action-automatic-releases@master
+        if: ${{ inputs.update_branch == 'beta' }}
+        with:
+          repo_token: '${{ secrets.DEPLOY_KEY }}'
+          automatic_release_tag: ${{ needs.build-data.outputs.version }}
+          prerelease: false
+          title: 'Beta build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          files: |
+            zen.source.tar.gz
+            zen.linux-x86_64.tar.bz2
+            zen.linux-aarch64.tar.bz2
+            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-x86_64.mar
+            macos-aarch64.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-x86_64.dmg
+            zen.macos-aarch64.dmg
+
+  prepare-flatpak:
+    if: ${{ inputs.create_release && inputs.update_branch == 'beta' }}
+    permissions: write-all
+    name: Prepare Flatpak
+    needs: [release, linux, build-data]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Flatpak repository
+        uses: actions/checkout@v4
+        with:
+          repository: zen-browser/release-utils
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Install dependencies
+        run: |
+          git pull
+          sudo apt-get update
+          npm install
+
+      - name: Generate new Flatpak release
+        run: |
+          npm run build-flatpak -- \
+            --version ${{ needs.build-data.outputs.version }}
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 🚀 Update releases for Flatpak
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-auto@users.noreply.github.com
+
+      - name: Checkout Flatpak repository
+        uses: actions/checkout@v4
+        with:
+          repository: zen-browser/flatpak
+          token: ${{ secrets.DEPLOY_KEY }}
+          path: flatpak
+
+      - name: Move releases.xml
+        run: |
+          pwd
+          ls .
+          ls ..
+          mv releases.xml ./flatpak/io.github.zen_browser.zen.metainfo.xml
+          # output the version to the file
+          echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: '[release]: Update Flatpak manifest'
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-auto@users.noreply.github.com
+          repository: ./flatpak
+
+      - name: Wait 2 minutes for the Flatpak repo to update
+        run: sleep 120
+
+  release-flatpak:
+    if: ${{ inputs.create_release && inputs.update_branch == 'beta' }}
+    permissions: write-all
+    name: Release Flatpak
+    needs: [prepare-flatpak, build-data]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Flatpak repository
+        uses: actions/checkout@v4
+        with:
+          repository: flathub/io.github.zen_browser.zen
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Download Linux x86_64 build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.linux-x86_64.tar.bz2
+
+      - name: Update repository
+        uses: actions/checkout@v4
+        with:
+          path: zen-browser
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Download Flatpak archive
+        run: |
+          wget https://github.com/zen-browser/flatpak/releases/latest/download/archive.tar -O archive.tar
+
+      - 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
+        run: |
+          python3 ./zen-browser/scripts/prepare-flatpak-release.py \
+            --flatpak-archive archive.tar \
+            --version ${{ needs.build-data.outputs.version }} \
+            --linux-archive zen.linux-x86_64.tar.bz2 \
+            --output io.github.zen_browser.zen.yml \
+            --template-root ./zen-browser/flatpak
+
+      - name: Commit changes
+        run: |
+          git add io.github.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-x86_64.tar.bz2
+
+      - name: Upload Flatpak manifest
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: io.github.zen_browser.zen.yml
+          path: ./io.github.zen_browser.zen.yml
+
+      - name: Create pull request
+        uses: peter-evans/create-pull-request@v7
+        env:
+          GIT_TRACE: 1
+          GIT_CURL_VERBOSE: 1
+        with:
+          token: ${{ secrets.DEPLOY_KEY }}
+          commit-message: 🚀 Update to version ${{ needs.build-data.outputs.version }}
+          title: 🚀 Update to version ${{ needs.build-data.outputs.version }}
+          body: |
+            This PR updates the Zen Browser Flatpak package to version ${{ needs.build-data.outputs.version }}.
+
+            @${{ github.actor }} please review and merge this PR.
+          branch: update-to-${{ needs.build-data.outputs.version }}
+          base: master
+          git-token: ${{ secrets.DEPLOY_KEY }}
+          delete-branch: true

.github/workflows/clear-cache.yml

@@ -0,0 +1,33 @@
+name: Clear cache
+
+on:
+  workflow_dispatch:
+
+permissions:
+  actions: write
+
+jobs:
+  clear-cache:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clear cache
+        uses: actions/github-script@v7
+        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)
+              await github.rest.actions.deleteActionsCacheById({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                cache_id: cache.id,
+              })
+            }
+            
+            console.log("Clear completed")

.github/workflows/issue-metrics.yml

@@ -0,0 +1,65 @@
+name: Monthly issue metrics
+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 }} -reason:"not planned"'
+
+    - 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: 'Update monthly issue metrics'
+        commit_user_name: Zen Browser Robot
+        commit_user_email: zen-browser-auto@users.noreply.github.com

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

@@ -0,0 +1,172 @@
+name: Linux 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:
+  build-linux:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, aarch64]
+    name: Build Linux - ${{ matrix.arch }}
+
+    steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
+      - 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 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: |
+          set -x
+          sudo apt-get update --fix-missing
+          sudo apt-get update
+          sudo apt-get install -y 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: 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 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@v4
+        with:
+          path: /home/runner/.cache/sccache
+          key: ${{ runner.os }}-sccache
+
+      - name: Setup 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 }}
+
+      - name: Download Firefox source and dependencies
+        run: pnpm surfer 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 1.79
+          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.arch }}
+        run: pnpm surfer import
+
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
+      - name: Bootstrap
+        run: |
+          cd engine
+          export SURFER_PLATFORM="linux"
+          ./mach --no-interactive bootstrap --application-choice browser
+          cd ..
+
+      - name: Build
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        continue-on-error: true
+        run: |
+          export SURFER_PLATFORM="linux"
+          sh .github/workflows/src/release-build.sh
+
+      - name: Build again if it failed
+        if: failure()
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          export SURFER_PLATFORM="linux"
+          sh .github/workflows/src/release-build.sh
+
+      - name: Package
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          export SURFER_PLATFORM="linux"
+          pnpm package
+
+      - name: Rename artifacts
+        run: |
+          mv dist/zen-*.tar.bz2 "zen.linux-${{ matrix.arch }}.tar.bz2"
+          mv dist/output.mar linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
+
+      - name: Upload build artifact (binary)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.linux-${{ matrix.arch }}.tar.bz2
+          path: ./zen.linux-${{ matrix.arch }}.tar.bz2
+
+      - name: Upload build artifact (.mar)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
+          path: ./linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
+
+      - name: Upload build artifact (update manifests)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: linux_update_manifest_${{ matrix.arch }}
+          path: ./dist/update

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

@@ -0,0 +1,195 @@
+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: Build macOS - ${{ matrix.arch }}
+    runs-on: macos-14
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, aarch64]
+
+    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 sccache 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
+
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
+          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: Setup 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 }}
+
+      - name: Download Firefox source and dependencies
+        run: pnpm surfer 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
+          cd ..
+
+      - name: Import
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: pnpm surfer import --verbose
+
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
+      - name: Build Zen
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          export SURFER_PLATFORM="darwin"
+          if test "${{ matrix.arch }}" = "x86_64"; then
+            export ZEN_DISABLE_LTO=1
+          fi
+          sh .github/workflows/src/release-build.sh
+
+      - name: Rebuild Zen if failed
+        if: failure()
+        run: |
+          export SURFER_PLATFORM="darwin"
+          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 }}
+
+      - name: Package
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          export SURFER_PLATFORM="darwin"
+          export MACOS_APPLE_DEVELOPER_ID="${{ secrets.macOS_AppleDeveloperId }}"
+          pnpm package
+
+      - name: Rename artifacts
+        run: |
+          mv ./dist/output.mar macos-${{ matrix.arch }}.mar
+
+      - name: Sign .dmg
+        run: |
+          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"
+
+      - name: Sign .dmg again if failed
+        if: failure()
+        run: |
+          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"
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.macos-${{ matrix.arch }}.dmg
+          path: ./zen.macos-${{ matrix.arch }}.dmg
+
+      - name: Upload build artifact (.mar)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: macos-${{ matrix.arch }}.mar
+          path: ./macos-${{ matrix.arch }}.mar
+
+      - name: Upload build artifact (update manifests)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: macos_update_manifest_${{ matrix.arch }}
+          path: ./dist/update

.github/workflows/pr-test.yml

@@ -0,0 +1,32 @@
+name: Pull request test
+
+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: Setup pnpm
+        run: npm install -g pnpm
+
+      - name: Install Surfer
+        run: npm i -g @zen-browser/surfer
+
+      - name: Download Firefox and dependencies
+        run: surfer download
+
+      - name: Import patches
+        run: surfer i

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

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -ex
+
+if command -v apt-get &> /dev/null; then
+  sudo apt-get update
+  sudo apt-get install -y xvfb
+fi
+
+ulimit -n 4096
+
+if ! command -v Xvfb &> /dev/null; then
+  if ! test "$ZEN_CROSS_COMPILING"; then
+    Xvfb :2 -screen 0 1024x768x24 &
+    export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata
+    export DISPLAY=:2
+  fi
+  export ZEN_RELEASE=1
+  pnpm 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
+fi

.github/workflows/src/windows_mozconfig

@@ -1,19 +0,0 @@
-
-export WINSYSROOT="$(echo ~)/win-cross/vs2022"
-
-export MIDL="$(echo ~)/win-cross/wine/bin/widl"
-export WINE="$(echo ~)/win-cross/wine/bin/wine64"
-export WINEDEBUG=-all
-
-#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
-#? https://phabricator.services.mozilla.com/D170170
-ac_add_options --target=x86_64-pc-windows-msvc
-
-export MOZ_STUB_INSTALLER=1
-export MOZ_MAINTENANCE_SERVICE=
-
-export MOZ_PKG_FORMAT=TAR
-export MOZ_LTO=cross
-
-# ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE
-

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

@@ -0,0 +1,32 @@
+name: Zen Twilight Scheduled Releases
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+jobs:
+  twilight-release-schedule:
+    name: Twilight Release Schedule
+    permissions: write-all
+    secrets: inherit
+    uses: ./.github/workflows/build.yml
+    with:
+      create_release: true
+      update_branch: twilight
+      update_version: false
+
+  post-build:
+    name: Post Build
+    runs-on: ubuntu-latest
+    needs: twilight-release-schedule
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      # TODO:

.github/workflows/update-submodules.yml

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

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

@@ -0,0 +1,118 @@
+name: Windows PGO Builds
+
+on:
+  workflow_call:
+    inputs:
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+      profile-data-path-archive:
+        description: 'The path to the zip archive containing the profile data'
+        required: false
+        type: string
+      release-branch:
+        description: 'The branch to build'
+        required: true
+        type: string
+
+jobs:
+  windows-profile-build:
+    name: |
+      Windows Profile Build - ${{ matrix.arch }}
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, aarch64]
+
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "mr-cheff@users.noreply.github.com"
+          git config --global user.name "mr-cheff"
+
+      - name: Setup pnpm
+        run: npm install -g pnpm
+
+      - name: Install Surfer
+        run: npm i -g @zen-browser/surfer
+
+      - name: Download artifact
+        if: ${{ matrix.arch == 'x86_64' }}
+        uses: actions/download-artifact@v4
+        with:
+          path: C:\artifact
+          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")
+          C:\MozillaBuildSetup-Latest.exe /S | out-null
+
+      - name: Download Firefox and dependencies
+        if: ${{ matrix.arch == 'x86_64' }}
+        run: |
+          git config --global core.safecrlf false
+          pnpm surfer download
+
+      - name: Import patches
+        if: ${{ matrix.arch == 'x86_64' }}
+        env:
+          SURFER_NO_BRANDING_PATCH: true
+        run: pnpm surfer 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 = $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/action-debugger@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: 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.arch == 'aarch64' && 'arm64' || matrix.arch }}

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

@@ -0,0 +1,257 @@
+name: Windows Release Build
+
+on:
+  workflow_call:
+    inputs:
+      generate-gpo:
+        required: true
+        type: boolean
+        default: false
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+      profile-data-path-archive:
+        description: 'The path to the zip archive containing the profile data'
+        type: string
+      release-branch:
+        description: 'The branch to build'
+        required: true
+        type: string
+
+jobs:
+  windows-build:
+    name: Build Windows - ${{ matrix.arch }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, aarch64]
+
+    steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
+      - 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 pnpm
+        run: npm install -g pnpm
+
+      - 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 install
+
+      - name: Load Surfer CI setup
+        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download Firefox and dependencies
+        run: pnpm surfer download
+
+      - name: win-cross Cache
+        env:
+          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
+        id: cache-win-cross
+        uses: actions/cache@v4
+        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'
+        run: |
+          set -x
+          mkdir -p ~/win-cross
+          cd engine/
+          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
+          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: Bootstrap
+        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
+          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
+        run: |
+          cd engine/
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
+          source $HOME/.cargo/env
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-pc-windows-msvc
+          else
+            rustup target add x86_64-pc-windows-msvc
+          fi
+          cargo install cargo-download
+          cargo download -x windows=0.58.0
+          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.arch }}
+        run: pnpm surfer import --verbose
+
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
+      - 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.arch == 'aarch64' && 'arm64' || matrix.arch }}
+
+      - name: Show artifact info
+        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: Build
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          set -x
+          dos2unix configs/windows/mozconfig
+          export SURFER_PLATFORM="win32"
+          export ZEN_CROSS_COMPILING=1
+          if test ${{ inputs.generate-gpo }} = true; then
+            export ZEN_GA_GENERATE_PROFILE=1
+          fi
+          sh .github/workflows/src/release-build.sh
+
+      - name: Package
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          set -x
+          export SURFER_PLATFORM="win32"
+          pnpm package
+          mv ./dist/zen-$(pnpm 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/action-debugger@v1.3
+        timeout-minutes: 15
+
+      - name: Move package for PGO upload
+        if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
+        run: |
+          set -x
+          mv ./zen.win64.zip ./zen.win64-pgo-stage-1.zip
+
+      - name: Rename artifacts
+        if: ${{ !inputs.generate-gpo }}
+        run: |
+          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 artifact (PGO)
+        uses: actions/upload-artifact@v4
+        if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
+        with:
+          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
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            find engine/obj-aarch64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \;
+            find engine/obj-aarch64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
+          else
+            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 {} \;
+          fi
+
+      - name: Upload dist object
+        if: ${{ !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: windows-x64-obj-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
+          path: engine/obj-${{ matrix.arch == 'aarch64' && 'aarch64' || 'x86_64' }}-pc-windows-msvc/
+
+      - name: Upload artifact (if Twilight branch, binary)
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          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 artifact (if Twilight branch, installer)
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.installer${{ matrix.arch == 'aarch64' && '-arm64' ||  '' }}.exe
+          path: ./zen.installer${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.exe
+
+      - name: Upload artifact (if Twilight branch, .mar)
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
+          path: ./windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
+
+      - name: Upload artifact (if Twilight branch, update manifests)
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: windows_update_manifest_${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
+          path: ./dist/update

.gitignore

@@ -6,4 +6,6 @@ node_modules/
 .surfer/
 
 __pycache__/
-dist/
+dist/
+
+windsign-temp/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "l10n"]
+	path = l10n
+	url = https://github.com/zen-browser/l10n-packs

.husky/pre-commit

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

.nvmrc

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

.prettierignore

@@ -0,0 +1,12 @@
+engine/
+
+**/*.html
+**/*.xhtml
+**/*.inc.xhtml
+
+**/*.svg
+
+src/browser/app/profile/*.js
+pnpm-lock.yaml
+
+**/engine/

.prettierrc.json

@@ -0,0 +1,12 @@
+{
+  "bracketSameLine": true,
+  "endOfLine": "lf",
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "tabWidth": 2,
+  "useTabs": false,
+  "jsxSingleQuote": false,
+  "semi": true,
+  "printWidth": 128,
+  "plugins": []
+}

.python-version

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

.vscode/settings.json

@@ -13,6 +13,18 @@
     "utility": "cpp",
     "variant": "cpp",
     "compare": "cpp",
-    "thread": "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"
   }
-}
+}

AppDir/AppRun

@@ -0,0 +1,14 @@
+#!/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}" "$@"

AppDir/distribution/policies.json

@@ -0,0 +1,8 @@
+{
+  "policies": {
+    "DisableAppUpdate": true,
+    "AppAutoUpdate": false,
+    "ManualAppUpdateOnly": true,
+    "BackgroundAppUpdate": false
+  }
+}

AppDir/zen.desktop

@@ -0,0 +1,26 @@
+[Desktop Entry]
+Name=Zen Browser
+Comment=Experience tranquillity while browsing the web without people tracking you!
+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-beta
+Categories=Network;WebBrowser;
+StartupNotify=true
+Terminal=false
+X-MultipleArgs=false
+Keywords=Internet;WWW;Browser;Web;Explorer;
+Actions=new-window;new-private-window;profilemanager;
+
+[Desktop Action new-window]
+Name=Open a New Window
+Exec=zen %u
+
+[Desktop Action new-private-window]
+Name=Open a New Private Window
+Exec=zen --private-window %u
+
+[Desktop Action profilemanager]
+Name=Open the Profile Manager
+Exec=zen --ProfileManager %u

CODEOWNERS

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

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+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,
+  and learning from the experience
+* 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
+  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
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+hello@zen-browser.app.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+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
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

LICENSE

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  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/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

README.md

@@ -1,55 +1,148 @@
+<img src="./docs/assets/zen-dark.svg" width="100px" align="left">
 
-# 🌀 Zen Browser
+### `Zen Browser`
 
-Experience tranquillity while browsing the web without people tracking you!
+[![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)
 
-# Compatibility
 
-Zen is currently built using firefox version `127.0.2`!
+✨ Experience tranquillity while browsing the web without people tracking you! Zen is a privacy-focused browser that blocks trackers, ads, and other unwanted content while offering the best browsing experience!
 
-## 🚀 Run Locally
+<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>
 
-Clone the project
+## 🖥️ Compatibility
 
-```bash
-git clone https://github.com/zen-browser/desktop.git
-cd desktop
+Zen is currently built using firefox version `133.0.3`! 🚀
+
+- Check out the latest [release notes](https://zen-browser.app/release-notes)!
+- Part of our mission is to keep Zen up-to-date with the latest version of Firefox, so you can enjoy the latest features and security updates!
+
+## 🤝 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!
+
+### Issue metrics
+
+We keep track of how many issues are closed at the end of the month in [docs/issue-metrics](./docs/issue-metrics). This is to keep track of how many issues are being closed, because who doesn't like to see progress? 📈
+
+### Versioning
+
+Zen uses [Semantic Versioning](https://semver.org/) for versioning. Meaning, versions are displayed as `a.b.c-d.e` where:
+
+- `a` is the major version
+- `b` is the minor version
+- `c` is the patch version
+- `d` is the branch prefix
+- `e` is the build number
+
+### Branches
+
+Zen is divided into 2 main branches. We use `dev` for development and `stable` for stable releases. The `dev` branch is where all the new features are added and where `twilight` builds are generated. The `stable` branch is where the stable releases are generated. 
+
+We divide into 2 branches in case there's any really important security update (for example) that needs to be released before the next stable release. This allows us to do patches without releasing unstable versions to the public.
+
+## ⚡ 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.
+
+If you dont see your OS listed below, that's because we already have it in our [downloads page](https://zen-browser.app/download)! Make sure to check it out!
+
+#### Windows
+
+##### Winget
+
+```ps
+winget install --id Zen-Team.Zen-Browser
 ```
 
-Install dependencies 
+#### macOS
 
-```bash
-npm i
-```
+- Requires macOS 10.15 or later
+- Available for ARM and Intel architectures
 
-Download and bootstrap the browser
+You can also install Zen using Homebrew:
 
 ```
-npm run bootstrap
+brew install --cask zen-browser
 ```
 
-Start building the browser
+#### Linux
 
-```
-npm run build
+##### Arch-based distributions
+
+```sh
+yay -S zen-browser-bin
 ```
 
-Finally, run the browser!
+##### Other Linux distributions (AppImage with automated system integration)
 
-```
-npm start
+- `native` tarball install:
+```bash <(curl -s https://updates.zen-browser.app/install.sh)```
+
+- `zsync` is required for the Update feature of the script below
+
+```sh
+bash <(curl https://updates.zen-browser.app/appimage.sh)
 ```
 
-## Contributing
+* Again, if you don't see your OS listed above, that's because we already have it in our [downloads page](https://zen-browser.app/download)! 🔄
 
-Contributions are always welcome!
+To upgrade the browser to a newer version, use the embedded update functionality in `About Zen`.
 
-See `contributing.md` for ways to get started.
+## 👨‍💻 Development and Contributing
 
-Please adhere to this project's `code of conduct`.
+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/desktop/tree/dev/src/browser/base/zen-components).
 
+#### `Run Locally`
 
-## License
+In order to download and run zen locally, please follow [these instructions](https://docs.zen-browser.app/contribute/desktop).
 
-[MPL LICENSE](https://choosealicense.com/licenses/mit/)
+#### `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)
+- Gradient image extracted from [Arc Palette](https://github.com/neurokitti/Arc_Palette)
+
+### 🖥️ Comparison with other browsers
+
+As you can see, chromium based browsers are the most popular browsers, help us change that by starring the project and spreading the word! 🌟
+
+<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,chromium/chromium,brave/brave-browser&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop,chromium/chromium,brave/brave-browser&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=chromium/chromium,zen-browser/desktop,brave/brave-browser&type=Date" />
+ </picture>
+</a>
+
+## 📄 License
+
+Zen browser is under the [MPL LICENSE](./LICENSE). All the code is open-source and free to use! Attributions are appreciated but not required.

build/codesign/browser.developer.entitlements.xml

@@ -0,0 +1,32 @@
+<?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

@@ -0,0 +1,169 @@
+#!/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

@@ -0,0 +1,32 @@
+<?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/winsign/sign.ps1

@@ -0,0 +1,136 @@
+param(
+    [string][Parameter(Mandatory=$true)]$SignIdentity,
+    [string][Parameter(Mandatory=$true)]$GithubRunId
+)
+
+$ErrorActionPreference = "Stop"
+
+echo "Preparing environment"
+git pull --recurse-submodules
+mkdir windsign-temp -ErrorAction SilentlyContinue
+
+# Download in parallel
+
+#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
+
+gh run download $GithubRunId --name windows-x64-obj-arm64 -D windsign-temp\windows-x64-obj-arm64
+echo "Downloaded arm64 artifacts"
+gh run download $GithubRunId --name windows-x64-obj-x86_64 -D windsign-temp\windows-x64-obj-x86_64
+echo "Downloaded x86_64 artifacts"
+
+
+#Wait-Job -Name "DownloadGitObjectsRepo"
+
+mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
+
+pnpm surfer ci --brand beta
+
+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
+    echo "Packaging $name"
+    $env:SURFER_SIGNING_MODE="sign"
+    $env:MAR="$PWD\\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
+
+    # In the release script, we do the following:
+    #  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
+    #  - zen.installer.exe
+    #  - zen.win-x86_64.zip
+    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 `-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
+    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
+    echo "Moving zip for $name"
+    if ($name -eq "arm64") {
+        mv (Get-Item .\dist\*.en-US.win64-aarch64.zip) windsign-temp\windows-x64-signed-$name\zen.win-arm64.zip
+    } else {
+        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
+    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 .\windsign-temp\windows-binaries\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
+    mv windsign-temp\windows-x64-signed-$name .\windsign-temp\windows-binaries -Force
+
+    echo "Finished $name"
+}
+
+SignAndPackage arm64
+SignAndPackage x86_64
+
+echo "All artifacts signed and packaged, ready for release!"
+echo "Commiting the changes to the repository"
+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 (x86_64 and arm46) are signed and packaged, get a rest now!"
+Read-Host "Press Enter to continue"
+
+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/MacOSInstaller.svg

@@ -1,4 +0,0 @@
-<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg">
-  <rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />
-  Sorry, your browser does not support inline SVG.  
-</svg>

configs/branding/beta/MacOSInstaller.svg

@@ -1,4 +1 @@
-<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg">
-  <rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />
-  Sorry, your browser does not support inline SVG.  
-</svg>
+<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg"><rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />Sorry, your browser does not support inline SVG.</svg> 

configs/branding/beta/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>

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

@@ -0,0 +1,12 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_109_1042)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512 627.385C575.725 627.385 627.385 575.725 627.385 512C627.385 448.275 575.725 396.615 512 396.615C448.275 396.615 396.615 448.275 396.615 512C396.615 575.725 448.275 627.385 512 627.385ZM604.308 512C604.308 562.98 562.98 604.308 512 604.308C461.02 604.308 419.692 562.98 419.692 512C419.692 461.02 461.02 419.692 512 419.692C562.98 419.692 604.308 461.02 604.308 512Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M712 512C712 622.457 622.457 712 512 712C401.543 712 312 622.457 312 512C312 401.543 401.543 312 512 312C622.457 312 712 401.543 712 512ZM512 673.538C601.215 673.538 673.538 601.215 673.538 512C673.538 422.785 601.215 350.462 512 350.462C422.785 350.462 350.462 422.785 350.462 512C350.462 601.215 422.785 673.538 512 673.538Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M812 512C812 677.685 677.685 812 512 812C346.315 812 212 677.685 212 512C212 346.315 346.315 212 512 212C677.685 212 812 346.315 812 512ZM512 758.154C647.947 758.154 758.154 647.947 758.154 512C758.154 376.053 647.947 265.846 512 265.846C376.053 265.846 265.846 376.053 265.846 512C265.846 647.947 376.053 758.154 512 758.154Z" fill="#F76F53"/>
+</g>
+<defs>
+<clipPath id="clip0_109_1042">
+<rect width="1024" height="1024" fill="white"/>
+</clipPath>
+</defs>
+</svg>

configs/branding/beta/content/firefox-wordmark.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 56"><defs><style>.b{fill:context-fill #20123a;}</style></defs><path class="b" d="M11.2896,37.6632h15.1928v5.2919H3.2415v-3.8076l15.1487-21.2557H3.2126v-5.2919h23.2393v3.811l-15.1622,21.2523ZM50.8649,26.3765c.5434,1.4469.8151,3.1418.8151,5.0778v1.7322h-15.5019v.017c0,1.1243.2089,2.0991.6301,2.9176.4195.822,1.0139,1.4537,1.7849,1.8987s1.6847.6657,2.7427.6657c.7014,0,1.3433-.0984,1.9258-.2955.5842-.197,1.0818-.4925,1.4979-.8899.4144-.394.7303-.8797.9476-1.4503l5.8404.3838c-.2972,1.4028-.9018,2.6255-1.8154,3.6683-.9137,1.0428-2.0906,1.8511-3.5273,2.4319-1.4385.5774-3.0959.8661-4.9726.8661-2.3419,0-4.3561-.4755-6.0408-1.43-1.6847-.9544-2.9805-2.3063-3.8907-4.0623-.9086-1.7526-1.362-3.8314-1.362-6.2327,0-2.3402.4534-4.3951,1.362-6.1647.9103-1.7696,2.1925-3.1486,3.8466-4.1336,1.6558-.9884,3.5986-1.4843,5.8318-1.4843,1.503,0,2.9024.2411,4.2032.7201,1.2992.4789,2.4354,1.199,3.4084,2.1568.9731.9578,1.7306,2.1602,2.274,3.6072ZM45.7378,29.2737c0-.9069-.1987-1.7119-.5927-2.4149-.3957-.6997-.9409-1.2534-1.6388-1.6508-.6964-.4008-1.503-.6012-2.4235-.6012-.9578,0-1.8053.2208-2.5406.6589-.7371.4382-1.3127,1.0292-1.7271,1.7628-.3818.679-.5853,1.4304-.6228,2.2451h9.5455ZM73.0682,20.9318c-1.1769-.6929-2.5543-1.0394-4.1353-1.0394-1.6898,0-3.1265.3872-4.3137,1.165-1.1854.7744-2.0294,1.824-2.5338,3.1486h-.2667v-4.0181h-6.017v22.7672h6.3125v-13.1617c.0102-.9782.1953-1.8138.557-2.5135.36-.6963.8644-1.2261,1.5115-1.593.647-.3635,1.396-.5469,2.2451-.5469,1.2653,0,2.257.394,2.9788,1.1786.7217.7846,1.0767,1.8749,1.0682,3.2675v13.3689h6.3125v-14.4965c0-1.7662-.326-3.2913-.9782-4.5718-.6521-1.2805-1.5658-2.2655-2.741-2.955Z"/></svg>

configs/branding/twilight/MacOSInstaller.svg

@@ -0,0 +1 @@
+<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg"><rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />Sorry, your browser does not support inline SVG.</svg> 

configs/branding/twilight/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>

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

@@ -0,0 +1,12 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_109_1042)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512 627.385C575.725 627.385 627.385 575.725 627.385 512C627.385 448.275 575.725 396.615 512 396.615C448.275 396.615 396.615 448.275 396.615 512C396.615 575.725 448.275 627.385 512 627.385ZM604.308 512C604.308 562.98 562.98 604.308 512 604.308C461.02 604.308 419.692 562.98 419.692 512C419.692 461.02 461.02 419.692 512 419.692C562.98 419.692 604.308 461.02 604.308 512Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M712 512C712 622.457 622.457 712 512 712C401.543 712 312 622.457 312 512C312 401.543 401.543 312 512 312C622.457 312 712 401.543 712 512ZM512 673.538C601.215 673.538 673.538 601.215 673.538 512C673.538 422.785 601.215 350.462 512 350.462C422.785 350.462 350.462 422.785 350.462 512C350.462 601.215 422.785 673.538 512 673.538Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M812 512C812 677.685 677.685 812 512 812C346.315 812 212 677.685 212 512C212 346.315 346.315 212 512 212C677.685 212 812 346.315 812 512ZM512 758.154C647.947 758.154 758.154 647.947 758.154 512C758.154 376.053 647.947 265.846 512 265.846C376.053 265.846 265.846 376.053 265.846 512C265.846 647.947 376.053 758.154 512 758.154Z" fill="#F76F53"/>
+</g>
+<defs>
+<clipPath id="clip0_109_1042">
+<rect width="1024" height="1024" fill="white"/>
+</clipPath>
+</defs>
+</svg>

configs/branding/twilight/content/firefox-wordmark.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 56"><defs><style>.b{fill:context-fill #20123a;}</style></defs><path class="b" d="M11.2896,37.6632h15.1928v5.2919H3.2415v-3.8076l15.1487-21.2557H3.2126v-5.2919h23.2393v3.811l-15.1622,21.2523ZM50.8649,26.3765c.5434,1.4469.8151,3.1418.8151,5.0778v1.7322h-15.5019v.017c0,1.1243.2089,2.0991.6301,2.9176.4195.822,1.0139,1.4537,1.7849,1.8987s1.6847.6657,2.7427.6657c.7014,0,1.3433-.0984,1.9258-.2955.5842-.197,1.0818-.4925,1.4979-.8899.4144-.394.7303-.8797.9476-1.4503l5.8404.3838c-.2972,1.4028-.9018,2.6255-1.8154,3.6683-.9137,1.0428-2.0906,1.8511-3.5273,2.4319-1.4385.5774-3.0959.8661-4.9726.8661-2.3419,0-4.3561-.4755-6.0408-1.43-1.6847-.9544-2.9805-2.3063-3.8907-4.0623-.9086-1.7526-1.362-3.8314-1.362-6.2327,0-2.3402.4534-4.3951,1.362-6.1647.9103-1.7696,2.1925-3.1486,3.8466-4.1336,1.6558-.9884,3.5986-1.4843,5.8318-1.4843,1.503,0,2.9024.2411,4.2032.7201,1.2992.4789,2.4354,1.199,3.4084,2.1568.9731.9578,1.7306,2.1602,2.274,3.6072ZM45.7378,29.2737c0-.9069-.1987-1.7119-.5927-2.4149-.3957-.6997-.9409-1.2534-1.6388-1.6508-.6964-.4008-1.503-.6012-2.4235-.6012-.9578,0-1.8053.2208-2.5406.6589-.7371.4382-1.3127,1.0292-1.7271,1.7628-.3818.679-.5853,1.4304-.6228,2.2451h9.5455ZM73.0682,20.9318c-1.1769-.6929-2.5543-1.0394-4.1353-1.0394-1.6898,0-3.1265.3872-4.3137,1.165-1.1854.7744-2.0294,1.824-2.5338,3.1486h-.2667v-4.0181h-6.017v22.7672h6.3125v-13.1617c.0102-.9782.1953-1.8138.557-2.5135.36-.6963.8644-1.2261,1.5115-1.593.647-.3635,1.396-.5469,2.2451-.5469,1.2653,0,2.257.394,2.9788,1.1786.7217.7846,1.0767,1.8749,1.0682,3.2675v13.3689h6.3125v-14.4965c0-1.7662-.326-3.2913-.9782-4.5718-.6521-1.2805-1.5658-2.2655-2.741-2.955Z"/></svg>