extension-develop 3.18.4 → 3.18.5-canary.local-b4fd0431

package/dist/0~dev-server.mjs

@@ -5,9 +5,10 @@ import { rspack } from "@rspack/core";
 import { RspackDevServer } from "@rspack/dev-server";
 import { merge } from "webpack-merge";
 import { WebSocket, WebSocketServer } from "ws";
-import { createPlaywrightMetadataWriter, autoExitModeEnabled, autoExitForceKill, loadCommandConfig, extensionJsRunnerError, portInUse, devServerStartTimeout, autoExitTriggered, loadCustomConfig, loadBrowserConfig, sanitize, resolveCompanionExtensionsConfig, getSpecialFoldersDataForProjectRoot } from "./946.mjs";
-import { CONTROL_WS_PATH, clearControlToken, writeControlToken } from "./45.mjs";
-import { setupNoBrowserBannerOnFirstDone, webpackConfig, setupCompilerLifecycleHooks } from "./0~rspack-config.mjs";
+import { createPlaywrightMetadataWriter, autoExitModeEnabled, autoExitForceKill, loadCommandConfig, extensionJsRunnerError, portInUse, devServerStartTimeout, autoExitTriggered, loadCustomConfig, loadBrowserConfig, sanitize, resolveCompanionExtensionsConfig, getSpecialFoldersDataForProjectRoot } from "./101.mjs";
+import { CONTROL_WS_PATH, clearControlToken, writeControlToken } from "./875.mjs";
+import { dispatchReload, readContentScriptCount, createChangedSourcesTracker, classifyReloadFromSources } from "./839.mjs";
+import { setupNoBrowserBannerOnFirstDone, webpackConfig, resolveConnectableHost, setupCompilerLifecycleHooks } from "./0~rspack-config.mjs";
 import * as __rspack_external_path from "path";
 import * as __rspack_external_crypto from "crypto";
 import * as __rspack_external_net from "net";
@@ -52,10 +53,10 @@ class PortManager {
     constructor(basePort = 8080){
         this.basePort = basePort;
     }
-    async allocatePorts(requestedPort) {
+    async allocatePorts(requestedPort, host) {
         const isValidRequested = 'number' == typeof requestedPort && requestedPort >= 0 && requestedPort < 65536;
         const base = isValidRequested ? requestedPort : this.basePort;
-        const port = await findAvailablePortNear(base);
+        const port = await findAvailablePortNear(base, void 0, host);
         const instanceId = resolveInstanceIdOverride() || __rspack_external_crypto.randomBytes(8).toString('hex');
         this.currentInstance = {
             instanceId,
@@ -515,6 +516,19 @@ class BridgeBroker {
             this.pending.delete(cmdId);
         }
     }
+    broadcastReload(instruction) {
+        const frame = {
+            type: 'reload',
+            reloadType: instruction.type,
+            changedContentScriptEntries: instruction.changedContentScriptEntries
+        };
+        let notified = 0;
+        for (const [conn, role] of this.roles)if ('producer' === role) try {
+            conn.send(frame);
+            notified++;
+        } catch  {}
+        return notified;
+    }
     ingestLog(incoming) {
         const event = this.ring.push(incoming);
         this.file?.write(event);
@@ -915,18 +929,20 @@ async function dev_server_devServer(projectStructure, devOptions) {
     const browserConfig = await loadBrowserConfig(packageJsonDir, devOptions.browser);
     const portManager = new PortManager(8080);
     const desiredPort = 'string' == typeof devOptions.port ? parseInt(devOptions.port, 10) : devOptions.port;
-    const portAllocation = await portManager.allocatePorts(desiredPort);
+    const devServerHost = devOptions.host || '127.0.0.1';
+    const portAllocation = await portManager.allocatePorts(desiredPort, devServerHost);
     const currentInstance = portManager.getCurrentInstance();
     if (!currentInstance) throw new Error('Failed to create instance');
     const port = portAllocation.port;
-    const devServerHost = devOptions.host || '127.0.0.1';
+    const connectableHost = resolveConnectableHost(devServerHost, devOptions.publicHost);
     const devServerWebSocketURL = {
         protocol: 'ws',
-        hostname: devServerHost,
+        hostname: connectableHost,
         port
     };
     process.env.EXTENSION_DEV_SERVER_PROTOCOL = devServerWebSocketURL.protocol;
     process.env.EXTENSION_DEV_SERVER_HOST = devServerHost;
+    process.env.EXTENSION_DEV_SERVER_CONNECTABLE_HOST = connectableHost;
     process.env.EXTENSION_DEV_SERVER_PORT = String(port);
     process.env.EXTENSION_DEV_SERVER_PATH = '/ws';
     const browserName = String(devOptions.browser || 'chromium');
@@ -954,6 +970,8 @@ async function dev_server_devServer(projectStructure, devOptions) {
         actions: bridgeActionsFile,
         authorMode
     });
+    const launchedPlugin = devOptions.browsersPlugin;
+    if (launchedPlugin && 'function' == typeof launchedPlugin.setReloadBroker) launchedPlugin.setReloadBroker(bridgeBroker);
     let bridgeControlPort = null;
     try {
         bridgeLogFile.start();
@@ -1013,6 +1031,28 @@ async function dev_server_devServer(projectStructure, devOptions) {
     const manifestOutputPath = __rspack_external_path.join(packageJsonDir, 'dist', devOptions.browser, 'manifest.json');
     installManifestDiskWriteGuard(manifestOutputPath);
     suppressManifestOutputWrites(compiler, manifestOutputPath);
+    if (!devOptions.browsersPlugin && compiler?.hooks?.watchRun) {
+        const changedSources = createChangedSourcesTracker(compiler);
+        let isFirstBridgeCompile = true;
+        compiler.hooks.done.tapPromise('extjs-no-browser-reload', async (stats)=>{
+            const compilation = stats.compilation;
+            if (compilation.errors && compilation.errors.length > 0) return;
+            if (isFirstBridgeCompile) {
+                isFirstBridgeCompile = false;
+                return;
+            }
+            const outputPath = String(compilation.options?.output?.path || '');
+            const { forcedFull, changedSources: sources } = changedSources.snapshot();
+            const instruction = classifyReloadFromSources({
+                changedSources: sources,
+                forcedFull,
+                getContentScriptCount: ()=>readContentScriptCount(compilation, outputPath)
+            });
+            await dispatchReload(instruction, {
+                broker: bridgeBroker
+            });
+        });
+    }
     const metadata = createPlaywrightMetadataWriter({
         packageJsonDir,
         browser: String(devOptions.browser || 'chromium'),
@@ -1020,6 +1060,7 @@ async function dev_server_devServer(projectStructure, devOptions) {
         distPath: __rspack_external_path.join(packageJsonDir, 'dist', String(devOptions.browser || 'chromium')),
         manifestPath,
         port,
+        host: connectableHost,
         instanceId: currentInstance.instanceId,
         controlPort: bridgeControlPort,
         controlPath: CONTROL_WS_PATH,

package/dist/0~rslib-runtime.mjs

@@ -1,11 +1,15 @@
 import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{