更新monaco@0.37.1，修复多编辑器快捷键冲突，修复npm run dev

更新monaco@0.37.1（为后续优化ESLint做基础）
修复多编辑器快捷键冲突（0.31.0原本就有的多编辑器冲突未修复）
修复npm run dev

Author: DreamNya

package-lock.json

@@ -7,7 +7,7 @@
   "scripts": {
     "test": "jest --coverage",
     "lint": "eslint --ext .js,.ts,.tsx src/",
-    "dev": "concurrently \"webpack --mode development --config ./webpack/webpack.dev.ts\" \"npm run dev:linter\"",
+    "dev": "webpack --mode development --config ./webpack/webpack.dev.ts",
     "build": "webpack --mode production --config ./webpack/webpack.prod.ts && concurrently \"npm run build:linter\" \"npm run build:no-split\"",
     "build:linter": "webpack --mode production --config ./webpack/webpack.linter.ts",
     "build:no-split": "webpack --mode production --config ./webpack/webpack.no.split.ts",
@@ -28,7 +28,7 @@
     "dayjs": "^1.11.4",
     "dexie": "^3.2.2",
     "jszip": "^3.10.1",
-    "monaco-editor": "^0.31.0",
+    "monaco-editor": "^0.37.1",
     "monaco-vim": "^0.3.4",
     "pako": "^2.0.4",
     "react": "^18.2.0",

package.json

@@ -32,6 +32,9 @@ import ScriptResource from "@App/pages/components/ScriptResource";
 const { Row } = Grid;
 const { Col } = Grid;
 
+// 声明一个Map存储Script
+const ScriptMap = new Map();
+
 type HotKey = {
   hotKey: number;
   action: (script: Script, codeEditor: editor.IStandaloneCodeEditor) => void;
@@ -46,17 +49,34 @@ const Editor: React.FC<{
 }> = ({ id, script, hotKeys, callbackEditor, onChange }) => {
   const [init, setInit] = useState(false);
   const codeEditor = useRef<{ editor: editor.IStandaloneCodeEditor }>(null);
-
+  // Script.uuid为key，Script为value，储存Script
+  ScriptMap.has(script.uuid) || ScriptMap.set(script.uuid, script);
   useEffect(() => {
     if (!codeEditor.current || !codeEditor.current.editor) {
       setTimeout(() => {
         setInit(true);
       }, 200);
       return () => {};
     }
+    // 初始化editor时将Script的uuid绑定到editor上
+    // @ts-ignore
+    if (!codeEditor.current.editor.uuid) {
+      // @ts-ignore
+      codeEditor.current.editor.uuid = script.uuid;
+    }
     hotKeys.forEach((item) => {
       codeEditor.current?.editor.addCommand(item.hotKey, () => {
-        item.action(script, codeEditor.current!.editor);
+        // 获取当前激活的editor（通过editor._focusTracker._hasFocus判断editor激活状态 可能有更好的方法）
+        const activeEditor = editor
+          .getEditors()
+          // @ts-ignore
+          // eslint-disable-next-line no-underscore-dangle
+          .find((i) => i._focusTracker._hasFocus);
+
+        // 仅在获取到激活的editor时，通过editor上绑定的uuid获取Script，并指定激活的editor执行快捷键action
+        activeEditor &&
+          // @ts-ignore
+          item.action(ScriptMap.get(activeEditor.uuid), activeEditor);
       });
     });
     codeEditor.current.editor.onKeyUp(() => {

src/pages/options/routes/script/ScriptEditor.tsx

@@ -3,6 +3,8 @@ import merge from "webpack-merge";
 import CompressionPlugin from "compression-webpack-plugin";
 import common from "../webpack.config";
 
+const NodePolyfillPlugin = require("node-polyfill-webpack-plugin");
+
 const src = `${__dirname}/../src`;
 const dist = `${__dirname}/../dist`;
 
@@ -13,6 +15,7 @@ common.entry = {
   inject: `${src}/inject.ts`,
   "editor.worker": "monaco-editor/esm/vs/editor/editor.worker.js",
   "ts.worker": "monaco-editor/esm/vs/language/typescript/ts.worker.js",
+  "linter.worker": `${src}/linter.worker.ts`,
 };
 
 common.output = {
@@ -33,5 +36,9 @@ export default merge(common, {
       test: /ts.worker.js/,
       deleteOriginalAssets: true,
     }),
+    new NodePolyfillPlugin(),
   ],
+  resolve: {
+    mainFields: ["browser", "main", "module"],
+  },
 });