Merge 2a5d7646da into 07fd3e685a

BUG:https://github.com/ArthurSonzogni/FTXUI/issues/1032

.bcr/config.yaml

@@ -0,0 +1,18 @@
+# Copyright 2025 Arthur Sonzogni. All rights reserved.
+# Use of this source code is governed by the MIT license that can be found in
+# the LICENSE file.
+{
+  "homepage": "https://github.com/ArthurSonzogni/FTXUI",
+  "maintainers": [
+    {
+      "name": "Arthur Sonzogni",
+      "email": "sonzogniarthur@gmail.com",
+      "github": "ArthurSonzogni"
+    }
+  ],
+  "repository": [
+    "github:ArthurSonzogni/FTXUI"
+  ],
+  "versions": [],
+  "yanked_versions": {}
+}

.bcr/presubmit.yml

@@ -1,24 +1,25 @@
 # Copyright 2025 Arthur Sonzogni. All rights reserved.
 # Use of this source code is governed by the MIT license that can be found in
 # the LICENSE file.
-matrix:
+bcr_test_module:
-  platform:
+  module_path: "."
-  - centos7
+  matrix:
-  - debian10
+    platform: [
-  - ubuntu2004
+      "debian11",
-  - macos
+      "macos",
-  - windows
+      "macos-arm64",
-  bazel: [6.x, 7.x, 8.x]
+      "ubuntu2204",
-tasks:
+      "windows",
-  verify_targets:
+    ]
-    name: Build and test.
+    bazel: [
-    platform: ${{ platform }}
+      6.x,
-    bazel: ${{ bazel }}
+      7.x,
-    build_targets:
+      8.x,
-    - '@ftxui//:ftxui'
+    ]
-    - '@ftxui//:screen'
+  tasks:
-    - '@ftxui//:dom'
+    run_tests:
-    - '@ftxui//:component'
+      name: "Run test module"
-    test_targets:
+      platform: ${{ platform }}
-    - '@ftxui//:tests'
+      bazel: ${{ bazel }}
-
+      test_targets:
+        - "//..."

.bcr/source.template.json

@@ -1,5 +1,5 @@
 {
   "integrity": "",
-  "strip_prefix": "",
+  "strip_prefix": "{REPO}-{VERSION}",
-  "url": "https://github.com/ArthurSonzogni/FTXUI/releases/download/{TAG}/source.tar.gz"
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}-{TAG}.tar.gz"
 }

.github/workflows/build.yaml

@@ -1,12 +1,10 @@
 name: Build
 
 on:
-  # On new commits to main:
+  create:
   push:
     branches:
       - main
-
-  # On pull requests:
   pull_request:
     branches:
       - main
@@ -14,7 +12,7 @@ on:
 jobs:
 
   test_bazel:
-    name: "Bazel, ${{ matrix.compiler }}, ${{ matrix.os }}"
+    name: "Test Bazel"
     strategy:
       fail-fast: false
       matrix:
@@ -46,7 +44,7 @@ jobs:
         run: bazel run tests
 
   test_cmake:
-    name: "CMake, ${{ matrix.compiler }}, ${{ matrix.os }}"
+    name: "Tests CMake"
     strategy:
       fail-fast: false
       matrix:
@@ -154,3 +152,121 @@ jobs:
           flags: ${{ runner.os }}
           name: ${{ runner.os }}-coverage
           files: ./build/coverage.xml
+
+  # Create a release on new v* tags
+  release:
+    needs:
+      - test_cmake
+      - test_bazel
+    if: ${{ github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v') }}
+    name: "Create release"
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+    steps:
+      - name: "Create release"
+        uses: softprops/action-gh-release@v1
+        id: create_release
+        with:
+          draft: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  # Build artifact for the release
+  package:
+    name: "Build packages"
+    needs: release
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            asset_path: build/ftxui*Linux*
+          - os: macos-latest
+            asset_path: build/ftxui*Darwin*
+          - os: windows-latest
+            asset_path: build/ftxui*Win64*
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Get number of CPU cores
+        uses: SimenB/github-actions-cpu-cores@v1
+        id: cpu-cores
+
+      - name: "Checkout repository"
+        uses: actions/checkout@v3
+
+      - name: "Install cmake"
+        uses: lukka/get-cmake@latest
+
+      - name: "Build packages"
+        run: >
+          mkdir build;
+          cd build;
+          cmake ..
+          -DCMAKE_BUILD_TYPE=Release
+          -DCMAKE_BUILD_PARALLEL_LEVEL=${{ steps.cpu-cores.outputs.count }}
+          -DFTXUI_BUILD_DOCS=OFF
+          -DFTXUI_BUILD_EXAMPLES=OFF
+          -DFTXUI_BUILD_TESTS=OFF
+          -DFTXUI_BUILD_TESTS_FUZZER=OFF
+          -DFTXUI_ENABLE_INSTALL=ON
+          -DFTXUI_DEV_WARNINGS=ON ;
+          cmake --build . --target package;
+
+      - uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: ${{ matrix.asset_path }}
+          overwrite: true
+  
+  documentation:
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout repository"
+        uses: actions/checkout@v3
+
+      - name: "Install cmake"
+        uses: lukka/get-cmake@latest
+
+      - name: "Install emsdk"
+        uses: mymindstorm/setup-emsdk@v7
+
+      - name: "Install Doxygen/Graphviz"
+        run: >
+          sudo apt-get update;
+          sudo apt-get install doxygen graphviz;
+
+      - name: "Build documentation"
+        run: >
+          mkdir build;
+          cd build;
+          emcmake cmake ..
+          -DCMAKE_BUILD_TYPE=Release
+          -DFTXUI_BUILD_DOCS=ON
+          -DFTXUI_BUILD_EXAMPLES=ON
+          -DFTXUI_BUILD_TESTS=OFF
+          -DFTXUI_BUILD_TESTS_FUZZER=OFF
+          -DFTXUI_ENABLE_INSTALL=OFF
+          -DFTXUI_DEV_WARNINGS=ON ;
+          cmake --build . --target doc;
+          cmake --build . ;
+          rsync -amv
+          --include='*/'
+          --include='*.html'
+          --include='*.css'
+          --include='*.mjs'
+          --include='*.js'
+          --include='*.wasm'
+          --exclude='*'
+          examples
+          doc/doxygen/html;
+
+      - name: "Deploy"
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: build/doc/doxygen/html/
+          enable_jekyll: false
+          allow_empty_commit: false
+          force_orphan: true
+          publish_branch: gh-pages

.github/workflows/documentation.yaml

@@ -1,60 +0,0 @@
-name: Documentation
-
-on:
-  # On new commits to main:
-  push:
-    branches:
-      - main
-
-jobs:
-  documentation:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout repository"
-        uses: actions/checkout@v3
-
-      - name: "Install cmake"
-        uses: lukka/get-cmake@latest
-
-      - name: "Install emsdk"
-        uses: mymindstorm/setup-emsdk@v7
-
-      - name: "Install Doxygen/Graphviz"
-        run: >
-          sudo apt-get update;
-          sudo apt-get install doxygen graphviz;
-
-      - name: "Build documentation"
-        run: >
-          mkdir build;
-          cd build;
-          emcmake cmake ..
-          -DCMAKE_BUILD_TYPE=Release
-          -DFTXUI_BUILD_DOCS=ON
-          -DFTXUI_BUILD_EXAMPLES=ON
-          -DFTXUI_BUILD_TESTS=OFF
-          -DFTXUI_BUILD_TESTS_FUZZER=OFF
-          -DFTXUI_ENABLE_INSTALL=OFF
-          -DFTXUI_DEV_WARNINGS=ON ;
-          cmake --build . --target doc;
-          cmake --build . ;
-          rsync -amv
-          --include='*/'
-          --include='*.html'
-          --include='*.css'
-          --include='*.mjs'
-          --include='*.js'
-          --include='*.wasm'
-          --exclude='*'
-          examples
-          doc/doxygen/html;
-
-      - name: "Deploy"
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: build/doc/doxygen/html/
-          enable_jekyll: false
-          allow_empty_commit: false
-          force_orphan: true
-          publish_branch: gh-pages

.github/workflows/publish.yaml

@@ -1,37 +0,0 @@
-name: "Publish to Bazel Central Registry"
-
-on:
-  # Manual kick-off (you type the tag)
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: "Tag to publish"
-        required: true
-        type: string
-
-  # Fire as soon as the Release workflow completes
-  workflow_run:
-    workflows:
-      - Release
-    types:
-      - completed
-
-permissions:
-
-  attestations: write
-  contents:     write
-  id-token:     write
-
-jobs:
-  publish:
-    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v0.0.4
-    # Only run on manual dispatch, or when Release finishes successfully
-    if: |
-      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
-    with:
-      tag_name: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name || github.event.workflow_run.head_branch }}
-      registry_fork: ArthurSonzogni/bazel-central-registry
-
-    secrets:
-      publish_token: ${{ secrets.PUBLISH_TOKEN }}

.github/workflows/publish_to_bcr.yaml

@@ -0,0 +1,28 @@
+on:
+  # Run the publish workflow after a successful release.
+  workflow_call:
+    inputs:
+      tag_name:
+        required: true
+        type: string
+
+  # Allow manual triggering of the workflow.
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        required: true
+        type: string
+
+jobs:    
+  publish:
+    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@[version]
+    with:
+      tag_name: ${{ inputs.tag_name }}
+      # GitHub repository which is a fork of the upstream where the Pull Request will be opened.
+      registry_fork: ArthurSonzogni/bazel-central-registry
+    permissions:
+      attestations: write
+      contents: write
+      id-token: write
+    secrets:
+      publish_token: ${{ secrets.PUBLISH_TOKEN }}

.github/workflows/release.yaml

@@ -1,112 +0,0 @@
-name: Release
-
-on:
-  # On push to a tag:
-  push:
-    tags:
-      - 'v*'
-
-  # On manual trigger:
-  workflow_dispatch:
-
-permissions:
-  # Needed to mint attestations
-  id-token: write
-  attestations: write
-  # Needed to upload release assets
-  contents: write
-
-jobs:
-  release:
-    name: "Create release"
-    runs-on: ubuntu-latest
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
-    steps:
-      - name: "Create release"
-        uses: softprops/action-gh-release@v1
-        id: create_release
-        with:
-          draft: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  # Build artifact for the release
-  package_compiled:
-    name: "Build packages"
-    needs: release
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            asset_path: build/ftxui*Linux*
-          - os: macos-latest
-            asset_path: build/ftxui*Darwin*
-          - os: windows-latest
-            asset_path: build/ftxui*Win64*
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Get number of CPU cores
-        uses: SimenB/github-actions-cpu-cores@v1
-        id: cpu-cores
-
-      - name: "Checkout repository"
-        uses: actions/checkout@v3
-
-      - name: "Install cmake"
-        uses: lukka/get-cmake@latest
-
-      - name: "Build packages"
-        run: >
-          mkdir build;
-          cd build;
-          cmake ..
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_BUILD_PARALLEL_LEVEL=${{ steps.cpu-cores.outputs.count }}
-          -DFTXUI_BUILD_DOCS=OFF
-          -DFTXUI_BUILD_EXAMPLES=OFF
-          -DFTXUI_BUILD_TESTS=OFF
-          -DFTXUI_BUILD_TESTS_FUZZER=OFF
-          -DFTXUI_ENABLE_INSTALL=ON
-          -DFTXUI_DEV_WARNINGS=ON ;
-          cmake --build . --target package;
-
-      - uses: shogo82148/actions-upload-release-asset@v1
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: ${{ matrix.asset_path }}
-          overwrite: true
-
-  # Build "source" artifact for the release. This is the same as the github
-  # "source" archive, but with a stable URL. This is useful for the Bazel
-  # Central Repository.
-  package_source:
-    name: "Build source package"
-    needs: release
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout repository"
-        uses: actions/checkout@v3
-
-      - name: "Create source package"
-        run: >
-          git archive --format=tar.gz -o source.tar.gz HEAD
-
-      - name: "Upload source package"
-        uses: shogo82148/actions-upload-release-asset@v1
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: source.tar.gz
-          overwrite: true
-
-      - name: Generate source attestation
-        id: attest_source
-        uses: actions/attest-build-provenance@v2
-        with:
-          subject-path: source.tar.gz
-
-      - name: "Upload source attestation"
-        uses: actions/upload-artifact@v3
-        with:
-          name: source.tar.gz.intoto.jsonl
-          path: ${{ steps.attest_source.outputs.bundle-path }}

BUILD.bazel

@@ -3,9 +3,13 @@
 # the LICENSE file.
 
 # TODO:
-# - Build benchmark.
+# - Windows/MSVC support.
-# - Build fuzzers.
+#   - Pass /utf-8 to MSVC users depending on FTXUI.
-# - Build documentation.
+#   - Pass "FTXUI_MICROSOFT_TERMINAL_FALLBACK" to windows users.
+# - Support building benchmark.
+# - Support building examples.
+# - Support building fuzzer.
+# - Support building documentation.
 # - Enable the two tests timing out.
 # - Support WebAssembly
 
@@ -13,7 +17,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load(":bazel/ftxui.bzl", "ftxui_cc_library")
 load(":bazel/ftxui.bzl", "generate_examples")
 load(":bazel/ftxui.bzl", "cpp20")
-load(":bazel/ftxui.bzl", "windows_copts")
+load(":bazel/ftxui.bzl", "msvc_copts")
 load(":bazel/ftxui.bzl", "pthread_linkopts")
 
 package(default_visibility = ["//visibility:public"])
@@ -241,7 +245,7 @@ cc_test(
         "include",
         "src",
     ],
-    copts = cpp20() + windows_copts(),
+    copts = cpp20() + msvc_copts(),
     deps = [
         "//:ftxui",
         "@googletest//:gtest_main",

CHANGELOG.md

@@ -1,35 +1,11 @@
 Changelog
 =========
 
-Future release
+Next release (2025-04-01)
-------------
+-------------------------
-
-6.1.6 (2025-05-01)
-------------------
 
 ### Build
-- Feature: Support `bazel` build system. See #1032.
+- Feature: Support `bazel`. See #1032. Proposed by @kcc.
-  Proposed by Kostya Serebryany @kcc
-  If all goes well (pending), it should appear in the Bazel central repository.
-  It can be imported into your project using the following lines:
-
-  **MODULE.bazel**
-  ```bazel
-  bazel_dep(name = "ftxui", version = "6.1.6")
-  ```
-
-  **BUILD.bazel**
-  ```bazel
-  deps = [
-    // Depend on the whole library:
-    "@ftxui//:ftxui",
-
-    // Choose a specific submodule:
-    "@ftxui//:component",
-    "@ftxui//:dom",
-    "@ftxui//:screen",
-  ]
-  ```
 
 ### Component
 - Bugfix: Fix a crash with ResizeableSplit. See #1023.

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(ftxui
   LANGUAGES CXX
-  VERSION 6.1.6
+  VERSION 6.0.2
   DESCRIPTION "C++ Functional Terminal User Interface."
 )
 

MODULE.bazel

@@ -3,7 +3,7 @@
 # the LICENSE file.
 
 # FTXUI Module.
-module(name = "ftxui", version = "6.1.6")
+module(name = "ftxui", version = "6.0.3")
 
 # Build deps.
 bazel_dep(name = "rules_cc", version = "0.1.1")

README.md

@@ -372,7 +372,7 @@ include(FetchContent)
 
 FetchContent_Declare(ftxui
   GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui
-  GIT_TAG v6.1.6
+  GIT_TAG v6.0.2
 )
 
 FetchContent_GetProperties(ftxui)

bazel/ftxui.bzl

@@ -20,42 +20,23 @@ def cpp20():
         "//conditions:default": ["-std=c++20"],
     })
 
-# Microsoft terminal is a bit buggy ¯\_(ツ)_/¯ and MSVC uses bad defaults.
+def msvc_copts():
-def windows_copts():
     MSVC_COPTS = [
-      # Microsoft Visual Studio must decode sources files as UTF-8.
+      # Force Microsoft Visual Studio to decode sources files in UTF-8.
       "/utf-8",
 
-      # Microsoft Visual Studio must interpret the codepoint using unicode.
+      # Force Microsoft Visual Studio to interpret the source files as
+      # Unicode.
       "/DUNICODE",
       "/D_UNICODE",
 
       # Fallback for Microsoft Terminal.
-      # This
-      # - Replace missing font symbols by others.
-      # - Reduce screen position pooling frequency to deals against a Microsoft
-      #   race condition. This was fixed in 2020, but clients never not updated.
-      #   - https://github.com/microsoft/terminal/pull/7583
-      #   - https://github.com/ArthurSonzogni/FTXUI/issues/136
       "/DFTXUI_MICROSOFT_TERMINAL_FALLBACK",
     ]
-
-    WINDOWS_COPTS = [
-      # Fallback for Microsoft Terminal.
-      # This
-      # - Replace missing font symbols by others.
-      # - Reduce screen position pooling frequency to deals against a Microsoft
-      #   race condition. This was fixed in 2020, but clients never not updated.
-      #   - https://github.com/microsoft/terminal/pull/7583
-      #   - https://github.com/ArthurSonzogni/FTXUI/issues/136
-      "-DFTXUI_MICROSOFT_TERMINAL_FALLBACK",
-    ];
     
     return select({
-        # MSVC:
         "@rules_cc//cc/compiler:msvc-cl": MSVC_COPTS,
         "@rules_cc//cc/compiler:clang-cl": MSVC_COPTS,
-        "@platforms//os:windows": WINDOWS_COPTS,
         "//conditions:default": [],
     })
 
@@ -88,12 +69,10 @@ def ftxui_cc_library(
             "include",
             "src",
         ],
-        copts = cpp17() + windows_copts(),
+        copts = cpp17() + msvc_copts(),
         visibility = ["//visibility:public"],
     )
 
-# Compile all the examples in the examples/ directory.
-# This is useful to check the Bazel is synchronized with CMake definitions.
 def generate_examples():
     cpp_files = native.glob(["examples/**/*.cpp"])
 
@@ -111,5 +90,5 @@ def generate_examples():
             name = name,
             srcs = [src],
             deps = ["//:component"],
-            copts = cpp20() + windows_copts(),
+            copts = cpp20() + msvc_copts(),
         )