From b3b8f6bc70076b2decf93eb8043619d3e3f57008 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 12 Mar 2025 09:46:28 -0700 Subject: [PATCH] server: remove eseval --- server/package-lock.json | 4 ++-- server/src/es/es-eval.ts | 5 ----- server/src/es/tsconfig.json | 19 ------------------- server/src/plugin/plugin-remote-worker.ts | 3 +-- server/tsconfig.json | 6 ------ 5 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 server/src/es/es-eval.ts delete mode 100644 server/src/es/tsconfig.json diff --git a/server/package-lock.json b/server/package-lock.json index a29babd13..f14bb6740 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.138.9", + "version": "0.138.15", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.138.9", + "version": "0.138.15", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/server/src/es/es-eval.ts b/server/src/es/es-eval.ts deleted file mode 100644 index e5426522f..000000000 --- a/server/src/es/es-eval.ts +++ /dev/null @@ -1,5 +0,0 @@ -export async function eseval(script: string) { - // const dataUrl = `data:text/javascript,${encodeURIComponent(script)}`; - const module = await import(script); - return module; -} diff --git a/server/src/es/tsconfig.json b/server/src/es/tsconfig.json deleted file mode 100644 index 28171b89b..000000000 --- a/server/src/es/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "compilerOptions": { - "composite": true, - "declaration": true, - "module": "ESNext", - "target": "esnext", - "noImplicitAny": true, - "outDir": "../../dist/es", - "esModuleInterop": false, - // skip error: Interface 'WebGL2RenderingContext' incorrectly extends interface 'WebGL2RenderingContextBase'. - // https://github.com/tensorflow/tfjs/issues/4201 - "skipLibCheck": true, - "sourceMap": true, - }, - "include": [ - "./es-eval.ts", - ], - "exclude": [] -} \ No newline at end of file diff --git a/server/src/plugin/plugin-remote-worker.ts b/server/src/plugin/plugin-remote-worker.ts index 007aa7266..a5cfed955 100644 --- a/server/src/plugin/plugin-remote-worker.ts +++ b/server/src/plugin/plugin-remote-worker.ts @@ -387,8 +387,7 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe if (isModule) { process.env.SCRYPTED_SDK_ES_MODULE = __filename; - const { eseval } = await import('../es/es-eval.js'); - const module = await eseval(mainNodeJsOnFilesystem); + const module = await import(mainNodeJsOnFilesystem); params.module.exports = module; } else if (sdkVersion) { diff --git a/server/tsconfig.json b/server/tsconfig.json index b01dbe99c..22ada44d3 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -12,12 +12,6 @@ "skipLibCheck": true, "sourceMap": true, }, - "references": [ - { "path": "./src/es" }, - ], - "exclude": [ - "src/es/es-eval.ts" - ], "include": [ "src/**/*", ],