extension-develop 4.0.11 → 4.0.13-canary.1784427403.c0188d2b

package/dist/0~dev-server.mjs

@@ -6,10 +6,10 @@ import { RspackDevServer } from "@rspack/dev-server";
 import { merge } from "webpack-merge";
 import { WebSocket, WebSocketServer } from "ws";
 import { hasProjectDependency, findNearestProjectManifestDirSync } from "./80.mjs";
-import { createPlaywrightMetadataWriter, autoExitModeEnabled, autoExitForceKill, loadCommandConfig, extensionJsRunnerError, portInUse, devServerStartTimeout, autoExitTriggered, loadCustomConfig, loadBrowserConfig, sanitize, resolveCompanionExtensionsConfig, constants_isGeckoBasedBrowser, getSpecialFoldersDataForProjectRoot } from "./101.mjs";
+import { autoExitForceKill, loadCommandConfig, sanitize, extensionJsRunnerError, portInUse, devServerStartTimeout, autoExitTriggered, asAbsolute, constants_isGeckoBasedBrowser, createPlaywrightMetadataWriter, autoExitModeEnabled, loadCustomConfig, getDistPath, loadBrowserConfig, resolveCompanionExtensionsConfig, getSpecialFoldersDataForProjectRoot } from "./101.mjs";
 import { CONTROL_WS_PATH, writePersistedControlPort, writeControlToken, clearControlToken, readPersistedControlPort } from "./887.mjs";
 import { actionsPath, logsPath, controlPortFilePath, legacyControlPortFilePath } from "./494.mjs";
-import { createChangedSourcesTracker, dispatchReload, readContentScriptCount, buildSourceFeatureIndex, classifyReloadFromSources } from "./839.mjs";
+import { buildSourceFeatureIndex, classifyReloadFromSources, readContentScriptCount, createChangedSourcesTracker, dispatchReload } 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";
@@ -462,6 +462,7 @@ class BridgeBroker {
     pending = new Map();
     staleResyncTimes = [];
     producerEverConnected = false;
+    onExecutorAttached;
     lastProducerDisconnectedAt = null;
     lastStaleHelloAt = null;
     pendingReload;
@@ -476,6 +477,7 @@ class BridgeBroker {
         this.controlToken = options.controlToken;
         this.actions = options.actions;
         this.authorMode = options.authorMode ?? false;
+        this.onExecutorAttached = options.onExecutorAttached;
         this.now = options.now ?? (()=>Date.now());
         this.setTimer = options.setTimer ?? ((fn, ms)=>setTimeout(fn, ms));
         this.clearTimer = options.clearTimer ?? ((h)=>clearTimeout(h));
@@ -597,7 +599,12 @@ class BridgeBroker {
         }
         if ('producer' !== hello.role && 'consumer' !== hello.role) return void conn.close(CLOSE_BAD_HELLO, 'unknown role');
         this.roles.set(conn, hello.role);
-        if ('producer' === hello.role) this.producerEverConnected = true;
+        if ('producer' === hello.role) {
+            this.producerEverConnected = true;
+            try {
+                this.onExecutorAttached?.();
+            } catch  {}
+        }
         if ('producer' === hello.role && this.pendingReload) {
             const frame = this.pendingReload;
             this.pendingReload = void 0;
@@ -1012,6 +1019,7 @@ async function dev_server_devServer(projectStructure, devOptions) {
     process.env.EXTENSION_DEV_SERVER_PORT = String(port);
     process.env.EXTENSION_DEV_SERVER_PATH = '/ws';
     const browserName = String(devOptions.browser || 'chromium');
+    const primaryDistPath = getDistPath(asAbsolute(packageJsonDir), browserName);
     const bridgeLogsAbsPath = logsPath(packageJsonDir, browserName);
     const bridgeLogsRelPath = __rspack_external_path.relative(packageJsonDir, bridgeLogsAbsPath);
     const bridgeLogFile = new LogsFileWriter({
@@ -1025,6 +1033,7 @@ async function dev_server_devServer(projectStructure, devOptions) {
         filePath: actionsPath(packageJsonDir, browserName)
     }) : void 0;
     const bridgeControlToken = allowControl && allowEval ? writeControlToken(packageJsonDir, browserName) : void 0;
+    let stampExecutorAttached;
     const bridgeBroker = new BridgeBroker({
         instanceId: currentInstance.instanceId,
         runId: currentInstance.instanceId,
@@ -1035,7 +1044,8 @@ async function dev_server_devServer(projectStructure, devOptions) {
         allowEval,
         controlToken: bridgeControlToken,
         actions: bridgeActionsFile,
-        authorMode
+        authorMode,
+        onExecutorAttached: ()=>stampExecutorAttached?.()
     });
     const launchedPlugin = devOptions.browsersPlugin;
     if (launchedPlugin && 'function' == typeof launchedPlugin.setReloadBroker) launchedPlugin.setReloadBroker(bridgeBroker);
@@ -1101,14 +1111,14 @@ async function dev_server_devServer(projectStructure, devOptions) {
         port: portAllocation.port,
         output: {
             clean: false,
-            path: __rspack_external_path.join(packageJsonDir, 'dist', devOptions.browser)
+            path: primaryDistPath
         }
     });
     const customWebpackConfig = await loadCustomConfig(packageJsonDir);
     const finalConfig = customWebpackConfig(baseConfig);
     const compilerConfig = merge(finalConfig, {});
     const compiler = rspack(compilerConfig);
-    const manifestOutputPath = __rspack_external_path.join(packageJsonDir, 'dist', devOptions.browser, 'manifest.json');
+    const manifestOutputPath = __rspack_external_path.join(primaryDistPath, 'manifest.json');
     installManifestDiskWriteGuard(manifestOutputPath);
     suppressManifestOutputWrites(compiler, manifestOutputPath);
     if (!devOptions.browsersPlugin && compiler?.hooks?.watchRun) {
@@ -1140,7 +1150,7 @@ async function dev_server_devServer(projectStructure, devOptions) {
         packageJsonDir,
         browser: String(devOptions.browser || 'chromium'),
         command: 'dev',
-        distPath: __rspack_external_path.join(packageJsonDir, 'dist', String(devOptions.browser || 'chromium')),
+        distPath: primaryDistPath,
         manifestPath,
         port,
         host: connectableHost,
@@ -1149,6 +1159,7 @@ async function dev_server_devServer(projectStructure, devOptions) {
         controlPath: CONTROL_WS_PATH,
         logsPath: bridgeLogsRelPath
     });
+    stampExecutorAttached = ()=>metadata.stampExecutorAttached();
     setupCompilerLifecycleHooks(compiler);
     if (devOptions.noBrowser) setupNoBrowserBannerOnFirstDone({
         compiler,