From 9d79e55bd85a678d094996563bad94aececfe528 Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Fri, 5 Nov 2021 15:17:21 +0000 Subject: [PATCH] Remove entrypoints/main/module.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R=szuend@chromium.org Bug: 1127902 Change-Id: I5d752140d5ce265b087f166ba8b0015cb2872dbb Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3264208 Commit-Queue: Tim van der Lippe Auto-Submit: Tim van der Lippe Reviewed-by: Simon Zünd --- config/gni/all_devtools_files.gni | 1 - front_end/entrypoints/main/main-meta.ts | 2 -- front_end/entrypoints/main/module.json | 5 ----- front_end/entrypoints/shell/shell.js | 1 + front_end/entrypoints/shell/shell.json | 1 - 5 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 front_end/entrypoints/main/module.json diff --git a/config/gni/all_devtools_files.gni b/config/gni/all_devtools_files.gni index 62877ca2cf..acec9ac814 100644 --- a/config/gni/all_devtools_files.gni +++ b/config/gni/all_devtools_files.gni @@ -58,7 +58,6 @@ all_devtools_files = [ "front_end/legacy_test_runner/layers_test_runner/layers_test_runner.js", "front_end/panels/layer_viewer/module.json", "front_end/panels/layers/module.json", - "front_end/entrypoints/main/module.json", "front_end/panels/media/module.json", "front_end/entrypoints/ndb_app/ndb_app.json", "front_end/legacy_test_runner/network_test_runner/network_test_runner.js", diff --git a/front_end/entrypoints/main/main-meta.ts b/front_end/entrypoints/main/main-meta.ts index 330174eccc..d241ad37fc 100644 --- a/front_end/entrypoints/main/main-meta.ts +++ b/front_end/entrypoints/main/main-meta.ts @@ -223,8 +223,6 @@ let loadedInspectorMainModule: (typeof InspectorMain|undefined); async function loadMainModule(): Promise { if (!loadedMainModule) { - // Side-effect import resources in module.json - await Root.Runtime.Runtime.instance().loadModulePromise('entrypoints/main'); loadedMainModule = await import('./main.js'); } return loadedMainModule; diff --git a/front_end/entrypoints/main/module.json b/front_end/entrypoints/main/module.json deleted file mode 100644 index cf13a6aadd..0000000000 --- a/front_end/entrypoints/main/module.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": [ - "ui/legacy" - ] -} diff --git a/front_end/entrypoints/shell/shell.js b/front_end/entrypoints/shell/shell.js index 19d6e912b1..a73a9e05ef 100644 --- a/front_end/entrypoints/shell/shell.js +++ b/front_end/entrypoints/shell/shell.js @@ -20,4 +20,5 @@ import '../../models/persistence/persistence-legacy.js'; import '../../models/extensions/extensions-legacy.js'; import './shell-meta-files.js'; +import '../main/main.js'; // We generate the descriptors in this file, which depend on the runtime. diff --git a/front_end/entrypoints/shell/shell.json b/front_end/entrypoints/shell/shell.json index 9b69e73673..7367a73a35 100644 --- a/front_end/entrypoints/shell/shell.json +++ b/front_end/entrypoints/shell/shell.json @@ -1,6 +1,5 @@ { "modules": [ - { "name": "entrypoints/main", "type": "autostart" }, { "name": "ui/legacy", "type": "autostart" }, { "name": "ui/legacy/components/text_editor", "type": "autostart" }, { "name": "ui/legacy/components/source_frame", "type": "autostart" },