Fix issue with relative path in webworker

paritytech · Jan 17, 2025 · dc2d2ff · dc2d2ff
1 parent b78b2b2
commit dc2d2ff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -14,5 +14,6 @@ rustflags = [
     "-Clink-arg=--pre-js=js/embed/pre.js",
     "-Clink-arg=-sNODEJS_CATCH_EXIT=0",
     "-Clink-arg=-sDISABLE_EXCEPTION_CATCHING=0",
+    "-Clink-arg=-sSINGLE_FILE=1",
     "-Copt-level=3"
 ]
diff --git a/js/embed/soljson_interface.js b/js/embed/soljson_interface.js
@@ -10,20 +10,7 @@ mergeInto(LibraryManager.library, {
     },
     resolc_compile: function(inputPtr, inputLen) {
         const inputJson = UTF8ToString(inputPtr, inputLen);
-
-        // Check if running in a web worker or node.js
-        if (typeof importScripts === 'function') {
-            // Running in a web worker
-            importScripts('./resolc.js');
-            var revive = createRevive()
-        } else if (typeof require === 'function') {
-            // Running in Node.js
-            const path = require('path');
-            createRevive = require(path.resolve(__dirname, './resolc.js'));
-            var revive = createRevive();
-        } else {
-            throw new Error('Unknown environment: Unable to load resolc.js');
-        }
+        var revive = createRevive();
         revive.writeToStdin(inputJson);
 
         // Call main on the new instance

diff --git a/js/playwright.config.js b/js/playwright.config.js
@@ -23,7 +23,7 @@ module.exports = defineConfig({
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
   },
-  timeout: 120000,
+  timeout: 480000,
   /* Configure projects for major browsers */
   projects: [
     {