From 6dd1f8161c4e480646b4c75693d75e7e542be205 Mon Sep 17 00:00:00 2001
From: Romain Lespinasse <romain.lespinasse@gmail.com>
Date: Thu, 29 Jun 2023 23:07:57 +0200
Subject: [PATCH] feat: update to drawio-desktop 21.5.1 (#37)

---
 Dockerfile                                          | 2 +-
 scripts/runner-no-security-warnings.sh              | 4 ----
 tests/data/issue-20/frame-bug-good.svg              | 2 +-
 tests/expected/output-electron-security-warning.log | 1 +
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100755 scripts/runner-no-security-warnings.sh

diff --git a/Dockerfile b/Dockerfile
index c628013..afc75a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:bullseye
 
 WORKDIR "/opt/drawio-desktop"
 
-ENV DRAWIO_VERSION "20.3.0"
+ENV DRAWIO_VERSION "21.5.1"
 RUN set -e; \
   apt-get update && apt-get install -y \
   xvfb \
diff --git a/scripts/runner-no-security-warnings.sh b/scripts/runner-no-security-warnings.sh
deleted file mode 100755
index 05a5a77..0000000
--- a/scripts/runner-no-security-warnings.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-"$DRAWIO_DESKTOP_EXECUTABLE_PATH" "$@" --no-sandbox 2>&1
diff --git a/tests/data/issue-20/frame-bug-good.svg b/tests/data/issue-20/frame-bug-good.svg
index 97b12f6..e504b44 100644
--- a/tests/data/issue-20/frame-bug-good.svg
+++ b/tests/data/issue-20/frame-bug-good.svg
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="192px" height="212px" viewBox="-0.5 -0.5 192 212"><defs/><g><path d="M 0 0 L 55 0 L 55 45 L 45 60 L 0 60 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 55 0 L 65 0 L 65 210 L 0 210 L 0 60" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 53px; height: 1px; padding-top: 30px; margin-left: 1px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b><font style="font-size: 12px">Good<br /></font></b></div></div></div></foreignObject><text x="28" y="34" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Good&#xa;</text></switch></g><path d="M 120 70 L 180 70 L 180 115 L 170 130 L 120 130 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 180 70 L 190 70 L 190 140 L 120 140 L 120 130" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 58px; height: 1px; padding-top: 100px; margin-left: 121px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b><font style="font-size: 12px">Bad</font></b></div></div></div></foreignObject><text x="150" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Bad</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="192px" height="212px" viewBox="-0.5 -0.5 192 212"><defs/><g><path d="M 0 0 L 55 0 L 55 45 L 45 60 L 0 60 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 55 0 L 65 0 L 65 210 L 0 210 L 0 60" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 53px; height: 1px; padding-top: 30px; margin-left: 1px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b><font style="font-size: 12px">Good<br /></font></b></div></div></div></foreignObject><text x="28" y="34" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Good&#xa;</text></switch></g><path d="M 120 70 L 180 70 L 180 115 L 170 130 L 120 130 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 180 70 L 190 70 L 190 140 L 120 140 L 120 130" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 58px; height: 1px; padding-top: 100px; margin-left: 121px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b><font style="font-size: 12px">Bad</font></b></div></div></div></foreignObject><text x="150" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Bad</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.drawio.com/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
diff --git a/tests/expected/output-electron-security-warning.log b/tests/expected/output-electron-security-warning.log
index 88dc048..8b6271a 100644
--- a/tests/expected/output-electron-security-warning.log
+++ b/tests/expected/output-electron-security-warning.log
@@ -1,5 +1,6 @@
 Failed to connect to the bus: Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
 Failed to connect to the bus: Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
+Failed to connect to the bus: Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
 Failed to connect to the bus: Could not parse server address: Unknown address type (examples of valid types are "tcp" and on UNIX "unix")
 Failed to connect to the bus: Could not parse server address: Unknown address type (examples of valid types are "tcp" and on UNIX "unix")
 Failed to connect to the bus: Could not parse server address: Unknown address type (examples of valid types are "tcp" and on UNIX "unix")