Skip to content

Commit

Permalink
Merge pull request #102 from jaegertracing/issue-96-jest-watchman-take-2
Browse files Browse the repository at this point in the history
Resolve #96 - problem with Jest and watchman
  • Loading branch information
tiffon authored Oct 23, 2017
2 parents 28aca0e + 969313d commit 013d2a6
Show file tree
Hide file tree
Showing 4 changed files with 686 additions and 342 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The app was built with [create-react-app](https://github.com/facebookincubator/c
Fork, then clone the `jaeger-ui` repo and change directory into it.

```
git clone https://github.com/uber/jaeger-ui.git
git clone https://github.com/jaegertracing/jaeger-ui.git
cd jaeger-ui
```

Expand Down Expand Up @@ -55,7 +55,7 @@ npm start
| Command | Description |
| ------- | ----------- |
| `npm start` | Starts development server with hot reloading and api proxy. |
| `npm test` | Runs all the test |
| `npm test` | Runs all the tests |
| `npm run lint` | Lint the project (eslint, prettier, flow) |
| `npm run build` | Runs production build. Outputs files to `/dist`. |

Expand Down
9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"history": "^4.6.3",
"is-promise": "^2.1.0",
"isomorphic-fetch": "^2.2.1",
"jest": "^21.2.1",
"json-markup": "^1.1.0",
"lodash": "^4.17.4",
"moment": "^2.18.1",
Expand Down Expand Up @@ -73,19 +74,15 @@
"start": "react-scripts start",
"start:docs": "REACT_APP_DEMO=true react-scripts start",
"build": "react-scripts build",
"build:docs": "HOMEPAGE=http://uber.github.io/jaeger-ui npm run set-homepage && REACT_APP_DEMO=true REACT_APP_GH_PAGES=true npm run build && npm run clear-homepage",
"eject": "react-scripts eject",
"test": "react-scripts test --env=jsdom",
"test": "CI=1 react-scripts test --env=jsdom --color",
"test-dev": "react-scripts test --env=jsdom",
"coverage": "npm run test -- --coverage",
"lint": "npm run eslint && npm run prettier && npm run flow && npm run check-license",
"eslint": "eslint src",
"check-license": "./scripts/check-license.sh",
"prettier": "prettier --single-quote --trailing-comma es5 --print-width 110 --write \"src/**/*.js\"",
"flow": "flow; test $? -eq 0 -o $? -eq 2",
"set-homepage": "json -I -f package.json -e 'this.homepage=process.env.HOMEPAGE'",
"clear-homepage": "json -I -f package.json -e 'delete this.homepage'",
"deploy-docs": "./scripts/deploy-docs.sh",
"postpublish": "npm run build:docs && npm run deploy-docs",
"add-license": "cd src && uber-licence",
"precommit": "lint-staged"
},
Expand Down
Loading

0 comments on commit 013d2a6

Please sign in to comment.