chrome-devtools-frontend 1.0.965611 → 1.0.967596

package/front_end/third_party/codemirror/README.chromium

@@ -20,3 +20,8 @@ wget -qO- https://registry.npmjs.org/codemirror/-/codemirror-5.61.0.tgz | tar xz
 Local changes applied:
 - Run `wget -qOpackage/mode/wast/wast.js https://raw.githubusercontent.com/codemirror/CodeMirror/0bf9231f90925acc7b273ef9aaf89730ddf6e07b/mode/wast/wast.js` to synchronize unreleased changes for WebAssembly disassembly syntax highlighting.
 - Some files have a `.d.ts` file added, as they are used during TypeScript compilation
+- Change extension of following files from `.js` to `.mjs`.
+  - package/addon/runmode/runmode-standalone.js
+  - package/mode/css/css.js
+  - package/mode/javascript/javascript.js
+  - package/mode/xml/xml.js

package/front_end/third_party/codemirror/codemirror-tsconfig.json

@@ -3,9 +3,9 @@
     "composite": true
   },
   "files": [
-    "package/addon/runmode/runmode-standalone.js",
-    "package/mode/css/css.js",
-    "package/mode/javascript/javascript.js",
-    "package/mode/xml/xml.js"
+    "package/addon/runmode/runmode-standalone.mjs",
+    "package/mode/css/css.mjs",
+    "package/mode/javascript/javascript.mjs",
+    "package/mode/xml/xml.mjs"
   ]
 }

package/front_end/third_party/lighthouse/README.chromium

@@ -5,4 +5,3 @@ License: Apache License 2.0
 Security Critical: no
 
 This directory contains Chromium's version of the lighthouse report assets, including renderer.
-

package/front_end/third_party/lighthouse/lighthouse-tsconfig.json

@@ -4,7 +4,7 @@
   },
   "files": [
     "report-assets/report.js",
-    "report-assets/report-generator.js",
+    "report-assets/report-generator.mjs",
     "lighthouse-dt-bundle.js"
   ]
 }

package/front_end/third_party/puppeteer/puppeteer.ts

@@ -4,7 +4,7 @@
 
 import { Browser } from './package/lib/esm/puppeteer/common/Browser.js';
 import { Connection } from './package/lib/esm/puppeteer/common/Connection.js';
-import { ConnectionTransport } from './package/lib/esm/puppeteer/common/ConnectionTransport.js';
+import { type ConnectionTransport } from './package/lib/esm/puppeteer/common/ConnectionTransport.js';
 import { Frame } from './package/lib/esm/puppeteer/common/FrameManager.js';
 import { ElementHandle } from './package/lib/esm/puppeteer/common/JSHandle.js';
 import { Page } from './package/lib/esm/puppeteer/common/Page.js';
@@ -17,4 +17,3 @@ export {
   Frame,
   Page,
 };
-

package/front_end/ui/components/text_editor/config.ts

@@ -188,6 +188,7 @@ function detectLineSeparator(text: string): CM.Extension {
 
 const baseKeymap = CM.keymap.of([
   {key: 'Tab', run: CM.acceptCompletion},
+  {key: 'End', run: CM.acceptCompletion},
   {key: 'Ctrl-m', run: CM.cursorMatchingBracket, shift: CM.selectMatchingBracket},
   {key: 'Mod-/', run: CM.toggleComment},
   {key: 'Mod-d', run: CM.selectNextOccurrence},

package/front_end/ui/legacy/Icon.ts

@@ -131,8 +131,8 @@ const initialDescriptors = new Map<string, Descriptor>([
   ['smallicon-warning', {position: 'd1', spritesheet: 'smallicons'}],
   ['smallicon-network-product', {position: 'e1', spritesheet: 'smallicons'}],
   ['smallicon-clear-warning', {position: 'f1', spritesheet: 'smallicons', isMask: true}],
-  ['smallicon-clear-info', {position: 'f2', spritesheet: 'smallicons'}],
-  ['smallicon-clear-error', {position: 'f3', spritesheet: 'smallicons'}],
+  ['smallicon-clear-info', {position: 'f2', spritesheet: 'smallicons', isMask: true}],
+  ['smallicon-clear-error', {position: 'f3', spritesheet: 'smallicons', isMask: true}],
   ['smallicon-account-circle', {position: 'f4', spritesheet: 'smallicons'}],
   ['smallicon-videoplayer-paused', {position: 'f6', spritesheet: 'smallicons', isMask: true}],
   ['smallicon-videoplayer-playing', {position: 'g6', spritesheet: 'smallicons', isMask: true}],

package/front_end/ui/legacy/components/cookie_table/CookiesTable.ts

@@ -677,7 +677,7 @@ export class CookiesTable extends UI.Widget.VBox {
       cookie.addAttribute(
           SDK.Cookie.Attributes.SourcePort, Number.parseInt(data[SDK.Cookie.Attributes.SourcePort], 10) || undefined);
     }
-    if (SDK.Cookie.Attributes.PartitionKey in data) {
+    if (data[SDK.Cookie.Attributes.PartitionKey]) {
       cookie.addAttribute(SDK.Cookie.Attributes.PartitionKey, data[SDK.Cookie.Attributes.PartitionKey]);
     }
     cookie.setSize(data[SDK.Cookie.Attributes.Name].length + data[SDK.Cookie.Attributes.Value].length);

package/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.ts

@@ -1612,12 +1612,12 @@ export class Renderer implements UI.UIUtils.Renderer {
     return rendererInstance;
   }
 
-  render(object: Object, options?: UI.UIUtils.Options): Promise<{
+  async render(object: Object, options?: UI.UIUtils.Options): Promise<{
     node: Node,
     tree: UI.TreeOutline.TreeOutline|null,
   }|null> {
     if (!(object instanceof SDK.RemoteObject.RemoteObject)) {
-      return Promise.reject(new Error('Can\'t render ' + object));
+      throw new Error('Can\'t render ' + object);
     }
     options = options || {title: undefined, editable: undefined};
     const title = options.title;
@@ -1626,10 +1626,10 @@ export class Renderer implements UI.UIUtils.Renderer {
       section.titleLessMode();
     }
     section.editable = Boolean(options.editable);
-    return Promise.resolve(({node: section.element, tree: section} as {
+    return {node: section.element, tree: section} as {
       node: Node,
       tree: UI.TreeOutline.TreeOutline | null,
-    } | null));
+    } | null;
   }
 }
 

package/front_end/ui/legacy/themeColors.css

@@ -267,7 +267,7 @@
   --color-input-text-disabled: rgba(128 134 139 / 70%);
   /* Colors for styling buttons */
   --color-button-outline-focus: rgb(138 180 248 / 75%);
-  --color-button-primary-background-hovering: rgb(174 203 250 / 100%);
+  --color-button-primary-background-hovering: rgb(128 167 229 / 100%);
   --color-button-primary-background-pressed: rgb(210 227 252 / 100%);
   --color-button-primary-text: rgb(0 0 0);
   --color-button-secondary-background-hovering: rgb(138 180 248 / 15%);

package/package.json

@@ -39,6 +39,7 @@
     "debug-unittest": "DEBUG_TEST=1 npm run unittest",
     "e2etest": "third_party/node/node.py --output scripts/test/run_test_suite.js --config=test/e2e/test-runner-config.json",
     "eslint-test": "third_party/node/node.py --output node_modules/mocha/bin/mocha \"./scripts/eslint_rules/tests/*_test.js\"",
+    "build-test": "third_party/node/node.py --output node_modules/mocha/bin/mocha \"./scripts/build/tests/*_test.js\"",
     "generate-dark-mode-styles": "third_party/node/node.py --output scripts/dark_mode/generate_dark_theme_sheet.js",
     "generate-protocol-resources": "scripts/deps/generate_protocol_resources.py && git cl format --js",
     "install-deps": "scripts/deps/manage_node_deps.py",
@@ -53,5 +54,5 @@
     "unittest": "scripts/test/run_unittests.py --no-text-coverage",
     "watch": "third_party/node/node.py --output scripts/watch_build.js"
   },
-  "version": "1.0.965611"
+  "version": "1.0.967596"
 }

package/scripts/build/devtools_plugin.js

@@ -42,6 +42,17 @@ function devtoolsPlugin(source, importer) {
   if (!importer) {
     return null;
   }
+
+  if (source === '../../lib/codemirror' || !source.startsWith('.')) {
+    // These are imported via require(...), but we don't use
+    // @rollup/plugin-commonjs. So this check is not necessary for rollup. But
+    // need to have this for esbuild as it doesn't ignore require(...).
+    return {
+      id: source,
+      external: true,
+    };
+  }
+
   const currentDirectory = path.normalize(dirnameWithSeparator(importer));
   const importedFilelocation = path.normalize(path.join(currentDirectory, source));
   const importedFileDirectory = dirnameWithSeparator(importedFilelocation);

package/scripts/build/esbuild.js

@@ -0,0 +1,63 @@
+// Copyright 2022 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.
+
+// @ts-check
+
+const path = require('path');
+
+const devtools_paths = require('../devtools_paths.js');
+const devtools_plugin = require('./devtools_plugin.js');
+
+// esbuild module uses binary in this path.
+process.env.ESBUILD_BINARY_PATH = path.join(devtools_paths.devtoolsRootPath(), 'third_party', 'esbuild', 'esbuild');
+
+const entryPoints = [process.argv[2]];
+const outfile = process.argv[3];
+
+const outdir = path.dirname(outfile);
+
+const plugin = {
+  name: 'devtools-plugin',
+  setup(build) {
+    // https://esbuild.github.io/plugins/#on-resolve
+    build.onResolve({filter: /.*/}, args => {
+      const res = devtools_plugin.devtoolsPlugin(args.path, args.importer);
+      if (!res) {
+        return null;
+      }
+
+      if (res.external) {
+        // res.id can be both of absolutized local JavaScript path or node's
+        // builtin module (e.g. 'fs', 'path'), and only relativize the path in
+        // former case.
+        if (path.isAbsolute(res.id)) {
+          res.id = './' + path.relative(outdir, res.id);
+        }
+
+        return {
+          external: res.external,
+          path: res.id,
+        };
+      }
+
+      return {
+        path: res.id,
+      };
+    });
+  },
+};
+
+require('esbuild')
+    .build({
+      entryPoints,
+      outfile,
+      bundle: true,
+      format: 'esm',
+      platform: 'browser',
+      plugins: [plugin],
+    })
+    .catch(err => {
+      console.error('failed to run esbuild:', err);
+      process.exit(1);
+    });

package/scripts/build/ninja/bundle.gni

@@ -2,46 +2,91 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("../../../third_party/typescript/typescript.gni")
 import("./node.gni")
 import("./vars.gni")
 
+declare_args() {
+  # If this is enabled, devtools build uses esbuild instead of rollup.js to
+  # bundle JavaScript files.
+  devtools_fast_bundle = devtools_skip_typecheck
+}
+
+assert(!(devtools_fast_bundle && is_official_build),
+       "Official build should not bundle with esbuild")
+
 template("bundle") {
   assert(defined(invoker.entrypoint),
          "You must define the 'entrypoint' for a bundle target")
 
-  node_action(target_name) {
-    script = "node_modules/rollup/dist/bin/rollup"
-
-    forward_variables_from(invoker,
-                           [
-                             "visibility",
-                             "deps",
-                             "public_deps",
-                           ])
-
-    inputs = [
-      invoker.entrypoint,
-      devtools_location_prepend + "scripts/build/rollup.config.js",
-    ]
-
-    args = [
-      # TODO(crbug.com/1098074): We need to hide warnings that are written stderr,
-      # as Chromium does not process the returncode of the subprocess correctly
-      # and instead looks if `stderr` is empty.
-      "--silent",
-      "--config",
-      rebase_path(devtools_location_prepend + "scripts/build/rollup.config.js",
-                  root_build_dir),
-      "--input",
-      rebase_path(invoker.entrypoint, root_build_dir),
-      "--file",
-      rebase_path(invoker.output_file_location, root_build_dir),
-    ]
-
-    if (!devtools_dcheck_always_on) {
-      args += [ "--configDCHECK" ]
+  if (devtools_fast_bundle) {
+    node_action(target_name) {
+      script = "scripts/build/esbuild.js"
+      forward_variables_from(invoker,
+                             [
+                               "visibility",
+                               "deps",
+                               "public_deps",
+                             ])
+
+      inputs = [
+        invoker.entrypoint,
+        devtools_location_prepend + "scripts/build/devtools_plugin.js",
+        devtools_location_prepend + "scripts/devtools_paths.js",
+      ]
+
+      _esbuild = devtools_location_prepend + "third_party/esbuild/esbuild"
+      if (host_os == "win") {
+        inputs += [ _esbuild + ".exe" ]
+      } else {
+        inputs += [ _esbuild ]
+      }
+
+      args = [
+        rebase_path(invoker.entrypoint, root_build_dir),
+        rebase_path(invoker.output_file_location, root_build_dir),
+      ]
+
+      outputs = [ invoker.output_file_location ]
     }
+  } else {
+    node_action(target_name) {
+      script = "node_modules/rollup/dist/bin/rollup"
+
+      forward_variables_from(invoker,
+                             [
+                               "visibility",
+                               "deps",
+                               "public_deps",
+                             ])
+
+      inputs = [
+        invoker.entrypoint,
+        devtools_location_prepend + "scripts/build/rollup.config.js",
+        devtools_location_prepend + "scripts/build/devtools_plugin.js",
+        devtools_location_prepend + "scripts/devtools_paths.js",
+      ]
 
-    outputs = [ invoker.output_file_location ]
+      args = [
+        # TODO(crbug.com/1098074): We need to hide warnings that are written stderr,
+        # as Chromium does not process the returncode of the subprocess correctly
+        # and instead looks if `stderr` is empty.
+        "--silent",
+        "--config",
+        rebase_path(
+            devtools_location_prepend + "scripts/build/rollup.config.js",
+            root_build_dir),
+        "--input",
+        rebase_path(invoker.entrypoint, root_build_dir),
+        "--file",
+        rebase_path(invoker.output_file_location, root_build_dir),
+      ]
+
+      if (!devtools_dcheck_always_on) {
+        args += [ "--configDCHECK" ]
+      }
+
+      outputs = [ invoker.output_file_location ]
+    }
   }
 }

package/scripts/build/ninja/minify-json-files.js

@@ -0,0 +1,19 @@
+// Copyright 2022 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.
+
+const fs = require('fs');
+const path = require('path');
+const {writeIfChanged} = require('./write-if-changed.js');
+
+const [, , src, dest, files] = process.argv;
+
+for (const file of files.split(',')) {
+  const srcPath = path.join(src, file);
+  const destPath = path.join(dest, file);
+
+  // Minifying JSON is straight-forward as JSON.stringify omits whitespace.
+  const srcContents = fs.readFileSync(srcPath);
+  const destContents = JSON.stringify(JSON.parse(srcContents));
+  writeIfChanged(destPath, destContents);
+}

package/scripts/build/ninja/minify_json.gni

@@ -0,0 +1,28 @@
+# Copyright 2022 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("./node.gni")
+import("./vars.gni")
+
+template("minify_json") {
+  node_action(target_name) {
+    forward_variables_from(invoker, [ "sources" ])
+
+    script = "scripts/build/ninja/minify-json-files.js"
+
+    _src = rebase_path(".", root_build_dir)
+    _dest = rebase_path(target_gen_dir, root_build_dir)
+
+    args = [
+      _src,
+      _dest,
+      string_join(",", sources),
+    ]
+
+    outputs = []
+    foreach(_input, sources) {
+      outputs += [ "$target_gen_dir/$_input" ]
+    }
+  }
+}

package/scripts/build/tests/plugins_test.js

@@ -0,0 +1,30 @@
+// Copyright 2022 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.
+
+const {assert} = require('chai');
+const path = require('path');
+
+const {devtoolsPlugin} = require('../devtools_plugin.js');
+
+describe('devtools_plugin can compute paths with', () => {
+  it('same directory import', () => {
+    assert.deepEqual(
+        devtoolsPlugin('./AnotherFile.js', 'front_end/core/sdk/FirstFile.js'),
+        {id: path.join('front_end', 'core', 'sdk', 'AnotherFile.js'), external: false});
+  });
+
+  it('different directory import', () => {
+    assert.deepEqual(
+        devtoolsPlugin('../common/common.js', 'front_end/core/sdk/FirstFile.js'),
+        {id: path.join('front_end', 'core', 'common', 'common.js'), external: true});
+  });
+
+  it('node built-in modules', () => {
+    assert.deepEqual(devtoolsPlugin('fs', 'scripts/some-script.js'), {id: 'fs', external: true});
+  });
+
+  it('importing generated files', () => {
+    assert.strictEqual(devtoolsPlugin('../../generated/Protocol.js', 'front_end/core/sdk/FirstFile.js'), null);
+  });
+});

package/scripts/javascript_natives/index.js

@@ -10,11 +10,14 @@ import * as WebIDL2 from 'webidl2';
 
 import {parseTSFunction, postProcess, walkRoot} from './helpers.js';
 
-const program = ts.createProgram(
-    [
-      new URL('node_modules/typescript/lib/lib.esnext.d.ts', import.meta.url).pathname,
-    ],
-    {noLib: false, types: []});
+if (process.argv.length !== 4) {
+  throw new Error('Please provide path to chromium/src and devtools-frontend');
+}
+
+const chromiumSource = process.argv[2];
+const typescriptSource = process.argv[3] + 'node_modules/typescript/lib/lib.esnext.d.ts';
+
+const program = ts.createProgram([typescriptSource], {noLib: false, types: []});
 
 for (const file of program.getSourceFiles()) {
   ts.forEachChild(file, node => {
@@ -36,7 +39,7 @@ for (const file of program.getSourceFiles()) {
 // `devtools/devtools-frontend`, where `devtools` is on the same level
 // as `chromium`. This matches `scripts/npm_test.js`.
 const files =
-    glob.sync('../../../../chromium/src/third_party/blink/renderer/+(core|modules)/**/*.idl', {cwd: process.env.PWD});
+    glob.sync(`${chromiumSource}/third_party/blink/renderer/+(core|modules)/**/*.idl`, {cwd: process.env.PWD});
 
 for (const file of files) {
   if (file.includes('testing')) {

package/scripts/javascript_natives/package.json

@@ -7,10 +7,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@types/webidl2": "^23.13.6",
-    "glob": "^7.1.2",
-    "mocha": "^9.1.4",
+    "@types/webidl2": "23.13.6",
+    "glob": "7.1.7",
+    "mocha": "9.1.3",
     "typescript": "latest",
-    "webidl2": "^24.2.0"
+    "webidl2": "24.2.0"
   }
 }