extension-develop 3.18.5-canary.local-34c11c8f → 4.0.0

package/dist/{962.mjs → 839.mjs}

@@ -4,10 +4,11 @@ import { execFileSync, spawn, spawnSync as external_child_process_spawnSync } fr
 import { buildExecEnv, detectPackageManagerFromLockfile } from "prefers-yarn";
 import pintor from "pintor";
 import { EventEmitter } from "node:events";
-import { package_namespaceObject, buildSuccessWithWarnings, buildWarningsDetails, loadCommandConfig, needsInstall, getDirs, buildCommandFailed, sanitize, writingTypeDefinitions, buildWebpack, assertNoManagedDependencyConflicts, debugDirs, debugBrowser, normalizeBrowser, debugOutputPath, loadCustomConfig, buildSuccess, writingTypeDefinitionsError, getDistPath, loadBrowserConfig, getProjectStructure, authorInstallNotice, resolveCompanionExtensionsConfig, getSpecialFoldersDataForProjectRoot } from "./946.mjs";
-import { getCanonicalContentScriptEntryName } from "./526.mjs";
+import { package_namespaceObject, buildSuccessWithWarnings, buildWarningsDetails, loadCommandConfig, needsInstall, getDirs, buildCommandFailed, sanitize, writingTypeDefinitions, buildWebpack, assertNoManagedDependencyConflicts, debugDirs, debugBrowser, normalizeBrowser, debugOutputPath, loadCustomConfig, buildSuccess, writingTypeDefinitionsError, getDistPath, loadBrowserConfig, getProjectStructure, authorInstallNotice, resolveCompanionExtensionsConfig, getSpecialFoldersDataForProjectRoot } from "./101.mjs";
+import { getCanonicalContentScriptEntryName } from "./291.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
+var __rspack_import_meta_dirname__ = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 import * as __rspack_external_fs from "fs";
 import * as __rspack_external_path from "path";
 import * as __rspack_external_fs_promises_400951f8 from "fs/promises";
@@ -27,7 +28,6 @@ function parseJsonSafe(text) {
     const s = raw && 0xfeff === raw.charCodeAt(0) ? raw.slice(1) : raw;
     return JSON.parse(s || '{}');
 }
-var develop_context_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 const cjsRequire = createRequire(import.meta.url);
 if (!process.env.EXTENSION_JS_OPTIONAL_DEPS_VERSION) process.env.EXTENSION_JS_OPTIONAL_DEPS_VERSION = package_namespaceObject.rE;
 function resolveDevelopRootFromDir(dir) {
@@ -50,7 +50,7 @@ function findDevelopRootFrom(startDir) {
     }
 }
 function findExtensionDevelopRoot() {
-    const libDir = develop_context_dirname;
+    const libDir = __rspack_import_meta_dirname__;
     const buildDir = __rspack_external_path.resolve(libDir, '..');
     const packageRoot = __rspack_external_path.resolve(buildDir, '..');
     const packageJsonPath = __rspack_external_path.join(packageRoot, 'package.json');
@@ -69,13 +69,13 @@ function resolveDevelopInstallRoot() {
     const directRoot = findExtensionDevelopRoot();
     if (directRoot) return directRoot;
     try {
-        const candidateRoot = findDevelopRootFrom(develop_context_dirname);
+        const candidateRoot = findDevelopRootFrom(__rspack_import_meta_dirname__);
         if (candidateRoot) return candidateRoot;
     } catch  {}
     try {
         const pkgPath = cjsRequire.resolve('extension-develop/package.json', {
             paths: [
-                develop_context_dirname
+                __rspack_import_meta_dirname__
             ]
         });
         return resolveDevelopRootFromDir(__rspack_external_path.dirname(pkgPath));
@@ -85,7 +85,7 @@ function resolveDevelopInstallRoot() {
 }
 function resolveDevelopDistFile(stem) {
     const installRoot = resolveDevelopInstallRoot();
-    const distRoot = installRoot ? __rspack_external_path.join(installRoot, 'dist') : __rspack_external_path.resolve(develop_context_dirname, '..');
+    const distRoot = installRoot ? __rspack_external_path.join(installRoot, 'dist') : __rspack_external_path.resolve(__rspack_import_meta_dirname__, '..');
     const base = __rspack_external_path.join(distRoot, stem);
     const candidates = [
         `${base}.js`,
@@ -100,7 +100,6 @@ function resolveDevelopDistFile(stem) {
     if ('1' === process.env.EXTENSION_DEBUG_DEVELOP_ROOT) console.log(`[extjs:develop-root] ${stem} -> ${base} (fallback, installRoot=${installRoot || '<none>'})`);
     return base;
 }
-var package_manager_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 const package_manager_require = createRequire(import.meta.url);
 function normalizePackageManager(value) {
     if (!value) return;
@@ -173,7 +172,7 @@ function resolveBundledNpmCliPath() {
         const resolved = package_manager_require.resolve('npm/bin/npm-cli.js', {
             paths: [
                 process.cwd(),
-                package_manager_dirname
+                __rspack_import_meta_dirname__
             ]
         });
         if (resolved && __rspack_external_fs.existsSync(resolved)) return resolved;
@@ -511,7 +510,7 @@ const OPTIONAL_DEPENDENCY_CONTRACTS = {
         integration: 'React',
         installPackages: [
             'react-refresh@0.18.0',
-            '@rspack/plugin-react-refresh@1.6.0'
+            '@rspack/plugin-react-refresh@2.0.2'
         ],
         verificationRules: [
             ...installRootRules([
@@ -1221,6 +1220,62 @@ async function extensionBuild(pathOrRemoteUrl, buildOptions) {
         process.exit(1);
     }
 }
+function viaBroker(broker, instruction) {
+    broker.broadcastReload({
+        type: instruction.type,
+        changedContentScriptEntries: instruction.changedContentScriptEntries
+    });
+}
+async function dispatchReload(instruction, executor) {
+    if (!instruction) return;
+    if ('true' === process.env.EXTENSION_NO_RELOAD) return;
+    if (executor.broker) viaBroker(executor.broker, instruction);
+}
+function createChangedSourcesTracker(compiler) {
+    let forcedFull = false;
+    let changedSources = [];
+    compiler.hooks.watchRun.tap('extjs-reload-changed-sources', ()=>{
+        forcedFull = false;
+        changedSources = [];
+        const modifiedFiles = compiler.modifiedFiles;
+        if (!modifiedFiles || 0 === modifiedFiles.size) return;
+        const contextDir = compiler.options.context || '';
+        for (const file of modifiedFiles){
+            const normalized = __rspack_external_path.relative(contextDir, file).replace(/\\/g, '/');
+            changedSources.push(normalized);
+            if (normalized.includes('manifest.json') || normalized.includes('_locales/')) forcedFull = true;
+        }
+    });
+    return {
+        snapshot: ()=>({
+                forcedFull,
+                changedSources
+            })
+    };
+}
+function classifyReloadFromSources(opts) {
+    const { changedSources, forcedFull, getContentScriptCount } = opts;
+    if (0 === changedSources.length) return;
+    if (forcedFull) return {
+        type: 'full',
+        changedAssets: changedSources
+    };
+    const isServiceWorkerSource = (rel)=>/(^|\/)background(\.|\/)/i.test(rel) || /service[-_.]?worker/i.test(rel);
+    if (changedSources.some(isServiceWorkerSource)) return {
+        type: 'service-worker',
+        changedAssets: changedSources
+    };
+    const contentScriptCount = getContentScriptCount();
+    if (contentScriptCount > 0) {
+        const entries = [];
+        for(let i = 0; i < contentScriptCount; i++)entries.push(getCanonicalContentScriptEntryName(i));
+        return {
+            type: "content-scripts",
+            changedContentScriptEntries: entries,
+            changedAssets: changedSources
+        };
+    }
+}
 class BuildEmitter extends EventEmitter {
     constructor(){
         super();
@@ -1234,25 +1289,15 @@ class BrowsersPlugin {
     extensionsToLoad = [];
     isFirstCompile = true;
     controller;
+    reloadBroker;
     constructor(options){
         this.options = options;
     }
+    setReloadBroker(broker) {
+        this.reloadBroker = broker;
+    }
     apply(compiler) {
-        let pendingReloadReason;
-        let pendingChangedSources = [];
-        compiler.hooks.watchRun.tap(BrowsersPlugin.name, ()=>{
-            pendingReloadReason = void 0;
-            pendingChangedSources = [];
-            const modifiedFiles = compiler.modifiedFiles;
-            if (!modifiedFiles || 0 === modifiedFiles.size) return;
-            const contextDir = compiler.options.context || '';
-            for (const file of modifiedFiles){
-                const normalized = __rspack_external_path.relative(contextDir, file).replace(/\\/g, '/');
-                pendingChangedSources.push(normalized);
-                if (normalized.includes('manifest.json')) pendingReloadReason = 'full';
-                else if (normalized.includes('_locales/')) pendingReloadReason = 'full';
-            }
-        });
+        const changedSources = createChangedSourcesTracker(compiler);
         compiler.hooks.done.tapPromise(BrowsersPlugin.name, async (stats)=>{
             const compilation = stats.compilation;
             const hasErrors = compilation.errors && compilation.errors.length > 0;
@@ -1262,29 +1307,13 @@ class BrowsersPlugin {
             const outputPath = String(compilation.options?.output?.path || '');
             const contextDir = String(compilation.options?.context || '');
             let reloadInstruction;
-            if (!this.isFirstCompile && pendingReloadReason) reloadInstruction = {
-                type: pendingReloadReason,
-                changedAssets: pendingChangedSources
-            };
-            else if (!this.isFirstCompile && pendingChangedSources.length > 0) {
-                const isServiceWorkerSource = (rel)=>/(^|\/)background(\.|\/)/i.test(rel) || /service[-_.]?worker/i.test(rel);
-                const hasServiceWorkerChange = pendingChangedSources.some(isServiceWorkerSource);
-                if (hasServiceWorkerChange) reloadInstruction = {
-                    type: 'service-worker',
-                    changedAssets: pendingChangedSources
-                };
-                else {
-                    const contentScriptCount = readContentScriptCount(compilation, outputPath);
-                    if (contentScriptCount > 0) {
-                        const entries = [];
-                        for(let i = 0; i < contentScriptCount; i++)entries.push(getCanonicalContentScriptEntryName(i));
-                        reloadInstruction = {
-                            type: "content-scripts",
-                            changedContentScriptEntries: entries,
-                            changedAssets: pendingChangedSources
-                        };
-                    } else reloadInstruction = void 0;
-                }
+            if (!this.isFirstCompile) {
+                const { forcedFull, changedSources: sources } = changedSources.snapshot();
+                reloadInstruction = classifyReloadFromSources({
+                    changedSources: sources,
+                    forcedFull,
+                    getContentScriptCount: ()=>readContentScriptCount(compilation, outputPath)
+                });
             }
             const wasFirstCompile = this.isFirstCompile;
             this.isFirstCompile = false;
@@ -1312,11 +1341,9 @@ class BrowsersPlugin {
                     ]
                 });
             }
-            else if (this.controller && reloadInstruction) {
-                if ('true' !== process.env.EXTENSION_NO_RELOAD) try {
-                    await this.controller.reload(reloadInstruction);
-                } catch  {}
-            }
+            else if (this.reloadBroker) await dispatchReload(reloadInstruction, {
+                broker: this.reloadBroker
+            });
             this.emitter.emit('compiled', {
                 outputPath,
                 contextDir,
@@ -1508,4 +1535,4 @@ async function extensionDev(pathOrRemoteUrl, devOptions) {
         process.exit(1);
     }
 }
-export { BuildEmitter, ensureOptionalContractModuleLoaded, ensureTypeScriptConfig, extensionBuild, extensionDev, getUserTypeScriptConfigFile, hasDependency, isUsingCustomLoader, isUsingIntegration, isUsingTypeScript, jsFrameworksConfigsDetected, jsFrameworksHmrSummary, jsFrameworksIntegrationsEnabled, loadOptionalContractModuleWithoutInstall, optional_deps_resolver_ensureOptionalContractPackageResolved, parseJsonSafe, resolveDevelopDistFile, resolveDevelopInstallRoot, resolveOptionalContractPackageWithoutInstall, resolveOptionalDependencySync };
+export { BuildEmitter, classifyReloadFromSources, createChangedSourcesTracker, dispatchReload, ensureOptionalContractModuleLoaded, ensureTypeScriptConfig, extensionBuild, extensionDev, getUserTypeScriptConfigFile, hasDependency, isUsingCustomLoader, isUsingIntegration, isUsingTypeScript, jsFrameworksConfigsDetected, jsFrameworksHmrSummary, jsFrameworksIntegrationsEnabled, loadOptionalContractModuleWithoutInstall, optional_deps_resolver_ensureOptionalContractPackageResolved, parseJsonSafe, readContentScriptCount, resolveDevelopDistFile, resolveDevelopInstallRoot, resolveOptionalContractPackageWithoutInstall, resolveOptionalDependencySync };

package/dist/bridge.mjs

@@ -1,6 +1,6 @@
 import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
 import { WebSocket } from "ws";
-import { CONTROL_WS_PATH } from "./45.mjs";
+import { CONTROL_WS_PATH } from "./875.mjs";
 import * as __rspack_external_fs from "fs";
 import * as __rspack_external_path from "path";
 function readReadyContract(projectPath, browser = 'chrome') {
@@ -224,5 +224,5 @@ class BridgeController {
         this.pending.clear();
     }
 }
-export { controlTokenPath, readControlToken } from "./45.mjs";
+export { controlTokenPath, readControlToken } from "./875.mjs";
 export { BridgeConsumer, BridgeController, readReadyContract };

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

@@ -2,7 +2,7 @@ import { createRequire as __extjsCreateRequire } from "node:module"; const requi
 import fs from "fs";
 import path from "path";
 import { validate } from "schema-utils";
-import { EXTENSIONJS_CONTENT_SCRIPT_LAYER } from "./526.mjs";
+import { EXTENSIONJS_CONTENT_SCRIPT_LAYER } from "./291.mjs";
 const schema = {
     type: 'object',
     properties: {

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

@@ -2,7 +2,7 @@ import { createRequire as __extjsCreateRequire } from "node:module"; const requi
 import fs from "fs";
 import path from "path";
 import { validate } from "schema-utils";
-import { EXTENSIONJS_CONTENT_SCRIPT_LAYER } from "./526.mjs";
+import { EXTENSIONJS_CONTENT_SCRIPT_LAYER } from "./291.mjs";
 const schema = {
     type: 'object',
     properties: {