Skip to content

Commit 87c3799

Browse files
authored
Merge branch 'main' into push-uuwqxppvkpxx
2 parents 2fea726 + 35c066e commit 87c3799

File tree

6 files changed

+135
-127
lines changed

6 files changed

+135
-127
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"copy-webpack-plugin": "^13.0.0",
135135
"cross-env": "^7.0.3",
136136
"css-loader": "^7.1.2",
137-
"cssnano": "^7.0.7",
137+
"cssnano": "^7.1.0",
138138
"devtools-license-check": "^0.9.0",
139139
"eslint": "^8.57.1",
140140
"eslint-config-prettier": "^10.1.5",
@@ -145,7 +145,7 @@
145145
"eslint-plugin-jest-dom": "^5.5.0",
146146
"eslint-plugin-jest-formatting": "^3.1.0",
147147
"eslint-plugin-react": "^7.37.5",
148-
"eslint-plugin-testing-library": "^7.5.3",
148+
"eslint-plugin-testing-library": "^7.6.0",
149149
"espree": "^10.4.0",
150150
"fake-indexeddb": "^6.0.1",
151151
"file-loader": "^6.2.0",
@@ -161,7 +161,7 @@
161161
"lockfile-lint": "^4.14.1",
162162
"mkdirp": "^3.0.1",
163163
"npm-run-all2": "^8.0.4",
164-
"open": "^10.1.2",
164+
"open": "^10.2.0",
165165
"patch-package": "^8.0.0",
166166
"postcss": "^8.5.6",
167167
"postcss-loader": "^8.1.1",
@@ -170,10 +170,10 @@
170170
"raw-loader": "^4.0.2",
171171
"rimraf": "^5.0.10",
172172
"style-loader": "^4.0.0",
173-
"stylelint": "^16.21.0",
173+
"stylelint": "^16.21.1",
174174
"stylelint-config-idiomatic-order": "^10.0.0",
175175
"stylelint-config-standard": "^38.0.0",
176-
"webpack": "^5.99.9",
176+
"webpack": "^5.100.2",
177177
"webpack-cli": "^6.0.1",
178178
"webpack-dev-server": "^5.2.2",
179179
"workbox-webpack-plugin": "^7.3.0",

src/components/app/Details.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.Details {
22
display: flex;
3+
overflow: clip;
34
flex: auto;
45
flex-direction: column;
56
}

src/components/app/ProfileName.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
.profileNameButton {
1818
overflow: hidden;
19+
min-width: 80px;
1920
padding: 0 9px;
2021
font-weight: 700;
2122
margin-inline-end: 5px;
@@ -24,6 +25,7 @@
2425
}
2526

2627
.profileNameButton::before {
28+
flex-shrink: 0;
2729
background-image: url(firefox-profiler-res/img/svg/edit-name-profiler.svg);
2830
}
2931

src/components/app/ProfileViewer.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@
113113
border-bottom: 1px solid var(--grey-30);
114114
margin: 0;
115115
background: var(--grey-10);
116+
overflow-x: auto;
117+
scrollbar-width: none;
116118
}
117119

118120
.profileViewerSpacer {

src/profile-logic/process-profile.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,9 +1482,12 @@ function _convertGeckoMarkerSchema(
14821482
const discardedFields = staticFields.filter(
14831483
(_f, i) => i !== staticDescriptionFieldIndex
14841484
);
1485-
if (discardedFields.length !== 0) {
1485+
const potentiallyUsefulDiscardedFields = discardedFields.filter(
1486+
(f) => f.label !== 'Marker' && f.value !== 'UserTiming'
1487+
);
1488+
if (potentiallyUsefulDiscardedFields.length !== 0) {
14861489
console.warn(
1487-
`Discarding the following static fields from marker schema "${name}": ${discardedFields.join(', ')}`
1490+
`Discarding the following static fields from marker schema "${markerSchema.name}": ${potentiallyUsefulDiscardedFields.map((f) => f.label + ': ' + f.value).join(', ')}`
14881491
);
14891492
}
14901493
description = staticFields[staticDescriptionFieldIndex].value;

0 commit comments

Comments
 (0)