diff --git a/.github/actions/deploy-vercel/action.yml b/.github/actions/deploy-vercel/action.yml index 63cd64980add..c1e7d29bc86b 100644 --- a/.github/actions/deploy-vercel/action.yml +++ b/.github/actions/deploy-vercel/action.yml @@ -26,4 +26,3 @@ inputs: runs: using: "node20" main: "index.mjs" - diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index fc74db961e29..0478952e2f0c 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -81,4 +81,3 @@ runs: shell: bash run: | sccache --show-stats - diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml index 4cc2fbe9821e..d1c4a5a76e36 100644 --- a/.github/workflows/auto_approve.yml +++ b/.github/workflows/auto_approve.yml @@ -44,4 +44,3 @@ jobs: --github-token "${{ secrets.GITHUB_TOKEN }}" \ --github-repository "rerun-io/rerun" \ --pr-number "${{ github.event.pull_request.number || github.event.issue.number }}" - diff --git a/.github/workflows/auto_release_crates.yml b/.github/workflows/auto_release_crates.yml index 49c47c3f1780..3d142a5edc87 100644 --- a/.github/workflows/auto_release_crates.yml +++ b/.github/workflows/auto_release_crates.yml @@ -65,4 +65,3 @@ jobs: with: CONCURRENCY: weekly-release-${{ github.run_id }} secrets: inherit - diff --git a/.github/workflows/checkboxes.yml b/.github/workflows/checkboxes.yml index 09615f269ffe..e5a935384aee 100644 --- a/.github/workflows/checkboxes.yml +++ b/.github/workflows/checkboxes.yml @@ -45,4 +45,3 @@ jobs: --github-token ${{ secrets.GITHUB_TOKEN }} \ --github-repository ${{ github.repository }} \ --pr-number ${{ github.event.pull_request.number }} - diff --git a/.github/workflows/clear_cache.yml b/.github/workflows/clear_cache.yml index a281f2a2ac4a..fa081e73609b 100644 --- a/.github/workflows/clear_cache.yml +++ b/.github/workflows/clear_cache.yml @@ -59,4 +59,3 @@ jobs: } clearInterval(_id); - diff --git a/.github/workflows/contrib_rerun_py.yml b/.github/workflows/contrib_rerun_py.yml index 3377ede54076..3e5376b67ae8 100644 --- a/.github/workflows/contrib_rerun_py.yml +++ b/.github/workflows/contrib_rerun_py.yml @@ -131,4 +131,3 @@ jobs: mkdir rrd pip install -r examples/python/structure_from_motion/requirements.txt python3 examples/python/structure_from_motion/main.py --dataset colmap_fiat --resize 800x600 --save rrd/colmap_fiat.rrd - diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml index 9674ecc4dbb3..33d56163ee72 100644 --- a/.github/workflows/documentation.yaml +++ b/.github/workflows/documentation.yaml @@ -40,4 +40,3 @@ jobs: retryErrors: true retryErrorsCount: 5 retryErrorsJitter: 2000 - diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 0a459462fb61..67e80e0d2564 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -37,4 +37,3 @@ jobs: mode: minimum count: 1 labels: "📊 analytics, , 🟦 blueprint, 🪳 bug, C/C++ SDK, codegen/idl, 🧑‍💻 dev experience, dependencies, 📖 documentation, 💬 discussion, examples, exclude from changelog, 📉 performance, 🐍 python API, ⛃ re_datastore, 📺 re_viewer, 🔺 re_renderer, 🚜 refactor, ⛴ release, 🦀 rust SDK, 🔨 testing, ui, 🕸️ web" - diff --git a/.github/workflows/on_gh_release.yml b/.github/workflows/on_gh_release.yml index 05172eb13aa7..190d682869df 100644 --- a/.github/workflows/on_gh_release.yml +++ b/.github/workflows/on_gh_release.yml @@ -21,4 +21,3 @@ jobs: CONCURRENCY: "${{ github.event.release.tag_name }}" RELEASE_VERSION: "${{ github.event.release.tag_name }}" secrets: inherit - diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml index 8b62db22be58..49b69881ba8d 100644 --- a/.github/workflows/on_pull_request.yml +++ b/.github/workflows/on_pull_request.yml @@ -184,4 +184,3 @@ jobs: CONCURRENCY: pr-${{ github.event.pull_request.number }} PR_NUMBER: ${{ github.event.pull_request.number }} secrets: inherit - diff --git a/.github/workflows/on_pull_request_contrib.yml b/.github/workflows/on_pull_request_contrib.yml index b7d5c1b98d30..cfddeb004350 100644 --- a/.github/workflows/on_pull_request_contrib.yml +++ b/.github/workflows/on_pull_request_contrib.yml @@ -29,4 +29,3 @@ jobs: with: CONCURRENCY: pr-${{ github.event.pull_request.number }} MATURIN_FEATURE_FLAGS: "--no-default-features --features extension-module" - diff --git a/.github/workflows/on_pull_request_target_contrib.yml b/.github/workflows/on_pull_request_target_contrib.yml index f028892e32e4..6f8a08de8a24 100644 --- a/.github/workflows/on_pull_request_target_contrib.yml +++ b/.github/workflows/on_pull_request_target_contrib.yml @@ -40,4 +40,3 @@ jobs: --github-token '${{ secrets.GITHUB_TOKEN }}' \ --github-repository '${{ github.repository }}' \ --pr-number '${{ github.event.pull_request.number }}' - diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd0f4bdee331..1f537f312410 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -426,4 +426,3 @@ jobs: EOF gh pr comment $pr_number --body-file comment-body.txt - diff --git a/.github/workflows/reusable_bench.yml b/.github/workflows/reusable_bench.yml index 854de7419253..730061949b22 100644 --- a/.github/workflows/reusable_bench.yml +++ b/.github/workflows/reusable_bench.yml @@ -157,4 +157,3 @@ jobs: scripts/ci/render_bench.py crates \ --after $(date -d"30 days ago" +%Y-%m-%d) \ --output "gs://rerun-builds/graphs" - diff --git a/.github/workflows/reusable_build_and_upload_rerun_c.yml b/.github/workflows/reusable_build_and_upload_rerun_c.yml index 12f789908d41..912436304e45 100644 --- a/.github/workflows/reusable_build_and_upload_rerun_c.yml +++ b/.github/workflows/reusable_build_and_upload_rerun_c.yml @@ -166,4 +166,3 @@ jobs: path: "./target/${{ needs.set-config.outputs.TARGET }}/release/${{ needs.set-config.outputs.LIB_NAME }}" destination: "rerun-builds/adhoc/${{inputs.ADHOC_NAME}}/rerun_c/${{ inputs.PLATFORM }}" parent: false - diff --git a/.github/workflows/reusable_build_npm.yml b/.github/workflows/reusable_build_npm.yml index ae981b69bfa7..62c80e1f06a1 100644 --- a/.github/workflows/reusable_build_npm.yml +++ b/.github/workflows/reusable_build_npm.yml @@ -57,4 +57,3 @@ jobs: - name: Build package shell: bash run: node rerun_js/web-viewer/scripts/build.mjs - diff --git a/.github/workflows/reusable_build_web.yml b/.github/workflows/reusable_build_web.yml index e82f66178edd..aa026c1af572 100644 --- a/.github/workflows/reusable_build_web.yml +++ b/.github/workflows/reusable_build_web.yml @@ -65,4 +65,3 @@ jobs: with: name: web_viewer path: web_viewer - diff --git a/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml b/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml index 0e112a07757c..396a395f151d 100644 --- a/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml +++ b/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml @@ -56,4 +56,3 @@ jobs: - name: "Bundle and upload rerun_cpp_sdk.zip" shell: bash run: python3 ./scripts/ci/bundle_and_upload_rerun_cpp.py --git-hash ${{ steps.get-sha.outputs.sha }} --platform-filter=${{ inputs.PLATFORM_FILTER }} - diff --git a/.github/workflows/reusable_checks.yml b/.github/workflows/reusable_checks.yml index e10f32c72d6e..84ab5bc2b5bb 100644 --- a/.github/workflows/reusable_checks.yml +++ b/.github/workflows/reusable_checks.yml @@ -384,3 +384,17 @@ jobs: # Only check c/cpp/h/hpp (default checks also .proto and others) include-regex: ^.*\.(c|cpp|h|hpp)$ + misc-formatting: + name: Misc formatting + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || '' }} + + - uses: prefix-dev/setup-pixi@v0.4.1 + with: + pixi-version: v0.6.0 + + - name: prettier --check + run: pixi run misc-fmt-check diff --git a/.github/workflows/reusable_pip_index.yml b/.github/workflows/reusable_pip_index.yml index ccfbb7fef4e1..dba7a9ba68b7 100644 --- a/.github/workflows/reusable_pip_index.yml +++ b/.github/workflows/reusable_pip_index.yml @@ -57,4 +57,3 @@ jobs: python scripts/ci/generate_prerelease_pip_index.py \ --commit ${{ github.sha }} \ --upload - diff --git a/.github/workflows/reusable_pr_summary.yml b/.github/workflows/reusable_pr_summary.yml index 3f39f75c30ca..cccc509e6173 100644 --- a/.github/workflows/reusable_pr_summary.yml +++ b/.github/workflows/reusable_pr_summary.yml @@ -62,4 +62,3 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_NUMBER: ${{ inputs.PR_NUMBER }} - diff --git a/.github/workflows/reusable_publish_npm.yml b/.github/workflows/reusable_publish_npm.yml index 98b02b08e1a4..bd8c1a222273 100644 --- a/.github/workflows/reusable_publish_npm.yml +++ b/.github/workflows/reusable_publish_npm.yml @@ -68,4 +68,3 @@ jobs: shell: bash run: | pixi run node rerun_js/web-viewer/scripts/publish.mjs - diff --git a/.github/workflows/reusable_publish_rerun_c.yml b/.github/workflows/reusable_publish_rerun_c.yml index a0f8e16fc68d..8acab8666958 100644 --- a/.github/workflows/reusable_publish_rerun_c.yml +++ b/.github/workflows/reusable_publish_rerun_c.yml @@ -54,15 +54,8 @@ jobs: bundle-and-upload-rerun_cpp: name: "Bundle and upload rerun_cpp_sdk.zip" - needs: - [ - linux, - macos-intel, - macos-arm, - windows, - ] + needs: [linux, macos-intel, macos-arm, windows] uses: ./.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml with: RELEASE_COMMIT: ${{ inputs.release-commit }} secrets: inherit - diff --git a/.github/workflows/reusable_publish_rerun_cli.yml b/.github/workflows/reusable_publish_rerun_cli.yml index 94eeceeaf1d3..bb3d56a5a008 100644 --- a/.github/workflows/reusable_publish_rerun_cli.yml +++ b/.github/workflows/reusable_publish_rerun_cli.yml @@ -51,4 +51,3 @@ jobs: PLATFORM: windows RELEASE_COMMIT: ${{ inputs.release-commit }} secrets: inherit - diff --git a/.github/workflows/reusable_run_notebook.yml b/.github/workflows/reusable_run_notebook.yml index 0daa7865bee7..3120b786477e 100644 --- a/.github/workflows/reusable_run_notebook.yml +++ b/.github/workflows/reusable_run_notebook.yml @@ -93,4 +93,3 @@ jobs: path: "/tmp/cube.html" destination: "rerun-builds/commit/${{env.SHORT_SHA}}/notebooks" parent: false - diff --git a/.github/workflows/reusable_sync_release_assets.yml b/.github/workflows/reusable_sync_release_assets.yml index 81da995d4da2..fea9ddb54604 100644 --- a/.github/workflows/reusable_sync_release_assets.yml +++ b/.github/workflows/reusable_sync_release_assets.yml @@ -63,4 +63,3 @@ jobs: --github-token ${{ secrets.GITHUB_TOKEN }} \ --wait ${{ inputs.WAIT_TIME_SECS }} \ --remove --update - diff --git a/.github/workflows/reusable_test_wheels.yml b/.github/workflows/reusable_test_wheels.yml index 4f9527fda2ac..cb2b35d08227 100644 --- a/.github/workflows/reusable_test_wheels.yml +++ b/.github/workflows/reusable_test_wheels.yml @@ -199,4 +199,3 @@ jobs: # --no-py-build because rerun-sdk is already built and installed run: | RUST_LOG=debug docs/code-examples/roundtrips.py --release --target x86_64-unknown-linux-gnu --no-py-build - diff --git a/.github/workflows/reusable_track_size.yml b/.github/workflows/reusable_track_size.yml index a4a55c7c311c..b6398dbb6bd1 100644 --- a/.github/workflows/reusable_track_size.yml +++ b/.github/workflows/reusable_track_size.yml @@ -183,4 +183,3 @@ jobs: scripts/ci/render_bench.py sizes \ --after $(date -d"180 days ago" +%Y-%m-%d) \ --output "gs://rerun-builds/graphs" - diff --git a/.github/workflows/reusable_update_pr_body.yml b/.github/workflows/reusable_update_pr_body.yml index d92ca19d55a8..5f3987958999 100644 --- a/.github/workflows/reusable_update_pr_body.yml +++ b/.github/workflows/reusable_update_pr_body.yml @@ -48,4 +48,3 @@ jobs: --github-token '${{ secrets.GITHUB_TOKEN }}' \ --github-repository '${{ github.repository }}' \ --pr-number '${{ inputs.PR_NUMBER }}' - diff --git a/.github/workflows/reusable_upload_web.yml b/.github/workflows/reusable_upload_web.yml index 5c4010e70490..1bcf1a6dc163 100644 --- a/.github/workflows/reusable_upload_web.yml +++ b/.github/workflows/reusable_upload_web.yml @@ -122,4 +122,3 @@ jobs: path: "web_viewer" destination: "rerun-web-viewer/pr/${{ inputs.PR_NUMBER }}" parent: false - diff --git a/.github/workflows/reusable_upload_web_demo.yml b/.github/workflows/reusable_upload_web_demo.yml index a7e552059440..5e0a80a892e6 100644 --- a/.github/workflows/reusable_upload_web_demo.yml +++ b/.github/workflows/reusable_upload_web_demo.yml @@ -121,4 +121,3 @@ jobs: path: "web_demo" destination: "rerun-demo/pr/${{ inputs.PR_NUMBER }}" parent: false - diff --git a/.github/workflows/reusable_upload_wheels.yml b/.github/workflows/reusable_upload_wheels.yml index 0804979214b8..3db865f0d145 100644 --- a/.github/workflows/reusable_upload_wheels.yml +++ b/.github/workflows/reusable_upload_wheels.yml @@ -94,4 +94,3 @@ jobs: path: "dist" destination: "rerun-builds/commit/${{ steps.get-sha.outputs.sha }}/wheels" parent: false - diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000000..2b9561f7fa1e --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +rerun_cpp/docs/**/* diff --git a/.prettierrc.toml b/.prettierrc.toml new file mode 100644 index 000000000000..1bea79eb6f0d --- /dev/null +++ b/.prettierrc.toml @@ -0,0 +1,14 @@ +semi = true +tabWidth = 4 + +[[overrides]] +files = ["*.yml", "*.yaml"] +options = { tabWidth = 2 } + +[[overrides]] +files = "*.js" +options = { semi = true, tabWidth = 2 } + +[[overrides]] +files = [".prettierrc", "*.json", "*.css", "*.html"] +options = { tabWidth = 2 } diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 9a79dca76eef..f15bc7d665a4 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -21,5 +21,6 @@ "webfreak.debug", "xaver.clang-format", // C++ formatter "zxh404.vscode-proto3", + "esbenp.prettier-vscode" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 98b125021661..2d4dfe5a8482 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -86,4 +86,17 @@ "[python]": { "editor.defaultFormatter": "charliermarsh.ruff", }, + + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[yaml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } } diff --git a/pixi.lock b/pixi.lock index 774d9ce33aaa..53380b07e19c 100644 --- a/pixi.lock +++ b/pixi.lock @@ -8831,6 +8831,102 @@ package: license_family: Apache size: 279200 timestamp: 1676838681615 +- platform: linux-64 + name: nodejs + version: 20.9.0 + category: main + manager: conda + dependencies: + - __glibc >=2.17,<3.0.a0 + - icu >=73.2,<74.0a0 + - libgcc-ng >=12 + - libstdcxx-ng >=12 + - libuv >=1.46.0,<1.47.0a0 + - libzlib >=1.2.13,<1.3.0a0 + - openssl >=3.1.4,<4.0a0 + - zlib + url: https://conda.anaconda.org/conda-forge/linux-64/nodejs-20.9.0-hb753e55_0.conda + hash: + md5: ddfcb003b0a6804fabe7dfbf1be16651 + sha256: 4d35f8151f83bc561e4bcb41b46dcf77ec708c88eb333d1376f37371288f46ad + build: hb753e55_0 + arch: x86_64 + subdir: linux-64 + build_number: 0 + license: MIT + license_family: MIT + size: 17141416 + timestamp: 1700390394425 +- platform: osx-64 + name: nodejs + version: 20.9.0 + category: main + manager: conda + dependencies: + - __osx >=10.9 + - icu >=73.2,<74.0a0 + - libcxx >=16.0.6 + - libuv >=1.46.0,<1.47.0a0 + - libzlib >=1.2.13,<1.3.0a0 + - openssl >=3.1.4,<4.0a0 + - zlib + url: https://conda.anaconda.org/conda-forge/osx-64/nodejs-20.9.0-h9adec40_0.conda + hash: + md5: eea3610c4b86886f545c0fe53d1e9438 + sha256: b492f1478fbca841491fbb9feeca7e859a9f57ea6319eeef09d702e12140a44f + build: h9adec40_0 + arch: x86_64 + subdir: osx-64 + build_number: 0 + constrains: + - __osx >=10.15 + license: MIT + license_family: MIT + size: 12232858 + timestamp: 1700393211831 +- platform: osx-arm64 + name: nodejs + version: 20.9.0 + category: main + manager: conda + dependencies: + - __osx >=10.9 + - icu >=73.2,<74.0a0 + - libcxx >=16.0.6 + - libuv >=1.46.0,<1.47.0a0 + - libzlib >=1.2.13,<1.3.0a0 + - openssl >=3.1.4,<4.0a0 + - zlib + url: https://conda.anaconda.org/conda-forge/osx-arm64/nodejs-20.9.0-h0950e01_0.conda + hash: + md5: f51aebc416d466c13a719f3604b2426c + sha256: 2e2cb08f6525a7ac7b4d9785ac826e9663ee969d21298f9718906fb931cb85e9 + build: h0950e01_0 + arch: aarch64 + subdir: osx-arm64 + build_number: 0 + license: MIT + license_family: MIT + size: 11636727 + timestamp: 1700400190792 +- platform: win-64 + name: nodejs + version: 20.9.0 + category: main + manager: conda + dependencies: [] + url: https://conda.anaconda.org/conda-forge/win-64/nodejs-20.9.0-h57928b3_0.conda + hash: + md5: 97d4628e7c293eb10516d35c6fb3c7e5 + sha256: 7ec505ac95df1847bd0065ae587a4fd176a23e4ddccda246113e0b5426a8469e + build: h57928b3_0 + arch: x86_64 + subdir: win-64 + build_number: 0 + license: MIT + license_family: MIT + size: 22600407 + timestamp: 1700384957633 - platform: linux-64 name: nox version: 2021.10.1 @@ -9048,68 +9144,68 @@ package: timestamp: 1694920741486 - platform: linux-64 name: openssl - version: 3.1.3 + version: 3.2.0 category: main manager: conda dependencies: - - ca-certificates * + - ca-certificates - libgcc-ng >=12 - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.3-hd590300_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.2.0-hd590300_1.conda hash: - md5: 7bb88ce04c8deb9f7d763ae04a1da72f - sha256: f4e35f506c7e8ab7dfdc47255b0d5aa8ce0c99028ae0affafd274333042c4f70 - build: hd590300_0 + md5: 603827b39ea2b835268adb8c821b8570 + sha256: 80efc6f429bd8e622d999652e5cba2ca56fcdb9c16a439d2ce9b4313116e4a87 + build: hd590300_1 arch: x86_64 subdir: linux-64 - build_number: 0 + build_number: 1 constrains: - pyopenssl >=22.1 license: Apache-2.0 license_family: Apache - size: 2642850 - timestamp: 1695158025027 + size: 2854103 + timestamp: 1701162437033 - platform: osx-64 name: openssl - version: 3.1.3 + version: 3.2.0 category: main manager: conda dependencies: - - ca-certificates * - url: https://conda.anaconda.org/conda-forge/osx-64/openssl-3.1.3-h8a1eda9_0.conda + - ca-certificates + url: https://conda.anaconda.org/conda-forge/osx-64/openssl-3.2.0-hd75f5a5_1.conda hash: - md5: 26f9b58f905547e658e9587f8e8cfe43 - sha256: 69731ce62d4b68e538af559747da53f837ae0bbca519b38f2eea28680eb9e8d1 - build: h8a1eda9_0 + md5: 06cb561619487c88891839b9beb5244c + sha256: 99161bf349f5dc80322f2a2c188588d11efa662566e4e19f2ac0a36d9fa3de25 + build: hd75f5a5_1 arch: x86_64 subdir: osx-64 - build_number: 0 + build_number: 1 constrains: - pyopenssl >=22.1 license: Apache-2.0 license_family: Apache - size: 2329752 - timestamp: 1695158667922 + size: 2508164 + timestamp: 1701163123673 - platform: osx-arm64 name: openssl - version: 3.1.3 + version: 3.2.0 category: main manager: conda dependencies: - - ca-certificates * - url: https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.1.3-h53f4e23_0.conda + - ca-certificates + url: https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.2.0-h0d3ecfb_1.conda hash: - md5: 40d01d3f39589f54b618ddd28a5a48cb - sha256: d9af6208610d4985322b8eade79215f1ded6e2a2b41b0a885714b971a36a5bae - build: h53f4e23_0 + md5: 47d16d26100f19ca495882882b7bc93b + sha256: a53e1c6c058b621fd1d13cca6f9cccd534d2b3f4b4ac789fe26f7902031d6c41 + build: h0d3ecfb_1 arch: aarch64 subdir: osx-arm64 - build_number: 0 + build_number: 1 constrains: - pyopenssl >=22.1 license: Apache-2.0 license_family: Apache - size: 2225422 - timestamp: 1695158154709 + size: 2856233 + timestamp: 1701162541844 - platform: win-64 name: openssl version: 3.1.3 @@ -9666,6 +9762,83 @@ package: noarch: python size: 22548 timestamp: 1693086745921 +- platform: linux-64 + name: prettier + version: 3.1.0 + category: main + manager: conda + dependencies: + - __glibc >=2.17,<3.0.a0 + - nodejs >=20.8.1,<21.0a0 + url: https://conda.anaconda.org/conda-forge/linux-64/prettier-3.1.0-h31abb78_0.conda + hash: + md5: 825c43da21ded31f538a695cca2961ee + sha256: a836d8d87734c76e04b64f66d2a72262ac09ce7e23c92b3f77d47bdc20267a21 + build: h31abb78_0 + arch: x86_64 + subdir: linux-64 + build_number: 0 + license: MIT + license_family: MIT + size: 1005605 + timestamp: 1699847633602 +- platform: osx-64 + name: prettier + version: 3.1.0 + category: main + manager: conda + dependencies: + - nodejs >=20.8.1,<21.0a0 + url: https://conda.anaconda.org/conda-forge/osx-64/prettier-3.1.0-hbd11d21_0.conda + hash: + md5: 0f2d6f2c329df13e0ff0bd3748b2f74f + sha256: 9dfd2b3d2d4c3cbdeb341263d5107b7018197ad167633387832def6f68154e55 + build: hbd11d21_0 + arch: x86_64 + subdir: osx-64 + build_number: 0 + license: MIT + license_family: MIT + size: 1002551 + timestamp: 1699847747031 +- platform: osx-arm64 + name: prettier + version: 3.1.0 + category: main + manager: conda + dependencies: + - nodejs >=20.8.1,<21.0a0 + url: https://conda.anaconda.org/conda-forge/osx-arm64/prettier-3.1.0-hb67532b_0.conda + hash: + md5: dfa0c94c177b8163579301aa4672f245 + sha256: c71c69ba2420da67a4bc1a5a85deab03e3c37cb4dea44a3bef01cc91e24bb1da + build: hb67532b_0 + arch: aarch64 + subdir: osx-arm64 + build_number: 0 + license: MIT + license_family: MIT + size: 1004352 + timestamp: 1699847777152 +- platform: win-64 + name: prettier + version: 3.1.0 + category: main + manager: conda + dependencies: + - nodejs >=20.8.1,<21.0a0 + url: https://conda.anaconda.org/conda-forge/win-64/prettier-3.1.0-h98b3114_0.conda + hash: + md5: 7ad09d13bc00a0c025344ce159dd4234 + sha256: 637c81650139f101e16d3358ca29140ce635b189cc272c612be7452bb6c52f04 + build: h98b3114_0 + arch: x86_64 + subdir: win-64 + build_number: 0 + license: MIT + license_family: MIT + size: 1007428 + timestamp: 1699847793435 - platform: linux-64 name: psutil version: 5.9.5 @@ -12452,6 +12625,64 @@ package: noarch: python size: 18954 timestamp: 1695255262261 +- platform: linux-64 + name: zlib + version: 1.2.13 + category: main + manager: conda + dependencies: + - libgcc-ng >=12 + - libzlib 1.2.13 hd590300_5 + url: https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.13-hd590300_5.conda + hash: + md5: 68c34ec6149623be41a1933ab996a209 + sha256: 9887a04d7e7cb14bd2b52fa01858f05a6d7f002c890f618d9fcd864adbfecb1b + build: hd590300_5 + arch: x86_64 + subdir: linux-64 + build_number: 5 + license: Zlib + license_family: Other + size: 92825 + timestamp: 1686575231103 +- platform: osx-64 + name: zlib + version: 1.2.13 + category: main + manager: conda + dependencies: + - libzlib 1.2.13 h8a1eda9_5 + url: https://conda.anaconda.org/conda-forge/osx-64/zlib-1.2.13-h8a1eda9_5.conda + hash: + md5: 75a8a98b1c4671c5d2897975731da42d + sha256: d1f4c82fd7bd240a78ce8905e931e68dca5f523c7da237b6b63c87d5625c5b35 + build: h8a1eda9_5 + arch: x86_64 + subdir: osx-64 + build_number: 5 + license: Zlib + license_family: Other + size: 90764 + timestamp: 1686575574678 +- platform: osx-arm64 + name: zlib + version: 1.2.13 + category: main + manager: conda + dependencies: + - libzlib 1.2.13 h53f4e23_5 + url: https://conda.anaconda.org/conda-forge/osx-arm64/zlib-1.2.13-h53f4e23_5.conda + hash: + md5: a08383f223b10b71492d27566fafbf6c + sha256: de0ee1e24aa6867058d3b852a15c8d7f49f262f5828772700c647186d4a96bbe + build: h53f4e23_5 + arch: aarch64 + subdir: osx-arm64 + build_number: 5 + license: Zlib + license_family: Other + size: 79577 + timestamp: 1686575471024 - platform: linux-64 name: zstd version: 1.5.5 diff --git a/pixi.toml b/pixi.toml index 5a218265e134..cc48f20e866a 100644 --- a/pixi.toml +++ b/pixi.toml @@ -42,6 +42,9 @@ lint-py-ruff = "ruff check --config rerun_py/pyproject.toml" lint-taplo = "taplo fmt --check" lint-typos = "typos" +misc-fmt = "prettier --write '**/*.{yml,yaml,js,css,html}'" +misc-fmt-check = "prettier --check '**/*.{yml,yaml,js,css,html}'" + py-build = "maturin develop --manifest-path rerun_py/Cargo.toml --extras=tests" py-test = { cmd = "python -m pytest -vv rerun_py/tests/unit", depends_on = [ "py-build", @@ -107,8 +110,9 @@ ninja = "1.11.1" # Make sure to use a version that is compatible with # the theme we're using, see https://github.com/jothepro/doxygen-awesome-css/blob/v2.2.1/README.md doxygen = "1.9.7.*" -binaryen = "116.*" # for `wasm-opt` +binaryen = "116.*" # for `wasm-opt` nox = "2021.10.1.*" +prettier = "3.1.0.*" [target.linux-64.dependencies] patchelf = ">=0.17" diff --git a/rerun_js/web-viewer/index.js b/rerun_js/web-viewer/index.js index a72b5fbef516..a7e95562cc57 100644 --- a/rerun_js/web-viewer/index.js +++ b/rerun_js/web-viewer/index.js @@ -75,4 +75,3 @@ export class WebViewer { } } } - diff --git a/rerun_js/web-viewer/react/index.js b/rerun_js/web-viewer/react/index.js index 62237b3f635d..b148ef17d978 100644 --- a/rerun_js/web-viewer/react/index.js +++ b/rerun_js/web-viewer/react/index.js @@ -51,7 +51,7 @@ export default function WebViewer(props) { // The web viewer will be restarted when: // - `parent` is added/moved/removed in the DOM // - `rrd` changes - [parent.current, rrd] + [parent.current, rrd], ); return React.createElement("div", { @@ -60,4 +60,3 @@ export default function WebViewer(props) { ref: parent, }); } - diff --git a/rerun_py/docs/css/mkdocstrings.css b/rerun_py/docs/css/mkdocstrings.css index 53b5d3df729e..33f390c1d869 100644 --- a/rerun_py/docs/css/mkdocstrings.css +++ b/rerun_py/docs/css/mkdocstrings.css @@ -45,7 +45,7 @@ body { color: inherit; } -.md-typeset p+h1 { +.md-typeset p + h1 { margin-top: 2rem; } diff --git a/rerun_py/docs/templates/python/material/class.html b/rerun_py/docs/templates/python/material/class.html index a4408aa91bae..4ce657e9940b 100644 --- a/rerun_py/docs/templates/python/material/class.html +++ b/rerun_py/docs/templates/python/material/class.html @@ -1,126 +1,81 @@ {# Very minimally patched from: https://github.com/mkdocstrings/python/blob/master/src/mkdocstrings_handlers/python/templates/material/_base/class.html - -See: CHANGE comments below -#} - -{{ log.debug("Rendering " + class.path) }} +See: CHANGE comments below #} {{ log.debug("Rendering " + class.path) }}
-{% with html_id = class.path %} - - {% if root %} - {% set show_full_path = config.show_root_full_path %} - {% set root_members = True %} - {% elif root_members %} - {% set show_full_path = config.show_root_members_full_path or config.show_object_full_path %} - {% set root_members = False %} - {% else %} - {% set show_full_path = config.show_object_full_path %} - {% endif %} - - {% if not root or config.show_root_heading %} - - {% filter heading(heading_level, - role="class", - id=html_id, - class="doc doc-heading", - toc_label=class.name) %} - - {% if config.separate_signature %} - {% if show_full_path %}{{ class.path }}{% else %}{{ class.name }}{% endif %} - {% elif config.merge_init_into_class and "__init__" in class.members -%} - {%- with function = class.members["__init__"] -%} - {%- filter highlight(language="python", inline=True) -%} - {# CHANGE: Insert class before class for better highlighting #} - class {% if show_full_path %}{{ class.path }}{% else %}{{ class.name }}{% endif %} - {%- include "signature.html" with context -%} - {%- endfilter -%} - {%- endwith -%} - {% else %} - {# CHANGE: Insert class before class for better highlighting #} - {%- filter highlight(language="python", inline=True) -%} - class {% if show_full_path %}{{ class.path }}{% else %}{{ class.name }}{% endif %} - {%- endfilter -%} - {% endif %} - - {% with labels = class.labels %} - {% include "labels.html" with context %} - {% endwith %} - - {% endfilter %} - - {% if config.separate_signature and config.merge_init_into_class %} - {% if "__init__" in class.members %} - {% with function = class.members["__init__"] %} - {% filter highlight(language="python", inline=False) %} - {% filter format_signature(config.line_length) %} - {% if show_full_path %}{{ class.path }}{% else %}{{ class.name }}{% endif %} - {% include "signature.html" with context %} - {% endfilter %} - {% endfilter %} - {% endwith %} - {% endif %} - {% endif %} - - {% else %} - {% if config.show_root_toc_entry %} - {% filter heading(heading_level, - role="class", - id=html_id, - toc_label=class.path if config.show_root_full_path else class.name, - hidden=True) %} - {% endfilter %} - {% endif %} - {% set heading_level = heading_level - 1 %} - {% endif %} - - {# CHANGE Relative to Upstream: don't apply the 'first' class since it causes worse CSS formatting for our #} - {# generated common API index since we inline bare functions that become root-level rather than modules. #} - {#
#} -
- {% if config.show_bases and class.bases %} + {% with html_id = class.path %} {% if root %} {% set show_full_path = + config.show_root_full_path %} {% set root_members = True %} {% elif + root_members %} {% set show_full_path = config.show_root_members_full_path or + config.show_object_full_path %} {% set root_members = False %} {% else %} {% + set show_full_path = config.show_object_full_path %} {% endif %} {% if not + root or config.show_root_heading %} {% filter heading(heading_level, + role="class", id=html_id, class="doc doc-heading", toc_label=class.name) %} {% + if config.separate_signature %} + {% if show_full_path %}{{ class.path }}{% else %}{{ class.name }}{% endif + %} + {% elif config.merge_init_into_class and "__init__" in class.members -%} {%- + with function = class.members["__init__"] -%} {%- filter + highlight(language="python", inline=True) -%} {# CHANGE: Insert class before + class for better highlighting #} class {% if show_full_path %}{{ class.path + }}{% else %}{{ class.name }}{% endif %} {%- include "signature.html" with + context -%} {%- endfilter -%} {%- endwith -%} {% else %} {# CHANGE: Insert + class before class for better highlighting #} {%- filter + highlight(language="python", inline=True) -%} class {% if show_full_path %}{{ + class.path }}{% else %}{{ class.name }}{% endif %} {%- endfilter -%} {% endif + %} {% with labels = class.labels %} {% include "labels.html" with context %} + {% endwith %} {% endfilter %} {% if config.separate_signature and + config.merge_init_into_class %} {% if "__init__" in class.members %} {% with + function = class.members["__init__"] %} {% filter highlight(language="python", + inline=False) %} {% filter format_signature(config.line_length) %} {% if + show_full_path %}{{ class.path }}{% else %}{{ class.name }}{% endif %} {% + include "signature.html" with context %} {% endfilter %} {% endfilter %} {% + endwith %} {% endif %} {% endif %} {% else %} {% if config.show_root_toc_entry + %} {% filter heading(heading_level, role="class", id=html_id, + toc_label=class.path if config.show_root_full_path else class.name, + hidden=True) %} {% endfilter %} {% endif %} {% set heading_level = + heading_level - 1 %} {% endif %} {# CHANGE Relative to Upstream: don't apply + the 'first' class since it causes worse CSS formatting for our #} {# generated + common API index since we inline bare functions that become root-level rather + than modules. #} {# +
+ #} +
+ {% if config.show_bases and class.bases %}

Bases: {% for expression in class.bases -%} - {% include "expression.html" with context %}{% if not loop.last %}, {% endif %} - {% endfor -%} + {% include "expression.html" with context %}{% if not + loop.last %}, {% endif %} {% endfor -%}

- {% endif %} - - {% with docstring_sections = class.docstring.parsed %} - {% include "docstring.html" with context %} - {% endwith %} - - {% if config.merge_init_into_class %} - {% if "__init__" in class.members and class.members["__init__"].has_docstring %} - {% with docstring_sections = class.members["__init__"].docstring.parsed %} - {% include "docstring.html" with context %} - {% endwith %} - {% endif %} - {% endif %} + {% endif %} {% with docstring_sections = class.docstring.parsed %} {% + include "docstring.html" with context %} {% endwith %} {% if + config.merge_init_into_class %} {% if "__init__" in class.members and + class.members["__init__"].has_docstring %} {% with docstring_sections = + class.members["__init__"].docstring.parsed %} {% include "docstring.html" + with context %} {% endwith %} {% endif %} {% endif %} {% if + config.show_source %} {% if config.merge_init_into_class %} {% if + "__init__" in class.members and class.members["__init__"].source %} +
+ + Source code in {{ class.relative_filepath }} + + {{ class.members["__init__"].source|highlight(language="python", + linestart=class.members["__init__"].lineno, linenums=True) }} +
+ {% endif %} {% elif class.source %} +
+ + Source code in {{ class.relative_filepath }} + + {{ class.source|highlight(language="python", linestart=class.lineno, + linenums=True) }} +
+ {% endif %} {% endif %} {% with obj = class %} {% set root = False %} {% + set heading_level = heading_level + 1 %} {% include "children.html" with + context %} {% endwith %} +
- {% if config.show_source %} - {% if config.merge_init_into_class %} - {% if "__init__" in class.members and class.members["__init__"].source %} -
- Source code in {{ class.relative_filepath }} - {{ class.members["__init__"].source|highlight(language="python", linestart=class.members["__init__"].lineno, linenums=True) }} -
- {% endif %} - {% elif class.source %} -
- Source code in {{ class.relative_filepath }} - {{ class.source|highlight(language="python", linestart=class.lineno, linenums=True) }} -
- {% endif %} - {% endif %} - - {% with obj = class %} - {% set root = False %} - {% set heading_level = heading_level + 1 %} - {% include "children.html" with context %} {% endwith %}
- -{% endwith %}
diff --git a/rerun_py/docs/templates/python/material/function.html b/rerun_py/docs/templates/python/material/function.html index f1dd1ed0e6bb..d17fdaf3a50f 100644 --- a/rerun_py/docs/templates/python/material/function.html +++ b/rerun_py/docs/templates/python/material/function.html @@ -1,84 +1,54 @@ {# Very minimally patched from: https://github.com/mkdocstrings/python/blob/master/src/mkdocstrings_handlers/python/templates/material/_base/function.html - -See: CHANGE comments below -#} -{{ log.debug("Rendering " + function.path) }} +See: CHANGE comments below #} {{ log.debug("Rendering " + function.path) }}
-{% with html_id = function.path %} - - {% if root %} - {% set show_full_path = config.show_root_full_path %} - {% set root_members = True %} - {% elif root_members %} - {% set show_full_path = config.show_root_members_full_path or config.show_object_full_path %} - {% set root_members = False %} - {% else %} - {% set show_full_path = config.show_object_full_path %} - {% endif %} - - {% if not root or config.show_root_heading %} - - {% filter heading(heading_level, - role="function", - id=html_id, - class="doc doc-heading", - toc_label=function.name ~ "()") %} - - {% if config.separate_signature %} - {% if show_full_path %}{{ function.path }}{% else %}{{ function.name }}{% endif %} - {% else %} - {% filter highlight(language="python", inline=True) %} - {# CHANGE: Insert def before function for better highlighting #} - def {% if show_full_path %}{{ function.path }}{% else %}{{ function.name }}{% endif %} - {% include "signature.html" with context %} - {% endfilter %} + {% with html_id = function.path %} {% if root %} {% set show_full_path = + config.show_root_full_path %} {% set root_members = True %} {% elif + root_members %} {% set show_full_path = config.show_root_members_full_path or + config.show_object_full_path %} {% set root_members = False %} {% else %} {% + set show_full_path = config.show_object_full_path %} {% endif %} {% if not + root or config.show_root_heading %} {% filter heading(heading_level, + role="function", id=html_id, class="doc doc-heading", toc_label=function.name + ~ "()") %} {% if config.separate_signature %} + {% if show_full_path %}{{ function.path }}{% else %}{{ function.name }}{% + endif %} + {% else %} {% filter highlight(language="python", inline=True) %} {# CHANGE: + Insert def before function for better highlighting #} def {% if show_full_path + %}{{ function.path }}{% else %}{{ function.name }}{% endif %} {% include + "signature.html" with context %} {% endfilter %} {% endif %} {% with labels = + function.labels %} {% include "labels.html" with context %} {% endwith %} {% + endfilter %} {% if config.separate_signature %} {% filter + highlight(language="python", inline=False) %} {# CHANGE: Insert def before + function for better highlighting #} def {% filter + format_signature(config.line_length) %} {% if show_full_path %}{{ + function.path }}{% else %}{{ function.name }}{% endif %} {% include + "signature.html" with context %} {% endfilter %} {% endfilter %} {% endif %} + {% else %} {% if config.show_root_toc_entry %} {% filter + heading(heading_level, role="function", id=html_id, toc_label=function.path if + config.show_root_full_path else function.name, hidden=True) %} {% endfilter %} + {% endif %} {% set heading_level = heading_level - 1 %} {% endif %} {# CHANGE + Relative to Upstream: don't apply the 'first' class since it causes worse CSS + formatting for our #} {# generated common API index since we inline bare + functions that become root-level rather than modules. #} {# +
+ #} +
+ {% with docstring_sections = function.docstring.parsed %} {% include + "docstring.html" with context %} {% endwith %} {% if config.show_source + and function.source %} +
+ + Source code in {{ function.relative_filepath }} + + {{ function.source|highlight(language="python", + linestart=function.lineno, linenums=True) }} +
{% endif %} +
- {% with labels = function.labels %} - {% include "labels.html" with context %} - {% endwith %} - - {% endfilter %} - - {% if config.separate_signature %} - {% filter highlight(language="python", inline=False) %} - {# CHANGE: Insert def before function for better highlighting #} - def {% filter format_signature(config.line_length) %} - {% if show_full_path %}{{ function.path }}{% else %}{{ function.name }}{% endif %} - {% include "signature.html" with context %} - {% endfilter %} - {% endfilter %} - {% endif %} - - {% else %} - {% if config.show_root_toc_entry %} - {% filter heading(heading_level, - role="function", - id=html_id, - toc_label=function.path if config.show_root_full_path else function.name, - hidden=True) %} - {% endfilter %} - {% endif %} - {% set heading_level = heading_level - 1 %} - {% endif %} - - {# CHANGE Relative to Upstream: don't apply the 'first' class since it causes worse CSS formatting for our #} - {# generated common API index since we inline bare functions that become root-level rather than modules. #} - {#
#} -
- {% with docstring_sections = function.docstring.parsed %} - {% include "docstring.html" with context %} {% endwith %} - - {% if config.show_source and function.source %} -
- Source code in {{ function.relative_filepath }} - {{ function.source|highlight(language="python", linestart=function.lineno, linenums=True) }} -
- {% endif %}
- -{% endwith %}
diff --git a/scripts/ci/demo_assets/static/index.css b/scripts/ci/demo_assets/static/index.css index 259d197261ce..7fd5c8d04535 100644 --- a/scripts/ci/demo_assets/static/index.css +++ b/scripts/ci/demo_assets/static/index.css @@ -310,4 +310,3 @@ a.button { text-decoration: none; font-weight: 500; } - diff --git a/scripts/ci/demo_assets/static/index.html b/scripts/ci/demo_assets/static/index.html index 62bf9aaf4e3b..ddf63320ca69 100644 --- a/scripts/ci/demo_assets/static/index.html +++ b/scripts/ci/demo_assets/static/index.html @@ -1,10 +1,13 @@ - + - + @@ -31,4 +34,3 @@ - diff --git a/scripts/ci/demo_assets/static/index.js b/scripts/ci/demo_assets/static/index.js index acd2c36bcecf..b5e42de2f398 100644 --- a/scripts/ci/demo_assets/static/index.js +++ b/scripts/ci/demo_assets/static/index.js @@ -28,7 +28,11 @@ function hide_canvas(html) { } // On mobile platforms show a warning, but provide a link to try anyways -if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) { +if ( + /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test( + navigator.userAgent, + ) +) { show_center_html(`

Rerun is not yet supported on mobile browsers. @@ -36,10 +40,12 @@ if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(naviga

Try anyways

`); - document.querySelector("#try_anyways").addEventListener("click", function (event) { - event.preventDefault(); - load_wasm(); - }); + document + .querySelector("#try_anyways") + .addEventListener("click", function (event) { + event.preventDefault(); + load_wasm(); + }); } else { load_wasm(); } @@ -59,7 +65,8 @@ function load_wasm() { const status_element = document.getElementById("status"); function progress({ loaded, total_bytes }) { if (total_bytes != null) { - status_element.innerHTML = Math.round(Math.min((loaded / total_bytes) * 100, 100)) + "%"; + status_element.innerHTML = + Math.round(Math.min((loaded / total_bytes) * 100, 100)) + "%"; } else { status_element.innerHTML = (loaded / (1024 * 1024)).toFixed(1) + "MiB"; } @@ -108,7 +115,7 @@ function load_wasm() { { status: response.status, statusText: response.statusText, - } + }, ); for (const [key, value] of response.headers.entries()) { @@ -128,7 +135,9 @@ function on_wasm_loaded() { // WebGPU version is currently only supported on browsers with WebGPU support, there is no dynamic fallback to WebGL. if (wasm_bindgen.is_webgpu_build() && typeof navigator.gpu === "undefined") { - console.debug("`navigator.gpu` is undefined. This indicates lack of WebGPU support."); + console.debug( + "`navigator.gpu` is undefined. This indicates lack of WebGPU support.", + ); show_center_html(`

Missing WebGPU support. @@ -170,10 +179,7 @@ function on_wasm_loaded() { check_for_panic(); let url = determine_url(); - handle - .start("the_canvas_id", url) - .then(on_app_started) - .catch(on_wasm_error); + handle.start("the_canvas_id", url).then(on_app_started).catch(on_wasm_error); } function on_app_started(handle) { @@ -243,4 +249,3 @@ document.body.addEventListener("click", (event) => { body.classList.remove("visible"); } }); - diff --git a/scripts/ci/demo_assets/static/sw.js b/scripts/ci/demo_assets/static/sw.js index afdf8339e24a..420648dbc993 100644 --- a/scripts/ci/demo_assets/static/sw.js +++ b/scripts/ci/demo_assets/static/sw.js @@ -1,27 +1,27 @@ -var cacheName = 'rerun-viewer-pwa'; +var cacheName = "rerun-viewer-pwa"; var filesToCache = [ - './', - './index.html', - './index.js', - './index.css', - './re_viewer.js', - './re_viewer_bg.wasm', + "./", + "./index.html", + "./index.js", + "./index.css", + "./re_viewer.js", + "./re_viewer_bg.wasm", ]; /* Start the service worker and cache all of the app's content */ -self.addEventListener('install', function (e) { +self.addEventListener("install", function (e) { e.waitUntil( caches.open(cacheName).then(function (cache) { return cache.addAll(filesToCache); - }) + }), ); }); /* Serve cached content when offline */ -self.addEventListener('fetch', function (e) { +self.addEventListener("fetch", function (e) { e.respondWith( caches.match(e.request).then(function (response) { return response || fetch(e.request); - }) + }), ); }); diff --git a/scripts/ci/demo_assets/templates/example.html b/scripts/ci/demo_assets/templates/example.html index f49d8531944b..4a85df35ee59 100644 --- a/scripts/ci/demo_assets/templates/example.html +++ b/scripts/ci/demo_assets/templates/example.html @@ -1,10 +1,13 @@ - + - + @@ -30,7 +33,9 @@

{% for entry in examples %} -
{{ entry.title }}
+
+ {{ entry.title }} +
{% endfor %}
@@ -38,9 +43,15 @@
?
-
{{ example.description_html }}
+
+ {{ example.description_html }} +
- +
@@ -73,7 +84,10 @@ // always strip `index.html` from the url, so that relative paths in links to examples work const index_html_pos = window.location.pathname.indexOf("index.html"); if (index_html_pos !== -1) { - window.location.href = window.location.pathname.slice(0, index_html_pos); + window.location.href = window.location.pathname.slice( + 0, + index_html_pos, + ); } @@ -85,4 +99,3 @@ - diff --git a/scripts/ci/templates/benchmark.html b/scripts/ci/templates/benchmark.html index 39f9da149d5e..adb8b26534df 100644 --- a/scripts/ci/templates/benchmark.html +++ b/scripts/ci/templates/benchmark.html @@ -1,4 +1,4 @@ - + @@ -86,8 +86,14 @@ xmlns="http://www.w3.org/2000/svg" > - - + + @@ -117,7 +123,9 @@ function createCanvas() { const main = document.querySelector("main"); - main.appendChild(document.getElementById("chart-template").content.cloneNode(true)); + main.appendChild( + document.getElementById("chart-template").content.cloneNode(true), + ); const container = main.lastElementChild; const zoom = container.querySelector("button"); @@ -127,7 +135,8 @@ function resizeCanvas() { if (fullscreen) { const style = getComputedStyle(container); - canvas._chart._aspectRatio = parseInt(style.width) / parseInt(style.height); + canvas._chart._aspectRatio = + parseInt(style.width) / parseInt(style.height); } else { canvas._chart._aspectRatio = 1; } @@ -184,4 +193,3 @@ - diff --git a/scripts/ci/templates/pip_index.html b/scripts/ci/templates/pip_index.html index 624c924601ae..db592b9ed645 100644 --- a/scripts/ci/templates/pip_index.html +++ b/scripts/ci/templates/pip_index.html @@ -1,42 +1,41 @@ - + - - + Pip Index - + - +

Minimum Pip Index

{% for build in found_builds %} -
-

Commit: {{ build.commit }}

- {% if build.wheels %} -
-

Wheels:

-
    - {% for wheel in build.wheels %} -
  • {{ wheel }}
    • - {% endfor %} -
-
- {% endif %} +
+

Commit: {{ build.commit }}

+ {% if build.wheels %} +
+

Wheels:

+
    + {% for wheel in build.wheels %} +
  • + {{ wheel }} +
    • + {% endfor %} +
+
+ {% endif %}
{% endfor %} - - + diff --git a/scripts/ci/templates/pr_results_summary.html b/scripts/ci/templates/pr_results_summary.html index fd4d0381ec6c..9ed8afa8ae4d 100644 --- a/scripts/ci/templates/pr_results_summary.html +++ b/scripts/ci/templates/pr_results_summary.html @@ -1,79 +1,96 @@ - + - - + Build Summary - + - -

Build Summary for #{{pr_number}}

+ +

+ Build Summary for + #{{pr_number}} +

{% for build in found_builds %} -
-

Commit: {{ build.commit }}

- {% if build.hosted_app %} -
-

Hosted App:

- {{ build.hosted_app }} -
- {% endif %} - {% if build.rerun_c_libraries %} -
-

Rerun C build:

-
    - {% for library in build.rerun_c_libraries %} -
  • {{ library }}
    • - {% endfor %} -
-
- {% endif %} - {% if build.bench_results %} -

Benchmark Results

- {% endif %} - {% if build.notebooks %} -
-

Notebooks:

- -
- {% endif %} - {% if build.wheels %} -
-

Wheels:

- -
- {% endif %} +
+

+ Commit: + {{ build.commit }} +

+ {% if build.hosted_app %} +
+

Hosted App:

+ {{ build.hosted_app }} +
+ {% endif %} {% if build.rerun_c_libraries %} +
+

Rerun C build:

+
    + {% for library in build.rerun_c_libraries %} +
  • + {{ library }} +
    • + {% endfor %} +
+
+ {% endif %} {% if build.bench_results %} +

+ Benchmark Results +

+ {% endif %} {% if build.notebooks %} +
+

Notebooks:

+ +
+ {% endif %} {% if build.wheels %} +
+

Wheels:

+ +
+ {% endif %}
{% endfor %} - - + diff --git a/scripts/screenshot_compare/assets/templates/example.html b/scripts/screenshot_compare/assets/templates/example.html index ac434c419f0f..816c6af519d7 100644 --- a/scripts/screenshot_compare/assets/templates/example.html +++ b/scripts/screenshot_compare/assets/templates/example.html @@ -1,9 +1,12 @@ - + - + Compare Screenshot @@ -13,18 +16,19 @@
- +
- - - - diff --git a/scripts/screenshot_compare/assets/templates/index.html b/scripts/screenshot_compare/assets/templates/index.html index e42ab977b613..4a5042565bf2 100644 --- a/scripts/screenshot_compare/assets/templates/index.html +++ b/scripts/screenshot_compare/assets/templates/index.html @@ -1,9 +1,12 @@ - + - + Screenshot compare @@ -11,13 +14,12 @@ - diff --git a/web_viewer/index.html b/web_viewer/index.html index 85df3d001570..68c2805336e0 100644 --- a/web_viewer/index.html +++ b/web_viewer/index.html @@ -1,294 +1,317 @@ - + - + - - + + - + - - - + + + Rerun Viewer - + - +
- +
- + - - + diff --git a/web_viewer/index_bundled.html b/web_viewer/index_bundled.html index f4881d94a4ed..4c08d22b9bdb 100644 --- a/web_viewer/index_bundled.html +++ b/web_viewer/index_bundled.html @@ -1,291 +1,311 @@ - + - + - - + + - + - - - + + + Rerun Viewer - + - +
- +
- - + diff --git a/web_viewer/sw.js b/web_viewer/sw.js index a16f4286b47a..c525de9bc413 100644 --- a/web_viewer/sw.js +++ b/web_viewer/sw.js @@ -1,25 +1,25 @@ -var cacheName = 'rerun-viewer-pwa'; +var cacheName = "rerun-viewer-pwa"; var filesToCache = [ - './', - './index.html', - './re_viewer.js', - './re_viewer_bg.wasm', + "./", + "./index.html", + "./re_viewer.js", + "./re_viewer_bg.wasm", ]; /* Start the service worker and cache all of the app's content */ -self.addEventListener('install', function (e) { +self.addEventListener("install", function (e) { e.waitUntil( caches.open(cacheName).then(function (cache) { return cache.addAll(filesToCache); - }) + }), ); }); /* Serve cached content when offline */ -self.addEventListener('fetch', function (e) { +self.addEventListener("fetch", function (e) { e.respondWith( caches.match(e.request).then(function (response) { return response || fetch(e.request); - }) + }), ); });