From 98b9e87cc7a8396bf5257f69f521382158121a38 Mon Sep 17 00:00:00 2001 From: Viktor Podzigun Date: Fri, 3 May 2019 09:05:57 +0200 Subject: [PATCH] Added common babel config --- project/src/main/scala/definitions/ClientUi.scala | 4 ++++ showcase/client.webpack.config.js | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/project/src/main/scala/definitions/ClientUi.scala b/project/src/main/scala/definitions/ClientUi.scala index a861e95..93e50de 100644 --- a/project/src/main/scala/definitions/ClientUi.scala +++ b/project/src/main/scala/definitions/ClientUi.scala @@ -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", diff --git a/showcase/client.webpack.config.js b/showcase/client.webpack.config.js index 35b228c..2b5c620 100644 --- a/showcase/client.webpack.config.js +++ b/showcase/client.webpack.config.js @@ -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)