Skip to content

Commit 78ed361

Browse files
authored
Merge branch 'ChromeDevTools:main' into main
2 parents d34686d + 0987a35 commit 78ed361

File tree

357 files changed

+7066
-7242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

357 files changed

+7066
-7242
lines changed

DEPS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ vars = {
1515
'build_revision': 'e13953ced04ed05f45aa3c961bd6d802aced74ec',
1616

1717
'buildtools_url': 'https://chromium.googlesource.com/chromium/src/buildtools.git',
18-
'buildtools_revision': '077a66f30fcf281b066fafb6dfc60818c238efb6',
18+
'buildtools_revision': 'e9b36e9ffb02b268d194c3f82f89952d09d0c714',
1919

2020
'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
21-
'depot_tools_revision': '977c37458fda472d8822a8b57e4a83a7bc747471',
21+
'depot_tools_revision': 'f810dae27200e4209bd0cba85bd2266ec0d55312',
2222

2323
'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
2424
'inspector_protocol_revision': '6d1ae0f13aae6ad381ca31b17b88a0f5af29ca94',
@@ -32,7 +32,7 @@ vars = {
3232
'emscripten_tag': 'ade9d780ff17c88d81aa13860361743e3c1e1396',
3333

3434
# GN CIPD package version.
35-
'gn_version': 'git_revision:487f8353f15456474437df32bb186187b0940b45',
35+
'gn_version': 'git_revision:0c25d1bbde6ef17e1e6d3938011f56a00c02e457',
3636

3737
'cmake_version': 'version:2@3.21.3',
3838

@@ -49,7 +49,7 @@ vars = {
4949
# Chrome version used for tests. It should be regularly updated to
5050
# match the Canary version listed here:
5151
# https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json
52-
'chrome': '138.0.7171.0',
52+
'chrome': '138.0.7182.0',
5353

5454
# 'magic' text to tell depot_tools that git submodules should be accepted but
5555
# but parity with DEPS file is expected.
@@ -59,7 +59,7 @@ vars = {
5959
'non_git_source': 'True',
6060

6161
# siso CIPD package version
62-
'siso_version': 'git_revision:17b491ae74e86312a96239ff88e852acee83c135',
62+
'siso_version': 'git_revision:30ea210712239b874febcadf661f118fc2c0f6d7',
6363
}
6464

6565
# Only these hosts are allowed for dependencies in this DEPS file.

buildtools

Submodule buildtools updated from 077a66f to e9b36e9

config/gni/devtools_grd_files.gni

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,7 @@ grd_files_release_sources = [
565565
"front_end/models/issues_manager/descriptions/sriValidationFailedSignatureMismatch.md",
566566
"front_end/models/issues_manager/descriptions/stylesheetLateImport.md",
567567
"front_end/models/issues_manager/descriptions/stylesheetRequestFailed.md",
568+
"front_end/models/issues_manager/descriptions/userReidentificationBlocked.md",
568569
"front_end/models/issues_manager/issues_manager.js",
569570
"front_end/models/javascript_metadata/javascript_metadata.js",
570571
"front_end/models/live-metrics/live-metrics.js",
@@ -802,6 +803,7 @@ grd_files_release_sources = [
802803
"front_end/ui/components/report_view/report_view.js",
803804
"front_end/ui/components/request_link_icon/request_link_icon.js",
804805
"front_end/ui/components/settings/settings.js",
806+
"front_end/ui/components/snackbars/snackbars.js",
805807
"front_end/ui/components/spinners/spinners.js",
806808
"front_end/ui/components/srgb_overlay/srgb_overlay.js",
807809
"front_end/ui/components/suggestion_input/suggestion_input.js",
@@ -1106,6 +1108,7 @@ grd_files_debug_sources = [
11061108
"front_end/models/issues_manager/SharedDictionaryIssue.js",
11071109
"front_end/models/issues_manager/SourceFrameIssuesManager.js",
11081110
"front_end/models/issues_manager/StylesheetLoadingIssue.js",
1111+
"front_end/models/issues_manager/UserReidentificationIssue.js",
11091112
"front_end/models/javascript_metadata/JavaScriptMetadata.js",
11101113
"front_end/models/javascript_metadata/NativeFunctions.js",
11111114
"front_end/models/live-metrics/LiveMetrics.js",
@@ -1312,7 +1315,7 @@ grd_files_debug_sources = [
13121315
"front_end/panels/application/SharedStorageModel.js",
13131316
"front_end/panels/application/SharedStorageTreeElement.js",
13141317
"front_end/panels/application/StorageBucketsTreeElement.js",
1315-
"front_end/panels/application/StorageItemsView.js",
1318+
"front_end/panels/application/StorageItemsToolbar.js",
13161319
"front_end/panels/application/StorageView.js",
13171320
"front_end/panels/application/TrustTokensTreeElement.js",
13181321
"front_end/panels/application/appManifestView.css.js",
@@ -1657,6 +1660,7 @@ grd_files_debug_sources = [
16571660
"front_end/panels/network/RequestResponseView.js",
16581661
"front_end/panels/network/RequestTimingView.js",
16591662
"front_end/panels/network/ResourceChunkView.js",
1663+
"front_end/panels/network/ResourceDirectSocketChunkView.js",
16601664
"front_end/panels/network/ResourceWebSocketFrameView.js",
16611665
"front_end/panels/network/SignedExchangeInfoView.js",
16621666
"front_end/panels/network/binaryResourceView.css.js",
@@ -2389,6 +2393,8 @@ grd_files_debug_sources = [
23892393
"front_end/ui/components/settings/SettingDeprecationWarning.js",
23902394
"front_end/ui/components/settings/settingCheckbox.css.js",
23912395
"front_end/ui/components/settings/settingDeprecationWarning.css.js",
2396+
"front_end/ui/components/snackbars/Snackbar.js",
2397+
"front_end/ui/components/snackbars/snackbar.css.js",
23922398
"front_end/ui/components/spinners/Spinner.js",
23932399
"front_end/ui/components/spinners/spinner.css.js",
23942400
"front_end/ui/components/srgb_overlay/SrgbOverlay.js",

docs/contributing/changes.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ Step-by-step guide on how to merge:
130130

131131
1. Request approval to merge by adding the milestone to the `Merge-Request` filed of the relevant crbug. A bot will come by and either ask for more info ([example](http://crbug.com/1123307#c1)) or approve the request.
132132
1. Backmerges are done to the `chromium/xxxx` (e.g. `chromium/3979`) branch on the DevTools frontend repo.
133-
Use <https://chromiumdash.appspot.com/branches> or [Omahaproxy](https://omahaproxy.appspot.com/)
134-
to find out what branch a major Chromium version has (column `true_branch`).
133+
Use <https://chromiumdash.appspot.com/branches> to find out what branch a major Chromium version has (column `Devtools`).
135134
1. Open the to-be-merged commit in Gerrit
136135
([example](https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1928912)).
137136
1. Click the hamburger menu on the top right and select “Cherry pick”.

docs/cookbook/localization.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ const UIStrings = {
280280
## How to prevent a term being localized
281281
282282
Any text within the backticks will not be translated. For example, if the
283-
'robots.txt' in string 'Requesting for robots.txt ...' should not be translated:
283+
'robots.txt' in string 'Requesting for robots.txt ' should not be translated:
284284
285285
```javascript
286286
// in example.js file
@@ -290,15 +290,15 @@ const UIStrings = {
290290
/**
291291
* @description Example description. Note: "robots.txt" is a canonical filename and should not be translated.
292292
*/
293-
requestMessage: 'Requesting for `robots.txt` ...',
293+
requestMessage: 'Requesting for `robots.txt` ',
294294
};
295295
const str_ = i18n.i18n.registerUIStrings('example.js', UIStrings);
296296

297297
const message = i18nString(UIStrings.requestMessage);
298298
```
299299
300300
The string will rendered with robots.txt not translated and without the
301-
backticks around it `js 'Requesting for robots.txt ...'`
301+
backticks around it `js 'Requesting for robots.txt '`
302302
303303
### Phrases that are fully locked
304304

docs/styleguide/ux/components.md

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ space.
6565
[`Toolbars`](https://source.chromium.org/chromium/chromium/src/+/main:third_party/devtools-frontend/src/front_end/ui/legacy/Toolbar.ts).
6666
Underneath they make use of `devtools-button`.
6767

68-
###### Don'ts
68+
###### Don't
6969

7070
* Use `<button>`, as they are not styled correctly
7171
* Change the default color of icons (only in exceptions)
@@ -155,15 +155,13 @@ button.addEventListener('click', event => onClick(event));
155155
if necessary, together with core styles.
156156
* Override inherited `width` with CSS if necessary.
157157

158-
###### Don'ts
158+
###### Don't
159159

160160
* Override the default colors.
161161
* Introduce custom select components.
162162

163163
##### Developer examples
164164

165-
###### Primary button
166-
167165
Usage with lit-html:
168166

169167
```js
@@ -205,14 +203,12 @@ select.addEventListener('change', event => onChange(event))
205203
nested within a [`<label>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label)
206204
for radio buttons, together with core styles.
207205

208-
###### Don'ts
206+
###### Don't
209207

210208
* Override the default colors.
211209

212210
##### Developer examples
213211

214-
###### Primary button
215-
216212
Usage with lit-html:
217213

218214
```js
@@ -242,14 +238,12 @@ radio.addEventListener('change', event => onChange(event))
242238
* Use [`<input type="range">`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/range)
243239
for sliders, together with core styles.
244240

245-
###### Don'ts
241+
###### Don't
246242

247243
* Override the default colors.
248244

249245
##### Developer examples
250246

251-
###### Primary button
252-
253247
Usage with lit-html:
254248

255249
```js
@@ -267,3 +261,40 @@ const slider = UI.UIUtils.createSlider(min, max, tabIndex);
267261
slider.addEventListener('change', event => onChange(event))
268262
```
269263

264+
## Icons
265+
266+
![Icon component (variety of icons)](images/icons-header.png)
267+
268+
### Usage
269+
270+
#### Designer guidelines
271+
272+
Find an exhaustive collection of icons currently used in DevTools [here](https://drive.google.com/corp/drive/folders/1EpmxLRjvdHn5Ia8iT3aicgIEPEvhXY_D?resourcekey=0-QseNsNRsF4w8F5EKz7ncnA)
273+
274+
#### Developer guidelines
275+
276+
##### Dos and Don'ts
277+
278+
###### Do
279+
280+
* Set class and change color and / or size in .css files
281+
282+
###### Don't
283+
284+
* Use icons as buttons
285+
* Use Icon constructor and data setter (deprecated)
286+
* Use inline styles e.g. `js icon.style.color = ‘some-color’`
287+
288+
##### Developer examples
289+
290+
Usage with lit-html:
291+
292+
```js
293+
html`<devtools-icon name=${'some-icon-name'}></devtools-icon>`
294+
```
295+
296+
Usage with the imperative API:
297+
298+
```js
299+
const someIcon = IconButton.Icon.create('some-icon-name', 'some-class');
300+
```
42.9 KB
Loading

docs/ui_engineering.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ For backwards compatibility, the first argument to `widgetConfig` can also be a
4444

4545
```html
4646
<devtools-widget .widgetConfig=${widgetConfig(ElementsPanel)}>
47-
<devtools-split-widget>
47+
<devtools-split-view>
4848
<devtools-widget slot="main" .widgetConfig=${widgetConfig(ElementsTree)}></devtools-widget>
4949
<devtools-tab-pane slot="sidebar">
5050
<devtools-widget .widgetConfig=${widgetConfig(StylesPane, {element: input.element})}></devtools-widget>
5151
<devtools-widget .widgetConfig=${widgetConfig(ComputedPane, {element: input.element})}></devtools-widget>
5252
...
5353
</devtools-tab-pane>
54-
</devtools-split-widget>
54+
</devtools-split-view>
5555
</devtools-widget>
5656
```
5757

eslint.config.mjs

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
// found in the LICENSE file.
44

55
import stylisticPlugin from '@stylistic/eslint-plugin';
6-
import typescriptPlugin from '@typescript-eslint/eslint-plugin';
7-
import tsParser from '@typescript-eslint/parser';
86
import { defineConfig, globalIgnores } from 'eslint/config';
97
import eslintPlugin from 'eslint-plugin-eslint-plugin';
108
import importPlugin from 'eslint-plugin-import';
119
import jsdocPlugin from 'eslint-plugin-jsdoc';
1210
import mochaPlugin from 'eslint-plugin-mocha';
1311
import globals from 'globals';
1412
import { join } from 'path';
13+
import typescriptEslint from 'typescript-eslint';
1514

1615
import rulesdirPlugin from './scripts/eslint_rules/rules-dir.mjs';
1716

@@ -66,7 +65,7 @@ export default defineConfig([
6665
{
6766
name: 'JavaScript files',
6867
plugins: {
69-
'@typescript-eslint': typescriptPlugin,
68+
'@typescript-eslint': typescriptEslint.plugin,
7069
'@stylistic': stylisticPlugin,
7170
'@eslint-plugin': eslintPlugin,
7271
mocha: mochaPlugin,
@@ -194,7 +193,7 @@ export default defineConfig([
194193
radix: 'error',
195194
'valid-typeof': 'error',
196195
'no-return-assign': ['error', 'always'],
197-
'no-implicit-coercion': ['error', {allow: ['!!']}],
196+
'no-implicit-coercion': ['error', { allow: ['!!'] }],
198197

199198
'no-array-constructor': 'error',
200199

@@ -301,15 +300,15 @@ export default defineConfig([
301300
ecmaVersion: 'latest',
302301
sourceType: 'module',
303302

304-
parser: tsParser,
303+
parser: typescriptEslint.parser,
305304
parserOptions: {
306305
allowAutomaticSingleRunInference: true,
307306
project: join(
308-
import.meta.dirname,
309-
'config',
310-
'typescript',
311-
'tsconfig.eslint.json',
312-
),
307+
import.meta.dirname,
308+
'config',
309+
'typescript',
310+
'tsconfig.eslint.json',
311+
),
313312
},
314313
},
315314

@@ -549,12 +548,12 @@ export default defineConfig([
549548
{
550549
// Enforce that any import of models/trace/trace.js names the import Trace.
551550
modulePath: join(
552-
import.meta.dirname,
553-
'front_end',
554-
'models',
555-
'trace',
556-
'trace.js',
557-
),
551+
import.meta.dirname,
552+
'front_end',
553+
'models',
554+
'trace',
555+
'trace.js',
556+
),
558557
importName: 'Trace',
559558
},
560559
],

extensions/cxx_debugging/e2e/TestDriver.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ function pausedReasonText(reason: string) {
5151
case 'step':
5252
return 'Debugger paused';
5353
}
54+
return;
5455
}
5556

5657
describe('CXX Debugging Extension Test Suite', function() {

extensions/cxx_debugging/e2e/tsconfig.json

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
{
2+
"extends": "../../../config/typescript/tsconfig.base.json",
23
"compilerOptions": {
3-
"strict": true,
4-
"noImplicitAny": true,
54
"target": "esnext",
65
"module": "commonjs",
7-
"sourceMap": true,
6+
"composite": false,
87
"allowUnreachableCode": false,
9-
"useUnknownInCatchVariables": false,
108
"baseUrl": ".",
119
"skipLibCheck": true,
1210
"paths": {
13-
"test/*": [
14-
"../../../test/*"
15-
],
16-
"puppeteer": [
17-
"../../../node_modules/puppeteer/lib/types.d.ts"
18-
],
19-
"*": [
20-
"*",
21-
"../../../node_modules/@types/*/index.d.ts"
22-
]
11+
"test/*": ["../../../test/*"],
12+
"puppeteer": ["../../../node_modules/puppeteer/lib/types.d.ts"],
13+
"*": ["*", "../../../node_modules/@types/*/index.d.ts"]
2314
}
2415
},
2516
"files": [
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
{
2+
"extends": "../../config/typescript/tsconfig.base.json",
23
"compilerOptions": {
3-
"strict": true,
4-
"noImplicitAny": true,
5-
"target": "esnext",
6-
"module": "esnext",
74
"moduleResolution": "node",
85
"allowUnreachableCode": false,
9-
"noEmitOnError": true,
106
"allowSyntheticDefaultImports": true,
117
"skipLibCheck": true,
12-
"sourceMap": true,
138
"baseUrl": ".",
149
"allowUmdGlobalAccess": true,
1510
"paths": {
1611
"lit-html": ["./third_party/lit-html"],
1712
"lit-html/*": ["./third_party/lit-html/*"]
1813
}
1914
},
20-
"include": [
21-
"src/*.ts",
22-
"tests/*.ts"
23-
]
15+
"include": ["src/*.ts", "tests/*.ts"]
2416
}

0 commit comments

Comments
 (0)