diff --git a/BUILD.gn b/BUILD.gn index 9f9deb10cf..f34bc0fd45 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -127,7 +127,7 @@ non_autostart_non_remote_modules = [ "panels/profiler/profiler_module.js", "issues/issues_module.js", "panels/developer_resources/developer_resources_module.js", - "protocol_monitor/protocol_monitor_module.js", + "panels/protocol_monitor/protocol_monitor_module.js", "quick_open/quick_open_module.js", "resources/resources_module.js", "search/search_module.js", diff --git a/all_devtools_files.gni b/all_devtools_files.gni index a0a2b3e997..cca92eb05c 100644 --- a/all_devtools_files.gni +++ b/all_devtools_files.gni @@ -242,7 +242,7 @@ all_devtools_files = [ "front_end/panels/developer_resources/module.json", "front_end/panels/developer_resources/developerResourcesView.css", "front_end/panels/developer_resources/developerResourcesListView.css", - "front_end/protocol_monitor/module.json", + "front_end/panels/protocol_monitor/module.json", "front_end/quick_open/filteredListWidget.css", "front_end/quick_open/module.json", "front_end/resources/appManifestView.css", diff --git a/all_devtools_modules.gni b/all_devtools_modules.gni index bfce40c6c3..e23daca9f3 100644 --- a/all_devtools_modules.gni +++ b/all_devtools_modules.gni @@ -376,6 +376,7 @@ all_typescript_module_sources = [ "panels/profiler/ProfileView.js", "panels/profiler/ProfilesPanel.js", "panels/profiler/TopDownProfileDataGrid.js", + "panels/protocol_monitor/ProtocolMonitor.js", "perf_ui/ChartViewport.js", "perf_ui/FilmStripView.js", "perf_ui/FlameChart.js", @@ -410,7 +411,6 @@ all_typescript_module_sources = [ "platform/utilities.js", "protocol_client/InspectorBackend.js", "protocol_client/NodeURL.js", - "protocol_monitor/ProtocolMonitor.js", "quick_open/CommandMenu.js", "quick_open/FilteredListWidget.js", "quick_open/HelpQuickOpen.js", diff --git a/devtools_grd_files.gni b/devtools_grd_files.gni index eadda4a479..27e9499dba 100644 --- a/devtools_grd_files.gni +++ b/devtools_grd_files.gni @@ -320,6 +320,9 @@ grd_files_release_sources = [ "front_end/panels/profiler/profiler-meta.js", "front_end/panels/profiler/profiler.js", "front_end/panels/profiler/profiler_module.js", + "front_end/panels/protocol_monitor/protocol_monitor-meta.js", + "front_end/panels/protocol_monitor/protocol_monitor.js", + "front_end/panels/protocol_monitor/protocol_monitor_module.js", "front_end/perf_ui/perf_ui-legacy.js", "front_end/perf_ui/perf_ui-meta.js", "front_end/perf_ui/perf_ui.js", @@ -330,9 +333,6 @@ grd_files_release_sources = [ "front_end/platform/platform.js", "front_end/protocol_client/protocol_client-legacy.js", "front_end/protocol_client/protocol_client.js", - "front_end/protocol_monitor/protocol_monitor-meta.js", - "front_end/protocol_monitor/protocol_monitor.js", - "front_end/protocol_monitor/protocol_monitor_module.js", "front_end/quick_open/quick_open-legacy.js", "front_end/quick_open/quick_open-meta.js", "front_end/quick_open/quick_open.js", @@ -789,6 +789,7 @@ grd_files_debug_sources = [ "front_end/panels/profiler/ProfileView.js", "front_end/panels/profiler/ProfilesPanel.js", "front_end/panels/profiler/TopDownProfileDataGrid.js", + "front_end/panels/protocol_monitor/ProtocolMonitor.js", "front_end/perf_ui/ChartViewport.js", "front_end/perf_ui/FilmStripView.js", "front_end/perf_ui/FlameChart.js", @@ -823,7 +824,6 @@ grd_files_debug_sources = [ "front_end/platform/utilities.js", "front_end/protocol_client/InspectorBackend.js", "front_end/protocol_client/NodeURL.js", - "front_end/protocol_monitor/ProtocolMonitor.js", "front_end/quick_open/CommandMenu.js", "front_end/quick_open/FilteredListWidget.js", "front_end/quick_open/HelpQuickOpen.js", diff --git a/devtools_module_entrypoints.gni b/devtools_module_entrypoints.gni index 40d103c1ad..53f777b34e 100644 --- a/devtools_module_entrypoints.gni +++ b/devtools_module_entrypoints.gni @@ -131,6 +131,8 @@ devtools_module_entrypoint_sources = [ "panels/profiler/profiler-legacy.js", "panels/profiler/profiler-meta.js", "panels/profiler/profiler.js", + "panels/protocol_monitor/protocol_monitor-meta.js", + "panels/protocol_monitor/protocol_monitor.js", "perf_ui/perf_ui-legacy.js", "perf_ui/perf_ui-meta.js", "perf_ui/perf_ui.js", @@ -140,8 +142,6 @@ devtools_module_entrypoint_sources = [ "platform/platform.js", "protocol_client/protocol_client-legacy.js", "protocol_client/protocol_client.js", - "protocol_monitor/protocol_monitor-meta.js", - "protocol_monitor/protocol_monitor.js", "quick_open/quick_open-legacy.js", "quick_open/quick_open-meta.js", "quick_open/quick_open.js", diff --git a/front_end/BUILD.gn b/front_end/BUILD.gn index 0d9e5d33dc..6605698242 100644 --- a/front_end/BUILD.gn +++ b/front_end/BUILD.gn @@ -173,11 +173,11 @@ ts_library("shell") { "panels/console_counters:meta", "panels/coverage:meta", "panels/profiler:meta", + "panels/protocol_monitor:meta", "perf_ui:meta", "persistence:legacy", "persistence:meta", "protocol_client:legacy", - "protocol_monitor:meta", "quick_open:meta", "sdk:legacy", "sdk:meta", diff --git a/front_end/i18n/locales/en-US.json b/front_end/i18n/locales/en-US.json index 5bb912b865..5473ac8826 100644 --- a/front_end/i18n/locales/en-US.json +++ b/front_end/i18n/locales/en-US.json @@ -6260,6 +6260,48 @@ "panels/profiler/ProfileView.ts | treeTopDown": { "message": "Tree (Top Down)" }, + "panels/protocol_monitor/protocol_monitor-meta.ts | protocolMonitor": { + "message": "Protocol monitor" + }, + "panels/protocol_monitor/protocol_monitor-meta.ts | showProtocolMonitor": { + "message": "Show Protocol monitor" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | clearAll": { + "message": "Clear all" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | direction": { + "message": "Direction" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | documentation": { + "message": "Documentation" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | filter": { + "message": "Filter" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | method": { + "message": "Method" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | noMessageSelected": { + "message": "No message selected" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | record": { + "message": "Record" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | request": { + "message": "Request" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | response": { + "message": "Response" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | sMs": { + "message": "{PH1} ms" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | target": { + "message": "Target" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | timestamp": { + "message": "Timestamp" + }, "perf_ui/FilmStripView.ts | doubleclickToZoomImageClickTo": { "message": "Doubleclick to zoom image. Click to view preceding requests." }, @@ -6455,48 +6497,6 @@ "persistence/WorkspaceSettingsTab.ts | workspace": { "message": "Workspace" }, - "protocol_monitor/protocol_monitor-meta.ts | protocolMonitor": { - "message": "Protocol monitor" - }, - "protocol_monitor/protocol_monitor-meta.ts | showProtocolMonitor": { - "message": "Show Protocol monitor" - }, - "protocol_monitor/ProtocolMonitor.ts | clearAll": { - "message": "Clear all" - }, - "protocol_monitor/ProtocolMonitor.ts | direction": { - "message": "Direction" - }, - "protocol_monitor/ProtocolMonitor.ts | documentation": { - "message": "Documentation" - }, - "protocol_monitor/ProtocolMonitor.ts | filter": { - "message": "Filter" - }, - "protocol_monitor/ProtocolMonitor.ts | method": { - "message": "Method" - }, - "protocol_monitor/ProtocolMonitor.ts | noMessageSelected": { - "message": "No message selected" - }, - "protocol_monitor/ProtocolMonitor.ts | record": { - "message": "Record" - }, - "protocol_monitor/ProtocolMonitor.ts | request": { - "message": "Request" - }, - "protocol_monitor/ProtocolMonitor.ts | response": { - "message": "Response" - }, - "protocol_monitor/ProtocolMonitor.ts | sMs": { - "message": "{PH1} ms" - }, - "protocol_monitor/ProtocolMonitor.ts | target": { - "message": "Target" - }, - "protocol_monitor/ProtocolMonitor.ts | timestamp": { - "message": "Timestamp" - }, "quick_open/CommandMenu.ts | noCommandsFound": { "message": "No commands found" }, diff --git a/front_end/i18n/locales/en-XL.json b/front_end/i18n/locales/en-XL.json index 63d8ce07e2..2cba9cebb1 100644 --- a/front_end/i18n/locales/en-XL.json +++ b/front_end/i18n/locales/en-XL.json @@ -6260,6 +6260,48 @@ "panels/profiler/ProfileView.ts | treeTopDown": { "message": "T̂ŕêé (T̂óp̂ D́ôẃn̂)" }, + "panels/protocol_monitor/protocol_monitor-meta.ts | protocolMonitor": { + "message": "P̂ŕôt́ôćôĺ m̂ón̂ít̂ór̂" + }, + "panels/protocol_monitor/protocol_monitor-meta.ts | showProtocolMonitor": { + "message": "Ŝh́ôẃ P̂ŕôt́ôćôĺ m̂ón̂ít̂ór̂" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | clearAll": { + "message": "Ĉĺêár̂ ál̂ĺ" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | direction": { + "message": "D̂ír̂éĉt́îón̂" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | documentation": { + "message": "D̂óĉúm̂én̂t́ât́îón̂" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | filter": { + "message": "F̂íl̂t́êŕ" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | method": { + "message": "M̂ét̂h́ôd́" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | noMessageSelected": { + "message": "N̂ó m̂éŝśâǵê śêĺêćt̂éd̂" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | record": { + "message": "R̂éĉór̂d́" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | request": { + "message": "R̂éq̂úêśt̂" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | response": { + "message": "R̂éŝṕôńŝé" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | sMs": { + "message": "{PH1} m̂ś" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | target": { + "message": "T̂ár̂ǵêt́" + }, + "panels/protocol_monitor/ProtocolMonitor.ts | timestamp": { + "message": "T̂ím̂éŝt́âḿp̂" + }, "perf_ui/FilmStripView.ts | doubleclickToZoomImageClickTo": { "message": "D̂óûb́l̂éĉĺîćk̂ t́ô źôóm̂ ím̂áĝé. Ĉĺîćk̂ t́ô v́îéŵ ṕr̂éĉéd̂ín̂ǵ r̂éq̂úêśt̂ś." }, @@ -6455,48 +6497,6 @@ "persistence/WorkspaceSettingsTab.ts | workspace": { "message": "Ŵór̂ḱŝṕâćê" }, - "protocol_monitor/protocol_monitor-meta.ts | protocolMonitor": { - "message": "P̂ŕôt́ôćôĺ m̂ón̂ít̂ór̂" - }, - "protocol_monitor/protocol_monitor-meta.ts | showProtocolMonitor": { - "message": "Ŝh́ôẃ P̂ŕôt́ôćôĺ m̂ón̂ít̂ór̂" - }, - "protocol_monitor/ProtocolMonitor.ts | clearAll": { - "message": "Ĉĺêár̂ ál̂ĺ" - }, - "protocol_monitor/ProtocolMonitor.ts | direction": { - "message": "D̂ír̂éĉt́îón̂" - }, - "protocol_monitor/ProtocolMonitor.ts | documentation": { - "message": "D̂óĉúm̂én̂t́ât́îón̂" - }, - "protocol_monitor/ProtocolMonitor.ts | filter": { - "message": "F̂íl̂t́êŕ" - }, - "protocol_monitor/ProtocolMonitor.ts | method": { - "message": "M̂ét̂h́ôd́" - }, - "protocol_monitor/ProtocolMonitor.ts | noMessageSelected": { - "message": "N̂ó m̂éŝśâǵê śêĺêćt̂éd̂" - }, - "protocol_monitor/ProtocolMonitor.ts | record": { - "message": "R̂éĉór̂d́" - }, - "protocol_monitor/ProtocolMonitor.ts | request": { - "message": "R̂éq̂úêśt̂" - }, - "protocol_monitor/ProtocolMonitor.ts | response": { - "message": "R̂éŝṕôńŝé" - }, - "protocol_monitor/ProtocolMonitor.ts | sMs": { - "message": "{PH1} m̂ś" - }, - "protocol_monitor/ProtocolMonitor.ts | target": { - "message": "T̂ár̂ǵêt́" - }, - "protocol_monitor/ProtocolMonitor.ts | timestamp": { - "message": "T̂ím̂éŝt́âḿp̂" - }, "quick_open/CommandMenu.ts | noCommandsFound": { "message": "N̂ó ĉóm̂ḿâńd̂ś f̂óûńd̂" }, diff --git a/front_end/protocol_monitor/BUILD.gn b/front_end/panels/protocol_monitor/BUILD.gn similarity index 53% rename from front_end/protocol_monitor/BUILD.gn rename to front_end/panels/protocol_monitor/BUILD.gn index 77756bcbba..a87b1ba1cf 100644 --- a/front_end/protocol_monitor/BUILD.gn +++ b/front_end/panels/protocol_monitor/BUILD.gn @@ -2,22 +2,22 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("../../scripts/build/ninja/devtools_entrypoint.gni") -import("../../scripts/build/ninja/devtools_module.gni") +import("../../../scripts/build/ninja/devtools_entrypoint.gni") +import("../../../scripts/build/ninja/devtools_module.gni") devtools_module("protocol_monitor") { sources = [ "ProtocolMonitor.ts" ] deps = [ - "../host:bundle", - "../i18n:bundle", - "../protocol_client:bundle", - "../sdk:bundle", - "../source_frame:bundle", - "../text_utils:bundle", - "../third_party/lit-html:bundle", - "../ui:bundle", - "../ui/components:bundle", + "../../host:bundle", + "../../i18n:bundle", + "../../protocol_client:bundle", + "../../sdk:bundle", + "../../source_frame:bundle", + "../../text_utils:bundle", + "../../third_party/lit-html:bundle", + "../../ui:bundle", + "../../ui/components:bundle", ] } diff --git a/front_end/protocol_monitor/ProtocolMonitor.ts b/front_end/panels/protocol_monitor/ProtocolMonitor.ts similarity index 96% rename from front_end/protocol_monitor/ProtocolMonitor.ts rename to front_end/panels/protocol_monitor/ProtocolMonitor.ts index ee33ba7e74..24a93075c1 100644 --- a/front_end/protocol_monitor/ProtocolMonitor.ts +++ b/front_end/panels/protocol_monitor/ProtocolMonitor.ts @@ -4,15 +4,15 @@ /* eslint-disable rulesdir/no_underscored_properties */ -import * as Host from '../host/host.js'; -import * as i18n from '../i18n/i18n.js'; -import * as ProtocolClient from '../protocol_client/protocol_client.js'; -import * as SDK from '../sdk/sdk.js'; -import * as SourceFrame from '../source_frame/source_frame.js'; -import * as TextUtils from '../text_utils/text_utils.js'; -import * as LitHtml from '../third_party/lit-html/lit-html.js'; -import * as Components from '../ui/components/components.js'; -import * as UI from '../ui/ui.js'; +import * as Host from '../../host/host.js'; +import * as i18n from '../../i18n/i18n.js'; +import * as ProtocolClient from '../../protocol_client/protocol_client.js'; +import * as SDK from '../../sdk/sdk.js'; +import * as SourceFrame from '../../source_frame/source_frame.js'; +import * as TextUtils from '../../text_utils/text_utils.js'; +import * as LitHtml from '../../third_party/lit-html/lit-html.js'; +import * as Components from '../../ui/components/components.js'; +import * as UI from '../../ui/ui.js'; const UIStrings = { /** @@ -67,7 +67,7 @@ const UIStrings = { */ noMessageSelected: 'No message selected', }; -const str_ = i18n.i18n.registerUIStrings('protocol_monitor/ProtocolMonitor.ts', UIStrings); +const str_ = i18n.i18n.registerUIStrings('panels/protocol_monitor/ProtocolMonitor.ts', UIStrings); const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_); const timestampRenderer = (value: Components.DataGridUtils.CellValue): LitHtml.TemplateResult => { diff --git a/front_end/protocol_monitor/module.json b/front_end/panels/protocol_monitor/module.json similarity index 100% rename from front_end/protocol_monitor/module.json rename to front_end/panels/protocol_monitor/module.json diff --git a/front_end/protocol_monitor/protocol_monitor-meta.ts b/front_end/panels/protocol_monitor/protocol_monitor-meta.ts similarity index 84% rename from front_end/protocol_monitor/protocol_monitor-meta.ts rename to front_end/panels/protocol_monitor/protocol_monitor-meta.ts index 6f4b5fe1b4..c2673b03ac 100644 --- a/front_end/protocol_monitor/protocol_monitor-meta.ts +++ b/front_end/panels/protocol_monitor/protocol_monitor-meta.ts @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import * as i18n from '../i18n/i18n.js'; -import * as Root from '../root/root.js'; -import * as UI from '../ui/ui.js'; +import * as i18n from '../../i18n/i18n.js'; +import * as Root from '../../root/root.js'; +import * as UI from '../../ui/ui.js'; // eslint-disable-next-line rulesdir/es_modules_import import type * as ProtocolMonitor from './protocol_monitor.js'; @@ -22,7 +22,7 @@ const UIStrings = { */ showProtocolMonitor: 'Show Protocol monitor', }; -const str_ = i18n.i18n.registerUIStrings('protocol_monitor/protocol_monitor-meta.ts', UIStrings); +const str_ = i18n.i18n.registerUIStrings('panels/protocol_monitor/protocol_monitor-meta.ts', UIStrings); const i18nLazyString = i18n.i18n.getLazilyComputedLocalizedString.bind(undefined, str_); let loadedProtocolMonitorModule: (typeof ProtocolMonitor|undefined); @@ -30,7 +30,7 @@ let loadedProtocolMonitorModule: (typeof ProtocolMonitor|undefined); async function loadProtocolMonitorModule(): Promise { if (!loadedProtocolMonitorModule) { // Side-effect import resources in module.json - await Root.Runtime.Runtime.instance().loadModulePromise('protocol_monitor'); + await Root.Runtime.Runtime.instance().loadModulePromise('panels/protocol_monitor'); loadedProtocolMonitorModule = await import('./protocol_monitor.js'); } return loadedProtocolMonitorModule; diff --git a/front_end/protocol_monitor/protocol_monitor.ts b/front_end/panels/protocol_monitor/protocol_monitor.ts similarity index 100% rename from front_end/protocol_monitor/protocol_monitor.ts rename to front_end/panels/protocol_monitor/protocol_monitor.ts diff --git a/front_end/shell.js b/front_end/shell.js index 5171da2cf2..c626803973 100644 --- a/front_end/shell.js +++ b/front_end/shell.js @@ -24,7 +24,7 @@ import './panels/changes/changes-meta.js'; import './input/input-meta.js'; import './linear_memory_inspector/linear_memory_inspector-meta.js'; import './settings/settings-meta.js'; -import './protocol_monitor/protocol_monitor-meta.js'; +import './panels/protocol_monitor/protocol_monitor-meta.js'; import './persistence/persistence-meta.js'; import './browser_sdk/browser_sdk-meta.js'; import './main/main-meta.js'; diff --git a/front_end/shell.json b/front_end/shell.json index d390059128..015c67609a 100644 --- a/front_end/shell.json +++ b/front_end/shell.json @@ -20,7 +20,7 @@ { "name": "object_ui" }, { "name": "perf_ui" }, { "name": "panels/profiler" }, - { "name": "protocol_monitor"}, + { "name": "panels/protocol_monitor"}, { "name": "quick_open" }, { "name": "search" }, { "name": "settings" }, diff --git a/test/unittests/front_end/missing_entrypoints/BUILD.gn b/test/unittests/front_end/missing_entrypoints/BUILD.gn index d37c50fdec..d2701a4d78 100644 --- a/test/unittests/front_end/missing_entrypoints/BUILD.gn +++ b/test/unittests/front_end/missing_entrypoints/BUILD.gn @@ -26,7 +26,7 @@ ts_library("missing_entrypoints") { "../../../../front_end/panels/lighthouse:bundle", "../../../../front_end/panels/performance_monitor:bundle", "../../../../front_end/panels/profiler:bundle", - "../../../../front_end/protocol_monitor:bundle", + "../../../../front_end/panels/protocol_monitor:bundle", "../../../../front_end/resources:bundle", "../../../../front_end/screencast:bundle", "../../../../front_end/security:bundle", diff --git a/test/unittests/front_end/missing_entrypoints/missing_entrypoints_test.ts b/test/unittests/front_end/missing_entrypoints/missing_entrypoints_test.ts index 5ff5dc3a70..fb2f7f7c15 100644 --- a/test/unittests/front_end/missing_entrypoints/missing_entrypoints_test.ts +++ b/test/unittests/front_end/missing_entrypoints/missing_entrypoints_test.ts @@ -31,7 +31,7 @@ describeWithEnvironment('Imports entrypoints that are yet to be tested', () => { await import('../../../../front_end/node_main/node_main.js'); await import('../../../../front_end/panels/performance_monitor/performance_monitor.js'); await import('../../../../front_end/panels/profiler/profiler.js'); - await import('../../../../front_end/protocol_monitor/protocol_monitor.js'); + await import('../../../../front_end/panels/protocol_monitor/protocol_monitor.js'); await import('../../../../front_end/resources/resources.js'); await import('../../../../front_end/screencast/screencast.js'); await import('../../../../front_end/security/security.js');