Skip to content

Commit eb15d40

Browse files
committed
es6
1 parent 9af085a commit eb15d40

18 files changed

Lines changed: 177 additions & 205 deletions

src/extension/components/ComponentTime.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const React = require('react')
1+
import React from 'react'
22

3-
const ProgressLoader = require('./ProgressLoader')
3+
import { ProgressLoader } from './ProgressLoader'
44

55
const theme = require('../theme')
66

@@ -22,7 +22,7 @@ const setHrefStyles = theme =>
2222
? { textDecoration: 'none', color: '#eff1f4' }
2323
: { textDecoration: 'none', color: 'black' }
2424

25-
function ComponentTime(props) {
25+
export function ComponentTime(props) {
2626
return (
2727
<div style={calign}>
2828
<a style={setHrefStyles(theme)} href={`#${props.componentname}`}>
@@ -39,5 +39,3 @@ function ComponentTime(props) {
3939
</div>
4040
)
4141
}
42-
43-
module.exports = ComponentTime

src/extension/components/ErrorComponent.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const React = require('react')
1+
import React from 'react'
22

3-
function ErrorComponent() {
3+
export function ErrorComponent() {
44
return (
55
<div style={{ fontWeight: 500, padding: '8px' }}>
66
An error occurred while collecting the measures. To resolve this error,
@@ -23,5 +23,3 @@ function ErrorComponent() {
2323
</div>
2424
)
2525
}
26-
27-
module.exports = ErrorComponent

src/extension/components/Measures.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
const React = require('react')
1+
import React from 'react'
22

3-
const ProgressLoader = require('./ProgressLoader')
3+
import { ProgressLoader } from './ProgressLoader'
44

55
const theme = require('../theme')
66

77
/**
88
This component renders the data (measures of each component)
99
*/
10-
function Measures(props) {
10+
export function Measures(props) {
1111
return (
1212
<div>
1313
<h1 className="component-text">Components</h1>
@@ -119,5 +119,3 @@ function Measures(props) {
119119
</div>
120120
)
121121
}
122-
123-
module.exports = Measures

src/extension/components/Metrics.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
const React = require('react')
1+
import React from 'react'
22

3-
const ComponentTime = require('./ComponentTime')
3+
import { ComponentTime } from './ComponentTime'
44

55
/**
66
This component contains the performance measures of React components in Circular loader .
77
*/
8-
function Metrics(props) {
8+
export function Metrics(props) {
99
return (
1010
<React.Fragment>
1111
<div className="component-progress-container">
@@ -27,5 +27,3 @@ function Metrics(props) {
2727
</React.Fragment>
2828
)
2929
}
30-
31-
module.exports = Metrics

src/extension/components/ProgressLoader.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
const React = require('react')
1+
import React from 'react'
22

33
const theme = require('../theme')
44

55
// inspired from https://codepen.io/bbrady/pen/ozrjKE
66

7-
function ProgressLoader(props) {
7+
export function ProgressLoader(props) {
88
// Size of the enclosing square
99
const sqSize = props.sqSize
1010
// SVG centers the stroke width on the radius, subtract out so circle fits in square
@@ -58,5 +58,3 @@ function ProgressLoader(props) {
5858
</svg>
5959
)
6060
}
61-
62-
module.exports = ProgressLoader

src/extension/components/ReactPerfDevtool.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const React = require('react')
2-
const Metrics = require('./Metrics')
3-
const Results = require('./Results')
4-
const ErrorComponent = require('./ErrorComponent')
5-
const Measures = require('./Measures')
1+
import React from 'react'
2+
import { Metrics } from './Metrics'
3+
import { Results } from './Results'
4+
import { ErrorComponent } from './ErrorComponent'
5+
import { Measures } from './Measures'
66

77
const theme = require('../theme')
88

@@ -28,7 +28,7 @@ let queries = {
2828
It also renders the total time taken while committing the changes, host effects
2929
and calling all the lifecycle methods.
3030
*/
31-
class ReactPerfDevtool extends React.Component {
31+
export class ReactPerfDevtool extends React.Component {
3232
timer = null
3333
evaluate = chrome.devtools.inspectedWindow.eval
3434
panelStyles = {
@@ -247,5 +247,3 @@ class ReactPerfDevtool extends React.Component {
247247
)
248248
}
249249
}
250-
251-
module.exports = ReactPerfDevtool

src/extension/components/Results.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
const React = require('react')
1+
import React from 'react'
22

3-
const getCommitChangesTime = require('../../shared/commitChanges')
4-
const {
3+
import { getCommitChangesTime } from '../../shared/commitChanges'
4+
import {
55
getCommitHostEffectsTime,
66
getTotalEffects
7-
} = require('../../shared/hostEffects')
8-
const { getLifecycleTime, getTotalMethods } = require('../../shared/lifecycle')
7+
} from '../../shared/hostEffects'
8+
import { getLifecycleTime, getTotalMethods } from '../../shared/lifecycle'
99

10-
const getTotalTime = require('../../shared/totalTime')
10+
import { getTotalTime } from '../../shared/totalTime'
1111

1212
const theme = require('../theme')
1313

@@ -98,13 +98,11 @@ function show(props) {
9898
This component renders the total time taken combining all the phases of a component,
9999
committing the changes, host effects and calling all the lifecycle methods.
100100
*/
101-
function Results(props) {
101+
export function Results(props) {
102102
return (
103103
<div className="container result">
104104
<h1 className="results">Results</h1>
105105
{props.rawMeasures.length !== 0 ? show(props) : null}
106106
</div>
107107
)
108108
}
109-
110-
module.exports = Results

src/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
module.exports = require('./extension/components/ReactPerfDevtool')
1+
import { ReactPerfDevtool } from './extension/components/ReactPerfDevtool'
2+
import { registerObserver } from './npm/hook'
3+
4+
export { ReactPerfDevtool, registerObserver }

src/npm/hook.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var getReactPerformanceData = require('../shared/parse')
2-
var generateDataFromMeasures = require('../shared/generate')
1+
import { getReactPerformanceData } from '../shared/parse'
2+
import { generateDataFromMeasures } from '../shared/generate'
33

44
/**
55
This registers an observer that listens to the React performance measurement event.
@@ -29,11 +29,13 @@ var generateDataFromMeasures = require('../shared/generate')
2929
3030
NOTE: This should only be used in development mode.
3131
*/
32-
function registerObserver(params, callback) {
32+
const registerObserver = (params, callback) => {
3333
params = params || {}
34-
var { shouldLog, port, components } = params
35-
var observer = new window.PerformanceObserver(list => {
36-
var measures = generateDataFromMeasures(
34+
35+
const { shouldLog, port, components } = params
36+
37+
let observer = new window.PerformanceObserver(list => {
38+
const measures = generateDataFromMeasures(
3739
getReactPerformanceData(list.getEntries())
3840
)
3941

@@ -62,17 +64,17 @@ function registerObserver(params, callback) {
6264
This function logs the measures to the console. Requires a server running on a specified port. Default port number is 8080.
6365
TODO: Change this behaviour if Chrome lands the support for recording performance when inspecting the node apps.
6466
*/
65-
function logToConsole({ port, components }, measures) {
67+
const logToConsole = ({ port, components }, measures) => {
6668
if (!components) {
6769
logMeasures(port, measures)
6870
} else if (typeof components !== undefined && Array.isArray(components)) {
69-
var requiredMeasures = getRequiredMeasures(components, measures)
71+
const requiredMeasures = getRequiredMeasures(components, measures)
7072

7173
logMeasures(port, requiredMeasures)
7274
}
7375
}
7476

75-
function logMeasures(port, measures) {
77+
const logMeasures = (port, measures) => {
7678
measures.forEach(
7779
({
7880
componentName,
@@ -117,7 +119,7 @@ function logMeasures(port, measures) {
117119
}
118120

119121
// Send the data to a specified port
120-
function send(data, port) {
122+
const send = (data, port) => {
121123
window.navigator.sendBeacon(
122124
`http://127.0.0.1:${
123125
port !== undefined && typeof port === 'number' ? port : 8080
@@ -126,8 +128,8 @@ function send(data, port) {
126128
)
127129
}
128130

129-
function getRequiredMeasures(components, measures) {
130-
var requiredMeasures = []
131+
const getRequiredMeasures = (components, measures) => {
132+
let requiredMeasures = []
131133

132134
if (!Array.isArray(components)) {
133135
components = [components]
@@ -142,4 +144,4 @@ function getRequiredMeasures(components, measures) {
142144
return requiredMeasures
143145
}
144146

145-
module.exports = registerObserver
147+
export { registerObserver }

src/npm/index.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)