extension-develop 4.1.12 → 4.1.14

package/dist/ensure-hmr-for-scripts.mjs

@@ -3,6 +3,7 @@ import node_fs from "node:fs";
 import node_path from "node:path";
 import { init, parse } from "es-module-lexer";
 import { validate } from "schema-utils";
+import { returnWithMap, adjustLoaderSourceMap, inputOrIdentityMap } from "./292.mjs";
 import { EXTENSIONJS_CONTENT_SCRIPT_LAYER } from "./291.mjs";
 import { stripBom } from "./23.mjs";
 import { toResourceKey } from "./93.mjs";
@@ -17,11 +18,22 @@ const schema = {
         },
         includeList: {
             type: 'object'
+        },
+        frameworkOwnsRefresh: {
+            type: 'boolean'
         }
     },
     additionalProperties: false
 };
-function ensureHMRForScripts(source) {
+function ensureHMRForScripts(source, inputSourceMap) {
+    const withPrelude = (prelude)=>{
+        const resourcePath = String(this.resourcePath || '');
+        return adjustLoaderSourceMap(inputOrIdentityMap(inputSourceMap, resourcePath, source), {
+            prefix: prelude,
+            before: source,
+            after: source
+        });
+    };
     const debugHtmlHmr = '1' === process.env.EXTENSION_DEBUG_HTML_HMR_SKIP;
     const resourceQuery = String(this.resourceQuery || '');
     if (resourceQuery.includes('vue&type=')) return source;
@@ -40,6 +52,15 @@ function ensureHMRForScripts(source) {
         if (debugHtmlHmr) console.log(`[extjs:html-hmr] skip layer resource=${resourcePath} layer=${moduleLayer}`);
         return source;
     }
+    if (options?.frameworkOwnsRefresh === true) {
+        if (debugHtmlHmr) console.log(`[extjs:html-hmr] skip framework-refresh resource=${resourcePath}`);
+        return source;
+    }
+    const issuer = this?._module?.issuer;
+    if (issuer) {
+        if (debugHtmlHmr) console.log(`[extjs:html-hmr] skip child resource=${resourcePath}`);
+        return source;
+    }
     try {
         const manifestPath = String(options?.manifestPath || '');
         const manifestDir = manifestPath ? node_path.dirname(manifestPath) : '';
@@ -55,23 +76,20 @@ function ensureHMRForScripts(source) {
                 if (debugHtmlHmr) console.log(`[extjs:html-hmr] skip direct resource=${resourcePath} manifest=${manifestPath}`);
                 return source;
             }
-            let issuer = this?._module?.issuer;
-            while(issuer){
-                const issuerResource = String(issuer?.resource || issuer?.userRequest || '');
-                if (issuerResource && contentEntryPaths.has(toResourceKey(issuerResource))) {
-                    if (debugHtmlHmr) console.log(`[extjs:html-hmr] skip issuer resource=${resourcePath} issuer=${issuerResource}`);
-                    return source;
-                }
-                issuer = issuer?.issuer;
-            }
         }
     } catch (error) {
         if (debugHtmlHmr) console.log(`[extjs:html-hmr] error resource=${resourcePath} manifest=${String(options?.manifestPath || '')} error=${error instanceof Error ? error.message : String(error)}`);
     }
     if (debugHtmlHmr) console.log(`[extjs:html-hmr] inject resource=${resourcePath} manifest=${String(options?.manifestPath || '')} layer=${moduleLayer || '<none>'}`);
     const moduleType = String(this?._module?.type || '');
-    if ("javascript/dynamic" === moduleType) return `${buildReloadCode('module.hot')}${source}`;
-    if ("javascript/esm" === moduleType) return `${buildReloadCode('import.meta.webpackHot')}${source}`;
+    if ("javascript/dynamic" === moduleType) {
+        const prelude = buildReloadCode('module.hot');
+        return returnWithMap(this, `${prelude}${source}`, withPrelude(prelude));
+    }
+    if ("javascript/esm" === moduleType) {
+        const prelude = buildReloadCode('import.meta.webpackHot');
+        return returnWithMap(this, `${prelude}${source}`, withPrelude(prelude));
+    }
     const callback = this.async();
     init.then(()=>{
         let hasModuleSyntax = false;
@@ -79,9 +97,11 @@ function ensureHMRForScripts(source) {
             const [, , , moduleSyntax] = parse(source);
             hasModuleSyntax = Boolean(moduleSyntax);
         } catch  {}
-        callback(null, `${buildReloadCode(hasModuleSyntax ? 'import.meta.webpackHot' : 'module.hot')}${source}`);
+        const prelude = buildReloadCode(hasModuleSyntax ? 'import.meta.webpackHot' : 'module.hot');
+        callback(null, `${prelude}${source}`, withPrelude(prelude));
     }).catch(()=>{
-        callback(null, `${buildReloadCode('module.hot')}${source}`);
+        const prelude = buildReloadCode('module.hot');
+        callback(null, `${prelude}${source}`, withPrelude(prelude));
     });
 }
 function buildReloadCode(hot) {
@@ -96,12 +116,9 @@ if (${hot}) {
           while (el.firstChild) el.removeChild(el.firstChild);
         };
 
-        clear(document.getElementById('app'));
-
-        var roots = document.querySelectorAll('[data-extension-root]');
-        roots.forEach(function(node) {
-          clear(node);
-        });
+        // The page mounts on #root; the version before must not stay
+        // underneath the one the entry renders next.
+        clear(document.getElementById('root'));
       } catch (err) {
         console.error('Error clearing HTML containers', err);
       }