diff --git a/src/processing/script/header.ts b/src/processing/script/header.ts
index 5c0b2c1e8..0fb76cb1f 100644
--- a/src/processing/script/header.ts
+++ b/src/processing/script/header.ts
@@ -17,10 +17,15 @@ const STRICT_MODE_PLACEHOLDER     = '{strict-placeholder}';
 const SW_SCOPE_HEADER_VALUE       = '{sw-scope-header-value}';
 const WORKER_SETTINGS_PLACEHOLDER = '{worker-settings}';
 
+// NOTE: we need try/catch if a worker with ES module (fix for https://github.com/DevExpress/testcafe/issues/8251)
 const IMPORT_WORKER_HAMMERHEAD = `
 if (typeof importScripts !== "undefined" && /\\[native code]/g.test(importScripts.toString())) {
     var ${INSTRUCTION.getWorkerSettings} = function () {return ${WORKER_SETTINGS_PLACEHOLDER}};
-    importScripts((location.origin || (location.protocol + "//" + location.host)) + "${SERVICE_ROUTES.workerHammerhead}");
+    try {
+        importScripts((location.origin || (location.protocol + "//" + location.host)) + "${SERVICE_ROUTES.workerHammerhead}");
+    } catch (e) {
+        (async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "${SERVICE_ROUTES.workerHammerhead}"); })();
+    }
 }
 `;
 
diff --git a/test/server/data/cache/expected-script.js b/test/server/data/cache/expected-script.js
index 6690fe2cc..da79fda5a 100644
--- a/test/server/data/cache/expected-script.js
+++ b/test/server/data/cache/expected-script.js
@@ -1,4 +1,4 @@
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
 var elements = document.getElementsByTagName('div');
 
 for (var i = 0; i < elements.length; i++ )
diff --git a/test/server/data/html-import-page/expected.html b/test/server/data/html-import-page/expected.html
index beec73be4..c136f2fd7 100644
--- a/test/server/data/html-import-page/expected.html
+++ b/test/server/data/html-import-page/expected.html
@@ -14,7 +14,7 @@
         }
     
 /*hammerhead|stylesheet|end*/</style>
-    <script type="text/javascript">/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+    <script type="text/javascript">/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
 
         {
             a :  __get$(window,"location") 
@@ -31,7 +31,7 @@
     <!-- T217636: Health monitor - script incorrectly processes html-comments (flipkart.com) -->
     <script type="text/javascript">
         <!--<script type="text/javascript">-->
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
         var someScript;
     
 /*hammerhead|script|end*/</script>
diff --git a/test/server/data/page/expected-https.html b/test/server/data/page/expected-https.html
index a9cd4b36b..621bb61d1 100644
--- a/test/server/data/page/expected-https.html
+++ b/test/server/data/page/expected-https.html
@@ -45,7 +45,7 @@
     </script>
     <script type="text/javascript">
 //<![CDATA[
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
 
              __set$(window,"location",'test') ;
              0,function(){var _hh$temp0='test';return __set$Loc(location,_hh$temp0)||(location=_hh$temp0);}.call(this) ;
@@ -56,7 +56,7 @@
 /*hammerhead|script|end*///]]></script>
     <script type="text/javascript">
         <!--//--><![CDATA[//><!--
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
         var someScript;
         
 /*hammerhead|script|end*///--><!]]>
@@ -64,11 +64,11 @@
     <!-- T217636: Health monitor - script incorrectly processes html-comments (flipkart.com) -->
     <script type="text/javascript">
         <!--<script type="text/javascript">-->
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
         var someScript;
     
 /*hammerhead|script|end*/</script>
-    <script type="module">/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+    <script type="module">/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
 
         import foo from  "https://127.0.0.1:1836/sessionId*12345!s!utf-8/http://base.url/foo.js" ;
 
diff --git a/test/server/data/page/expected.html b/test/server/data/page/expected.html
index f8a08a1b5..51e50c982 100644
--- a/test/server/data/page/expected.html
+++ b/test/server/data/page/expected.html
@@ -45,7 +45,7 @@
     </script>
     <script type="text/javascript">
 //<![CDATA[
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
 
              __set$(window,"location",'test') ;
              0,function(){var _hh$temp0='test';return __set$Loc(location,_hh$temp0)||(location=_hh$temp0);}.call(this) ;
@@ -56,7 +56,7 @@
 /*hammerhead|script|end*///]]></script>
     <script type="text/javascript">
         <!--//--><![CDATA[//><!--
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
         var someScript;
         
 /*hammerhead|script|end*///--><!]]>
@@ -64,11 +64,11 @@
     <!-- T217636: Health monitor - script incorrectly processes html-comments (flipkart.com) -->
     <script type="text/javascript">
         <!--<script type="text/javascript">-->
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
         var someScript;
     
 /*hammerhead|script|end*/</script>
-    <script type="module">/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+    <script type="module">/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
 
         import foo from  "http://127.0.0.1:1836/sessionId*12345!s!utf-8/http://base.url/foo.js" ;
 
diff --git a/test/server/data/script/expected.js b/test/server/data/script/expected.js
index b18166996..bdef00d8c 100644
--- a/test/server/data/script/expected.js
+++ b/test/server/data/script/expected.js
@@ -1,4 +1,4 @@
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
 // fragment of the jQuery v1.4.1
 function liveHandler( event ) {
     var stop, elems = [], selectors = [], args = arguments,
diff --git a/test/server/data/service-worker/expected-with-header.js b/test/server/data/service-worker/expected-with-header.js
index f2cf1c8b4..7fedd94c4 100644
--- a/test/server/data/service-worker/expected-with-header.js
+++ b/test/server/data/service-worker/expected-with-header.js
@@ -1,3 +1,3 @@
-/*hammerhead|script|start*/var __swScopeHeaderValue = "/path/";if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/var __swScopeHeaderValue = "/path/";if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
 eval( __proc$Script('test') );
 /*hammerhead|script|end*/
\ No newline at end of file
diff --git a/test/server/data/service-worker/expected.js b/test/server/data/service-worker/expected.js
index b4d090a31..2c088aede 100644
--- a/test/server/data/service-worker/expected.js
+++ b/test/server/data/service-worker/expected.js
@@ -1,3 +1,3 @@
-/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");}}/*hammerhead|script|processing-header-end*/
+/*hammerhead|script|start*/if (typeof globalThis.window !== 'undefined' && globalThis.window){globalThis.window['hammerhead|process-dom-method'] && globalThis.window['hammerhead|process-dom-method']();if (globalThis.window.__get$ && typeof __get$ === 'undefined')var __get$Loc = globalThis.window.__get$Loc,__set$Loc = globalThis.window.__set$Loc,__set$ = globalThis.window.__set$,__get$ = globalThis.window.__get$,__call$ = globalThis.window.__call$,__get$Eval = globalThis.window.__get$Eval,__proc$Script = globalThis.window.__proc$Script,__proc$Html = globalThis.window.__proc$Html,__get$PostMessage = globalThis.window.__get$PostMessage,__get$ProxyUrl = globalThis.window.__get$ProxyUrl,__rest$Array = globalThis.window.__rest$Array,__rest$Object = globalThis.window.__rest$Object,__arrayFrom$ = globalThis.window.__arrayFrom$;} else {if (typeof __get$ === 'undefined')var __get$Loc = function(l){return l},__set$Loc = function(l,v){return l = v},__set$ = function(o,p,v){return o[p] = v},__get$ = function(o,p,opt=false){return opt&&(o===undefined||o===null)?undefined:o[p]},__call$ = function(o,p,a){return o[p].apply(o,a)},__get$Eval = function(e){return e},__proc$Script = function(s){return s},__proc$Html = function(h){return h},__get$PostMessage = function(w,p){return arguments.length===1?w.postMessage:p},__get$ProxyUrl = function(u,d){return u},__rest$Array = function(a,i){return Array.prototype.slice.call(a, i)},__rest$Object = function(o,p){var k=Object.keys(o),n={};for(var i=0;i<k.length;++i)if(p.indexOf(k[i])<0)n[k[i]]=o[k[i]];return n},__arrayFrom$ = function(r){if(!r)return r;return!Array.isArray(r)&&"function"==typeof r[Symbol.iterator]?Array.from(r):r};if (typeof importScripts !== "undefined" && /\[native code]/g.test(importScripts.toString())) {var __getWorkerSettings$ = function () {return null};try {importScripts((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js");} catch (e) {(async function () { await import((location.origin || (location.protocol + "//" + location.host)) + "/worker-hammerhead.js"); })();}}}/*hammerhead|script|processing-header-end*/
  __get$PostMessage(null,postMessage) ('test');
 /*hammerhead|script|end*/
\ No newline at end of file