sharedworker -> regular worker

Author: YousefED

packages/frame/src/runtime/editor/index.ts

@@ -7,7 +7,7 @@ import type * as Monaco from "monaco-editor";
 import EditorWorker from "./workers/editor.worker?worker"; // eslint-disable-line import/no-webpack-loader-syntax
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-import TsWorker from "./workers/ts.worker?sharedworker"; // eslint-disable-line import/no-webpack-loader-syntax
+import TsWorker from "./workers/ts.worker?worker"; // eslint-disable-line import/no-webpack-loader-syntax
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import CSSWorker from "monaco-editor/esm/vs/language/css/css.worker?worker";
@@ -22,30 +22,31 @@ if (!(window as any).MonacoEnvironment) {
     getWorker: function (workerId: string, label: string) {
       if (label === "typescript" || label === "javascript") {
         const w = new TsWorker(); // TsWorker();
+        return w;
         // w.port.start();
 
-        return {
-          postMessage: w.port.postMessage.bind(w.port),
-          addEventListener: w.port.addEventListener.bind(w.port),
-          removeEventListener: w.port.removeEventListener.bind(w.port),
-          terminate: () => {
-            // noop
-          },
-          get onmessage() {
-            return w.port.onmessage;
-          },
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          set onmessage(val: any) {
-            w.port.onmessage = val;
-          },
-          get onmessageerror() {
-            return w.port.onmessageerror;
-          },
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          set onmessageerror(val: any) {
-            w.port.onmessageerror = val;
-          },
-        };
+        // return {
+        //   postMessage: w.port.postMessage.bind(w.port),
+        //   addEventListener: w.port.addEventListener.bind(w.port),
+        //   removeEventListener: w.port.removeEventListener.bind(w.port),
+        //   terminate: () => {
+        //     // noop
+        //   },
+        //   get onmessage() {
+        //     return w.port.onmessage;
+        //   },
+        //   // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        //   set onmessage(val: any) {
+        //     w.port.onmessage = val;
+        //   },
+        //   get onmessageerror() {
+        //     return w.port.onmessageerror;
+        //   },
+        //   // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        //   set onmessageerror(val: any) {
+        //     w.port.onmessageerror = val;
+        //   },
+        // };
       }
       if (label === "json") {
         throw new Error("not implemented");

packages/frame/src/runtime/editor/workers/ts.worker.ts

@@ -5,11 +5,11 @@
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
+import * as worker from "monaco-editor/esm/vs/editor/editor.worker.js";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import { TypeScriptWorker } from "monaco-editor/esm/vs/language/typescript/ts.worker.js";
-import { initialize } from "./worker-init";
 
 export class CustomTypeScriptWorker extends TypeScriptWorker {
   // eslint-disable-next-line
@@ -85,37 +85,37 @@ export class CustomTypeScriptWorker extends TypeScriptWorker {
 
 // for regular webWorker:
 
-// globalThis.onmessage = () => {
-//   worker.initialize(
-//     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-//     (context: any, createData: any) =>
-//       new CustomTypeScriptWorker(context, createData)
-//   );
-// };
+globalThis.onmessage = () => {
+  worker.initialize(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (context: any, createData: any) =>
+      new CustomTypeScriptWorker(context, createData)
+  );
+};
 
 // For SharedWorker:
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const connect = (port: any) => {
-  // let initialized = false;
-  port.onmessage = (e: any) => {
-    initialize(
-      function (ctx: any, createData: any) {
-        return new CustomTypeScriptWorker(ctx, createData);
-      },
-      port,
-      false
-    );
-  };
-};
+// export const connect = (port: any) => {
+//   // let initialized = false;
+//   port.onmessage = (e: any) => {
+//     initialize(
+//       function (ctx: any, createData: any) {
+//         return new CustomTypeScriptWorker(ctx, createData);
+//       },
+//       port,
+//       false
+//     );
+//   };
+// };
 
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-self.onconnect = (e) => {
-  const [port] = e.ports;
-  connect(port);
-};
+// // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// // @ts-ignore
+// self.onconnect = (e) => {
+//   const [port] = e.ports;
+//   connect(port);
+// };
 
-if (!("SharedWorkerGlobalScope" in self)) {
-  connect(self);
-}
+// if (!("SharedWorkerGlobalScope" in self)) {
+//   connect(self);
+// }