diff --git a/README.md b/README.md index a1a0e541549..73ed3ac8037 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ This can then be served from a static web server to test locally: python3 -m http.server 8000 --directory out/Default/gen/front_end ``` -The frontend will be available at `http://localhost:8000/inspector.html` (or `http://localhost:8000/rn_inspector.html` for the RN-specific entry point). +The frontend will be available at `http://localhost:8000/inspector.html` (or `http://localhost:8000/rn_fusebox.html` for the RN-specific entry point). ### Syncing with the upstream repo diff --git a/config/gni/devtools_grd_files.gni b/config/gni/devtools_grd_files.gni index a0271daefe0..2c103a0f8ae 100644 --- a/config/gni/devtools_grd_files.gni +++ b/config/gni/devtools_grd_files.gni @@ -374,7 +374,6 @@ grd_files_release_sources = [ "front_end/entrypoints/node_app/node_app.js", "front_end/entrypoints/rehydrated_devtools_app/rehydrated_devtools_app.js", "front_end/entrypoints/rn_fusebox/rn_fusebox.js", - "front_end/entrypoints/rn_inspector/rn_inspector.js", "front_end/entrypoints/shell/shell.js", "front_end/entrypoints/wasmparser_worker/wasmparser_worker-entrypoint.js", "front_end/entrypoints/wasmparser_worker/wasmparser_worker.js", @@ -681,7 +680,6 @@ grd_files_release_sources = [ "front_end/panels/recorder/recorder-meta.js", "front_end/panels/recorder/recorder.js", "front_end/panels/recorder/util/util.js", - "front_end/panels/rn_welcome/rn_welcome-legacy-meta.js", "front_end/panels/rn_welcome/rn_welcome-meta.js", "front_end/panels/rn_welcome/rn_welcome.js", "front_end/panels/screencast/screencast-meta.js", @@ -721,7 +719,6 @@ grd_files_release_sources = [ "front_end/panels/whats_new/whats_new.js", "front_end/rehydrated_devtools_app.html", "front_end/rn_fusebox.html", - "front_end/rn_inspector.html", "front_end/services/puppeteer/puppeteer.js", "front_end/services/trace_bounds/trace_bounds.js", "front_end/services/tracing/tracing.js", diff --git a/front_end/BUILD.gn b/front_end/BUILD.gn index e3f2045cfeb..39817034616 100644 --- a/front_end/BUILD.gn +++ b/front_end/BUILD.gn @@ -28,7 +28,6 @@ group("front_end") { "entrypoints/node_app:entrypoint", "entrypoints/rehydrated_devtools_app:entrypoint", "entrypoints/rn_fusebox:entrypoint", - "entrypoints/rn_inspector:entrypoint", "entrypoints/shell", "entrypoints/wasmparser_worker:worker_entrypoint", "entrypoints/worker_app:entrypoint", @@ -78,7 +77,6 @@ node_action("html_entrypoints") { "ndb_app", "node_app", "rn_fusebox", - "rn_inspector", "rehydrated_devtools_app", "worker_app", "device_mode_emulation_frame", diff --git a/front_end/core/host/RNPerfMetrics.ts b/front_end/core/host/RNPerfMetrics.ts index 30b604630c9..87e3bb98669 100644 --- a/front_end/core/host/RNPerfMetrics.ts +++ b/front_end/core/host/RNPerfMetrics.ts @@ -25,7 +25,7 @@ class RNPerfMetrics { #listeners = new Set(); #launchId: string|null = null; #appId: string|null = null; - #entryPoint: EntryPoint = 'rn_inspector'; + #entryPoint: EntryPoint = 'rn_fusebox'; #telemetryInfo: Object = {}; // map of panel location to panel name #currentPanels = new Map(); @@ -381,7 +381,7 @@ function maybeWrapError(baseMessage: string, error: unknown): [string, Error] { return [message, new Error(message, {cause: error})]; } -type EntryPoint = 'rn_fusebox'|'rn_inspector'; +type EntryPoint = 'rn_fusebox'; type CommonEventFields = Readonly<{ timestamp: DOMHighResTimeStamp, diff --git a/front_end/core/rn_experiments/BUILD.gn b/front_end/core/rn_experiments/BUILD.gn index b1a9f1cb6e4..4f7b587f99f 100644 --- a/front_end/core/rn_experiments/BUILD.gn +++ b/front_end/core/rn_experiments/BUILD.gn @@ -25,7 +25,6 @@ devtools_entrypoint("bundle") { visibility = [ "../../entrypoints/rn_fusebox:*", - "../../entrypoints/rn_inspector:*", "../../entrypoints/main:*", ] } diff --git a/front_end/core/rn_experiments/experimentsImpl.ts b/front_end/core/rn_experiments/experimentsImpl.ts index 32b5996d2c5..b4f02ac26e4 100644 --- a/front_end/core/rn_experiments/experimentsImpl.ts +++ b/front_end/core/rn_experiments/experimentsImpl.ts @@ -24,8 +24,8 @@ // - define it in the RNExperiments enum and Experiments enum (in Runtime.ts) // - register it in this file (rn_experiments.ts) // - set `enabledByDefault` as appropriate -// - optionally, configure it further in each RN-specific entry point -// (rn_inspector.ts, rn_fusebox.ts) +// - optionally, configure it further in the RN-specific entry point +// (rn_fusebox.ts) // // React Native-specific experiments are merged into the main ExperimentsSupport // object in MainImpl and can't be configured further afterwards (except diff --git a/front_end/entrypoints/inspector_main/BUILD.gn b/front_end/entrypoints/inspector_main/BUILD.gn index c4bbc880d95..876de679742 100644 --- a/front_end/entrypoints/inspector_main/BUILD.gn +++ b/front_end/entrypoints/inspector_main/BUILD.gn @@ -71,7 +71,6 @@ devtools_entrypoint("meta") { "../devtools_app/*", "../rehydrated_devtools_app/*", "../rn_fusebox:*", - "../rn_inspector:*", ] } diff --git a/front_end/entrypoints/main/BUILD.gn b/front_end/entrypoints/main/BUILD.gn index 9579cb75092..603a2647a55 100644 --- a/front_end/entrypoints/main/BUILD.gn +++ b/front_end/entrypoints/main/BUILD.gn @@ -57,7 +57,6 @@ devtools_entrypoint("bundle") { "../node_app:*", "../rehydrated_devtools_app:*", "../rn_fusebox:*", - "../rn_inspector:*", "../worker_app:*", ] diff --git a/front_end/entrypoints/rn_inspector/BUILD.gn b/front_end/entrypoints/rn_inspector/BUILD.gn deleted file mode 100644 index c0b25e019a0..00000000000 --- a/front_end/entrypoints/rn_inspector/BUILD.gn +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# Copyright 2021 The Chromium Authors. All rights reserved. -# 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("../visibility.gni") - -devtools_entrypoint("entrypoint") { - entrypoint = "rn_inspector.ts" - - deps = [ - "../../core/rn_experiments:bundle", - "../../entrypoints/inspector_main:meta", - "../../panels/accessibility:meta", - "../../panels/animation:meta", - "../../panels/application:meta", - "../../panels/browser_debugger:meta", - "../../panels/css_overview:meta", - "../../panels/developer_resources:meta", - "../../panels/elements:meta", - "../../panels/emulation:meta", - "../../panels/issues:meta", - "../../panels/layer_viewer:meta", - "../../panels/layers:meta", - "../../panels/lighthouse:meta", - "../../panels/media:meta", - "../../panels/mobile_throttling:meta", - "../../panels/network:meta", - "../../panels/performance_monitor:meta", - "../../panels/recorder:meta", - "../../panels/rn_welcome:meta-legacy", - "../../panels/security:meta", - "../../panels/sensors:meta", - "../../panels/web_audio:meta", - "../../panels/webauthn:meta", - "../main:bundle", - "../shell", - ] - - visibility = [ "../../:*" ] - - visibility += devtools_entrypoints_visibility -} diff --git a/front_end/entrypoints/rn_inspector/README.md b/front_end/entrypoints/rn_inspector/README.md deleted file mode 100644 index caa407c9825..00000000000 --- a/front_end/entrypoints/rn_inspector/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# `rn_inspector.html` - -`rn_inspector.html` is a customized entry point designed to work well with React Native targets. - -## Notes on embedding - -* Adding `&sources.hide_add_folder=true` to the inspector frontend URL hides UI related to Filesystem / Workspaces that does not work in hosted mode. diff --git a/front_end/entrypoints/rn_inspector/rn_inspector.ts b/front_end/entrypoints/rn_inspector/rn_inspector.ts deleted file mode 100644 index 387c17f8a3f..00000000000 --- a/front_end/entrypoints/rn_inspector/rn_inspector.ts +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) Meta Platforms, Inc. and affiliates. -// Copyright 2024 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import '../shell/shell.js'; -import '../../panels/emulation/emulation-meta.js'; -import '../../panels/sensors/sensors-meta.js'; -import '../../panels/developer_resources/developer_resources-meta.js'; -import '../inspector_main/inspector_main-meta.js'; -import '../../panels/issues/issues-meta.js'; -import '../../panels/mobile_throttling/mobile_throttling-meta.js'; -import '../../panels/network/network-meta.js'; -import '../../panels/rn_welcome/rn_welcome-legacy-meta.js'; - -import * as Host from '../../core/host/host.js'; -import * as i18n from '../../core/i18n/i18n.js'; -import * as RNExperiments from '../../core/rn_experiments/rn_experiments.js'; -import * as Root from '../../core/root/root.js'; -import type * as Sources from '../../panels/sources/sources.js'; -import * as UI from '../../ui/legacy/legacy.js'; -import * as Main from '../main/main.js'; - -/* - * To ensure accurate timing measurements, - * please make sure these perf metrics lines are called ahead of everything else - */ -Host.rnPerfMetrics.registerPerfMetricsGlobalPostMessageHandler(); -Host.rnPerfMetrics.setLaunchId(Root.Runtime.Runtime.queryParam('launchId')); -Host.rnPerfMetrics.setAppId(Root.Runtime.Runtime.queryParam('appId')); -Host.rnPerfMetrics.setTelemetryInfo(JSON.parse(Root.Runtime.Runtime.queryParam('telemetryInfo') || '{}')); -Host.rnPerfMetrics.entryPointLoadingStarted('rn_inspector'); - -RNExperiments.RNExperimentsImpl.setIsReactNativeEntryPoint(true); -RNExperiments.RNExperimentsImpl.Instance.enableExperimentsByDefault([ - Root.Runtime.ExperimentName.JS_HEAP_PROFILER_ENABLE, - Root.Runtime.ExperimentName.REACT_NATIVE_SPECIFIC_UI, -]); - -const UIStrings = { - /** - *@description Title of the 'React Native' tool in the Network Navigator View, which is part of the Sources tool - */ - networkTitle: 'React Native', - /** - *@description Command for showing the 'React Native' tool in the Network Navigator View, which is part of the Sources tool - */ - showReactNative: 'Show React Native', -} as const; - -const str_ = i18n.i18n.registerUIStrings('entrypoints/rn_inspector/rn_inspector.ts', UIStrings); -const i18nLazyString = i18n.i18n.getLazilyComputedLocalizedString.bind(undefined, str_); - -let loadedSourcesModule: (typeof Sources|undefined); - -async function loadSourcesModule(): Promise { - if (!loadedSourcesModule) { - loadedSourcesModule = await import('../../panels/sources/sources.js'); - } - return loadedSourcesModule; -} - -UI.ViewManager.registerViewExtension({ - location: UI.ViewManager.ViewLocationValues.NAVIGATOR_VIEW, - id: 'navigator-network', - title: i18nLazyString(UIStrings.networkTitle), - commandPrompt: i18nLazyString(UIStrings.showReactNative), - order: 2, - persistence: UI.ViewManager.ViewPersistence.PERMANENT, - async loadView() { - const Sources = await loadSourcesModule(); - return Sources.SourcesNavigator.NetworkNavigatorView.instance(); - }, -}); - -// @ts-expect-error Exposed for legacy layout tests -self.runtime = Root.Runtime.Runtime.instance({forceNew: true}); -new Main.MainImpl.MainImpl(); - -Host.rnPerfMetrics.entryPointLoadingFinished('rn_inspector'); diff --git a/front_end/entrypoints/shell/BUILD.gn b/front_end/entrypoints/shell/BUILD.gn index bee6cdd52f7..20fe528cfa0 100644 --- a/front_end/entrypoints/shell/BUILD.gn +++ b/front_end/entrypoints/shell/BUILD.gn @@ -47,7 +47,6 @@ devtools_entrypoint("shell") { "../ndb_app:*", "../node_app:*", "../rn_fusebox:*", - "../rn_inspector:*", "../worker_app:*", ] diff --git a/front_end/index.html b/front_end/index.html index efffb3e28f7..1b4f9004394 100644 --- a/front_end/index.html +++ b/front_end/index.html @@ -16,9 +16,6 @@
    -
  • - rn_inspector.html ⚛️ -
  • rn_fusebox.html ⚛️
    • diff --git a/front_end/panels/recorder/BUILD.gn b/front_end/panels/recorder/BUILD.gn index 365f264c059..3a994430ab0 100644 --- a/front_end/panels/recorder/BUILD.gn +++ b/front_end/panels/recorder/BUILD.gn @@ -73,7 +73,6 @@ devtools_entrypoint("meta") { "../../entrypoints/devtools_app:*", "../../entrypoints/inspector:*", "../../entrypoints/rn_fusebox:*", - "../../entrypoints/rn_inspector:*", ] } diff --git a/front_end/panels/rn_welcome/BUILD.gn b/front_end/panels/rn_welcome/BUILD.gn index e854cc8449a..31f04717d24 100644 --- a/front_end/panels/rn_welcome/BUILD.gn +++ b/front_end/panels/rn_welcome/BUILD.gn @@ -46,14 +46,6 @@ devtools_entrypoint("bundle") { visibility += devtools_panels_visibility } -devtools_entrypoint("meta-legacy") { - entrypoint = "rn_welcome-legacy-meta.ts" - - deps = [ ":bundle" ] - - visibility = [ "../../entrypoints/rn_inspector/*" ] -} - devtools_entrypoint("meta") { entrypoint = "rn_welcome-meta.ts" diff --git a/front_end/panels/rn_welcome/RNWelcome.ts b/front_end/panels/rn_welcome/RNWelcome.ts index b59c6ba7d52..599b90c3fde 100644 --- a/front_end/panels/rn_welcome/RNWelcome.ts +++ b/front_end/panels/rn_welcome/RNWelcome.ts @@ -16,10 +16,6 @@ import {html, render} from '../../ui/lit/lit.js'; import rnWelcomeStyles from './rnWelcome.css.js'; const UIStrings = { - /** @description Beta label */ - betaLabel: 'Beta', - /** @description Tech Preview label */ - techPreviewLabel: 'Tech Preview', /** @description Welcome text */ welcomeMessage: 'Welcome to debugging in React Native', /** @description "Debugging docs" link */ @@ -49,8 +45,6 @@ let rnWelcomeImplInstance: RNWelcomeImpl; interface RNWelcomeOptions { debuggerBrandName: () => Platform.UIString.LocalizedString; - showBetaLabel?: boolean; - showTechPreviewLabel?: boolean; showDocs?: boolean; } @@ -119,8 +113,6 @@ export class RNWelcomeImpl extends UI.Widget.VBox implements render(): void { const { debuggerBrandName, - showBetaLabel = false, - showTechPreviewLabel = false, showDocs = false, } = this.options; const welcomeIconUrl = new URL( @@ -150,16 +142,6 @@ export class RNWelcomeImpl extends UI.Widget.VBox implements

    ${debuggerBrandName()}

    - ${showBetaLabel ? html` -
    - ${i18nString(UIStrings.betaLabel)} -
    - ` : null} - ${showTechPreviewLabel ? html` -
    - ${i18nString(UIStrings.techPreviewLabel)} -
    - ` : null}
    ${i18nString(UIStrings.welcomeMessage)} diff --git a/front_end/panels/rn_welcome/rnWelcome.css b/front_end/panels/rn_welcome/rnWelcome.css index 9af4df9f29a..83c9b9be8cf 100644 --- a/front_end/panels/rn_welcome/rnWelcome.css +++ b/front_end/panels/rn_welcome/rnWelcome.css @@ -62,19 +62,6 @@ color: var(--color-text-primary); } -.rn-welcome-title-accessory { - margin-left: 12px; - padding: 4px 8px; - border-radius: 6px; - background-color: var(--sys-color-green-bright); - font-size: 12px; - color: var(--sys-color-primary); -} - -.rn-welcome-title-accessory-purple { - background-color: var(--sys-color-purple-bright); -} - .rn-welcome-tagline { margin-bottom: 24px; font-size: 1rem; diff --git a/front_end/panels/rn_welcome/rn_welcome-legacy-meta.ts b/front_end/panels/rn_welcome/rn_welcome-legacy-meta.ts deleted file mode 100644 index 246d8beaa77..00000000000 --- a/front_end/panels/rn_welcome/rn_welcome-legacy-meta.ts +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Meta Platforms, Inc. and affiliates. -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import * as i18n from '../../core/i18n/i18n.js'; -import * as Root from '../../core/root/root.js'; -import * as UI from '../../ui/legacy/legacy.js'; - -import type * as RNWelcome from './rn_welcome.js'; - -const UIStrings = { - /** - * @description Title of the Welcome panel, plus an emoji symbolizing React Native - */ - rnWelcome: '⚛️ Welcome', - - /** - * @description Command for showing the Welcome panel - */ - showRnWelcome: 'Show React Native Welcome panel', - /** @description The name of the debugging product */ - debuggerBrandName: 'React Native JS Inspector', -} as const; -const str_ = i18n.i18n.registerUIStrings('panels/rn_welcome/rn_welcome-legacy-meta.ts', UIStrings); -const i18nLazyString = i18n.i18n.getLazilyComputedLocalizedString.bind(undefined, str_); - -let loadedRNWelcomeModule: (typeof RNWelcome|undefined); - -async function loadRNWelcomeModule(): Promise { - if (!loadedRNWelcomeModule) { - loadedRNWelcomeModule = await import('./rn_welcome.js'); - } - return loadedRNWelcomeModule; -} - -UI.ViewManager.registerViewExtension({ - location: UI.ViewManager.ViewLocationValues.PANEL, - id: 'rn-welcome', - title: i18nLazyString(UIStrings.rnWelcome), - commandPrompt: i18nLazyString(UIStrings.showRnWelcome), - order: -10, - persistence: UI.ViewManager.ViewPersistence.PERMANENT, - async loadView() { - const RNWelcome = await loadRNWelcomeModule(); - return RNWelcome.RNWelcome.RNWelcomeImpl.instance({ - debuggerBrandName: i18nLazyString(UIStrings.debuggerBrandName), - showTechPreviewLabel: true, - }); - }, - experiment: Root.Runtime.ExperimentName.REACT_NATIVE_SPECIFIC_UI, -}); diff --git a/front_end/panels/rn_welcome/rn_welcome-meta.ts b/front_end/panels/rn_welcome/rn_welcome-meta.ts index bc53f61d35a..83913a3a016 100644 --- a/front_end/panels/rn_welcome/rn_welcome-meta.ts +++ b/front_end/panels/rn_welcome/rn_welcome-meta.ts @@ -48,7 +48,6 @@ UI.ViewManager.registerViewExtension({ const RNWelcome = await loadRNWelcomeModule(); return RNWelcome.RNWelcome.RNWelcomeImpl.instance({ debuggerBrandName: i18nLazyString(UIStrings.debuggerBrandName), - showBetaLabel: false, showDocs: true, }); }, diff --git a/scripts/build/generate_html_entrypoint.js b/scripts/build/generate_html_entrypoint.js index 23ade05d730..eb3de8bfd51 100644 --- a/scripts/build/generate_html_entrypoint.js +++ b/scripts/build/generate_html_entrypoint.js @@ -33,7 +33,6 @@ if (!Array.isArray(entrypoints)) { const templateContent = fs.readFileSync(template, 'utf-8'); const REACT_NATIVE_ENTRYPOINT_TO_TITLE = new Map([ - ['rn_inspector', 'DevTools (React Native)'], ['rn_fusebox', 'React Native DevTools'] ]); diff --git a/scripts/eslint_rules/lib/check-license-header.js b/scripts/eslint_rules/lib/check-license-header.js index 44a7ff10a26..1f2392baef4 100644 --- a/scripts/eslint_rules/lib/check-license-header.js +++ b/scripts/eslint_rules/lib/check-license-header.js @@ -79,7 +79,6 @@ const META_CODE_PATHS = [ 'core/rn_experiments', 'core/sdk/ReactNativeApplicationModel.ts', 'entrypoints/rn_fusebox', - 'entrypoints/rn_inspector', 'entrypoints/shell/browser_compatibility_guard.ts', 'global_typings/react_native.d.ts', 'models/react_native',