From 5507b1e8c911daa03fa9de53b9384095728b4329 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Thu, 23 Feb 2023 10:40:31 +0530 Subject: [PATCH] refactor(ui/editor): migrate code-editor to react [EE-4848] (#8257) --- app/assets/css/index.js | 2 - .../images/build/buildImageController.js | 4 +- .../edge-job-form/edgeJobFormController.js | 4 +- .../code-editor/code-editor.controller.js | 8 + .../components/code-editor/code-editor.html | 8 + .../components/code-editor/code-editor.js | 6 +- .../components/code-editor/codeEditor.html | 1 - .../environment-variables-panel.controller.js | 4 +- .../environment-variables-panel.html | 2 +- .../web-editor-form.controller.js | 5 - .../web-editor-form/web-editor-form.html | 2 +- app/portainer/react/components/index.ts | 13 ++ app/portainer/services/codeMirror.js | 55 ------ app/portainer/services/codeMirrorDialog.css | 49 ----- .../views/stacks/edit/stackController.js | 6 +- app/react/components/CodeEditor.tsx | 41 +++++ package.json | 11 +- yarn.lock | 168 +++++++++++++++++- 18 files changed, 259 insertions(+), 130 deletions(-) create mode 100644 app/portainer/components/code-editor/code-editor.controller.js create mode 100644 app/portainer/components/code-editor/code-editor.html delete mode 100644 app/portainer/components/code-editor/codeEditor.html delete mode 100644 app/portainer/services/codeMirror.js delete mode 100644 app/portainer/services/codeMirrorDialog.css create mode 100644 app/react/components/CodeEditor.tsx diff --git a/app/assets/css/index.js b/app/assets/css/index.js index 05b51eb79..97ce0a638 100644 --- a/app/assets/css/index.js +++ b/app/assets/css/index.js @@ -2,8 +2,6 @@ import 'bootstrap/dist/css/bootstrap.css'; import 'toastr/build/toastr.css'; import 'xterm/dist/xterm.css'; import 'angularjs-slider/dist/rzslider.css'; -import 'codemirror/lib/codemirror.css'; -import 'codemirror/addon/lint/lint.css'; import 'angular-json-tree/dist/angular-json-tree.css'; import 'angular-loading-bar/build/loading-bar.css'; import 'angular-moment-picker/dist/angular-moment-picker.min.css'; diff --git a/app/docker/views/images/build/buildImageController.js b/app/docker/views/images/build/buildImageController.js index 1e8e60f10..965f8d668 100644 --- a/app/docker/views/images/build/buildImageController.js +++ b/app/docker/views/images/build/buildImageController.js @@ -148,8 +148,8 @@ function BuildImageController($scope, $async, $window, BuildService, Notificatio return true; }; - $scope.editorUpdate = function (cm) { - $scope.formValues.DockerFileContent = cm.getValue(); + $scope.editorUpdate = function (value) { + $scope.formValues.DockerFileContent = value; $scope.state.isEditorDirty = true; }; diff --git a/app/edge/components/edge-job-form/edgeJobFormController.js b/app/edge/components/edge-job-form/edgeJobFormController.js index 6e609cfd5..454a31ee6 100644 --- a/app/edge/components/edge-job-form/edgeJobFormController.js +++ b/app/edge/components/edge-job-form/edgeJobFormController.js @@ -112,8 +112,8 @@ export class EdgeJobFormController { this.formAction(this.formValues.method); } - editorUpdate(cm) { - this.model.FileContent = cm.getValue(); + editorUpdate(value) { + this.model.FileContent = value; this.isEditorDirty = true; } diff --git a/app/portainer/components/code-editor/code-editor.controller.js b/app/portainer/components/code-editor/code-editor.controller.js new file mode 100644 index 000000000..db21f3007 --- /dev/null +++ b/app/portainer/components/code-editor/code-editor.controller.js @@ -0,0 +1,8 @@ +/* @ngInject */ +export default function CodeEditorController($scope) { + this.handleChange = (value) => { + $scope.$evalAsync(() => { + this.onChange(value); + }); + }; +} diff --git a/app/portainer/components/code-editor/code-editor.html b/app/portainer/components/code-editor/code-editor.html new file mode 100644 index 000000000..33d43931b --- /dev/null +++ b/app/portainer/components/code-editor/code-editor.html @@ -0,0 +1,8 @@ + diff --git a/app/portainer/components/code-editor/code-editor.js b/app/portainer/components/code-editor/code-editor.js index efe262c7e..788aede3a 100644 --- a/app/portainer/components/code-editor/code-editor.js +++ b/app/portainer/components/code-editor/code-editor.js @@ -1,6 +1,8 @@ +import controller from './code-editor.controller'; + angular.module('portainer.app').component('codeEditor', { - templateUrl: './codeEditor.html', - controller: 'CodeEditorController', + templateUrl: './code-editor.html', + controller, bindings: { identifier: '@', placeholder: '@', diff --git a/app/portainer/components/code-editor/codeEditor.html b/app/portainer/components/code-editor/codeEditor.html deleted file mode 100644 index 54d2a0bbf..000000000 --- a/app/portainer/components/code-editor/codeEditor.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/portainer/components/environment-variables-panel/environment-variables-panel.controller.js b/app/portainer/components/environment-variables-panel/environment-variables-panel.controller.js index 9f842e40e..c2b09060e 100644 --- a/app/portainer/components/environment-variables-panel/environment-variables-panel.controller.js +++ b/app/portainer/components/environment-variables-panel/environment-variables-panel.controller.js @@ -27,8 +27,8 @@ export default class EnvironmentVariablesPanelController { this.onChange(value); } - editorUpdate(cm) { - this.editorText = cm.getValue(); + editorUpdate(value) { + this.editorText = value; this.onChange(parseDotEnvFile(this.editorText)); } } diff --git a/app/portainer/components/environment-variables-panel/environment-variables-panel.html b/app/portainer/components/environment-variables-panel/environment-variables-panel.html index 91b040262..0007c8045 100644 --- a/app/portainer/components/environment-variables-panel/environment-variables-panel.html +++ b/app/portainer/components/environment-variables-panel/environment-variables-panel.html @@ -23,7 +23,7 @@ Switch to simple mode to define variables line by line, or load from .env file -
+
diff --git a/app/portainer/components/form-components/web-editor-form/web-editor-form.controller.js b/app/portainer/components/form-components/web-editor-form/web-editor-form.controller.js index 54128bfab..09c2e4c55 100644 --- a/app/portainer/components/form-components/web-editor-form/web-editor-form.controller.js +++ b/app/portainer/components/form-components/web-editor-form/web-editor-form.controller.js @@ -1,13 +1,8 @@ class WebEditorFormController { /* @ngInject */ constructor(BROWSER_OS_PLATFORM) { - this.editorUpdate = this.editorUpdate.bind(this); this.BROWSER_OS_PLATFORM = BROWSER_OS_PLATFORM; } - - editorUpdate(cm) { - this.onChange(cm.getValue()); - } } export default WebEditorFormController; diff --git a/app/portainer/components/form-components/web-editor-form/web-editor-form.html b/app/portainer/components/form-components/web-editor-form/web-editor-form.html index 0eb061c7e..b694a5f77 100644 --- a/app/portainer/components/form-components/web-editor-form/web-editor-form.html +++ b/app/portainer/components/form-components/web-editor-form/web-editor-form.html @@ -46,7 +46,7 @@ read-only="$ctrl.readOnly" yml="$ctrl.yml" value="$ctrl.value" - on-change="($ctrl.editorUpdate)" + on-change="($ctrl.onChange)" >
diff --git a/app/portainer/react/components/index.ts b/app/portainer/react/components/index.ts index 2d4c95ead..df0a623d8 100644 --- a/app/portainer/react/components/index.ts +++ b/app/portainer/react/components/index.ts @@ -39,6 +39,7 @@ import { Slider } from '@@/form-components/Slider'; import { TagButton } from '@@/TagButton'; import { BETeaserButton } from '@@/BETeaserButton'; import { TimeWindowDisplay } from '@@/TimeWindowDisplay'; +import { CodeEditor } from '@@/CodeEditor'; import { fileUploadField } from './file-upload-field'; import { switchField } from './switch-field'; @@ -241,4 +242,16 @@ export const componentsModule = angular .component( 'timeWindowDisplay', r2a(withReactQuery(withUIRouter(TimeWindowDisplay)), []) + ) + .component( + 'reactCodeEditor', + r2a(CodeEditor, [ + 'id', + 'placeholder', + 'yaml', + 'readonly', + 'onChange', + 'value', + 'height', + ]) ).name; diff --git a/app/portainer/services/codeMirror.js b/app/portainer/services/codeMirror.js deleted file mode 100644 index 83590b53f..000000000 --- a/app/portainer/services/codeMirror.js +++ /dev/null @@ -1,55 +0,0 @@ -import _ from 'lodash-es'; -import CodeMirror from 'codemirror'; -import 'codemirror/mode/yaml/yaml.js'; -import 'codemirror/addon/lint/lint.js'; -import 'codemirror/addon/lint/yaml-lint.js'; -import 'codemirror/addon/display/placeholder.js'; -import 'codemirror/addon/search/search.js'; -import 'codemirror/addon/search/searchcursor.js'; -import 'codemirror/addon/search/jump-to-line.js'; -import 'codemirror/addon/dialog/dialog.js'; -import './codeMirrorDialog.css'; - -angular.module('portainer.app').factory('CodeMirrorService', function CodeMirrorService() { - 'use strict'; - - var service = {}; - - var codeMirrorGenericOptions = { - lineNumbers: true, - extraKeys: { - 'Alt-F': 'findPersistent', - }, - }; - - var codeMirrorYAMLOptions = { - mode: 'text/x-yaml', - gutters: ['CodeMirror-lint-markers'], - lint: true, - extraKeys: { - 'Alt-F': 'findPersistent', - Tab: function (cm) { - var spaces = Array(cm.getOption('indentUnit') + 1).join(' '); - cm.replaceSelection(spaces); - }, - }, - }; - - service.applyCodeMirrorOnElement = function (element, yamlLint, readOnly) { - var options = angular.copy(codeMirrorGenericOptions); - - if (yamlLint) { - _.assign(options, codeMirrorYAMLOptions); - } - - if (readOnly) { - options.readOnly = true; - } - - var cm = CodeMirror.fromTextArea(element, options); - cm.setSize('100%', 500); - return cm; - }; - - return service; -}); diff --git a/app/portainer/services/codeMirrorDialog.css b/app/portainer/services/codeMirrorDialog.css deleted file mode 100644 index 64861e77a..000000000 --- a/app/portainer/services/codeMirrorDialog.css +++ /dev/null @@ -1,49 +0,0 @@ -/* styles from https://github.com/codemirror/codemirror5/blob/master/addon/dialog/dialog.css with the button styles updated */ - -.CodeMirror-dialog { - position: absolute; - left: 0; - right: 0; - background: inherit; - z-index: 15; - padding: 0.1em 0.8em; - overflow: hidden; - color: inherit; -} - -.CodeMirror-dialog-top { - border-bottom: 1px solid #eee; - top: 0; -} - -.CodeMirror-dialog-bottom { - border-top: 1px solid #eee; - bottom: 0; -} - -.CodeMirror-dialog input { - border: none; - outline: none; - background: transparent; - width: 20em; - color: inherit; - font-family: monospace; -} - -.CodeMirror-dialog button { - /* apply styles from btn-default */ - @apply border-gray-5 bg-white text-gray-9; - @apply hover:border-gray-5 hover:bg-gray-3 hover:text-gray-10; - /* dark mode */ - @apply th-dark:border-gray-warm-7 th-dark:bg-gray-warm-10 th-dark:text-gray-warm-4; - @apply th-dark:hover:border-gray-6 th-dark:hover:bg-gray-warm-9 th-dark:hover:text-gray-warm-4; - /* highcontrast mode */ - @apply th-highcontrast:border-gray-warm-7 th-highcontrast:bg-gray-warm-10 th-highcontrast:text-white; - @apply th-highcontrast:hover:border-gray-6 th-highcontrast:hover:bg-gray-warm-9 th-highcontrast:hover:text-white; - - @apply font-sans; - @apply border border-solid; - font-size: 85%; - padding: 0px 8px; - border-radius: 8px; -} diff --git a/app/portainer/views/stacks/edit/stackController.js b/app/portainer/views/stacks/edit/stackController.js index 58eeff06e..1dca422af 100644 --- a/app/portainer/views/stacks/edit/stackController.js +++ b/app/portainer/views/stacks/edit/stackController.js @@ -268,10 +268,10 @@ angular.module('portainer.app').controller('StackController', [ }); }; - $scope.editorUpdate = function (cm) { - if ($scope.stackFileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) { + $scope.editorUpdate = function (value) { + if ($scope.stackFileContent.replace(/(\r\n|\n|\r)/gm, '') !== value.replace(/(\r\n|\n|\r)/gm, '')) { $scope.state.isEditorDirty = true; - $scope.stackFileContent = cm.getValue(); + $scope.stackFileContent = value; $scope.state.yamlError = StackHelper.validateYAML($scope.stackFileContent, $scope.containerNames, $scope.state.originalContainerNames); } }; diff --git a/app/react/components/CodeEditor.tsx b/app/react/components/CodeEditor.tsx new file mode 100644 index 000000000..f0ad8255c --- /dev/null +++ b/app/react/components/CodeEditor.tsx @@ -0,0 +1,41 @@ +import CodeMirror from '@uiw/react-codemirror'; +import { StreamLanguage } from '@codemirror/language'; +import { yaml } from '@codemirror/legacy-modes/mode/yaml'; +import { useMemo } from 'react'; + +interface Props { + id: string; + placeholder?: string; + yaml?: boolean; + readonly?: boolean; + onChange: (value: string) => void; + value: string; + height?: string; +} + +export function CodeEditor({ + id, + onChange, + placeholder, + readonly, + value, + height = '500px', + yaml: isYaml, +}: Props) { + const extensions = useMemo( + () => (isYaml ? [StreamLanguage.define(yaml)] : []), + [isYaml] + ); + + return ( + + ); +} diff --git a/package.json b/package.json index 21dba58c5..a88e232c7 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,14 @@ }, "dependencies": { "@aws-crypto/sha256-js": "^2.0.0", + "@codemirror/autocomplete": "^6.4.0", + "@codemirror/language": "^6.3.2", + "@codemirror/legacy-modes": "^6.3.1", + "@codemirror/lint": "^6.1.0", + "@codemirror/search": "^6.2.3", + "@codemirror/state": "^6.2.0", + "@codemirror/theme-one-dark": "^6.1.0", + "@codemirror/view": "^6.7.1", "@lineup-lite/hooks": "^1.6.0", "@nxmix/tokenize-ansi": "^3.0.0", "@open-amt-cloud-toolkit/ui-toolkit-react": "2.0.0", @@ -76,6 +84,7 @@ "@uirouter/angularjs": "1.0.11", "@uirouter/react": "^1.0.7", "@uirouter/react-hybrid": "^1.0.4", + "@uiw/react-codemirror": "^4.19.5", "angular": "1.8.2", "angular-clipboard": "^1.6.2", "angular-file-saver": "^1.1.3", @@ -101,7 +110,7 @@ "chardet": "^1.4.0", "chart.js": "^2.7.0", "clsx": "^1.1.1", - "codemirror": "~5.65.11", + "codemirror": "^6.0.1", "core-js": "^3.19.3", "date-fns": "^2.29.3", "fast-json-patch": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 5bd5057d3..0a3c6b80b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2167,6 +2167,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.18.6": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd" + integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ== + dependencies: + regenerator-runtime "^0.13.11" + "@babel/template@^7.10.3", "@babel/template@^7.12.7", "@babel/template@^7.15.4", "@babel/template@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" @@ -2365,6 +2372,87 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@codemirror/autocomplete@^6.0.0", "@codemirror/autocomplete@^6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-6.4.0.tgz#76ac9a2a411a4cc6e13103014dba5e0fe601da5a" + integrity sha512-HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA== + dependencies: + "@codemirror/language" "^6.0.0" + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.6.0" + "@lezer/common" "^1.0.0" + +"@codemirror/commands@^6.0.0", "@codemirror/commands@^6.1.0": + version "6.1.3" + resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-6.1.3.tgz#401d0b6d18e7d5eb9a96f6c8ae4ea56a08e8fd06" + integrity sha512-wUw1+vb34Ultv0Q9m/OVB7yizGXgtoDbkI5f5ErM8bebwLyUYjicdhJTKhTvPTpgkv8dq/BK0lQ3K5pRf2DAJw== + dependencies: + "@codemirror/language" "^6.0.0" + "@codemirror/state" "^6.2.0" + "@codemirror/view" "^6.0.0" + "@lezer/common" "^1.0.0" + +"@codemirror/language@^6.0.0", "@codemirror/language@^6.3.2": + version "6.3.2" + resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.3.2.tgz#a3d5796d17a2cd3110bac0f5126db67c7e90a0f3" + integrity sha512-g42uHhOcEMAXjmozGG+rdom5UsbyfMxQFh7AbkeoaNImddL6Xt4cQDL0+JxmG7+as18rUAvZaqzP/TjsciVIrA== + dependencies: + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" + "@lezer/common" "^1.0.0" + "@lezer/highlight" "^1.0.0" + "@lezer/lr" "^1.0.0" + style-mod "^4.0.0" + +"@codemirror/legacy-modes@^6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@codemirror/legacy-modes/-/legacy-modes-6.3.1.tgz#77ab3f3db1ce3e47aad7a5baac3a4b12844734a5" + integrity sha512-icXmCs4Mhst2F8mE0TNpmG6l7YTj1uxam3AbZaFaabINH5oWAdg2CfR/PVi+d/rqxJ+TuTnvkKK5GILHrNThtw== + dependencies: + "@codemirror/language" "^6.0.0" + +"@codemirror/lint@^6.0.0", "@codemirror/lint@^6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-6.1.0.tgz#f006142d3a580fdb8ffc2faa3361b2232c08e079" + integrity sha512-mdvDQrjRmYPvQ3WrzF6Ewaao+NWERYtpthJvoQ3tK3t/44Ynhk8ZGjTSL9jMEv8CgSMogmt75X8ceOZRDSXHtQ== + dependencies: + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" + crelt "^1.0.5" + +"@codemirror/search@^6.0.0", "@codemirror/search@^6.2.3": + version "6.2.3" + resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-6.2.3.tgz#fab933fef1b1de8ef40cda275c73d9ac7a1ff40f" + integrity sha512-V9n9233lopQhB1dyjsBK2Wc1i+8hcCqxl1wQ46c5HWWLePoe4FluV3TGHoZ04rBRlGjNyz9DTmpJErig8UE4jw== + dependencies: + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" + crelt "^1.0.5" + +"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.1", "@codemirror/state@^6.1.4", "@codemirror/state@^6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.2.0.tgz#a0fb08403ced8c2a68d1d0acee926bd20be922f2" + integrity sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA== + +"@codemirror/theme-one-dark@^6.0.0", "@codemirror/theme-one-dark@^6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@codemirror/theme-one-dark/-/theme-one-dark-6.1.0.tgz#6f8b3c7fc22e9fec59edd573f4ba9546db42e007" + integrity sha512-AiTHtFRu8+vWT9wWUWDM+cog6ZwgivJogB1Tm/g40NIpLwph7AnmxrSzWfvJN5fBVufsuwBxecQCNmdcR5D7Aw== + dependencies: + "@codemirror/language" "^6.0.0" + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" + "@lezer/highlight" "^1.0.0" + +"@codemirror/view@^6.0.0", "@codemirror/view@^6.6.0", "@codemirror/view@^6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.7.1.tgz#370e95d6f001e7f5cadc459807974b4f0a6eb225" + integrity sha512-kYtS+uqYw/q/0ytYxpkqE1JVuK5NsbmBklWYhwLFTKO9gVuTdh/kDEeZPKorbqHcJ+P+ucrhcsS1czVweOpT2g== + dependencies: + "@codemirror/state" "^6.1.4" + style-mod "^4.0.0" + w3c-keyname "^2.2.4" + "@colors/colors@1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" @@ -2890,6 +2978,25 @@ resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796" integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg== +"@lezer/common@^1.0.0": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.0.2.tgz#8fb9b86bdaa2ece57e7d59e5ffbcb37d71815087" + integrity sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng== + +"@lezer/highlight@^1.0.0": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-1.1.3.tgz#bf5a36c2ee227f526d74997ac91f7777e29bd25d" + integrity sha512-3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw== + dependencies: + "@lezer/common" "^1.0.0" + +"@lezer/lr@^1.0.0": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.2.5.tgz#e9088164a711690596f17378665e0554157c9b03" + integrity sha512-f9319YG1A/3ysgUE3bqCHEd7g+3ZZ71MWlwEc42mpnLVYXgfJJgtu1XAyBB4Kz8FmqmnFe9caopDqKeMMMAU6g== + dependencies: + "@lezer/common" "^1.0.0" + "@lineup-lite/components@~1.6.0": version "1.6.0" resolved "https://registry.yarnpkg.com/@lineup-lite/components/-/components-1.6.0.tgz#e1a9d368e1c3851f312a3e667e8f3eda52d9f0fc" @@ -5180,6 +5287,31 @@ classnames "^2.3.1" prop-types "^15.6.1" +"@uiw/codemirror-extensions-basic-setup@4.19.5": + version "4.19.5" + resolved "https://registry.yarnpkg.com/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.19.5.tgz#2fcfa7b92236f316f0291378e9c5aaa1611146e9" + integrity sha512-1zt7ZPJ01xKkSW/KDy0FZNga0bngN1fC594wCVG7FBi60ehfcAucpooQ+JSPScKXopxcb+ugPKZvVLzr9/OfzA== + dependencies: + "@codemirror/autocomplete" "^6.0.0" + "@codemirror/commands" "^6.0.0" + "@codemirror/language" "^6.0.0" + "@codemirror/lint" "^6.0.0" + "@codemirror/search" "^6.0.0" + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" + +"@uiw/react-codemirror@^4.19.5": + version "4.19.5" + resolved "https://registry.yarnpkg.com/@uiw/react-codemirror/-/react-codemirror-4.19.5.tgz#a3fac44a741a3cbefb0fd58be4fa621e201f247e" + integrity sha512-ZCHh8d7beXbF8/t7F1+yHht6A9Y6CdKeOkZq4A09lxJEnyTQrj1FMf2zvfaqc7K23KNjkTCtSlbqKKbVDgrWaw== + dependencies: + "@babel/runtime" "^7.18.6" + "@codemirror/commands" "^6.1.0" + "@codemirror/state" "^6.1.1" + "@codemirror/theme-one-dark" "^6.0.0" + "@uiw/codemirror-extensions-basic-setup" "4.19.5" + codemirror "^6.0.0" + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -7419,10 +7551,18 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -codemirror@~5.65.11: - version "5.65.11" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz#c818edc3274788c008f636520c5490a1f7009b4f" - integrity sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A== +codemirror@^6.0.0, codemirror@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-6.0.1.tgz#62b91142d45904547ee3e0e0e4c1a79158035a29" + integrity sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg== + dependencies: + "@codemirror/autocomplete" "^6.0.0" + "@codemirror/commands" "^6.0.0" + "@codemirror/language" "^6.0.0" + "@codemirror/lint" "^6.0.0" + "@codemirror/search" "^6.0.0" + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.0.0" coffee-script@^1.10.0: version "1.12.7" @@ -7856,6 +7996,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +crelt@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.5.tgz#57c0d52af8c859e354bace1883eb2e1eb182bb94" + integrity sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA== + cross-fetch@3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" @@ -16029,6 +16174,11 @@ regenerate@^1.4.2: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== +regenerator-runtime@^0.13.11: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== + regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" @@ -17490,6 +17640,11 @@ style-loader@^3.3.1: resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575" integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ== +style-mod@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.0.0.tgz#97e7c2d68b592975f2ca7a63d0dd6fcacfe35a01" + integrity sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw== + style-to-object@0.3.0, style-to-object@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" @@ -18611,6 +18766,11 @@ w3c-hr-time@^1.0.2: dependencies: browser-process-hrtime "^1.0.0" +w3c-keyname@^2.2.4: + version "2.2.6" + resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.6.tgz#8412046116bc16c5d73d4e612053ea10a189c85f" + integrity sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg== + w3c-xmlserializer@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"