Skip to content

Commit

Permalink
Added common babel config
Browse files Browse the repository at this point in the history
  • Loading branch information
viktor-podzigun committed May 3, 2019
1 parent f711923 commit 98b9e87
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions project/src/main/scala/definitions/ClientUi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ object ClientUi extends ScalaJsModule {
),

npmDevDependencies in Compile ++= Seq(
"babel-loader" -> "8.0.5",
"@babel/core" -> "7.4.0",
"@babel/preset-env" -> "7.4.2",

"css-loader" -> "0.28.7",
"extract-text-webpack-plugin" -> "3.0.0",
"resolve-url-loader" -> "3.0.0",
Expand Down
5 changes: 3 additions & 2 deletions showcase/client.webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const merge = require("webpack-merge")

const generatedConfig = require('./scalajs.webpack.config')
const commonConfig = require("./scommons.webpack.config.js")
const commonClientConfig = require("./scommons.webpack.config.js")
const commonBabelConfig = require("./sc-babel.webpack.config.js")

module.exports = merge(generatedConfig, commonConfig)
module.exports = merge(generatedConfig, commonClientConfig, commonBabelConfig)

0 comments on commit 98b9e87

Please sign in to comment.