diff --git a/.eslintrc.js b/.eslintrc.js index 4474b35fad..6ba3910c42 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -21,7 +21,7 @@ module.exports = { settings: { 'import/resolver': { node: { - extensions: ['.js', 'json', '.tsx'], + extensions: ['.js', '.jsx', 'json', '.tsx'], }, }, }, diff --git a/package.json b/package.json index 490da66864..fec09488fa 100644 --- a/package.json +++ b/package.json @@ -49,12 +49,12 @@ "build": "lerna run build", "check-license": "./scripts/check-license.sh", "coverage": "lerna run coverage", - "eslint": "eslint --cache 'scripts/*.{js,ts,tsx}' 'packages/*/src/**/*.{js,ts,tsx}' 'packages/*/*.{js,ts,tsx}'", + "eslint": "eslint --cache 'scripts/*.{js,jsx,ts,tsx}' 'packages/*/src/**/*.{js,jsx,ts,tsx}' 'packages/*/*.{js,jsx,ts,tsx}'", "fmt": "yarn prettier", "lint": "npm-run-all -ln --parallel prettier-lint tsc-lint eslint check-license", "prepare": "lerna run --stream --sort prepublishOnly", - "prettier": "prettier --write '{.,scripts}/*.{js,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,json,md,ts,tsx}' 'packages/*/*.{css,js,json,md,ts,tsx}'", - "prettier-lint": "prettier --list-different '{.,scripts}/*.{js,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,json,md,ts,tsx}' 'packages/*/*.{css,js,json,md,ts,tsx}'", + "prettier": "prettier --write '{.,scripts}/*.{js,jsx,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx}'", + "prettier-lint": "prettier --list-different '{.,scripts}/*.{js,jsx,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx}'", "test": "lerna run test", "tsc-lint": "tsc --build", "tsc-lint-debug": "tsc --listFiles", diff --git a/packages/jaeger-ui/src/components/App/index.js b/packages/jaeger-ui/src/components/App/index.jsx similarity index 100% rename from packages/jaeger-ui/src/components/App/index.js rename to packages/jaeger-ui/src/components/App/index.jsx diff --git a/packages/jaeger-ui/src/components/DependencyGraph/DAG.js b/packages/jaeger-ui/src/components/DependencyGraph/DAG.jsx similarity index 100% rename from packages/jaeger-ui/src/components/DependencyGraph/DAG.js rename to packages/jaeger-ui/src/components/DependencyGraph/DAG.jsx diff --git a/packages/jaeger-ui/src/components/DependencyGraph/DependencyForceGraph.js b/packages/jaeger-ui/src/components/DependencyGraph/DependencyForceGraph.jsx similarity index 100% rename from packages/jaeger-ui/src/components/DependencyGraph/DependencyForceGraph.js rename to packages/jaeger-ui/src/components/DependencyGraph/DependencyForceGraph.jsx diff --git a/packages/jaeger-ui/src/components/DependencyGraph/index.js b/packages/jaeger-ui/src/components/DependencyGraph/index.jsx similarity index 100% rename from packages/jaeger-ui/src/components/DependencyGraph/index.js rename to packages/jaeger-ui/src/components/DependencyGraph/index.jsx diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.jsx similarity index 100% rename from packages/jaeger-ui/src/components/SearchTracePage/SearchForm.js rename to packages/jaeger-ui/src/components/SearchTracePage/SearchForm.jsx diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx similarity index 100% rename from packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.js rename to packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx diff --git a/packages/jaeger-ui/src/components/SearchTracePage/index.js b/packages/jaeger-ui/src/components/SearchTracePage/index.jsx similarity index 99% rename from packages/jaeger-ui/src/components/SearchTracePage/index.js rename to packages/jaeger-ui/src/components/SearchTracePage/index.jsx index c0955b8a52..aa3b0717bc 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/index.js +++ b/packages/jaeger-ui/src/components/SearchTracePage/index.jsx @@ -108,7 +108,7 @@ export class SearchTracePageImpl extends Component { { + loadJsonTraces={fileList => { loadJsonTraces(fileList); }} />