Skip to content

Commit

Permalink
Merge pull request #18 from olzzon/develop
Browse files Browse the repository at this point in the history
Fix: bouldn´ build app. Babel didn´t have preset-env installed
  • Loading branch information
olzzon authored Apr 25, 2019
2 parents 1289458 + 58c573b commit ae92c35
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"presets": [
"@babel/preset-react"
"@babel/preset-react",
"@babel/preset-env"
],
"plugins": [
"@babel/plugin-syntax-object-rest-spread"
Expand Down
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,26 @@
"postpackage": "electron-packager ./ --out=./builds"
},
"dependencies": {
"@babel/plugin-syntax-object-rest-spread": "^7.2.0",
"electron": "^4.0.0",

"osc": "https://github.com/PieceMeta/osc.js/tarball/master",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-redux": "^6.0.0",
"react-select": "^2.4.3",
"redux": "^4.0.1",
"tv-automation-server-core-integration": "^0.9.0",
"webmidi": "^2.3.2"
"webmidi": "^2.3.3"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/plugin-syntax-object-rest-spread": "^7.2.0",
"@babel/preset-env": "^7.4.3",
"electron": "^4.1.5",
"@babel/core": "^7.4.3",
"@babel/preset-react": "^7.0.0",
"babel-loader": "^8.0.4",
"babel-loader": "^8.0.5",
"babili-webpack-plugin": "^0.1.2",
"css-loader": "^2.0.2",
"electron-packager": "^13.0.1",
"electron-packager": "^13.1.1",
"file-loader": "^3.0.1",
"html-webpack-plugin": "^3.2.0",
"mini-css-extract-plugin": "^0.5.0",
Expand All @@ -54,8 +56,8 @@
"postcss-nested": "^4.1.1",
"postcss-pxtorem": "^4.0.1",
"style-loader": "^0.23.1",
"webpack": "^4.28.2",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.14"
"webpack": "^4.30.0",
"webpack-cli": "^3.3.1",
"webpack-dev-server": "^3.3.1"
}
}

0 comments on commit ae92c35

Please sign in to comment.