From 22a8d5c35db97d65a90b21d97e6835380191845d Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Wed, 25 Sep 2019 22:14:22 +0200 Subject: Upgrade Bootstrap to version 4 --- kvision-modules/kvision-bootstrap/build.gradle | 10 +--- .../pl/treksoft/kvision/KVManagerBootstrap.kt | 7 +-- .../src/main/resources/js/bootstrap.config.js | 64 ---------------------- .../src/main/resources/js/bootstrap.config.less | 0 kvision-modules/kvision-chart/build.gradle | 4 -- kvision-modules/kvision-datacontainer/build.gradle | 11 ---- kvision-modules/kvision-datetime/build.gradle | 4 -- kvision-modules/kvision-dialog/build.gradle | 11 ---- kvision-modules/kvision-handlebars/build.gradle | 6 +- kvision-modules/kvision-i18n/build.gradle | 4 -- kvision-modules/kvision-pace/build.gradle | 4 -- kvision-modules/kvision-redux-kotlin/build.gradle | 11 ---- kvision-modules/kvision-redux/build.gradle | 8 +-- kvision-modules/kvision-richtext/build.gradle | 6 +- kvision-modules/kvision-select/build.gradle | 4 -- kvision-modules/kvision-spinner/build.gradle | 4 -- kvision-modules/kvision-tabulator/build.gradle | 4 -- kvision-modules/kvision-upload/build.gradle | 4 -- kvision-modules/shared.gradle | 7 +++ 19 files changed, 17 insertions(+), 156 deletions(-) delete mode 100644 kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js delete mode 100644 kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less (limited to 'kvision-modules') 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 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') -- cgit