aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2019-09-25 22:14:22 +0200
committerRobert Jaros <rjaros@finn.pl>2019-09-25 22:14:22 +0200
commit22a8d5c35db97d65a90b21d97e6835380191845d (patch)
tree158bc4a45638bf2a2da2ba571f46dec14b618379
parent9da6c523723ca8a77c19c471b9beaeb0102f1cbf (diff)
downloadkvision-22a8d5c35db97d65a90b21d97e6835380191845d.tar.gz
kvision-22a8d5c35db97d65a90b21d97e6835380191845d.tar.bz2
kvision-22a8d5c35db97d65a90b21d97e6835380191845d.zip
Upgrade Bootstrap to version 4
-rw-r--r--build.gradle28
-rw-r--r--gradle.properties2
-rw-r--r--kvision-modules/kvision-bootstrap/build.gradle10
-rw-r--r--kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt7
-rw-r--r--kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js64
-rw-r--r--kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less0
-rw-r--r--kvision-modules/kvision-chart/build.gradle4
-rw-r--r--kvision-modules/kvision-datacontainer/build.gradle11
-rw-r--r--kvision-modules/kvision-datetime/build.gradle4
-rw-r--r--kvision-modules/kvision-dialog/build.gradle11
-rw-r--r--kvision-modules/kvision-handlebars/build.gradle6
-rw-r--r--kvision-modules/kvision-i18n/build.gradle4
-rw-r--r--kvision-modules/kvision-pace/build.gradle4
-rw-r--r--kvision-modules/kvision-redux-kotlin/build.gradle11
-rw-r--r--kvision-modules/kvision-redux/build.gradle8
-rw-r--r--kvision-modules/kvision-richtext/build.gradle6
-rw-r--r--kvision-modules/kvision-select/build.gradle4
-rw-r--r--kvision-modules/kvision-spinner/build.gradle4
-rw-r--r--kvision-modules/kvision-tabulator/build.gradle4
-rw-r--r--kvision-modules/kvision-upload/build.gradle4
-rw-r--r--kvision-modules/shared.gradle7
-rw-r--r--settings.gradle46
22 files changed, 55 insertions, 194 deletions
diff --git a/build.gradle b/build.gradle
index 1a8952bb..af9c8ac6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,25 +122,25 @@ dependencies {
if (!project.gradle.startParameter.taskNames.contains("dokka")) {
kotlinFrontend {
npm {
- dependency("css-loader", "2.0.1")
- dependency("style-loader", "0.23.1")
- dependency("less", "3.9.0")
- dependency("less-loader", "4.1.0")
+ dependency("css-loader", "3.2.0")
+ dependency("style-loader", "1.0.0")
+ dependency("less", "3.10.3")
+ dependency("less-loader", "5.0.0")
dependency("imports-loader", "0.8.0")
- dependency("uglifyjs-webpack-plugin", "2.0.1")
- dependency("file-loader", "2.0.0")
- dependency("url-loader", "1.1.2")
- dependency("jquery", "3.2.1")
- dependency("fecha", "2.3.2")
+ dependency("uglifyjs-webpack-plugin", "2.2.0")
+ dependency("file-loader", "4.2.0")
+ dependency("url-loader", "2.1.0")
+ dependency("jquery", "3.4.1")
+ dependency("fecha", "3.0.3")
dependency("snabbdom", "0.7.3")
dependency("snabbdom-virtualize", "0.7.0")
dependency("jquery-resizable-dom", "0.32.0")
dependency("element-resize-event", "3.0.3")
- dependency("navigo", "7.0.0")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
+ dependency("navigo", "7.1.2")
+ devDependency("karma", "4.3.0")
+ devDependency("karma-chrome-launcher", "3.1.0")
+ devDependency("karma-webpack", "4.0.2")
+ devDependency("qunit", "2.9.2")
}
webpackBundle {
diff --git a/gradle.properties b/gradle.properties
index 87af4512..5e3d2fe1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
group=pl.treksoft
-version=1.0.0-SNAPSHOT
+version=2.0.0-SNAPSHOT
kotlinVersion=1.3.50
javaVersion=1.8
coroutinesVersion=1.3.1
diff --git a/kvision-modules/kvision-bootstrap/build.gradle b/kvision-modules/kvision-bootstrap/build.gradle
index 6c504c17..2f8efeb8 100644
--- a/kvision-modules/kvision-bootstrap/build.gradle
+++ b/kvision-modules/kvision-bootstrap/build.gradle
@@ -3,16 +3,12 @@ apply from: "../shared.gradle"
kotlinFrontend {
npm {
- dependency("bootstrap", "3.4.1")
- dependency("bootstrap-webpack", "0.0.6")
+ dependency("popper.js", "1.15.0")
+ dependency("bootstrap", "4.3.1")
dependency("font-awesome", "4.7.0")
dependency("font-awesome-webpack-4", "1.0.0")
- dependency("awesome-bootstrap-checkbox", "0.3.7")
+ dependency("awesome-bootstrap-checkbox", "1.0.1")
dependency("bootstrap-vertical-tabs", "1.2.2")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
}
diff --git a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt
index 01e1f3c3..678ad33e 100644
--- a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt
+++ b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt
@@ -32,16 +32,15 @@ internal object KVManagerBootstrap {
private val links = document.getElementsByTagName("link")
private val bootstrapWebpack = try {
val bootswatch = links.asList().find { it.getAttribute("href")?.contains("bootstrap.min.css") ?: false }
+ require("bootstrap")
if (bootswatch != null) {
- require("bootstrap-webpack!./js/bootstrap.config.js")
if (bootswatch.getAttribute("href")?.contains("/paper/") == true) {
require("./css/paper.css")
}
- require("./css/style.css")
} else {
- require("bootstrap-webpack")
- require("./css/style.css")
+ require("bootstrap/dist/css/bootstrap.min.css")
}
+ require("./css/style.css")
} catch (e: Throwable) {
}
private val fontAwesomeWebpack = try {
diff --git a/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js b/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js
deleted file mode 100644
index 906942d1..00000000
--- a/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js
+++ /dev/null
@@ -1,64 +0,0 @@
-module.exports = {
-
- // Default for the style loading
- styleLoader: 'style-loader!css-loader!less-loader',
-
- scripts: {
- 'transition': true,
- 'alert': true,
- 'button': true,
- 'carousel': true,
- 'collapse': true,
- 'dropdown': true,
- 'modal': true,
- 'tooltip': true,
- 'popover': true,
- 'scrollspy': true,
- 'tab': true,
- 'affix': true
- },
- styles: {
- "mixins": false,
-
- "normalize": false,
- "print": false,
-
- "scaffolding": false,
- "type": false,
- "code": false,
- "grid": false,
- "tables": false,
- "forms": false,
- "buttons": false,
-
- "component-animations": false,
- "glyphicons": false,
- "dropdowns": false,
- "button-groups": false,
- "input-groups": false,
- "navs": false,
- "navbar": false,
- "breadcrumbs": false,
- "pagination": false,
- "pager": false,
- "labels": false,
- "badges": false,
- "jumbotron": false,
- "thumbnails": false,
- "alerts": false,
- "progress-bars": false,
- "media": false,
- "list-group": false,
- "panels": false,
- "wells": false,
- "close": false,
-
- "modals": false,
- "tooltip": false,
- "popovers": false,
- "carousel": false,
-
- "utilities": false,
- "responsive-utilities": false
- }
-};
diff --git a/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less b/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less
deleted file mode 100644
index e69de29b..00000000
--- a/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less
+++ /dev/null
diff --git a/kvision-modules/kvision-chart/build.gradle b/kvision-modules/kvision-chart/build.gradle
index d90de6ce..6733a4ab 100644
--- a/kvision-modules/kvision-chart/build.gradle
+++ b/kvision-modules/kvision-chart/build.gradle
@@ -4,10 +4,6 @@ kotlinFrontend {
npm {
dependency("chart.js", "2.7.3")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
}
diff --git a/kvision-modules/kvision-datacontainer/build.gradle b/kvision-modules/kvision-datacontainer/build.gradle
index a10a048f..6779c309 100644
--- a/kvision-modules/kvision-datacontainer/build.gradle
+++ b/kvision-modules/kvision-datacontainer/build.gradle
@@ -1,12 +1 @@
apply from: "../shared.gradle"
-
-kotlinFrontend {
-
- npm {
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
- }
-
-}
diff --git a/kvision-modules/kvision-datetime/build.gradle b/kvision-modules/kvision-datetime/build.gradle
index bbd4bb79..b853d2f4 100644
--- a/kvision-modules/kvision-datetime/build.gradle
+++ b/kvision-modules/kvision-datetime/build.gradle
@@ -4,10 +4,6 @@ kotlinFrontend {
npm {
dependency("bootstrap-datetime-picker", "2.4.4")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
}
diff --git a/kvision-modules/kvision-dialog/build.gradle b/kvision-modules/kvision-dialog/build.gradle
index 292a228f..4aaef76d 100644
--- a/kvision-modules/kvision-dialog/build.gradle
+++ b/kvision-modules/kvision-dialog/build.gradle
@@ -3,14 +3,3 @@ apply from: "../shared.gradle"
dependencies {
compile "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion"
}
-
-kotlinFrontend {
-
- npm {
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
- }
-
-}
diff --git a/kvision-modules/kvision-handlebars/build.gradle b/kvision-modules/kvision-handlebars/build.gradle
index a971427e..3864067c 100644
--- a/kvision-modules/kvision-handlebars/build.gradle
+++ b/kvision-modules/kvision-handlebars/build.gradle
@@ -3,12 +3,8 @@ apply from: "../shared.gradle"
kotlinFrontend {
npm {
- dependency("handlebars", "4.1.0")
+ dependency("handlebars", "4.3.1")
dependency("handlebars-loader", "1.7.1")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
}
diff --git a/kvision-modules/kvision-i18n/build.gradle b/kvision-modules/kvision-i18n/build.gradle
index 72870169..a2b6d3f8 100644
--- a/kvision-modules/kvision-i18n/build.gradle
+++ b/kvision-modules/kvision-i18n/build.gradle
@@ -4,10 +4,6 @@ kotlinFrontend {
npm {
dependency("jed", "1.1.1")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
}
diff --git a/kvision-modules/kvision-pace/build.gradle b/kvision-modules/kvision-pace/build.gradle
index 238f9efa..d577df20 100644
--- a/kvision-modules/kvision-pace/build.gradle
+++ b/kvision-modules/kvision-pace/build.gradle
@@ -4,10 +4,6 @@ kotlinFrontend {
npm {
dependency("pace-progressbar", "1.0.8")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
} \ No newline at end of file
diff --git a/kvision-modules/kvision-redux-kotlin/build.gradle b/kvision-modules/kvision-redux-kotlin/build.gradle
index 78bfda21..0b00ddd8 100644
--- a/kvision-modules/kvision-redux-kotlin/build.gradle
+++ b/kvision-modules/kvision-redux-kotlin/build.gradle
@@ -4,14 +4,3 @@ dependencies {
compile ("org.reduxkotlin:redux-kotlin-js:$reduxKotlinVersion")
compile ("org.reduxkotlin:redux-kotlin-thunk-js:$reduxKotlinThunkVersion")
}
-
-kotlinFrontend {
-
- npm {
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
- }
-
-}
diff --git a/kvision-modules/kvision-redux/build.gradle b/kvision-modules/kvision-redux/build.gradle
index 3394095f..7acecd2f 100644
--- a/kvision-modules/kvision-redux/build.gradle
+++ b/kvision-modules/kvision-redux/build.gradle
@@ -9,13 +9,9 @@ dependencies {
kotlinFrontend {
npm {
- dependency("redux", "4.0.0")
+ dependency("redux", "4.0.4")
dependency("redux-thunk", "2.3.0")
- dependency("core-js", "3.0.0")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
+ dependency("core-js", "3.2.1")
}
}
diff --git a/kvision-modules/kvision-richtext/build.gradle b/kvision-modules/kvision-richtext/build.gradle
index fde9ff17..489113a7 100644
--- a/kvision-modules/kvision-richtext/build.gradle
+++ b/kvision-modules/kvision-richtext/build.gradle
@@ -3,11 +3,7 @@ apply from: "../shared.gradle"
kotlinFrontend {
npm {
- dependency("trix", "1.1.0")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
+ dependency("trix", "1.2.0")
}
}
diff --git a/kvision-modules/kvision-select/build.gradle b/kvision-modules/kvision-select/build.gradle
index 7525f037..f8fcbc8a 100644
--- a/kvision-modules/kvision-select/build.gradle
+++ b/kvision-modules/kvision-select/build.gradle
@@ -5,10 +5,6 @@ kotlinFrontend {
npm {
dependency("bootstrap-select", "1.12.4")
dependency("ajax-bootstrap-select", "1.4.3")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
}
diff --git a/kvision-modules/kvision-spinner/build.gradle b/kvision-modules/kvision-spinner/build.gradle
index 4569b8bc..0c3a2940 100644
--- a/kvision-modules/kvision-spinner/build.gradle
+++ b/kvision-modules/kvision-spinner/build.gradle
@@ -4,10 +4,6 @@ kotlinFrontend {
npm {
dependency("bootstrap-touchspin", "4.2.5")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
}
diff --git a/kvision-modules/kvision-tabulator/build.gradle b/kvision-modules/kvision-tabulator/build.gradle
index 19da0553..0712c1e6 100644
--- a/kvision-modules/kvision-tabulator/build.gradle
+++ b/kvision-modules/kvision-tabulator/build.gradle
@@ -8,10 +8,6 @@ kotlinFrontend {
npm {
dependency("tabulator-tables", "4.4.1")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
}
diff --git a/kvision-modules/kvision-upload/build.gradle b/kvision-modules/kvision-upload/build.gradle
index 2ac20c32..2a843308 100644
--- a/kvision-modules/kvision-upload/build.gradle
+++ b/kvision-modules/kvision-upload/build.gradle
@@ -8,10 +8,6 @@ kotlinFrontend {
npm {
dependency("bootstrap-fileinput", "4.5.2")
- devDependency("karma", "3.1.4")
- devDependency("karma-chrome-launcher", "2.2.0")
- devDependency("karma-webpack", "3.0.5")
- devDependency("qunit", "2.8.0")
}
}
diff --git a/kvision-modules/shared.gradle b/kvision-modules/shared.gradle
index 2b45f630..640d8478 100644
--- a/kvision-modules/shared.gradle
+++ b/kvision-modules/shared.gradle
@@ -4,6 +4,13 @@ apply plugin: 'kotlinx-serialization'
kotlinFrontend {
+ npm {
+ devDependency("karma", "4.3.0")
+ devDependency("karma-chrome-launcher", "3.1.0")
+ devDependency("karma-webpack", "4.0.2")
+ devDependency("qunit", "2.9.2")
+ }
+
webpackBundle {
bundleName = "main"
contentPath = file('src/main/web')
diff --git a/settings.gradle b/settings.gradle
index 39b26428..3fc250ff 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,26 +4,26 @@ include 'kvision-modules:kvision-base',
'kvision-modules:kvision-common-remote',
'kvision-modules:kvision-common-types',
'kvision-modules:kvision-bootstrap',
- 'kvision-modules:kvision-select',
- 'kvision-modules:kvision-datetime',
- 'kvision-modules:kvision-spinner',
- 'kvision-modules:kvision-richtext',
- 'kvision-modules:kvision-upload',
- 'kvision-modules:kvision-handlebars',
- 'kvision-modules:kvision-i18n',
- 'kvision-modules:kvision-chart',
- 'kvision-modules:kvision-datacontainer',
- 'kvision-modules:kvision-dialog',
- 'kvision-modules:kvision-redux',
- 'kvision-modules:kvision-redux-kotlin',
- 'kvision-modules:kvision-tabulator',
- 'kvision-modules:kvision-moment',
- 'kvision-modules:kvision-pace',
- 'kvision-modules:kvision-remote',
- 'kvision-modules:kvision-select-remote',
- 'kvision-modules:kvision-tabulator-remote',
- 'kvision-modules:kvision-server-jooby',
- 'kvision-modules:kvision-server-ktor',
- 'kvision-modules:kvision-server-spring-boot',
- 'kvision-modules:kvision-electron',
- 'kvision-modules:kvision-cordova'
+// 'kvision-modules:kvision-select',
+// 'kvision-modules:kvision-datetime',
+// 'kvision-modules:kvision-spinner',
+// 'kvision-modules:kvision-richtext',
+// 'kvision-modules:kvision-upload',
+// 'kvision-modules:kvision-handlebars',
+ 'kvision-modules:kvision-i18n'
+// 'kvision-modules:kvision-chart',
+// 'kvision-modules:kvision-datacontainer',
+// 'kvision-modules:kvision-dialog',
+// 'kvision-modules:kvision-redux',
+// 'kvision-modules:kvision-redux-kotlin',
+// 'kvision-modules:kvision-tabulator',
+// 'kvision-modules:kvision-moment',
+// 'kvision-modules:kvision-pace',
+// 'kvision-modules:kvision-remote',
+// 'kvision-modules:kvision-select-remote',
+// 'kvision-modules:kvision-tabulator-remote',
+// 'kvision-modules:kvision-server-jooby',
+// 'kvision-modules:kvision-server-ktor',
+// 'kvision-modules:kvision-server-spring-boot',
+// 'kvision-modules:kvision-electron',
+// 'kvision-modules:kvision-cordova'