chore: Merge conflicts.

Author: jaywcjlove

package.json

@@ -61,7 +61,7 @@
     "@types/testing-library__jest-dom": "5.14.0",
     "@uiw/react-github-corners": "1.4.0",
     "@uiw/react-markdown-preview": "3.1.3",
-    "code-example": "3.0.4",
+    "code-example": "3.0.6",
     "compile-less-cli": "1.8.0",
     "husky": "6.0.0",
     "kkt": "6.10.4",

website/App.tsx

@@ -11,11 +11,23 @@ import './App.css';
 const App: React.FC = () => {
   const [value, setValue] = useState('');
   const [language, setLanguage] = useState('jsx');
+  const [lang, setLang] = useState('jsx');
   useEffect(() => {
     if (language) {
       import(`code-example/txt/sample.${language}.txt`)
         .then((code) => {
           setValue(code.default || '');
+          let str = language;
+          if (/^(mysql|pgsql)$/.test(language)) {
+            str = 'sql';
+          }
+          if (/^(objective-c)$/.test(language)) {
+            str = 'objc';
+          }
+          if (/^(vue)$/.test(language)) {
+            str = 'html';
+          }
+          setLang(str);
         })
         .catch((err) => {
           setValue('');
@@ -35,7 +47,7 @@ const App: React.FC = () => {
         <TextareaCodeEditor
           autoFocus
           value={value}
-          language={language}
+          language={lang}
           minHeight={80}
           placeholder={`Please enter ${(language || '').toLocaleUpperCase()} code.`}
           style={{