Skip to content

Commit 9eccc42

Browse files
authored
Merge branch 'main' into lint-fix
2 parents f6815d5 + 531ad81 commit 9eccc42

35 files changed

+538
-721
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test_script:
2727
# Output useful info for debugging.
2828
- yarn versions
2929
# run tests
30-
- yarn test-all:ci
30+
- yarn test-all
3131
- yarn build-prod:quiet
3232

3333
cache:

package.json

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"start-photon": "node res/photon/server",
4545
"test": "node bin/output-fixing-commands.js cross-env LC_ALL=C TZ=UTC NODE_ENV=test jest",
4646
"test-all": "run-p --max-parallel 4 ts license-check lint test test-alex test-lockfile",
47-
"test-all:ci": "run-p --max-parallel 4 ts license-check lint test test-alex test-lockfile",
4847
"test-build-coverage": "yarn test --coverage --coverageReporters=html",
4948
"test-serve-coverage": "ws -d coverage/ -p 4343",
5049
"test-coverage": "run-s test-build-coverage test-serve-coverage",
@@ -62,10 +61,10 @@
6261
"@codemirror/lang-cpp": "^6.0.3",
6362
"@codemirror/lang-javascript": "^6.2.4",
6463
"@codemirror/lang-rust": "^6.0.2",
65-
"@codemirror/language": "^6.11.2",
64+
"@codemirror/language": "^6.11.3",
6665
"@codemirror/state": "^6.5.2",
6766
"@codemirror/view": "^6.38.1",
68-
"@firefox-devtools/react-contextmenu": "^5.2.2",
67+
"@firefox-devtools/react-contextmenu": "^5.2.3",
6968
"@fluent/bundle": "^0.19.1",
7069
"@fluent/langneg": "^0.7.0",
7170
"@fluent/react": "^0.15.2",
@@ -77,7 +76,7 @@
7776
"classnames": "^2.5.1",
7877
"common-tags": "^1.8.2",
7978
"copy-to-clipboard": "^3.3.3",
80-
"core-js": "^3.44.0",
79+
"core-js": "^3.45.0",
8180
"escape-string-regexp": "^4.0.0",
8281
"gecko-profiler-demangle": "^0.3.3",
8382
"idb": "^8.0.3",
@@ -89,7 +88,7 @@
8988
"mixedtuplemap": "^1.0.0",
9089
"namedtuplemap": "^1.0.0",
9190
"photon-colors": "^3.3.2",
92-
"protobufjs": "^7.5.3",
91+
"protobufjs": "^7.5.4",
9392
"query-string": "^9.2.2",
9493
"react": "^18.3.1",
9594
"react-dom": "^18.3.1",
@@ -106,24 +105,24 @@
106105
"workbox-window": "^7.3.0"
107106
},
108107
"devDependencies": {
109-
"@babel/cli": "^7.28.0",
110-
"@babel/core": "^7.28.0",
108+
"@babel/cli": "^7.28.3",
109+
"@babel/core": "^7.28.3",
111110
"@babel/eslint-parser": "^7.28.0",
112111
"@babel/eslint-plugin": "^7.27.1",
113112
"@babel/plugin-proposal-class-properties": "^7.18.6",
114-
"@babel/preset-env": "^7.28.0",
113+
"@babel/preset-env": "^7.28.3",
115114
"@babel/preset-react": "^7.27.1",
116115
"@babel/preset-typescript": "^7.27.1",
117116
"@fetch-mock/jest": "^0.2.16",
118-
"@testing-library/dom": "^10.4.0",
117+
"@testing-library/dom": "^10.4.1",
119118
"@testing-library/jest-dom": "^6.6.4",
120119
"@testing-library/react": "^16.3.0",
121120
"@types/clamp": "^1.0.3",
122121
"@types/common-tags": "^1.8.4",
123122
"@types/jest": "^30.0.0",
124123
"@types/minimist": "^1.2.5",
125124
"@types/query-string": "^6.3.0",
126-
"@types/react": "^18.3.1",
125+
"@types/react": "^18.3.24",
127126
"@types/react-dom": "^18.3.1",
128127
"@types/react-splitter-layout": "^4.0.0",
129128
"@types/react-transition-group": "^4.4.5",
@@ -133,14 +132,14 @@
133132
"@typescript-eslint/parser": "^8.38.0",
134133
"alex": "^11.0.1",
135134
"autoprefixer": "^10.4.21",
136-
"babel-jest": "^30.0.4",
135+
"babel-jest": "^30.0.5",
137136
"babel-loader": "^10.0.0",
138137
"babel-plugin-module-resolver": "^5.0.2",
139-
"browserslist": "^4.25.1",
140-
"caniuse-lite": "^1.0.30001727",
138+
"browserslist": "^4.25.2",
139+
"caniuse-lite": "^1.0.30001731",
141140
"circular-dependency-plugin": "^5.2.1",
142141
"codecov": "^3.8.3",
143-
"copy-webpack-plugin": "^13.0.0",
142+
"copy-webpack-plugin": "^13.0.1",
144143
"cross-env": "^10.0.0",
145144
"css-loader": "^7.1.2",
146145
"cssnano": "^7.1.0",
@@ -153,15 +152,15 @@
153152
"eslint-plugin-jest-dom": "^5.5.0",
154153
"eslint-plugin-jest-formatting": "^3.1.0",
155154
"eslint-plugin-react": "^7.37.5",
156-
"eslint-plugin-testing-library": "^7.6.0",
155+
"eslint-plugin-testing-library": "^7.6.3",
157156
"espree": "^10.4.0",
158-
"fake-indexeddb": "^6.0.1",
157+
"fake-indexeddb": "^6.1.0",
159158
"file-loader": "^6.2.0",
160159
"glob": "^11.0.3",
161-
"html-webpack-plugin": "^5.6.3",
160+
"html-webpack-plugin": "^5.6.4",
162161
"husky": "^4.3.8",
163-
"jest": "^30.0.4",
164-
"jest-environment-jsdom": "^30.0.4",
162+
"jest": "^30.0.5",
163+
"jest-environment-jsdom": "^30.0.5",
165164
"jest-extended": "^6.0.0",
166165
"json-loader": "^0.5.7",
167166
"local-web-server": "^5.4.0",
@@ -177,18 +176,18 @@
177176
"raw-loader": "^4.0.2",
178177
"rimraf": "^5.0.10",
179178
"style-loader": "^4.0.0",
180-
"stylelint": "^16.21.1",
179+
"stylelint": "^16.23.0",
181180
"stylelint-config-idiomatic-order": "^10.0.0",
182-
"stylelint-config-standard": "^38.0.0",
181+
"stylelint-config-standard": "^39.0.0",
183182
"typescript": "^5.8.3",
184-
"webpack": "^5.100.2",
183+
"webpack": "^5.101.3",
185184
"webpack-cli": "^6.0.1",
186185
"webpack-dev-server": "^5.2.2",
187186
"workbox-webpack-plugin": "^7.3.0",
188187
"yargs": "^18.0.0"
189188
},
190189
"resolutions": {
191-
"@types/react-splitter-layout/@types/react": "^18.3.1",
190+
"@types/react-splitter-layout/@types/react": "^18.3.24",
192191
"@types/trusted-types": "^2.0.7"
193192
},
194193
"jest": {

src/components/app/AppHeader.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export class AppHeader extends React.PureComponent<{}> {
2222
id="AppHeader--app-header"
2323
elems={{
2424
header: (
25-
// $FlowExpectError Flow doesn't know about this fluent rule for react component.
2625
<InnerNavigationLink
2726
dataSource="none"
2827
className="appHeaderLink"

src/components/app/CompareHome.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
.compareHomeForm {
1818
display: grid;
1919
align-items: center;
20-
grid-gap: 1em;
20+
gap: 1em;
2121
grid-template-columns: auto 1fr;
2222
}
2323

src/components/app/Home.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,6 @@ class HomeImpl extends React.PureComponent<HomeProps, HomeState> {
660660
id="Home--compare-recordings-info"
661661
elems={{
662662
a: (
663-
// $FlowExpectError Flow doesn't know about this fluent rule for react component.
664663
<InnerNavigationLink dataSource="compare">
665664
Compare
666665
</InnerNavigationLink>

src/components/app/KeyboardShortcut.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
.appKeyboardShortcutsContent {
6565
display: grid;
6666
margin: 40px;
67-
grid-gap: 80px;
67+
gap: 80px;
6868
grid-template-columns: 1fr 1fr;
6969
}
7070

src/components/flame-graph/Canvas.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
.flameGraphCanvasTooltip > .tooltipHeader {
2020
display: grid;
21-
grid-gap: 2px 0;
21+
gap: 2px 0;
2222
grid-template-columns: min-content auto;
2323
}
2424

src/components/js-tracer/Chart.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ class JsTracerExpensiveChartImpl extends React.PureComponent<Props> {
104104
chartProps={{
105105
jsTracerTimingRows,
106106
jsTracerTable,
107-
// $FlowFixMe Error introduced by upgrading to v0.96.0. See issue #1936.
108107
updatePreviewSelection,
109108
rangeStart: timeRange.start,
110109
rangeEnd: timeRange.end,

src/components/marker-chart/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ class MarkerChartImpl extends React.PureComponent<Props> {
153153
getMarker,
154154
getMarkerLabel,
155155
markerListLength,
156-
// $FlowFixMe Error introduced by upgrading to v0.96.0. See issue #1936.
157156
updatePreviewSelection,
158157
changeMouseTimePosition,
159158
changeRightClickedMarker,

src/components/shared/CodeView.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@
128128
.cm-content {
129129
font-family: ui-monospace, 'Roboto Mono', monospace;
130130
hyphens: none;
131+
overflow-wrap: normal;
131132
word-break: normal;
132133
word-spacing: normal;
133-
word-wrap: normal;
134134
}
135135

136136
/**

0 commit comments

Comments
 (0)