From cb0e776cc8dabe37c1f8d364a5127834352ee9bc Mon Sep 17 00:00:00 2001 From: Jens L Date: Tue, 13 Jun 2023 13:45:38 +0200 Subject: [PATCH] web/admin: fix codemirror not working on safari (#5943) Signed-off-by: Jens Langhammer --- web/package-lock.json | 6 ++++-- web/package.json | 1 + web/rollup.config.js | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index c8769d3d7..d7acd2b04 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -34,6 +34,7 @@ "lit": "^2.7.5", "mermaid": "^10.2.3", "rapidoc": "^9.3.4", + "style-mod": "^4.0.3", "webcomponent-qr-code": "^1.1.1", "yaml": "^2.3.1" }, @@ -20825,8 +20826,9 @@ } }, "node_modules/style-mod": { - "version": "4.0.0", - "license": "MIT" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.3.tgz", + "integrity": "sha512-78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw==" }, "node_modules/stylis": { "version": "4.2.0", diff --git a/web/package.json b/web/package.json index 62ef9e2b2..a00fd08a4 100644 --- a/web/package.json +++ b/web/package.json @@ -50,6 +50,7 @@ "lit": "^2.7.5", "mermaid": "^10.2.3", "rapidoc": "^9.3.4", + "style-mod": "^4.0.3", "webcomponent-qr-code": "^1.1.1", "yaml": "^2.3.1" }, diff --git a/web/rollup.config.js b/web/rollup.config.js index 07f919514..8e3a5c696 100644 --- a/web/rollup.config.js +++ b/web/rollup.config.js @@ -9,7 +9,7 @@ import cssimport from "rollup-plugin-cssimport"; import { terser } from "rollup-plugin-terser"; // https://github.com/d3/d3-interpolate/issues/58 -const D3_WARNING = /Circular dependency.*d3-[interpolate|selection]/; +const IGNORED_WARNINGS = /Circular dependency(.*d3-[interpolate|selection])|(.*@lit\/localize.*)/; const extensions = [".js", ".jsx", ".ts", ".tsx"]; @@ -81,7 +81,7 @@ export const defaultOptions = { cache: true, context: "window", onwarn: function (warning, warn) { - if (D3_WARNING.test(warning)) { + if (IGNORED_WARNINGS.test(warning)) { return; } if (warning.code === "UNRESOLVED_IMPORT") {