From 745506a2ccbb590a1672159235b0add3563641e0 Mon Sep 17 00:00:00 2001 From: xusongfu Date: Wed, 24 Aug 2022 16:15:28 +0800 Subject: [PATCH] fix: fix the worker-json error in browser console Fix the json_worker module url of ace editor to fix above error Change-Id: I2770b527ea533099323bcd91d4b11f974df3e1dd --- src/components/CodeEditor/AceEditor.jsx | 6 ++++++ src/components/CodeEditor/index.jsx | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/CodeEditor/AceEditor.jsx b/src/components/CodeEditor/AceEditor.jsx index a578d0ea..26ce8773 100644 --- a/src/components/CodeEditor/AceEditor.jsx +++ b/src/components/CodeEditor/AceEditor.jsx @@ -14,6 +14,7 @@ import React from 'react'; import AceEditor from 'react-ace'; +import ace from 'ace-builds'; import 'ace-builds/src-noconflict/mode-json'; // import 'ace-builds/src-noconflict/mode-yaml'; // import 'ace-builds/src-noconflict/mode-groovy'; @@ -21,6 +22,11 @@ import 'ace-builds/src-noconflict/theme-github'; import './custom.less'; +// eslint-disable-next-line import/no-webpack-loader-syntax,import/no-unresolved +const worker = require('file-loader?esModule=false!ace-builds/src-noconflict/worker-json'); + +ace.config.setModuleUrl('ace/mode/json_worker', worker); + export default class AceEditorWrapper extends React.Component { render() { return ( diff --git a/src/components/CodeEditor/index.jsx b/src/components/CodeEditor/index.jsx index 47c479d9..b7bdae21 100644 --- a/src/components/CodeEditor/index.jsx +++ b/src/components/CodeEditor/index.jsx @@ -60,7 +60,11 @@ const getCodeValue = (value, mode) => { class CodeEditor extends PureComponent { static propTypes = { - value: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), + value: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.object, + PropTypes.array, + ]), mode: PropTypes.string, options: PropTypes.object, onChange: PropTypes.func,