Skip to content

Commit 7dd57d3

Browse files
author
Brian Vaughn
committed
Import scheduling profiler into DevTools Profiler tab
1 parent 3101872 commit 7dd57d3

35 files changed

+225
-687
lines changed

‎packages/react-devtools-core/webpack.standalone.js

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ const __DEV__ = NODE_ENV === 'development';
1818

1919
const DEVTOOLS_VERSION = getVersionString();
2020

21+
const babelOptions = {
22+
configFile: resolve(
23+
__dirname,
24+
'..',
25+
'react-devtools-shared',
26+
'babel.config.js',
27+
),
28+
};
29+
2130
module.exports = {
2231
mode: __DEV__ ? 'development' : 'production',
2332
devtool: __DEV__ ? 'cheap-module-eval-source-map' : 'source-map',
@@ -62,17 +71,25 @@ module.exports = {
6271
],
6372
module: {
6473
rules: [
74+
{
75+
test: /\.worker\.js$/,
76+
use: [
77+
{
78+
loader: 'worker-loader',
79+
options: {
80+
inline: 'no-fallback',
81+
},
82+
},
83+
{
84+
loader: 'babel-loader',
85+
options: babelOptions,
86+
},
87+
],
88+
},
6589
{
6690
test: /\.js$/,
6791
loader: 'babel-loader',
68-
options: {
69-
configFile: resolve(
70-
__dirname,
71-
'..',
72-
'react-devtools-shared',
73-
'babel.config.js',
74-
),
75-
},
92+
options: babelOptions,
7693
},
7794
{
7895
test: /\.css$/,

‎packages/react-devtools-extensions/firefox/manifest.json

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

3333
"devtools_page": "main.html",
3434

35-
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
35+
"content_security_policy": "script-src 'self' 'unsafe-eval' blob:; object-src 'self'",
3636
"web_accessible_resources": [
3737
"main.html",
3838
"panel.html",

‎packages/react-devtools-extensions/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"chrome-launch": "^1.1.4",
3838
"crx": "^5.0.0",
3939
"css-loader": "^1.0.1",
40+
"file-loader": "^6.1.0",
4041
"firefox-profile": "^1.0.2",
4142
"fs-extra": "^4.0.2",
4243
"jest-fetch-mock": "^3.0.3",
@@ -55,7 +56,8 @@
5556
"web-ext": "^3.0.0",
5657
"webpack": "^4.43.0",
5758
"webpack-cli": "^3.3.11",
58-
"webpack-dev-server": "^3.10.3"
59+
"webpack-dev-server": "^3.10.3",
60+
"worker-loader": "^3.0.3"
5961
},
6062
"dependencies": {
6163
"web-ext": "^4"

‎packages/react-devtools-extensions/webpack.config.js

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ const DEVTOOLS_VERSION = getVersionString();
1919

2020
const featureFlagTarget = process.env.FEATURE_FLAG_TARGET || 'extension-oss';
2121

22+
const babelOptions = {
23+
configFile: resolve(
24+
__dirname,
25+
'..',
26+
'react-devtools-shared',
27+
'babel.config.js',
28+
),
29+
};
30+
2231
module.exports = {
2332
mode: __DEV__ ? 'development' : 'production',
2433
devtool: __DEV__ ? 'cheap-module-eval-source-map' : false,
@@ -81,17 +90,25 @@ module.exports = {
8190
],
8291

8392
rules: [
93+
{
94+
test: /\.worker\.js$/,
95+
use: [
96+
{
97+
loader: 'worker-loader',
98+
options: {
99+
inline: 'no-fallback',
100+
},
101+
},
102+
{
103+
loader: 'babel-loader',
104+
options: babelOptions,
105+
},
106+
],
107+
},
84108
{
85109
test: /\.js$/,
86110
loader: 'babel-loader',
87-
options: {
88-
configFile: resolve(
89-
__dirname,
90-
'..',
91-
'react-devtools-shared',
92-
'babel.config.js',
93-
),
94-
},
111+
options: babelOptions,
95112
},
96113
{
97114
test: /\.css$/,

‎packages/react-devtools-inline/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@
3434
"babel-loader": "^8.0.4",
3535
"cross-env": "^3.1.4",
3636
"css-loader": "^1.0.1",
37+
"file-loader": "^6.1.0",
3738
"raw-loader": "^3.1.0",
3839
"style-loader": "^0.23.1",
3940
"webpack": "^4.43.0",
4041
"webpack-cli": "^3.3.11",
41-
"webpack-dev-server": "^3.10.3"
42+
"webpack-dev-server": "^3.10.3",
43+
"worker-loader": "^3.0.3"
4244
}
4345
}

‎packages/react-devtools-inline/webpack.config.js

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ const __DEV__ = NODE_ENV === 'development';
1616

1717
const DEVTOOLS_VERSION = getVersionString();
1818

19+
const babelOptions = {
20+
configFile: resolve(
21+
__dirname,
22+
'..',
23+
'react-devtools-shared',
24+
'babel.config.js',
25+
),
26+
};
27+
1928
module.exports = {
2029
mode: __DEV__ ? 'development' : 'production',
2130
devtool: __DEV__ ? 'eval-cheap-source-map' : 'source-map',
@@ -65,17 +74,25 @@ module.exports = {
6574
],
6675
module: {
6776
rules: [
77+
{
78+
test: /\.worker\.js$/,
79+
use: [
80+
{
81+
loader: 'worker-loader',
82+
options: {
83+
inline: 'no-fallback',
84+
},
85+
},
86+
{
87+
loader: 'babel-loader',
88+
options: babelOptions,
89+
},
90+
],
91+
},
6892
{
6993
test: /\.js$/,
7094
loader: 'babel-loader',
71-
options: {
72-
configFile: resolve(
73-
__dirname,
74-
'..',
75-
'react-devtools-shared',
76-
'babel.config.js',
77-
),
78-
},
95+
options: babelOptions,
7996
},
8097
{
8198
test: /\.css$/,

‎packages/react-devtools-scheduling-profiler/buildUtils.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎packages/react-devtools-scheduling-profiler/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "react-devtools-scheduling-profiler",
4-
"version": "0.0.0",
4+
"version": "4.14.0",
55
"license": "MIT",
66
"scripts": {
77
"build": "cross-env NODE_ENV=production cross-env TARGET=remote webpack --config webpack.config.js",

‎packages/react-devtools-scheduling-profiler/src/App.css

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎packages/react-devtools-scheduling-profiler/src/App.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,9 @@ import '@reach/tooltip/styles.css';
1515
import * as React from 'react';
1616

1717
import {SchedulingProfiler} from './SchedulingProfiler';
18-
import {useBrowserTheme, useDisplayDensity} from './hooks';
1918

20-
import styles from './App.css';
2119
import 'react-devtools-shared/src/devtools/views/root.css';
2220

2321
export default function App() {
24-
useBrowserTheme();
25-
useDisplayDensity();
26-
27-
return (
28-
<div className={styles.DevTools}>
29-
<div className={styles.TabContent}>
30-
<SchedulingProfiler />
31-
</div>
32-
</div>
33-
);
22+
return <SchedulingProfiler />;
3423
}

‎packages/react-devtools-scheduling-profiler/src/CanvasPage.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ import {
5252
import {COLORS} from './content-views/constants';
5353

5454
import EventTooltip from './EventTooltip';
55-
import ContextMenu from './context/ContextMenu';
56-
import ContextMenuItem from './context/ContextMenuItem';
57-
import useContextMenu from './context/useContextMenu';
55+
import ContextMenu from 'react-devtools-shared/src/devtools/ContextMenu/ContextMenu';
56+
import ContextMenuItem from 'react-devtools-shared/src/devtools/ContextMenu/ContextMenuItem';
57+
import useContextMenu from 'react-devtools-shared/src/devtools/ContextMenu/useContextMenu';
5858
import {getBatchRange} from './utils/getBatchRange';
5959

6060
import styles from './CanvasPage.css';

‎packages/react-devtools-scheduling-profiler/src/EventTooltip.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
padding: 0.25rem;
77
user-select: none;
88
pointer-events: none;
9-
background-color: #ffffff;
10-
border: 1px solid #ccc;
11-
box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
9+
background-color: var(--color-background);
10+
border: 1px solid var(border);
11+
box-shadow: 1px 1px 2px var(--color-shadow);
1212
font-size: 11px;
1313
}
1414

@@ -26,7 +26,7 @@
2626
}
2727

2828
.DetailsGridLabel {
29-
color: #666;
29+
color: var(--color-dim);
3030
text-align: right;
3131
}
3232

@@ -56,14 +56,14 @@
5656
line-height: 1.5;
5757
-webkit-mask-image: linear-gradient(
5858
180deg,
59-
#fff,
60-
#fff 5em,
59+
var(--color-background),
60+
var(--color-background) 5em,
6161
transparent
6262
);
6363
mask-image: linear-gradient(
6464
180deg,
65-
#fff,
66-
#fff 5em,
65+
var(--color-background),
66+
var(--color-background) 5em,
6767
transparent
6868
);
6969
white-space: pre;

0 commit comments

Comments
 (0)