Skip to content

Commit b7464c7

Browse files
authored
Merge branch 'main' into inline-badge-in-marker-stacks
2 parents 031c0a8 + 687156c commit b7464c7

File tree

3 files changed

+466
-450
lines changed

3 files changed

+466
-450
lines changed

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@codemirror/lang-rust": "^6.0.2",
6464
"@codemirror/language": "^6.11.3",
6565
"@codemirror/state": "^6.5.2",
66-
"@codemirror/view": "^6.38.2",
66+
"@codemirror/view": "^6.38.4",
6767
"@firefox-devtools/react-contextmenu": "^5.2.3",
6868
"@fluent/bundle": "^0.19.1",
6969
"@fluent/langneg": "^0.7.0",
@@ -80,7 +80,7 @@
8080
"escape-string-regexp": "^4.0.0",
8181
"gecko-profiler-demangle": "^0.4.0",
8282
"idb": "^8.0.3",
83-
"iongraph-web": "0.1.15",
83+
"iongraph-web": "0.1.16",
8484
"jszip": "^3.10.1",
8585
"long": "^5.3.2",
8686
"memoize-immutable": "^3.0.0",
@@ -90,7 +90,7 @@
9090
"namedtuplemap": "^1.0.0",
9191
"photon-colors": "^3.3.2",
9292
"protobufjs": "^7.5.4",
93-
"query-string": "^9.3.0",
93+
"query-string": "^9.3.1",
9494
"react": "^18.3.1",
9595
"react-dom": "^18.3.1",
9696
"react-intersection-observer": "^9.16.0",
@@ -114,17 +114,17 @@
114114
"@babel/preset-env": "^7.28.3",
115115
"@babel/preset-react": "^7.27.1",
116116
"@babel/preset-typescript": "^7.27.1",
117-
"@eslint/js": "^9.35.0",
117+
"@eslint/js": "^9.36.0",
118118
"@testing-library/dom": "^10.4.1",
119-
"@testing-library/jest-dom": "^6.8.0",
119+
"@testing-library/jest-dom": "^6.9.1",
120120
"@testing-library/react": "^16.3.0",
121121
"@types/clamp": "^1.0.3",
122122
"@types/common-tags": "^1.8.4",
123123
"@types/jest": "^30.0.0",
124124
"@types/minimist": "^1.2.5",
125125
"@types/node": "^22.18.8",
126126
"@types/query-string": "^6.3.0",
127-
"@types/react": "^18.3.25",
127+
"@types/react": "^18.3.26",
128128
"@types/react-dom": "^18.3.1",
129129
"@types/react-splitter-layout": "^4.0.0",
130130
"@types/react-transition-group": "^4.4.5",
@@ -134,19 +134,19 @@
134134
"@typescript-eslint/parser": "^8.45.0",
135135
"alex": "^11.0.1",
136136
"autoprefixer": "^10.4.21",
137-
"babel-jest": "^30.1.2",
137+
"babel-jest": "^30.2.0",
138138
"babel-loader": "^10.0.0",
139139
"babel-plugin-module-resolver": "^5.0.2",
140140
"browserslist": "^4.26.2",
141141
"caniuse-lite": "^1.0.30001743",
142142
"circular-dependency-plugin": "^5.2.1",
143143
"codecov": "^3.8.3",
144144
"copy-webpack-plugin": "^13.0.1",
145-
"cross-env": "^10.0.0",
145+
"cross-env": "^10.1.0",
146146
"css-loader": "^7.1.2",
147147
"cssnano": "^7.1.1",
148148
"devtools-license-check": "^0.9.0",
149-
"eslint": "^9.35.0",
149+
"eslint": "^9.36.0",
150150
"eslint-config-prettier": "^10.1.8",
151151
"eslint-import-resolver-alias": "^1.1.2",
152152
"eslint-plugin-import": "^2.32.0",
@@ -163,16 +163,16 @@
163163
"globals": "^16.4.0",
164164
"html-webpack-plugin": "^5.6.4",
165165
"husky": "^4.3.8",
166-
"jest": "^30.1.3",
167-
"jest-environment-jsdom": "^30.1.2",
166+
"jest": "^30.2.0",
167+
"jest-environment-jsdom": "^30.2.0",
168168
"jest-extended": "^6.0.0",
169169
"json-loader": "^0.5.7",
170170
"local-web-server": "^5.4.0",
171171
"lockfile-lint": "^4.14.1",
172172
"mkdirp": "^3.0.1",
173173
"npm-run-all2": "^8.0.4",
174174
"open": "^10.2.0",
175-
"patch-package": "^8.0.0",
175+
"patch-package": "^8.0.1",
176176
"postcss": "^8.5.6",
177177
"postcss-loader": "^8.2.0",
178178
"postinstall-postinstall": "^2.1.0",
@@ -183,15 +183,15 @@
183183
"stylelint": "^16.24.0",
184184
"stylelint-config-idiomatic-order": "^10.0.0",
185185
"stylelint-config-standard": "^39.0.0",
186-
"typescript": "^5.8.3",
187-
"webpack": "^5.101.3",
186+
"typescript": "^5.9.3",
187+
"webpack": "^5.102.0",
188188
"webpack-cli": "^6.0.1",
189189
"webpack-dev-server": "^5.2.2",
190190
"workbox-webpack-plugin": "^7.3.0",
191191
"yargs": "^18.0.0"
192192
},
193193
"resolutions": {
194-
"@types/react-splitter-layout/@types/react": "^18.3.25",
194+
"@types/react-splitter-layout/@types/react": "^18.3.26",
195195
"@types/trusted-types": "^2.0.7"
196196
},
197197
"jest": {

src/components/shared/IonGraphView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44
import type { LineTimings } from 'firefox-profiler/types';
55

6-
import { GraphViewer, migrate } from 'iongraph-web';
7-
import 'iongraph-web/dist/style.css';
6+
import { GraphViewer, migrate } from 'iongraph-web/react';
7+
import 'iongraph-web/style.css';
88

99
import { useMemo } from 'react';
1010

0 commit comments

Comments
 (0)