From 930d5456e0da96265e71dd57a9e5b0f37020916b Mon Sep 17 00:00:00 2001 From: Tom Cheng Date: Sun, 30 Jan 2022 23:15:35 -0500 Subject: [PATCH] Upgrade react-ace to ^9.4.4 (#683) --- package-lock.json | 64 +++++++++++++------------------ package.json | 4 +- src/renderer/components/query.jsx | 10 ++--- 3 files changed, 33 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index 81a4658b..7103f932 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "MIT", "dependencies": { "@babel/core": "^7.14.3", + "ace-builds": "^1.4.13", "axios": "^0.21.1", "bunyan": "^1.8.5", "connection-string": "^4.3.4", @@ -55,7 +56,6 @@ "@typescript-eslint/parser": "^4.16.1", "autoprefixer": "^10.2.5", "babel-loader": "^8.2.2", - "brace": "^0.11.0", "breakpoint-sass": "^2.6.1", "chai": "^4.3.0", "classnames": "^2.2.5", @@ -104,7 +104,7 @@ "prettier": "^2.2.1", "prop-types": "^15.7.2", "react": "^16.14.0", - "react-ace": "^7.0.5", + "react-ace": "^9.4.4", "react-dom": "^16.14.0", "react-draggable": "^3.3.2", "react-redux": "^7.2.4", @@ -11867,6 +11867,11 @@ "node": ">= 0.6" } }, + "node_modules/ace-builds": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.14.tgz", + "integrity": "sha512-NBOQlm9+7RBqRqZwimpgquaLeTJFayqb9UEPtTkpC3TkkwDnlsT/TwsCC0svjt9kEZ6G9mH5AEOHSz6Q/HrzQQ==" + }, "node_modules/acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", @@ -13670,12 +13675,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/brace": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.0.tgz", - "integrity": "sha1-FVzYBgdofcjLkI8N+U5ioDPB1WM=", - "dev": true - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -28112,24 +28111,22 @@ } }, "node_modules/react-ace": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-7.0.5.tgz", - "integrity": "sha512-3iI+Rg2bZXCn9K984ll2OF4u9SGcJH96Q1KsUgs9v4M2WePS4YeEHfW2nrxuqJrAkE5kZbxaCE79k6kqK0YBjg==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.5.0.tgz", + "integrity": "sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==", "dev": true, "dependencies": { - "brace": "^0.11.1", - "diff-match-patch": "^1.0.4", + "ace-builds": "^1.4.13", + "diff-match-patch": "^1.0.5", "lodash.get": "^4.4.2", "lodash.isequal": "^4.5.0", "prop-types": "^15.7.2" + }, + "peerDependencies": { + "react": "^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0", + "react-dom": "^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0" } }, - "node_modules/react-ace/node_modules/brace": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz", - "integrity": "sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg=", - "dev": true - }, "node_modules/react-colorful": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.2.3.tgz", @@ -44069,6 +44066,11 @@ "negotiator": "0.6.2" } }, + "ace-builds": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.14.tgz", + "integrity": "sha512-NBOQlm9+7RBqRqZwimpgquaLeTJFayqb9UEPtTkpC3TkkwDnlsT/TwsCC0svjt9kEZ6G9mH5AEOHSz6Q/HrzQQ==" + }, "acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", @@ -45576,12 +45578,6 @@ } } }, - "brace": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.0.tgz", - "integrity": "sha1-FVzYBgdofcjLkI8N+U5ioDPB1WM=", - "dev": true - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -57302,24 +57298,16 @@ } }, "react-ace": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-7.0.5.tgz", - "integrity": "sha512-3iI+Rg2bZXCn9K984ll2OF4u9SGcJH96Q1KsUgs9v4M2WePS4YeEHfW2nrxuqJrAkE5kZbxaCE79k6kqK0YBjg==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.5.0.tgz", + "integrity": "sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==", "dev": true, "requires": { - "brace": "^0.11.1", - "diff-match-patch": "^1.0.4", + "ace-builds": "^1.4.13", + "diff-match-patch": "^1.0.5", "lodash.get": "^4.4.2", "lodash.isequal": "^4.5.0", "prop-types": "^15.7.2" - }, - "dependencies": { - "brace": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz", - "integrity": "sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg=", - "dev": true - } } }, "react-colorful": { diff --git a/package.json b/package.json index 89d6113f..2122a0d5 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,7 @@ }, "dependencies": { "@babel/core": "^7.14.3", + "ace-builds": "^1.4.13", "axios": "^0.21.1", "bunyan": "^1.8.5", "connection-string": "^4.3.4", @@ -135,7 +136,6 @@ "@typescript-eslint/parser": "^4.16.1", "autoprefixer": "^10.2.5", "babel-loader": "^8.2.2", - "brace": "^0.11.0", "breakpoint-sass": "^2.6.1", "chai": "^4.3.0", "classnames": "^2.2.5", @@ -184,7 +184,7 @@ "prettier": "^2.2.1", "prop-types": "^15.7.2", "react": "^16.14.0", - "react-ace": "^7.0.5", + "react-ace": "^9.4.4", "react-dom": "^16.14.0", "react-draggable": "^3.3.2", "react-redux": "^7.2.4", diff --git a/src/renderer/components/query.jsx b/src/renderer/components/query.jsx index 63b213cb..c75abdf3 100644 --- a/src/renderer/components/query.jsx +++ b/src/renderer/components/query.jsx @@ -3,11 +3,11 @@ import PropTypes from 'prop-types'; import debounce from 'lodash.debounce'; import { format } from 'sql-formatter'; import AceEditor from 'react-ace'; -import ace from 'brace'; -import 'brace/mode/sql'; -import 'brace/theme/github'; -import 'brace/ext/language_tools'; -import 'brace/ext/searchbox'; +import ace from 'ace-builds'; +import 'ace-builds/src-noconflict/mode-sql'; +import 'ace-builds/src-noconflict/theme-github'; +import 'ace-builds/src-noconflict/ext-language_tools'; +import 'ace-builds/src-noconflict/ext-searchbox'; import { ResizableBox } from 'react-resizable'; import CheckBox from './checkbox'; import QueryResult from './query-result';