Skip to content

Commit

Permalink
Fixes the failing CI master build (#2697)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexec committed Nov 13, 2019
1 parent f01df4e commit 09808b5
Show file tree
Hide file tree
Showing 6 changed files with 150 additions and 576 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ jobs:
paths: [~/.cache/yarn, node_modules]
- run: yarn test
- run: ./node_modules/.bin/codecov -p ..
- run: yarn build
- run: NODE_ENV='production' yarn build
- run: yarn lint
workflows:
version: 2
Expand Down
6 changes: 6 additions & 0 deletions ui/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react"
]
}
3 changes: 2 additions & 1 deletion ui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules
dist
.vscode
junit.xml
coverage
coverage
/yarn-error.log
6 changes: 3 additions & 3 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"tslint-react": "^3.4.0",
"typescript": "^3.4.5",
"unidiff": "^1.0.2",
"webpack": "^4.29.5",
"webpack": "^4.41.2",
"webpack-cli": "^3.2.3",
"webpack-dev-server": "^3.2.1"
},
Expand All @@ -82,15 +82,15 @@
"@types/react-dom": "16.8.2"
},
"devDependencies": {
"@babel/core": "^7.0.0-0",
"@babel/core": "^7.7.2",
"@babel/preset-env": "^7.7.1",
"@babel/preset-react": "^7.7.0",
"@babel/preset-typescript": "^7.7.2",
"@types/jest": "^24.0.13",
"@types/react-test-renderer": "^16.8.3",
"add": "^2.0.6",
"babel-jest": "^24.9.0",
"babel-preset-env": "^1.7.0",
"babel-loader": "^8.0.6",
"codecov": "^3.6.1",
"identity-obj-proxy": "^3.0.0",
"jest": "^24.9.0",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const config = {
/node_modules\/monaco-editor/,
],
test: /\.js$/,
loaders: [ ...( isProd ? ['babel-loader?presets=babel-preset-env'] : []), 'source-map-loader']
loaders: [...(isProd ? ['babel-loader'] : []), 'source-map-loader'],
}, {
test: /\.scss$/,
loader: 'style-loader!raw-loader!sass-loader'
Expand Down
Loading

0 comments on commit 09808b5

Please sign in to comment.