summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey Bion <joffrey.bion@gmail.com>2019-08-15 00:21:41 +0200
committerjoffrey-bion <joffrey.bion@gmail.com>2019-10-22 20:42:32 +0200
commit74208bb97b42227b2df29c43eabf8688446092f4 (patch)
tree68b7c7a342277f338d9fcd00efdaec7362f9867c
parentFirst connected component (diff)
downloadseven-wonders-74208bb97b42227b2df29c43eabf8688446092f4.tar.gz
seven-wonders-74208bb97b42227b2df29c43eabf8688446092f4.tar.bz2
seven-wonders-74208bb97b42227b2df29c43eabf8688446092f4.zip
Update styled components
-rw-r--r--sw-ui-kt/build.gradle.kts14
1 files changed, 10 insertions, 4 deletions
diff --git a/sw-ui-kt/build.gradle.kts b/sw-ui-kt/build.gradle.kts
index 05f31d04..c44bf746 100644
--- a/sw-ui-kt/build.gradle.kts
+++ b/sw-ui-kt/build.gradle.kts
@@ -31,11 +31,12 @@ kotlin {
implementation(npm("react-redux", reactReduxVersion))
implementation(npm("redux", "4.0.4"))
- implementation("org.jetbrains:kotlin-react-router-dom:4.3.1-$kotlinWrappersVersion")
- implementation(npm("react-router-dom", "4.3.1"))
+ val reactRouterDomVersion = "4.3.1"
+ implementation("org.jetbrains:kotlin-react-router-dom:$reactRouterDomVersion-$kotlinWrappersVersion")
+ implementation(npm("react-router-dom", reactRouterDomVersion))
implementation("org.jetbrains:kotlin-styled:1.0.0-$kotlinWrappersVersion")
- implementation(npm("styled-components", "3.4.9"))
+ implementation(npm("styled-components", "4.3.2"))
implementation(npm("inline-style-prefixer", "5.1.0"))
// seems to be required by "kotlin-extensions" JS lib
@@ -51,11 +52,16 @@ tasks {
compileKotlinJs {
kotlinOptions.metaInfo = true
kotlinOptions.sourceMap = true
- // non-plain module kind is necessary to use top-level declarations from UMD modules (e.g. react-redux)
+ // commonjs module kind is necessary to use top-level declarations from UMD modules (e.g. react-redux)
// because the Kotlin wrapper didn't specify @JsNonModule
kotlinOptions.moduleKind = "commonjs"
kotlinOptions.main = "call"
}
+ compileTestKotlinJs {
+ // commonjs module kind is necessary to use top-level declarations from UMD modules (e.g. react-redux)
+ // because the Kotlin wrapper didn't specify @JsNonModule
+ kotlinOptions.moduleKind = "commonjs"
+ }
"processResources"(ProcessResources::class) {
val webpack = project.tasks.withType(KotlinWebpack::class).first()
bgstack15