extension-develop 4.0.18 → 4.0.19-canary.1785200797.ce99a79e

package/dist/0~rspack-config.mjs

@@ -14,7 +14,7 @@ import node_fs from "node:fs";
 import node_path from "node:path";
 import { isResourceUnderDirs, canonicalizeDir, toResourceKey } from "./93.mjs";
 import { prefix as messaging_prefix, isDebug } from "./349.mjs";
-import { debugExtensionsToLoad, package_namespaceObject, getDirs, asAbsolute, browserRunnerDisabled, packagingDistributionFiles, PlaywrightPlugin, toPosixPath, resolveCompanionExtensionDirs, debugContextPath, isGeckoBasedBrowser, spacerLine, messages_ready, CHROMIUM_FAMILY_ALIASES, treeWithSourceAndDistFiles, treeWithDistFilesbrowser, computeExtensionsToLoad, noCompanionExtensionsResolved, treeWithSourceFiles, bundlerFatalError, bundlerRecompiling, noEntrypointsDetected, GECKO_FAMILY_ALIASES, packagingSourceFiles, debugBrowser, debugOutputPath, manifestInvalidJson, isChromiumBasedBrowser, getSpecialFoldersDataForCompiler } from "./101.mjs";
+import { debugExtensionsToLoad, package_namespaceObject, getDirs, asAbsolute, browserRunnerDisabled, treeWithDistFilesBrowser, packagingDistributionFiles, toPosixPath, PlaywrightPlugin, debugContextPath, resolveCompanionExtensionDirs, isGeckoBasedBrowser, spacerLine, messages_ready, CHROMIUM_FAMILY_ALIASES, treeWithSourceAndDistFiles, computeExtensionsToLoad, noCompanionExtensionsResolved, treeWithSourceFiles, bundlerFatalError, bundlerRecompiling, noEntrypointsDetected, GECKO_FAMILY_ALIASES, packagingSourceFiles, debugBrowser, debugOutputPath, manifestInvalidJson, isChromiumBasedBrowser, getSpecialFoldersDataForCompiler } from "./101.mjs";
 import { unixify as paths_unixify, getManifestOverrides, isUsingTypeScript, resolvePackageManager, jsFrameworksIntegrationsEnabled, resolveRootAbsoluteRef, isStaticThemeSource, buildCanonicalManifest, getCurrentManifestContent, ensureTypeScriptConfig, resolveDevelopInstallRoot, filterKeysForThisBrowser as manifest_utils_filterKeysForThisBrowser, isUsingCustomLoader, getUserTypeScriptConfigFile, isUsingIntegration as messages_isUsingIntegration, reportToCompilation, normalizeManifestOutputPath, jsFrameworksHmrSummary, ReloadPlugin, humanLine, jsFrameworksConfigsDetected, collectRootAbsoluteRefs, getManifestContent, resolveDevelopDistFile, hasDependency, setOriginalManifestContent, isFromFilepathList, setCurrentManifestContent } from "./839.mjs";
 import { scrubBrand, makeSanitizedConsole } from "./0~branding.mjs";
 import { stripBom, parseJsonSafe } from "./23.mjs";
@@ -614,6 +614,11 @@ function resolveManifestName(rawName, manifest, searchRoots, fallback) {
     return fallback;
 }
 const toPosix = (p)=>p.replace(/\\/g, '/');
+const COMPANION_DIR = 'extensions';
+function isCompanionExtension(file) {
+    const [first] = toPosix(file).split('/');
+    return first === COMPANION_DIR;
+}
 async function getFilesToZip(projectDir) {
     const gitignorePath = __rspack_external_node_path_c5b9b54f.join(projectDir, '.gitignore');
     const ig = ignore();
@@ -625,7 +630,7 @@ async function getFilesToZip(projectDir) {
         cwd: projectDir,
         dot: true
     });
-    return files.filter((file)=>!ig.ignores(file));
+    return files.filter((file)=>!ig.ignores(file) && !isCompanionExtension(file));
 }
 class ZipPlugin {
     options;
@@ -688,7 +693,7 @@ class ZipPlugin {
                     const distItem = created.find((c)=>'dist' === c.kind);
                     if (sourceItem && distItem) console.log(treeWithSourceAndDistFiles(this.browser, name, sourceItem.path, distItem.path));
                     else if (sourceItem) console.log(treeWithSourceFiles(name, 'zip', this.browser, sourceItem.path));
-                    else if (distItem) console.log(treeWithDistFilesbrowser(name, 'zip', this.browser, distItem.path));
+                    else if (distItem) console.log(treeWithDistFilesBrowser(name, 'zip', this.browser, distItem.path));
                 }
             } catch (error) {
                 if (stats?.compilation?.warnings) stats.compilation.warnings.push(new Error(`ZipPlugin: Failed to create zip(s): ${String(error)}`));

package/dist/101.mjs

@@ -214,7 +214,7 @@ function packagingDistributionFiles(zipPath) {
 function treeWithSourceAndDistFiles(browser, name, sourceZip, destZip) {
     return `${messaging_prefix('debug')} zip      name=${name} browser=${String(browser)} source=${sourceZip} dist=${destZip}`;
 }
-function treeWithDistFilesbrowser(name, ext, browser, zipPath) {
+function treeWithDistFilesBrowser(name, ext, browser, zipPath) {
     return `${messaging_prefix('debug')} zip      name=${name}.${ext} browser=${String(browser)} dist=${zipPath}`;
 }
 function treeWithSourceFiles(name, ext, browser, zipPath) {
@@ -643,7 +643,7 @@ async function config_loader_isUsingExperimentalConfig(projectPath) {
     }
     return false;
 }
-var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.0.18","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.18","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.19-canary.1785200797.ce99a79e","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.18","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);
 }
@@ -2234,4 +2234,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, browserLaunchFailed, browserRunnerDisabled, buildCommandFailed, buildSuccess, buildSuccessWithWarnings, buildWarningsDetails, buildWebpack, bundlerFatalError, bundlerRecompiling, computeExtensionsToLoad, createPlaywrightMetadataWriter, debugBrowser, debugContextPath, debugDirs, debugExtensionsToLoad, debugOutputPath, devCommandFailed, devServerStartTimeout, downloadingText, extensionJsRunnerError, extensionLoadRecovered, extensionLoadStillRefused, extensionPreview, failedToDownloadOrExtractZIPFileError, getDirs, getDistPath, getProjectStructure, getSessionRunId, getSpecialFoldersDataForCompiler, getSpecialFoldersDataForProjectRoot, invalidRemoteZip, isChromiumBasedBrowser, isGeckoBasedBrowser, 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, browserLaunchFailed, browserRunnerDisabled, buildCommandFailed, buildSuccess, buildSuccessWithWarnings, buildWarningsDetails, buildWebpack, bundlerFatalError, bundlerRecompiling, computeExtensionsToLoad, createPlaywrightMetadataWriter, debugBrowser, debugContextPath, debugDirs, debugExtensionsToLoad, debugOutputPath, devCommandFailed, devServerStartTimeout, downloadingText, extensionJsRunnerError, extensionLoadRecovered, extensionLoadStillRefused, extensionPreview, failedToDownloadOrExtractZIPFileError, getDirs, getDistPath, getProjectStructure, getSessionRunId, getSpecialFoldersDataForCompiler, getSpecialFoldersDataForProjectRoot, invalidRemoteZip, isChromiumBasedBrowser, isGeckoBasedBrowser, 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/494.mjs

@@ -51,4 +51,4 @@ function actionsPath(projectPath, browser) {
 function buildSummaryPath(projectPath, browser) {
     return __rspack_external_node_path_c5b9b54f.join(browserArtifactsDir(projectPath, browser), 'build-summary.json');
 }
-export { actionsPath, browserArtifactsDir, buildSummaryPath, controlPortFilePath, controlTokenPath, ensureSessionArtifactsIgnoreFile, eventsPath, legacyControlPortFilePath, legacyControlTokenPath, logsPath, readyContractPath };
+export { actionsPath, browserArtifactsDir, buildSummaryPath, controlPortFilePath, controlTokenPath, ensureSessionArtifactsIgnoreFile, eventsPath, legacyControlPortFilePath, legacyControlTokenPath, logsPath, readyContractPath, sessionArtifactsRootDir, sessionStateDir };

package/dist/839.mjs

@@ -271,7 +271,7 @@ function attachLifecycleStream(compiler, stream) {
 }
 const MAX_SUMMARY_WARNINGS = 20;
 const build_summary_ANSI_PATTERN = /\u001b\[[0-9;]*m/g;
-function getBuildSummary(browser, info) {
+function getBuildSummary(browser, info, outputPath) {
     const assets = info?.assets || [];
     const warnings = (info?.warnings || []).slice(0, MAX_SUMMARY_WARNINGS).map((warning)=>{
         const message = warning && 'object' == typeof warning ? String(warning.message ?? '') : String(warning ?? '');
@@ -279,6 +279,9 @@ function getBuildSummary(browser, info) {
     }).filter(Boolean);
     return {
         browser,
+        ...outputPath ? {
+            output_path: outputPath
+        } : {},
         total_assets: assets.length,
         total_bytes: assets.reduce((n, a)=>n + (a.size || 0), 0),
         largest_asset_bytes: assets.reduce((m, a)=>Math.max(m, a.size || 0), 0),
@@ -1022,6 +1025,7 @@ async function extensionBuild(pathOrRemoteUrl, buildOptions) {
         const compiler = rspack(compilerConfig);
         let summary = {
             browser,
+            output_path: distPath,
             total_assets: 0,
             total_bytes: 0,
             largest_asset_bytes: 0,
@@ -1049,7 +1053,7 @@ async function extensionBuild(pathOrRemoteUrl, buildOptions) {
                         warnings: true,
                         errors: true
                     });
-                    summary = getBuildSummary(browser, info);
+                    summary = getBuildSummary(browser, info, distPath);
                     try {
                         const summaryFile = buildSummaryPath(packageJsonDir, browser);
                         __rspack_external_node_fs_5ea92f0c.mkdirSync(__rspack_external_node_path_c5b9b54f.dirname(summaryFile), {
@@ -1069,13 +1073,22 @@ async function extensionBuild(pathOrRemoteUrl, buildOptions) {
         });
         if (('safari' === browser || 'webkit-based' === browser) && buildOptions?.safariPackager) {
             const safariConfig = await loadBrowserConfig(packageJsonDir, browser);
-            await buildOptions.safariPackager(distPath, 'full', {
+            const safari = await buildOptions.safariPackager(distPath, 'full', {
                 appName: buildOptions.appName ?? safariConfig.appName,
                 bundleId: buildOptions.bundleId ?? safariConfig.bundleId,
                 macOsOnly: buildOptions.macOsOnly ?? safariConfig.macOsOnly,
                 forceRegenerate: buildOptions.forceRegenerate,
                 safariBinary: buildOptions.safariBinary ?? safariConfig.safariBinary
             });
+            if (safari) {
+                summary = {
+                    ...summary,
+                    safari
+                };
+                try {
+                    __rspack_external_node_fs_5ea92f0c.writeFileSync(buildSummaryPath(packageJsonDir, browser), JSON.stringify(summary));
+                } catch  {}
+            }
         }
         return summary;
     } catch (error) {

package/dist/bridge-entry.d.ts

@@ -1,5 +1,8 @@
 export { BridgeConsumer, type ConsumerOptions, type ReadyContractInfo, readReadyContract } from './dev-server/control-bridge/consumer-client';
 export type { BridgeTarget, CommandOp, GapFrame, LogContext, LogEvent, LogLevel, ReadyFrame, ResultFrame } from './dev-server/control-bridge/contracts';
+export { CONTROL_ENVELOPE_VERSION, CONTROL_WS_PATH, LOG_EVENT_VERSION } from './dev-server/control-bridge/contracts';
 export { controlPortFilePath, readPersistedControlPort } from './dev-server/control-bridge/control-port-store';
 export { BridgeController, type CommandInput, type ControllerOptions } from './dev-server/control-bridge/controller-client';
+export { type LogQuery, matchesLogQuery, readLogEvents } from './dev-server/control-bridge/logs-query';
 export { controlTokenPath, readControlToken } from './dev-server/control-bridge/session-token';
+export { actionsPath, browserArtifactsDir, buildSummaryPath, eventsPath, logsPath, readyContractPath, sessionArtifactsRootDir, sessionStateDir } from './lib/session-paths';

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 { readyContractPath } from "./494.mjs";
+import { readyContractPath, logsPath } from "./494.mjs";
 import { CONTROL_WS_PATH } from "./887.mjs";
 import * as __rspack_external_node_fs_5ea92f0c from "node:fs";
 function readReadyContract(projectPath, browser = 'chrome') {
@@ -232,6 +232,82 @@ class BridgeController {
         this.pending.clear();
     }
 }
-export { controlPortFilePath, controlTokenPath } from "./494.mjs";
-export { readControlToken, readPersistedControlPort } from "./887.mjs";
-export { BridgeConsumer, BridgeController, readReadyContract };
+const LOG_LEVEL_ORDER = [
+    'error',
+    'warn',
+    'info',
+    'debug',
+    'trace'
+];
+function logLevelRank(level) {
+    const normalized = 'log' === level ? 'info' : level;
+    const index = LOG_LEVEL_ORDER.indexOf(normalized);
+    return -1 === index ? LOG_LEVEL_ORDER.length : index;
+}
+function toContextSet(context) {
+    if (null == context) return null;
+    const list = Array.isArray(context) ? context : String(context).split(',');
+    const names = list.map((name)=>name.trim()).filter(Boolean);
+    if (0 === names.length) return null;
+    if (1 === names.length && 'all' === names[0].toLowerCase()) return null;
+    return new Set(names);
+}
+function makeUrlMatcher(pattern) {
+    const escaped = pattern.includes('*') ? pattern.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*') : null;
+    const expression = null == escaped ? null : new RegExp(escaped);
+    return (event)=>{
+        const candidates = [
+            event.url,
+            event.hostname
+        ].filter((value)=>'string' == typeof value);
+        if (0 === candidates.length) return false;
+        return candidates.some((candidate)=>expression ? expression.test(candidate) : candidate.includes(pattern));
+    };
+}
+function toFiniteNumber(value) {
+    if (null == value || '' === value) return null;
+    const parsed = 'number' == typeof value ? value : Number(value);
+    return Number.isFinite(parsed) ? parsed : null;
+}
+function matchesLogQuery(event, query) {
+    if (!event || 'object' != typeof event) return false;
+    if ('header' === event.type) return false;
+    if (query.signalsOnly && 'dx.signal' !== event.eventType) return false;
+    const contexts = toContextSet(query.context);
+    if (contexts && !contexts.has(String(event.context))) return false;
+    const minLevel = String(query.level ?? 'all').toLowerCase();
+    if ('all' !== minLevel && 'off' !== minLevel) {
+        if (logLevelRank(String(event.level || '')) > logLevelRank(minLevel)) return false;
+    }
+    const since = toFiniteNumber(query.since);
+    if (null != since && 'number' == typeof event.seq && event.seq <= since) return false;
+    if (query.url && !makeUrlMatcher(query.url)(event)) return false;
+    const tabId = toFiniteNumber(query.tab);
+    if (null != tabId && event.tabId !== tabId) return false;
+    return true;
+}
+function readLogEvents(projectPath, browser = 'chrome', query = {}) {
+    let raw;
+    try {
+        raw = __rspack_external_node_fs_5ea92f0c.readFileSync(logsPath(projectPath, browser), 'utf-8');
+    } catch  {
+        return [];
+    }
+    const events = [];
+    for (const line of raw.split('\n')){
+        if (!line) continue;
+        let event;
+        try {
+            event = JSON.parse(line);
+        } catch  {
+            continue;
+        }
+        if (matchesLogQuery(event, query)) events.push(event);
+    }
+    return events;
+}
+var bridge_entry_CONTROL_ENVELOPE_VERSION = 1;
+var bridge_entry_LOG_EVENT_VERSION = 1;
+export { CONTROL_WS_PATH, readControlToken, readPersistedControlPort } from "./887.mjs";
+export { actionsPath, browserArtifactsDir, buildSummaryPath, controlPortFilePath, controlTokenPath, eventsPath, logsPath, readyContractPath, sessionArtifactsRootDir, sessionStateDir } from "./494.mjs";
+export { BridgeConsumer, BridgeController, bridge_entry_CONTROL_ENVELOPE_VERSION as CONTROL_ENVELOPE_VERSION, bridge_entry_LOG_EVENT_VERSION as LOG_EVENT_VERSION, matchesLogQuery, readLogEvents, readReadyContract };

package/dist/dev-server/control-bridge/logs-query.d.ts

@@ -0,0 +1,37 @@
+/** Increasing verbosity; a level selects itself plus everything more severe. */
+export declare const LOG_LEVEL_ORDER: readonly ['error', 'warn', 'info', 'debug', 'trace'];
+export type LogLevelFilter = (typeof LOG_LEVEL_ORDER)[number] | 'all' | 'off' | (string & {});
+export interface LogQuery {
+    /** One context, a comma-separated list, an array, or 'all'. */
+    context?: string | string[];
+    /** Minimum severity. 'all' and 'off' select every level. */
+    level?: LogLevelFilter;
+    /** Only structured dx.signal diagnostics. */
+    signalsOnly?: boolean;
+    /** Only events whose seq is strictly greater than this. */
+    since?: number | string;
+    /** Glob (`*` = any run of chars) or plain substring over url then hostname. */
+    url?: string;
+    /** Only events carrying this tab id. */
+    tab?: number | string;
+}
+/** A bridge log line as read off disk: dynamic, so the probed fields only. */
+export interface LogEventLike {
+    type?: unknown;
+    eventType?: unknown;
+    context?: unknown;
+    level?: unknown;
+    seq?: unknown;
+    url?: unknown;
+    hostname?: unknown;
+    tabId?: unknown;
+}
+export declare function logLevelRank(level: string): number;
+/** True when the event passes every clause of the query. */
+export declare function matchesLogQuery(event: LogEventLike, query: LogQuery): boolean;
+/**
+ * One-shot read of a session's logs.ndjson. Returns an empty array when the
+ * session has never written one: an absent file is "nothing logged yet", and
+ * making that a throw would force every caller to guard it.
+ */
+export declare function readLogEvents(projectPath: string, browser?: string, query?: LogQuery): LogEventLike[];