extension-develop 4.0.14 → 4.0.15

package/dist/0~dev-server.mjs

@@ -6,7 +6,7 @@ import { rspack } from "@rspack/core";
 import { RspackDevServer } from "@rspack/dev-server";
 import { merge } from "webpack-merge";
 import { WebSocket, WebSocketServer } from "ws";
-import { autoExitForceKill, loadCommandConfig, sanitize, extensionJsRunnerError, portInUse, devServerStartTimeout, autoExitTriggered, asAbsolute, constants_isGeckoBasedBrowser, createPlaywrightMetadataWriter, autoExitModeEnabled, loadCustomConfig, loadBrowserConfig, getDistPath, resolveCompanionExtensionsConfig, getSpecialFoldersDataForProjectRoot } from "./101.mjs";
+import { autoExitForceKill, loadCommandConfig, sanitize, extensionJsRunnerError, portInUse, devServerStartTimeout, autoExitTriggered, asAbsolute, constants_isGeckoBasedBrowser, createPlaywrightMetadataWriter, autoExitModeEnabled, getSessionRunId, loadCustomConfig, loadBrowserConfig, getDistPath, resolveCompanionExtensionsConfig, getSpecialFoldersDataForProjectRoot } from "./101.mjs";
 import { CONTROL_WS_PATH, writePersistedControlPort, writeControlToken, clearControlToken, readPersistedControlPort } from "./887.mjs";
 import { hasProjectDependency, findNearestProjectManifestDirSync } from "./80.mjs";
 import { actionsPath, controlPortFilePath, logsPath, legacyControlPortFilePath, ensureSessionArtifactsIgnoreFile } from "./494.mjs";
@@ -372,7 +372,10 @@ class BridgeBroker {
         return pinged;
     }
     ingestLog(incoming) {
-        const event = this.ring.push(incoming);
+        const event = this.ring.push({
+            ...incoming,
+            runId: this.runId
+        });
         this.file?.write(event);
         this.fanOut({
             type: 'log',
@@ -1043,9 +1046,10 @@ async function dev_server_devServer(projectStructure, devOptions) {
     const bridgeLogsAbsPath = logsPath(packageJsonDir, browserName);
     ensureSessionArtifactsIgnoreFile(packageJsonDir);
     const bridgeLogsRelPath = __rspack_external_node_path_c5b9b54f.relative(packageJsonDir, bridgeLogsAbsPath);
+    const sessionRunId = getSessionRunId(packageJsonDir, browserName);
     const bridgeLogFile = new LogsFileWriter({
         filePath: bridgeLogsAbsPath,
-        runId: currentInstance.instanceId
+        runId: sessionRunId
     });
     const allowControl = Boolean(extendedOptions.allowControl);
     const allowEval = Boolean(extendedOptions.allowEval);
@@ -1057,7 +1061,7 @@ async function dev_server_devServer(projectStructure, devOptions) {
     let stampExecutorAttached;
     const bridgeBroker = new BridgeBroker({
         instanceId: currentInstance.instanceId,
-        runId: currentInstance.instanceId,
+        runId: sessionRunId,
         engine: constants_isGeckoBasedBrowser(browserName) ? 'firefox' : 'chromium',
         ring: new LogRingBuffer(),
         file: bridgeLogFile,
@@ -1091,7 +1095,7 @@ async function dev_server_devServer(projectStructure, devOptions) {
                         lineNumber: event.lineNumber
                     } : {}
                 },
-                runId: currentInstance.instanceId
+                runId: sessionRunId
             });
         } catch  {}
     });

package/dist/101.mjs

@@ -698,7 +698,7 @@ async function config_loader_isUsingExperimentalConfig(projectPath) {
     }
     return false;
 }
-var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.0.14","El":{"@prefresh/core":"1.5.9","@prefresh/utils":"1.2.1","@rspack/core":"^2.1.1","@rspack/dev-server":"2.1.0","@rspack/plugin-preact-refresh":"2.0.1","@rspack/plugin-react-refresh":"2.0.2","@vue/compiler-sfc":"3.5.26","acorn":"^8.16.0","adm-zip":"^0.6.0","browser-extension-manifest-fields":"^2.2.9","case-sensitive-paths-webpack-plugin":"^2.4.0","content-security-policy-parser":"^0.6.0","dotenv":"^17.2.3","es-module-lexer":"^2.1.0","extension-from-store":"^0.1.1","go-git-it":"^5.1.5","ignore":"^7.0.5","less":"4.6.7","less-loader":"13.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"8.5.10","postcss-loader":"8.2.1","postcss-preset-env":"11.1.1","postcss-scss":"4.0.9","preact":"10.27.3","prefers-yarn":"2.0.1","react-refresh":"0.18.0","sass-loader":"17.0.0","schema-utils":"^4.3.3","svelte-loader":"3.2.4","tiny-glob":"^0.2.9","vue":"3.5.26","vue-loader":"17.4.2","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.20.1"}}');
+var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.0.15","El":{"@prefresh/core":"1.5.9","@prefresh/utils":"1.2.1","@rspack/core":"^2.1.1","@rspack/dev-server":"2.1.0","@rspack/plugin-preact-refresh":"2.0.1","@rspack/plugin-react-refresh":"2.0.2","@vue/compiler-sfc":"3.5.26","acorn":"^8.16.0","adm-zip":"^0.6.0","browser-extension-manifest-fields":"^2.2.9","case-sensitive-paths-webpack-plugin":"^2.4.0","content-security-policy-parser":"^0.6.0","dotenv":"^17.2.3","es-module-lexer":"^2.1.0","extension-from-store":"^0.1.1","go-git-it":"^5.1.5","ignore":"^7.0.5","less":"4.6.7","less-loader":"13.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"8.5.10","postcss-loader":"8.2.1","postcss-preset-env":"11.1.1","postcss-scss":"4.0.9","preact":"10.27.3","prefers-yarn":"2.0.1","react-refresh":"0.18.0","sass-loader":"17.0.0","schema-utils":"^4.3.3","svelte-loader":"3.2.4","tiny-glob":"^0.2.9","vue":"3.5.26","vue-loader":"17.4.2","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.20.1"}}');
 function asAbsolute(p) {
     return __rspack_external_node_path_c5b9b54f.isAbsolute(p) ? p : __rspack_external_node_path_c5b9b54f.resolve(p);
 }
@@ -1822,6 +1822,9 @@ function getRunIdForSession(metadataDir) {
     runIdByMetadataDir.set(metadataDir, runId);
     return runId;
 }
+function getSessionRunId(packageJsonDir, browser) {
+    return getRunIdForSession(getPlaywrightMetadataDir(packageJsonDir, browser));
+}
 function readManifestProvenance(manifestPath) {
     try {
         const manifest = parseJsonSafe(__rspack_external_node_fs_5ea92f0c.readFileSync(manifestPath, 'utf-8'));
@@ -1913,6 +1916,7 @@ function createPlaywrightMetadataWriter(options) {
             if (__rspack_external_node_fs_5ea92f0c.existsSync(readyPath)) {
                 const prev = JSON.parse(__rspack_external_node_fs_5ea92f0c.readFileSync(readyPath, 'utf-8'));
                 if ('number' == typeof prev.cdpPort) payload.cdpPort = prev.cdpPort;
+                if ('number' == typeof prev.rdpPort) payload.rdpPort = prev.rdpPort;
                 if ('string' == typeof prev.browserExitedAt) {
                     payload.browserExitedAt = prev.browserExitedAt;
                     payload.browserExitCode = prev.browserExitCode ?? null;
@@ -2226,4 +2230,4 @@ async function extensionPreview(pathOrRemoteUrl, previewOptions, browserLauncher
     await browserLauncher(resolvedOpts);
     metadata.writeReady();
 }
-export { CHROMIUM_FAMILY_ALIASES, GECKO_FAMILY_ALIASES, PlaywrightPlugin, asAbsolute, assertNoManagedDependencyConflicts, authorInstallNotice, autoExitForceKill, autoExitModeEnabled, autoExitTriggered, browserRunnerDisabled, buildCommandFailed, buildSuccess, buildSuccessWithWarnings, buildWarningsDetails, buildWebpack, bundlerFatalError, bundlerRecompiling, computeExtensionsToLoad, constants_isGeckoBasedBrowser, createPlaywrightMetadataWriter, debugBrowser, debugContextPath, debugDirs, debugExtensionsToLoad, debugOutputPath, devCommandFailed, devServerStartTimeout, downloadingText, extensionJsRunnerError, extensionPreview, failedToDownloadOrExtractZIPFileError, getDirs, getDistPath, getProjectStructure, getSpecialFoldersDataForCompiler, getSpecialFoldersDataForProjectRoot, invalidRemoteZip, isChromiumBasedBrowser, loadBrowserConfig, loadCommandConfig, loadCustomConfig, localZipNotFound, manifestInvalidJson, messages_ready, needsInstall, noCompanionExtensionsResolved, noEntrypointsDetected, normalizeBrowser, notAZipArchive, package_namespaceObject, packagingDistributionFiles, packagingSourceFiles, portInUse, projectInstallFallbackToNpm, projectInstallScriptsDisabled, resolveCompanionExtensionDirs, resolveCompanionExtensionsConfig, sanitize, spacerLine, toPosixPath, treeWithDistFilesbrowser, treeWithSourceAndDistFiles, treeWithSourceFiles, unpackagedSuccessfully, unpackagingExtension, writingTypeDefinitions, writingTypeDefinitionsError };
+export { CHROMIUM_FAMILY_ALIASES, GECKO_FAMILY_ALIASES, PlaywrightPlugin, asAbsolute, assertNoManagedDependencyConflicts, authorInstallNotice, autoExitForceKill, autoExitModeEnabled, autoExitTriggered, browserRunnerDisabled, buildCommandFailed, buildSuccess, buildSuccessWithWarnings, buildWarningsDetails, buildWebpack, bundlerFatalError, bundlerRecompiling, computeExtensionsToLoad, constants_isGeckoBasedBrowser, createPlaywrightMetadataWriter, debugBrowser, debugContextPath, debugDirs, debugExtensionsToLoad, debugOutputPath, devCommandFailed, devServerStartTimeout, downloadingText, extensionJsRunnerError, extensionPreview, failedToDownloadOrExtractZIPFileError, getDirs, getDistPath, getProjectStructure, getSessionRunId, getSpecialFoldersDataForCompiler, getSpecialFoldersDataForProjectRoot, invalidRemoteZip, isChromiumBasedBrowser, loadBrowserConfig, loadCommandConfig, loadCustomConfig, localZipNotFound, manifestInvalidJson, messages_ready, needsInstall, noCompanionExtensionsResolved, noEntrypointsDetected, normalizeBrowser, notAZipArchive, package_namespaceObject, packagingDistributionFiles, packagingSourceFiles, portInUse, projectInstallFallbackToNpm, projectInstallScriptsDisabled, resolveCompanionExtensionDirs, resolveCompanionExtensionsConfig, sanitize, spacerLine, toPosixPath, treeWithDistFilesbrowser, treeWithSourceAndDistFiles, treeWithSourceFiles, unpackagedSuccessfully, unpackagingExtension, writingTypeDefinitions, writingTypeDefinitionsError };

package/dist/plugin-playwright/index.d.ts

@@ -24,6 +24,7 @@ export type ReadyMetadata = {
     controlPath?: string;
     logsPath?: string;
     cdpPort?: number;
+    rdpPort?: number;
     toolchainVersion: string;
     extensionName?: string;
     extensionVersion?: string;
@@ -70,6 +71,7 @@ type PluginOptions = {
     logsPath?: string;
 };
 export declare function formatStatsErrors(errors: unknown): string[];
+export declare function getSessionRunId(packageJsonDir: string, browser: string): string;
 export declare function getPlaywrightMetadataDir(packageJsonDir: string, browser: string): AbsolutePath;
 export declare function createPlaywrightMetadataWriter(options: WriterOptions): {
     metadataDir: AbsolutePath;

package/package.json

@@ -34,7 +34,7 @@
     "runtime"
   ],
   "name": "extension-develop",
-  "version": "4.0.14",
+  "version": "4.0.15",
   "description": "Develop, build, preview, and package Extension.js projects.",
   "author": {
     "name": "Cezar Augusto",