chrome-devtools-frontend 1.0.946351 → 1.0.948359

package/front_end/core/platform/string-utilities.ts

@@ -450,7 +450,7 @@ export const createSearchRegex = function(query: string, caseSensitive: boolean,
   }
 
   if (!regexObject) {
-    regexObject = self.createPlainTextSearchRegex(query, regexFlags);
+    regexObject = createPlainTextSearchRegex(query, regexFlags);
   }
 
   return regexObject;
@@ -602,3 +602,16 @@ export const findUnclosedCssQuote = function(str: string): string {
   }
   return unmatchedQuote;
 };
+
+export const createPlainTextSearchRegex = function(query: string, flags?: string): RegExp {
+  // This should be kept the same as the one in StringUtil.cpp.
+  let regex = '';
+  for (let i = 0; i < query.length; ++i) {
+    const c = query.charAt(i);
+    if (regexSpecialCharacters().indexOf(c) !== -1) {
+      regex += '\\';
+    }
+    regex += c;
+  }
+  return new RegExp(regex, flags || '');
+};

package/front_end/core/platform/utilities.ts

@@ -31,35 +31,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* The long term goal here is to remove all functions in this file and
- * replace them with ES Module functions rather than prototype
- * extensions but in the mean time if an old func in here depends on one
- * that has been migrated, it will need to be imported.
- */
-
-import {caseInsensetiveComparator, regexSpecialCharacters, sprintf} from './string-utilities.js';
-
-// Still used in the test runners that can't use ES modules :(
-String.sprintf = sprintf;
-
-// @ts-ignore https://crbug.com/1050549
-String.regexSpecialCharacters = regexSpecialCharacters;
-// @ts-ignore https://crbug.com/1050549
-String.caseInsensetiveComparator = caseInsensetiveComparator;
-
-self.createPlainTextSearchRegex = function(query: string, flags?: string): RegExp {
-  // This should be kept the same as the one in StringUtil.cpp.
-  let regex = '';
-  for (let i = 0; i < query.length; ++i) {
-    const c = query.charAt(i);
-    if (regexSpecialCharacters().indexOf(c) !== -1) {
-      regex += '\\';
-    }
-    regex += c;
-  }
-  return new RegExp(regex, flags || '');
-};
-
 export function runOnWindowLoad(callback: () => void): void {
   function windowLoaded(): void {
     window.removeEventListener('DOMContentLoaded', windowLoaded, false);

package/front_end/core/root/Runtime.ts

@@ -7,9 +7,6 @@ const originalAssert = console.assert;
 
 const queryParamsObject = new URLSearchParams(location.search);
 
-// The following variable are initialized all the way at the bottom of this file
-let importScriptPathPrefix: string;
-
 let runtimePlatform = '';
 
 let runtimeInstance: Runtime|undefined;
@@ -32,66 +29,16 @@ export function getRemoteBase(location: string = self.location.toString()): {
   return {base: `${url.origin}/remote/serve_file/${version[1]}/`, version: version[1]};
 }
 
-export const mappingForLayoutTests = new Map<string, string>([
-  ['panels/animation', 'animation'],
-  ['panels/browser_debugger', 'browser_debugger'],
-  ['panels/changes', 'changes'],
-  ['panels/console', 'console'],
-  ['panels/elements', 'elements'],
-  ['panels/emulation', 'emulation'],
-  ['panels/mobile_throttling', 'mobile_throttling'],
-  ['panels/network', 'network'],
-  ['panels/profiler', 'profiler'],
-  ['panels/application', 'resources'],
-  ['panels/search', 'search'],
-  ['panels/sources', 'sources'],
-  ['panels/snippets', 'snippets'],
-  ['panels/settings', 'settings'],
-  ['panels/timeline', 'timeline'],
-  ['panels/web_audio', 'web_audio'],
-  ['models/persistence', 'persistence'],
-  ['models/workspace_diff', 'workspace_diff'],
-  ['entrypoints/main', 'main'],
-  ['third_party/diff', 'diff'],
-  ['ui/legacy/components/inline_editor', 'inline_editor'],
-  ['ui/legacy/components/data_grid', 'data_grid'],
-  ['ui/legacy/components/perf_ui', 'perf_ui'],
-  ['ui/legacy/components/source_frame', 'source_frame'],
-  ['ui/legacy/components/color_picker', 'color_picker'],
-  ['ui/legacy/components/cookie_table', 'cookie_table'],
-  ['ui/legacy/components/quick_open', 'quick_open'],
-  ['ui/legacy/components/utils', 'components'],
-]);
-
 export class Runtime {
-  readonly #modules: Module[];
-  modulesMap: {
-    [x: string]: Module,
-  };
-  readonly #descriptorsMap: {
-    [x: string]: ModuleDescriptor,
-  };
-  private constructor(descriptors: ModuleDescriptor[]) {
-    this.#modules = [];
-    this.modulesMap = {};
-    this.#descriptorsMap = {};
-
-    for (const descriptor of descriptors) {
-      this.registerModule(descriptor);
-    }
+  private constructor() {
   }
 
   static instance(opts: {
     forceNew: boolean|null,
-    moduleDescriptors: Array<ModuleDescriptor>|null,
-  }|undefined = {forceNew: null, moduleDescriptors: null}): Runtime {
-    const {forceNew, moduleDescriptors} = opts;
+  }|undefined = {forceNew: null}): Runtime {
+    const {forceNew} = opts;
     if (!runtimeInstance || forceNew) {
-      if (!moduleDescriptors) {
-        throw new Error(`Unable to create runtime: moduleDescriptors must be provided: ${new Error().stack}`);
-      }
-
-      runtimeInstance = new Runtime(moduleDescriptors);
+      runtimeInstance = new Runtime();
     }
 
     return runtimeInstance;
@@ -202,51 +149,11 @@ export class Runtime {
     return '\n/*# sourceURL=' + sourceURL + ' */';
   }
 
-  module(moduleName: string): Module {
-    return this.modulesMap[moduleName];
-  }
-
-  private registerModule(descriptor: ModuleDescriptor): void {
-    const module = new Module(this, descriptor);
-    this.#modules.push(module);
-    this.modulesMap[descriptor['name']] = module;
-    const mappedName = mappingForLayoutTests.get(descriptor['name']);
-    if (mappedName !== undefined) {
-      this.modulesMap[mappedName] = module;
-    }
-  }
-
-  loadModulePromise(moduleName: string): Promise<boolean> {
-    return this.modulesMap[moduleName].loadPromise();
-  }
-
-  loadAutoStartModules(moduleNames: string[]): Promise<boolean[]> {
-    const promises = [];
-    for (const moduleName of moduleNames) {
-      promises.push(this.loadModulePromise(moduleName));
-    }
-    return Promise.all(promises);
-  }
-
-  getModulesMap(): {[x: string]: Module} {
-    return this.modulesMap;
-  }
-
   loadLegacyModule(modulePath: string): Promise<void> {
     return import(`../../${modulePath}`);
   }
 }
 
-export class ModuleDescriptor {
-  name!: string;
-  dependencies!: string[]|undefined;
-  modules!: string[];
-  resources!: string[];
-  condition!: string|undefined;
-  experiment!: string|null;
-  constructor() {
-  }
-}
 export interface Option {
   title: string;
   value: string|boolean;
@@ -254,92 +161,6 @@ export interface Option {
   text?: string;
 }
 
-function computeContainingFolderName(name: string): string {
-  if (name.includes('/')) {
-    return name.substring(name.lastIndexOf('/') + 1, name.length);
-  }
-  return name;
-}
-
-export class Module {
-  readonly #manager: Runtime;
-  readonly descriptor: ModuleDescriptor;
-  readonly #nameInternal: string;
-  #loadedForTest: boolean;
-  #pendingLoadPromise?: Promise<boolean>;
-  constructor(manager: Runtime, descriptor: ModuleDescriptor) {
-    this.#manager = manager;
-    this.descriptor = descriptor;
-    this.#nameInternal = descriptor.name;
-    this.#loadedForTest = false;
-  }
-
-  name(): string {
-    return this.#nameInternal;
-  }
-
-  enabled(): boolean {
-    return Runtime.isDescriptorEnabled(this.descriptor);
-  }
-
-  resource(name: string): string {
-    const fullName = this.#nameInternal + '/' + name;
-    const content = cachedResources.get(fullName);
-    if (!content) {
-      throw new Error(fullName + ' not preloaded. Check module.json');
-    }
-    return content;
-  }
-
-  loadPromise(): Promise<boolean> {
-    if (!this.enabled()) {
-      return Promise.reject(new Error('Module ' + this.#nameInternal + ' is not enabled'));
-    }
-
-    if (this.#pendingLoadPromise) {
-      return this.#pendingLoadPromise;
-    }
-
-    const dependencies = this.descriptor.dependencies;
-    const dependencyPromises = [];
-    for (let i = 0; dependencies && i < dependencies.length; ++i) {
-      dependencyPromises.push(this.#manager.getModulesMap()[dependencies[i]].loadPromise());
-    }
-
-    this.#pendingLoadPromise = Promise.all(dependencyPromises).then(this.loadModules.bind(this)).then(() => {
-      this.#loadedForTest = true;
-      return this.#loadedForTest;
-    });
-
-    return this.#pendingLoadPromise;
-  }
-
-  private async loadModules(): Promise<void> {
-    const containingFolderName = computeContainingFolderName(this.#nameInternal);
-
-    const moduleFileName = `${containingFolderName}_module.js`;
-    const entrypointFileName = `${containingFolderName}.js`;
-
-    // If a module has resources, they are part of the `_module.js` files that are generated
-    // by `build_release_applications`. These need to be loaded before any other code is
-    // loaded, to make sure that the resource content is properly cached in `cachedResources`.
-    if (this.descriptor.modules && this.descriptor.modules.includes(moduleFileName)) {
-      await import(`../../${this.#nameInternal}/${moduleFileName}`);
-    }
-
-    await import(`../../${this.#nameInternal}/${entrypointFileName}`);
-  }
-
-  private modularizeURL(resourceName: string): string {
-    return Runtime.normalizePath(this.#nameInternal + '/' + resourceName);
-  }
-
-  fetchResource(resourceName: string): Promise<string> {
-    const sourceURL = getResourceURL(this.modularizeURL(resourceName));
-    return loadResourcePromise(sourceURL);
-  }
-}
-
 export class ExperimentsSupport {
   #experiments: Experiment[];
   #experimentNames: Set<string>;
@@ -513,37 +334,9 @@ export function loadResourcePromise(url: string): Promise<string> {
   }
 }
 
-function getResourceURL(scriptName: string, base?: string): string {
-  const sourceURL = (base || importScriptPathPrefix) + scriptName;
-  const schemaIndex = sourceURL.indexOf('://') + 3;
-  let pathIndex = sourceURL.indexOf('/', schemaIndex);
-  if (pathIndex === -1) {
-    pathIndex = sourceURL.length;
-  }
-  return sourceURL.substring(0, pathIndex) + Runtime.normalizePath(sourceURL.substring(pathIndex));
-}
-
-(function(): void {
-const baseUrl = self.location ? self.location.origin + self.location.pathname : '';
-importScriptPathPrefix = baseUrl.substring(0, baseUrl.lastIndexOf('/') + 1);
-})();
-
 // This must be constructed after the query parameters have been parsed.
 export const experiments = new ExperimentsSupport();
 
-export const cachedResources = new Map<string, string>();
-
-// Only exported for LightHouse, which uses it in `report-generator.js`.
-// Do not use this global in DevTools' implementation.
-// TODO(crbug.com/1127292): remove this global
-// @ts-ignore
-globalThis.EXPORTED_CACHED_RESOURCES_ONLY_FOR_LIGHTHOUSE = cachedResources;
-
-export let appStartedPromiseCallback: () => void;
-export const appStarted = new Promise<void>(fulfill => {
-  appStartedPromiseCallback = fulfill;
-});
-
 // TODO(crbug.com/1167717): Make this a const enum again
 // eslint-disable-next-line rulesdir/const_enum
 export enum ExperimentName {

package/front_end/core/sdk/AccessibilityModel.ts

@@ -27,7 +27,6 @@ export interface CoreOrProtocolAxProperty {
 
 export class AccessibilityNode {
   readonly #accessibilityModelInternal: AccessibilityModel;
-  readonly #agent: ProtocolProxyApi.AccessibilityApi;
   readonly #idInternal: Protocol.Accessibility.AXNodeId;
   readonly #backendDOMNodeIdInternal: Protocol.DOM.BackendNodeId|null;
   readonly #deferredDOMNodeInternal: DeferredDOMNode|null;
@@ -44,7 +43,6 @@ export class AccessibilityNode {
 
   constructor(accessibilityModel: AccessibilityModel, payload: Protocol.Accessibility.AXNode) {
     this.#accessibilityModelInternal = accessibilityModel;
-    this.#agent = accessibilityModel.getAgent();
 
     this.#idInternal = payload.nodeId;
     accessibilityModel.setAXNodeForAXId(this.#idInternal, this);

package/front_end/core/sdk/CSSProperty.ts

@@ -27,7 +27,6 @@ export class CSSProperty {
   #active: boolean;
   #nameRangeInternal: TextUtils.TextRange.TextRange|null;
   #valueRangeInternal: TextUtils.TextRange.TextRange|null;
-  readonly #invalidProperty: string|null;
   #invalidString?: Common.UIString.LocalizedString;
 
   constructor(
@@ -46,7 +45,6 @@ export class CSSProperty {
     this.#active = true;
     this.#nameRangeInternal = null;
     this.#valueRangeInternal = null;
-    this.#invalidProperty = null;
   }
 
   static parsePayload(ownerStyle: CSSStyleDeclaration, index: number, payload: Protocol.CSS.CSSProperty): CSSProperty {

package/front_end/core/sdk/CSSRule.ts

@@ -203,11 +203,9 @@ export class CSSStyleRule extends CSSRule {
 }
 
 export class CSSKeyframesRule {
-  readonly #cssModel: CSSModel;
   readonly #animationName: CSSValue;
   readonly #keyframesInternal: CSSKeyframeRule[];
   constructor(cssModel: CSSModel, payload: Protocol.CSS.CSSKeyframesRule) {
-    this.#cssModel = cssModel;
     this.#animationName = new CSSValue(payload.animationName);
     this.#keyframesInternal = payload.keyframes.map(keyframeRule => new CSSKeyframeRule(cssModel, keyframeRule));
   }

package/front_end/core/sdk/Cookie.ts

@@ -263,28 +263,3 @@ export enum Attributes {
   Priority = 'priority',
   PartitionKey = 'partitionKey',
 }
-
-/**
- * A `CookieReference` uniquely identifies a cookie by the triple (#name,domain,#path). Additionally, a context may be
- * included to make it clear which site under Application>Cookies should be opened when revealing a `CookieReference`.
- */
-export class CookieReference {
-  readonly #name: string;
-  readonly #domainInternal: string;
-  readonly #path: string;
-  readonly #contextUrlInternal: string|undefined;
-  constructor(name: string, domain: string, path: string, contextUrl: string|undefined) {
-    this.#name = name;
-    this.#domainInternal = domain;
-    this.#path = path;
-    this.#contextUrlInternal = contextUrl;
-  }
-
-  domain(): string {
-    return this.#domainInternal;
-  }
-
-  contextUrl(): string|undefined {
-    return this.#contextUrlInternal;
-  }
-}

package/front_end/core/sdk/EmulationModel.ts

@@ -15,7 +15,6 @@ import {SDKModel} from './SDKModel.js';
 
 export class EmulationModel extends SDKModel<void> {
   readonly #emulationAgent: ProtocolProxyApi.EmulationApi;
-  readonly #pageAgent: ProtocolProxyApi.PageApi;
   readonly #deviceOrientationAgent: ProtocolProxyApi.DeviceOrientationApi;
   #cssModel: CSSModel|null;
   readonly #overlayModelInternal: OverlayModel|null;
@@ -31,7 +30,6 @@ export class EmulationModel extends SDKModel<void> {
   constructor(target: Target) {
     super(target);
     this.#emulationAgent = target.emulationAgent();
-    this.#pageAgent = target.pageAgent();
     this.#deviceOrientationAgent = target.deviceOrientationAgent();
     this.#cssModel = target.model(CSSModel);
     this.#overlayModelInternal = target.model(OverlayModel);

package/front_end/core/sdk/HeapProfilerModel.ts

@@ -15,7 +15,6 @@ import {SDKModel} from './SDKModel.js';
 export class HeapProfilerModel extends SDKModel<EventTypes> {
   #enabled: boolean;
   readonly #heapProfilerAgent: ProtocolProxyApi.HeapProfilerApi;
-  readonly #memoryAgent: ProtocolProxyApi.MemoryApi;
   readonly #runtimeModelInternal: RuntimeModel;
   #samplingProfilerDepth: number;
 
@@ -24,7 +23,6 @@ export class HeapProfilerModel extends SDKModel<EventTypes> {
     target.registerHeapProfilerDispatcher(new HeapProfilerDispatcher(this));
     this.#enabled = false;
     this.#heapProfilerAgent = target.heapProfilerAgent();
-    this.#memoryAgent = target.memoryAgent();
     this.#runtimeModelInternal = (target.model(RuntimeModel) as RuntimeModel);
     this.#samplingProfilerDepth = 0;
   }

package/front_end/core/sdk/NetworkManager.ts

@@ -1575,7 +1575,6 @@ class ExtraInfoBuilder {
   #requestExtraInfos: (ExtraRequestInfo|null)[];
   #responseExtraInfos: (ExtraResponseInfo|null)[];
   #finishedInternal: boolean;
-  #hasExtraInfo: boolean;
   #webBundleInfo: WebBundleInfo|null;
   #webBundleInnerRequestInfo: WebBundleInnerRequestInfo|null;
 
@@ -1584,7 +1583,6 @@ class ExtraInfoBuilder {
     this.#requestExtraInfos = [];
     this.#responseExtraInfos = [];
     this.#finishedInternal = false;
-    this.#hasExtraInfo = false;
     this.#webBundleInfo = null;
     this.#webBundleInnerRequestInfo = null;
   }
@@ -1595,7 +1593,6 @@ class ExtraInfoBuilder {
   }
 
   addRequestExtraInfo(info: ExtraRequestInfo): void {
-    this.#hasExtraInfo = true;
     this.#requestExtraInfos.push(info);
     this.sync(this.#requestExtraInfos.length - 1);
   }

package/front_end/core/sdk/Resource.ts

@@ -52,7 +52,6 @@ export class Resource implements TextUtils.ContentProvider.ContentProvider {
   #lastModifiedInternal: Date|null;
   readonly #contentSizeInternal: number|null;
   #contentInternal!: string|null;
-  #contentLoadError!: string|null;
   #contentEncodedInternal!: boolean;
   readonly #pendingContentCallbacks: ((arg0: Object|null) => void)[];
   #parsedURLInternal?: Common.ParsedURL.ParsedURL;
@@ -245,12 +244,10 @@ export class Resource implements TextUtils.ContentProvider.ContentProvider {
           {frameId: this.frameId as Protocol.Page.FrameId, url: this.url});
       const protocolError = response.getError();
       if (protocolError) {
-        this.#contentLoadError = protocolError;
         this.#contentInternal = null;
         loadResult = {content: null, error: protocolError, isEncoded: false};
       } else {
         this.#contentInternal = response.content;
-        this.#contentLoadError = null;
         loadResult = {content: response.content, isEncoded: response.base64Encoded};
       }
       this.#contentEncodedInternal = response.base64Encoded;

package/front_end/core/sdk/ResourceTreeModel.ts

@@ -604,7 +604,6 @@ export class ResourceTreeFrame {
   #urlInternal: string;
   #domainAndRegistryInternal: string;
   #securityOriginInternal: string|null;
-  #mimeType: string|null;
   #unreachableUrlInternal: string;
   #adFrameStatusInternal?: Protocol.Page.AdFrameStatus;
   #secureContextType: Protocol.Page.SecureContextType|null;
@@ -632,7 +631,6 @@ export class ResourceTreeFrame {
     this.#urlInternal = (payload && payload.url) || '';
     this.#domainAndRegistryInternal = (payload && payload.domainAndRegistry) || '';
     this.#securityOriginInternal = payload && payload.securityOrigin;
-    this.#mimeType = payload && payload.mimeType;
     this.#unreachableUrlInternal = (payload && payload.unreachableUrl) || '';
     this.#adFrameStatusInternal = payload?.adFrameStatus;
     this.#secureContextType = payload && payload.secureContextType;
@@ -685,7 +683,6 @@ export class ResourceTreeFrame {
     this.#urlInternal = framePayload.url;
     this.#domainAndRegistryInternal = framePayload.domainAndRegistry;
     this.#securityOriginInternal = framePayload.securityOrigin;
-    this.#mimeType = framePayload.mimeType;
     this.#unreachableUrlInternal = framePayload.unreachableUrl || '';
     this.#adFrameStatusInternal = framePayload?.adFrameStatus;
     this.#secureContextType = framePayload.secureContextType;

package/front_end/core/sdk/ServiceWorkerManager.ts

@@ -98,7 +98,6 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 const i18nLazyString = i18n.i18n.getLazilyComputedLocalizedString.bind(undefined, str_);
 
 export class ServiceWorkerManager extends SDKModel<EventTypes> {
-  readonly #lastAnonymousTargetId: number;
   readonly #agent: ProtocolProxyApi.ServiceWorkerApi;
   readonly #registrationsInternal: Map<string, ServiceWorkerRegistration>;
   #enabled: boolean;
@@ -111,7 +110,6 @@ export class ServiceWorkerManager extends SDKModel<EventTypes> {
   constructor(target: Target) {
     super(target);
     target.registerServiceWorkerDispatcher(new ServiceWorkerDispatcher(this));
-    this.#lastAnonymousTargetId = 0;
     this.#agent = target.serviceWorkerAgent();
     this.#registrationsInternal = new Map();
     this.#enabled = false;

package/front_end/core/sdk/sdk-legacy.ts

@@ -73,9 +73,6 @@ SDK.ConsoleMessage.FrontendMessageSource = SDKModule.ConsoleModel.FrontendMessag
 /** @constructor */
 SDK.Cookie = SDKModule.Cookie.Cookie;
 
-/** @constructor */
-SDK.CookieReference = SDKModule.Cookie.CookieReference;
-
 /** @constructor */
 SDK.CookieParser = SDKModule.CookieParser.CookieParser;
 

package/front_end/devtools_compatibility.js

@@ -389,7 +389,6 @@
     ExperimentEnabledAtLaunch: 'DevTools.ExperimentEnabledAtLaunch',
     ExperimentEnabled: 'DevTools.ExperimentEnabled',
     ExperimentDisabled: 'DevTools.ExperimentDisabled',
-    CssEditorOpened: 'DevTools.CssEditorOpened',
     DeveloperResourceLoaded: 'DevTools.DeveloperResourceLoaded',
     DeveloperResourceScheme: 'DevTools.DeveloperResourceScheme',
     LinearMemoryInspectorRevealedFrom: 'DevTools.LinearMemoryInspector.RevealedFrom',
@@ -401,6 +400,7 @@
     RecordingReplayFinished: 'DevTools.RecordingReplayFinished',
     RecordingReplayStarted: 'DevTools.RecordingReplayStarted',
     RecordingToggled: 'DevTools.RecordingToggled',
+    SyncSetting: 'DevTools.SyncSetting',
   };
 
   /**

package/front_end/entrypoints/devtools_app/{devtools_app-meta-files.ts → devtools_app.ts}

@@ -1,7 +1,7 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright 2018 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/css_overview/css_overview-meta.js';
 import '../../panels/elements/elements-meta.js';
 import '../../panels/browser_debugger/browser_debugger-meta.js';
@@ -25,3 +25,10 @@ import '../../panels/timeline/timeline-meta.js';
 import '../../panels/web_audio/web_audio-meta.js';
 import '../../panels/webauthn/webauthn-meta.js';
 import '../../panels/layer_viewer/layer_viewer-meta.js';
+
+import * as Root from '../../core/root/root.js';
+import * as Main from '../main/main.js';
+
+// @ts-ignore Exposed for legacy layout tests
+self.runtime = Root.Runtime.Runtime.instance({forceNew: true});
+new Main.MainImpl.MainImpl();

package/front_end/entrypoints/heap_snapshot_worker/HeapSnapshot.ts

@@ -909,7 +909,8 @@ export abstract class HeapSnapshot {
       return matchedStringIndexes;
     }
 
-    const regexp = searchConfig.isRegex ? new RegExp(query) : createPlainTextSearchRegex(query, 'i');
+    const regexp =
+        searchConfig.isRegex ? new RegExp(query) : Platform.StringUtilities.createPlainTextSearchRegex(query, 'i');
 
     function filterRegexp(matchedStringIndexes: Set<number>, string: string, index: number): Set<number> {
       if (regexp.test(string)) {

package/front_end/entrypoints/inspector/{inspector.js → inspector.ts}

@@ -3,6 +3,3 @@
 // found in the LICENSE file.
 import '../devtools_app/devtools_app.js';
 import '../../panels/screencast/screencast-meta.js';
-import * as Startup from '../startup/startup.js';
-
-Startup.RuntimeInstantiator.startApplication('inspector');

package/front_end/entrypoints/js_app/{JsMain.ts → js_app.ts}

@@ -1,12 +1,15 @@
 // Copyright 2018 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/js_profiler/js_profiler-meta.js';
 
 import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Components from '../../ui/legacy/components/utils/utils.js';
+import * as Main from '../main/main.js';
 
 const UIStrings = {
   /**
@@ -15,7 +18,7 @@ const UIStrings = {
   main: 'Main',
 };
 
-const str_ = i18n.i18n.registerUIStrings('entrypoints/js_app/JsMain.ts', UIStrings);
+const str_ = i18n.i18n.registerUIStrings('entrypoints/js_app/js_app.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 let jsMainImplInstance: JsMainImpl;
@@ -41,3 +44,4 @@ export class JsMainImpl implements Common.Runnable.Runnable {
 }
 
 Common.Runnable.registerEarlyInitializationRunnable(JsMainImpl.instance);
+new Main.MainImpl.MainImpl();

package/front_end/entrypoints/main/MainImpl.ts

@@ -139,7 +139,6 @@ export class MainImpl {
 
   private async loaded(): Promise<void> {
     console.timeStamp('Main._loaded');
-    await Root.Runtime.appStarted;
     Root.Runtime.Runtime.setPlatform(Host.Platform.platform());
     const prefs = await new Promise<{[key: string]: string}>(resolve => {
       Host.InspectorFrontendHost.InspectorFrontendHostInstance.getPreferences(resolve);

package/front_end/entrypoints/ndb_app/{ndb_app.js → ndb_app.ts}

@@ -4,7 +4,5 @@
 import '../shell/shell.js';
 
 import * as Main from '../main/main.js';
-import * as Startup from '../startup/startup.js';
 
 new Main.MainImpl.MainImpl();
-Startup.RuntimeInstantiator.startApplication('ndb_app');

package/front_end/entrypoints/{node_main → node_app}/NodeConnectionsPanel.ts

@@ -32,7 +32,7 @@ const UIStrings = {
   */
   networkAddressEgLocalhost: 'Network address (e.g. localhost:9229)',
 };
-const str_ = i18n.i18n.registerUIStrings('entrypoints/node_main/NodeConnectionsPanel.ts', UIStrings);
+const str_ = i18n.i18n.registerUIStrings('entrypoints/node_app/NodeConnectionsPanel.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 let nodeConnectionsPanelInstance: NodeConnectionsPanel;