From d14f17f01017944f7be8d3267a07dc0146aea36e Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Fri, 1 May 2020 19:09:26 +0200 Subject: Force jQuery 3.4.1 and Moment.js 2.24.0 to workaround breaking issues. --- build.gradle.kts | 40 ++++++++++++++-------- .../kvision-bootstrap-css/build.gradle.kts | 2 +- .../kvision-bootstrap-datetime/build.gradle.kts | 2 +- .../kvision-bootstrap-select/build.gradle.kts | 4 +-- .../kvision-bootstrap-spinner/build.gradle.kts | 2 +- .../kvision-bootstrap-typeahead/build.gradle.kts | 2 +- .../kvision-bootstrap-upload/build.gradle.kts | 2 +- kvision-modules/kvision-bootstrap/build.gradle.kts | 8 ++--- kvision-modules/kvision-chart/build.gradle.kts | 2 +- .../kvision-fontawesome/build.gradle.kts | 2 +- .../kvision-handlebars/build.gradle.kts | 4 +-- kvision-modules/kvision-i18n/build.gradle.kts | 2 +- kvision-modules/kvision-maps/build.gradle.kts | 2 +- kvision-modules/kvision-moment/build.gradle.kts | 2 +- kvision-modules/kvision-pace/build.gradle.kts | 2 +- kvision-modules/kvision-redux/build.gradle.kts | 4 +-- kvision-modules/kvision-richtext/build.gradle.kts | 2 +- kvision-modules/kvision-tabulator/build.gradle.kts | 2 +- kvision-modules/kvision-toast/build.gradle.kts | 2 +- 19 files changed, 50 insertions(+), 38 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d1d5932c..b0609400 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,20 +35,20 @@ dependencies { api("com.github.snabbdom:snabbdom-kotlin:$snabbdomKotlinVersion") api("pl.treksoft:navigo-kotlin:$navigoKotlinVersion") api("pl.treksoft:jquery-kotlin:$jqueryKotlinVersion") - implementation(npm("css-loader", "3.5.2")) - implementation(npm("style-loader", "1.1.4")) - implementation(npm("less", "3.11.1")) - implementation(npm("less-loader", "5.0.0")) - implementation(npm("imports-loader", "0.8.0")) - implementation(npm("uglifyjs-webpack-plugin", "2.2.0")) - implementation(npm("file-loader", "6.0.0")) - implementation(npm("url-loader", "4.1.0")) - implementation(npm("jquery", "^3.5.0")) - implementation(npm("fecha", "4.2.0")) - implementation(npm("snabbdom", "0.7.4")) - implementation(npm("snabbdom-virtualize", "0.7.0")) - implementation(npm("jquery-resizable-dom", "0.35.0")) - implementation(npm("navigo", "7.1.2")) + implementation(npm("css-loader", "^3.5.2")) + implementation(npm("style-loader", "^1.1.4")) + implementation(npm("less", "^3.11.1")) + implementation(npm("less-loader", "^5.0.0")) + implementation(npm("imports-loader", "^0.8.0")) + implementation(npm("uglifyjs-webpack-plugin", "^2.2.0")) + implementation(npm("file-loader", "^6.0.0")) + implementation(npm("url-loader", "^4.1.0")) + implementation(npm("jquery", "^3.4.1")) + implementation(npm("fecha", "^4.2.0")) + implementation(npm("snabbdom", "^0.7.4")) + implementation(npm("snabbdom-virtualize", "^0.7.0")) + implementation(npm("jquery-resizable-dom", "^0.35.0")) + implementation(npm("navigo", "^7.1.2")) testImplementation(kotlin("test-js")) } @@ -83,6 +83,18 @@ fun copyResources() { } tasks { + withType { + doLast { + yarnLock.parentFile.resolve("package.json").apply { + writeText(readText().replace( + "\"dependencies\": {},", + "\"dependencies\": {},\n \"resolutions\": { \"moment\": \"2.24.0\", \"jquery\": \"3.4.1\" }," + )) + } + org.jetbrains.kotlin.gradle.targets.js.yarn.YarnWorkspaces() + .yarnExec(project, yarnLock.parentFile, "Relaunching Yarn to fix resolutions") + } + } getByName("JsJar", Jar::class) { from("${project.buildDir}/js/packages/kvision/package.json") } diff --git a/kvision-modules/kvision-bootstrap-css/build.gradle.kts b/kvision-modules/kvision-bootstrap-css/build.gradle.kts index f686d3fe..b7fc63c0 100644 --- a/kvision-modules/kvision-bootstrap-css/build.gradle.kts +++ b/kvision-modules/kvision-bootstrap-css/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("bootstrap", "4.4.1")) + implementation(npm("bootstrap", "^4.4.1")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-bootstrap-datetime/build.gradle.kts b/kvision-modules/kvision-bootstrap-datetime/build.gradle.kts index 900553a9..6b37d4b8 100644 --- a/kvision-modules/kvision-bootstrap-datetime/build.gradle.kts +++ b/kvision-modules/kvision-bootstrap-datetime/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("pc-bootstrap4-datetimepicker", "4.17.50")) + implementation(npm("pc-bootstrap4-datetimepicker", "^4.17.50")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-bootstrap-select/build.gradle.kts b/kvision-modules/kvision-bootstrap-select/build.gradle.kts index 1cd4dffe..ab2ad52b 100644 --- a/kvision-modules/kvision-bootstrap-select/build.gradle.kts +++ b/kvision-modules/kvision-bootstrap-select/build.gradle.kts @@ -16,8 +16,8 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("bootstrap-select", "1.13.16")) - implementation(npm("ajax-bootstrap-select", "rjaros/Ajax-Bootstrap-Select")) + implementation(npm("bootstrap-select", "^1.13.16")) + implementation(npm("ajax-bootstrap-select", "^1.4.5")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-bootstrap-spinner/build.gradle.kts b/kvision-modules/kvision-bootstrap-spinner/build.gradle.kts index a1d33a85..100921a7 100644 --- a/kvision-modules/kvision-bootstrap-spinner/build.gradle.kts +++ b/kvision-modules/kvision-bootstrap-spinner/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("bootstrap-touchspin", "4.3.0")) + implementation(npm("bootstrap-touchspin", "^4.3.0")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-bootstrap-typeahead/build.gradle.kts b/kvision-modules/kvision-bootstrap-typeahead/build.gradle.kts index 3e1446ff..e9631bb1 100644 --- a/kvision-modules/kvision-bootstrap-typeahead/build.gradle.kts +++ b/kvision-modules/kvision-bootstrap-typeahead/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("eam_bootstrap-3-typeahead", "0.0.2")) + implementation(npm("eam_bootstrap-3-typeahead", "^0.0.2")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-bootstrap-upload/build.gradle.kts b/kvision-modules/kvision-bootstrap-upload/build.gradle.kts index ccafbf30..daaca3c8 100644 --- a/kvision-modules/kvision-bootstrap-upload/build.gradle.kts +++ b/kvision-modules/kvision-bootstrap-upload/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { api(project(":kvision-modules:kvision-common-types")) api(rootProject) api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion") - implementation(npm("bootstrap-fileinput", "5.0.8")) + implementation(npm("bootstrap-fileinput", "^5.0.8")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-bootstrap/build.gradle.kts b/kvision-modules/kvision-bootstrap/build.gradle.kts index 7910091a..83bd4e3d 100644 --- a/kvision-modules/kvision-bootstrap/build.gradle.kts +++ b/kvision-modules/kvision-bootstrap/build.gradle.kts @@ -16,10 +16,10 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("popper.js", "1.16.1")) - implementation(npm("bootstrap", "4.4.1")) - implementation(npm("awesome-bootstrap-checkbox", "1.0.1")) - implementation(npm("element-resize-event", "3.0.3")) + implementation(npm("popper.js", "^1.16.1")) + implementation(npm("bootstrap", "^4.4.1")) + implementation(npm("awesome-bootstrap-checkbox", "^1.0.1")) + implementation(npm("element-resize-event", "^3.0.3")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-chart/build.gradle.kts b/kvision-modules/kvision-chart/build.gradle.kts index 841eb991..92ce56f9 100644 --- a/kvision-modules/kvision-chart/build.gradle.kts +++ b/kvision-modules/kvision-chart/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("chart.js", "2.9.3")) + implementation(npm("chart.js", "^2.9.3")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-fontawesome/build.gradle.kts b/kvision-modules/kvision-fontawesome/build.gradle.kts index ddfd90a5..46f0d15b 100644 --- a/kvision-modules/kvision-fontawesome/build.gradle.kts +++ b/kvision-modules/kvision-fontawesome/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("@fortawesome/fontawesome-free", "5.13.0")) + implementation(npm("@fortawesome/fontawesome-free", "^5.13.0")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-handlebars/build.gradle.kts b/kvision-modules/kvision-handlebars/build.gradle.kts index f8742f9f..b6148eb5 100644 --- a/kvision-modules/kvision-handlebars/build.gradle.kts +++ b/kvision-modules/kvision-handlebars/build.gradle.kts @@ -16,8 +16,8 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("handlebars", "4.7.6")) - implementation(npm("handlebars-loader", "1.7.1")) + implementation(npm("handlebars", "^4.7.6")) + implementation(npm("handlebars-loader", "^1.7.1")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-i18n/build.gradle.kts b/kvision-modules/kvision-i18n/build.gradle.kts index f074b84f..1b7d6434 100644 --- a/kvision-modules/kvision-i18n/build.gradle.kts +++ b/kvision-modules/kvision-i18n/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("jed", "1.1.1")) + implementation(npm("jed", "^1.1.1")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-maps/build.gradle.kts b/kvision-modules/kvision-maps/build.gradle.kts index 46acbbba..344fae0a 100644 --- a/kvision-modules/kvision-maps/build.gradle.kts +++ b/kvision-modules/kvision-maps/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("leaflet", "1.6.0")) + implementation(npm("leaflet", "^1.6.0")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-moment/build.gradle.kts b/kvision-modules/kvision-moment/build.gradle.kts index c9a67ee9..150909cd 100644 --- a/kvision-modules/kvision-moment/build.gradle.kts +++ b/kvision-modules/kvision-moment/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("moment", "2.24.0")) + implementation(npm("moment", "^2.24.0")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-pace/build.gradle.kts b/kvision-modules/kvision-pace/build.gradle.kts index 2d847293..d1d5fb9f 100644 --- a/kvision-modules/kvision-pace/build.gradle.kts +++ b/kvision-modules/kvision-pace/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("pace-progressbar", "1.0.9")) + implementation(npm("pace-progressbar", "^1.0.9")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-redux/build.gradle.kts b/kvision-modules/kvision-redux/build.gradle.kts index 0fca329d..87cd0f23 100644 --- a/kvision-modules/kvision-redux/build.gradle.kts +++ b/kvision-modules/kvision-redux/build.gradle.kts @@ -21,8 +21,8 @@ dependencies { api("org.jetbrains:kotlin-redux:$kotlinReduxVersion") { exclude("org.jetbrains.kotlinx", "kotlinx-html-js") } - implementation(npm("redux", "4.0.5")) - implementation(npm("redux-thunk", "2.3.0")) + implementation(npm("redux", "^4.0.5")) + implementation(npm("redux-thunk", "^2.3.0")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-richtext/build.gradle.kts b/kvision-modules/kvision-richtext/build.gradle.kts index 6a8ba5f0..8eb87626 100644 --- a/kvision-modules/kvision-richtext/build.gradle.kts +++ b/kvision-modules/kvision-richtext/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("trix", "1.2.3")) + implementation(npm("trix", "^1.2.3")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-tabulator/build.gradle.kts b/kvision-modules/kvision-tabulator/build.gradle.kts index ec2e44f0..b1ed5c6c 100644 --- a/kvision-modules/kvision-tabulator/build.gradle.kts +++ b/kvision-modules/kvision-tabulator/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("tabulator-tables", "4.6.2")) + implementation(npm("tabulator-tables", "^4.6.2")) testImplementation(kotlin("test-js")) } diff --git a/kvision-modules/kvision-toast/build.gradle.kts b/kvision-modules/kvision-toast/build.gradle.kts index 36ea4949..77b1fa7d 100644 --- a/kvision-modules/kvision-toast/build.gradle.kts +++ b/kvision-modules/kvision-toast/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { dependencies { implementation(kotlin("stdlib-js")) api(rootProject) - implementation(npm("toastr", "2.1.4")) + implementation(npm("toastr", "^2.1.4")) testImplementation(kotlin("test-js")) } -- cgit