diff --git a/maubot/management/frontend/package.json b/maubot/management/frontend/package.json index 6205d46..04aa48f 100644 --- a/maubot/management/frontend/package.json +++ b/maubot/management/frontend/package.json @@ -15,7 +15,7 @@ "dependencies": { "node-sass": "^4.12.0", "react": "^16.8.6", - "react-ace": "^7.0.2", + "react-ace": "^8.0.0", "react-contextmenu": "^2.11.0", "react-dom": "^16.8.6", "react-json-tree": "^0.11.2", diff --git a/maubot/management/frontend/src/pages/dashboard/Instance.js b/maubot/management/frontend/src/pages/dashboard/Instance.js index ac8674e..e67e466 100644 --- a/maubot/management/frontend/src/pages/dashboard/Instance.js +++ b/maubot/management/frontend/src/pages/dashboard/Instance.js @@ -16,8 +16,8 @@ import React from "react" import { Link, NavLink, Route, Switch, withRouter } from "react-router-dom" import AceEditor from "react-ace" -import "brace/mode/yaml" -import "brace/theme/github" +import "ace-builds/src-noconflict/mode-yaml" +import "ace-builds/src-noconflict/theme-github" import { ReactComponent as ChevronRight } from "../../res/chevron-right.svg" import { ReactComponent as NoAvatarIcon } from "../../res/bot.svg" import PrefTable, { PrefInput, PrefSelect, PrefSwitch } from "../../components/PreferenceTable" diff --git a/maubot/management/frontend/yarn.lock b/maubot/management/frontend/yarn.lock index 62c1da4..8f56581 100644 --- a/maubot/management/frontend/yarn.lock +++ b/maubot/management/frontend/yarn.lock @@ -1743,6 +1743,11 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" +ace-builds@^1.4.6: + version "1.4.7" + resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.7.tgz#56e5465270b6c48a48d30e70d6b8f6b92fbf2b08" + integrity sha512-gwQGVFewBopRLho08BfahyvRa9FlB43JUig5ItAKTYc9kJJsbA9QNz75p28QtQomoPQ9rJx82ymL21x4ZSZmdg== + acorn-globals@^4.1.0, acorn-globals@^4.3.0: version "4.3.4" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" @@ -2445,11 +2450,6 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -brace@^0.11.1: - version "0.11.1" - resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58" - integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg= - braces@^2.3.1, braces@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" @@ -9123,12 +9123,12 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -react-ace@^7.0.2: - version "7.0.5" - resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-7.0.5.tgz#798299fd52ddf3a3dcc92afc5865538463544f01" - integrity sha512-3iI+Rg2bZXCn9K984ll2OF4u9SGcJH96Q1KsUgs9v4M2WePS4YeEHfW2nrxuqJrAkE5kZbxaCE79k6kqK0YBjg== +react-ace@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-8.0.0.tgz#e6fc155ec3cf240e92bdf2e156a50458a78ed0a4" + integrity sha512-EvU14vXbZpAenb1ZVKdn8yTQs/shZ9RghFulHtt67bBXT6sjrNHcfOEXHYtSEmwMb6pQVVNNuulzzd8o+Uouig== dependencies: - brace "^0.11.1" + ace-builds "^1.4.6" diff-match-patch "^1.0.4" lodash.get "^4.4.2" lodash.isequal "^4.5.0"