diff --git a/.mergify.yml b/.mergify.yml index d16d6ce..0a586e9 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,11 +8,134 @@ pull_request_rules: - name: merge scala-steward's PRs conditions: - - author=scala-steward - - body~=labels:.*early-semver-patch + - author=lucuma-steward[bot] + - or: + - body~=labels:.*early-semver-patch + - body~=labels:.*early-semver-minor + - 'title=flake.lock: Update' - status-success=Build and Test (ubuntu-latest, 3.2.2, temurin@17) actions: merge: {} +- name: Label csstype PRs + conditions: + - files~=^csstype/ + actions: + label: + add: + - csstype + remove: [] +- name: Label dateFns PRs + conditions: + - files~=^dateFns/ + actions: + label: + add: + - dateFns + remove: [] +- name: Label highcharts PRs + conditions: + - files~=^highcharts/ + actions: + label: + add: + - highcharts + remove: [] +- name: Label primereact PRs + conditions: + - files~=^primereact/ + actions: + label: + add: + - primereact + remove: [] +- name: Label propTypes PRs + conditions: + - files~=^propTypes/ + actions: + label: + add: + - propTypes + remove: [] +- name: Label react PRs + conditions: + - files~=^react/ + actions: + label: + add: + - react + remove: [] +- name: Label reactDatepicker PRs + conditions: + - files~=^reactDatepicker/ + actions: + label: + add: + - reactDatepicker + remove: [] +- name: Label reactPopper PRs + conditions: + - files~=^reactPopper/ + actions: + label: + add: + - reactPopper + remove: [] +- name: Label reactTransitionGroup PRs + conditions: + - files~=^reactTransitionGroup/ + actions: + label: + add: + - reactTransitionGroup + remove: [] +- name: Label scheduler PRs + conditions: + - files~=^scheduler/ + actions: + label: + add: + - scheduler + remove: [] +- name: Label std PRs + conditions: + - files~=^std/ + actions: + label: + add: + - std + remove: [] +- name: Label tanstackReactTable PRs + conditions: + - files~=^tanstackReactTable/ + actions: + label: + add: + - tanstackReactTable + remove: [] +- name: Label tanstackReactVirtual PRs + conditions: + - files~=^tanstackReactVirtual/ + actions: + label: + add: + - tanstackReactVirtual + remove: [] +- name: Label tanstackTableCore PRs + conditions: + - files~=^tanstackTableCore/ + actions: + label: + add: + - tanstackTableCore + remove: [] +- name: Label tanstackVirtualCore PRs + conditions: + - files~=^tanstackVirtualCore/ + actions: + label: + add: + - tanstackVirtualCore + remove: [] - name: merge dependabot PRs conditions: - author=dependabot[bot] diff --git a/build.sbt b/build.sbt index e119cc4..f6ca6ae 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ val scala3 = "3.2.2" -ThisBuild / tlBaseVersion := "0.2" +ThisBuild / tlBaseVersion := "0.3" ThisBuild / crossScalaVersions := Seq(scala3) ThisBuild / tlCiReleaseBranches := Seq("main") @@ -110,7 +110,6 @@ lazy val std = project ) .settings(facadeSettings("std")) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val csstype = project .settings( @@ -119,7 +118,6 @@ lazy val csstype = project .settings(facadeSettings("csstype")) .dependsOn(std) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val dateFns = project .settings( @@ -128,7 +126,6 @@ lazy val dateFns = project .settings(facadeSettings("date-fns")) .dependsOn(std) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val highcharts = project .settings( @@ -137,7 +134,6 @@ lazy val highcharts = project .settings(facadeSettings("highcharts")) .dependsOn(std) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val propTypes = project .settings( @@ -146,7 +142,6 @@ lazy val propTypes = project .settings(facadeSettings("prop-types")) .dependsOn(std) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val scheduler = project .settings( @@ -155,7 +150,6 @@ lazy val scheduler = project .settings(facadeSettings("scheduler")) .dependsOn(std) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val react = project .settings( @@ -164,7 +158,6 @@ lazy val react = project .settings(facadeSettings("react")) .dependsOn(csstype, propTypes, scheduler) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val reactTransitionGroup = project .settings( @@ -173,7 +166,6 @@ lazy val reactTransitionGroup = project .settings(facadeSettings("react-transition-group")) .dependsOn(react) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val primereact = project .settings( @@ -182,7 +174,6 @@ lazy val primereact = project .settings(facadeSettings("primereact")) .dependsOn(reactTransitionGroup) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val reactPopper = project .settings( @@ -191,7 +182,6 @@ lazy val reactPopper = project .settings(facadeSettings("react-popper")) .dependsOn(react) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val reactDatepicker = project .settings( @@ -200,7 +190,6 @@ lazy val reactDatepicker = project .settings(facadeSettings("react-datepicker")) .dependsOn(reactPopper, dateFns) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val tanstackTableCore = project .settings( @@ -209,7 +198,6 @@ lazy val tanstackTableCore = project .settings(facadeSettings("@tanstack/table-core")) .dependsOn(std) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val tanstackReactTable = project .settings( @@ -218,7 +206,6 @@ lazy val tanstackReactTable = project .settings(facadeSettings("@tanstack/react-table")) .dependsOn(react, tanstackTableCore) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val tanstackVirtualCore = project .settings( @@ -227,7 +214,6 @@ lazy val tanstackVirtualCore = project .settings(facadeSettings("@tanstack/virtual-core")) .dependsOn(std) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) lazy val tanstackReactVirtual = project .settings( @@ -236,4 +222,3 @@ lazy val tanstackReactVirtual = project .settings(facadeSettings("@tanstack/react-virtual")) .dependsOn(react, tanstackVirtualCore) .enablePlugins(ScalaJSPlugin) - .disablePlugins(MergifyPlugin) diff --git a/package-lock.json b/package-lock.json index d546834..32aca43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "dependencies": { "@tanstack/react-table": "^8.7.9", - "@tanstack/react-virtual": "^3.0.0-beta.45", + "@tanstack/react-virtual": "^3.0.0-beta.47", "@types/react-datepicker": "^4.8.0", "highcharts": "^10.3.3", "primereact": "^9.0.0-rc.1", @@ -53,11 +53,11 @@ } }, "node_modules/@tanstack/react-virtual": { - "version": "3.0.0-beta.45", - "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.0-beta.45.tgz", - "integrity": "sha512-/VCBrs89i9s4cM9Ag9nFfu3PD5U50vmqdZqWyxgy2ljuLlDRvOkBXDcyRjP32tDpkYjAKbsqK0UEmHK+nbIPBA==", + "version": "3.0.0-beta.47", + "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.0-beta.47.tgz", + "integrity": "sha512-RnZTzzrmmL9WDNtmNTHGRB6e+yKJuRsrQjlIhK2bGVU0HEVvC7w/X6VUWCSAqJSriypniE8daRXSAisgQzhbsA==", "dependencies": { - "@tanstack/virtual-core": "3.0.0-beta.45" + "@tanstack/virtual-core": "3.0.0-beta.47" }, "funding": { "type": "github", @@ -80,9 +80,9 @@ } }, "node_modules/@tanstack/virtual-core": { - "version": "3.0.0-beta.45", - "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.0.0-beta.45.tgz", - "integrity": "sha512-RPEwL4BxsQlaO6F923WnElLnOIokJmdwVBK835s9JQPoY+CMJUotAXjJK2I/Gsy8AXLjdvTvS50uOiKHIUHBKw==", + "version": "3.0.0-beta.47", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.0.0-beta.47.tgz", + "integrity": "sha512-/sh1pycClyW5BBpMAItKxP9qD7w0KSL7k/tHLsOFulMOrGTGhWRUiZE7VDEN0nHk5DNMx5TsPfaXC1jy6DxnVA==", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -340,11 +340,11 @@ } }, "@tanstack/react-virtual": { - "version": "3.0.0-beta.45", - "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.0-beta.45.tgz", - "integrity": "sha512-/VCBrs89i9s4cM9Ag9nFfu3PD5U50vmqdZqWyxgy2ljuLlDRvOkBXDcyRjP32tDpkYjAKbsqK0UEmHK+nbIPBA==", + "version": "3.0.0-beta.47", + "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.0-beta.47.tgz", + "integrity": "sha512-RnZTzzrmmL9WDNtmNTHGRB6e+yKJuRsrQjlIhK2bGVU0HEVvC7w/X6VUWCSAqJSriypniE8daRXSAisgQzhbsA==", "requires": { - "@tanstack/virtual-core": "3.0.0-beta.45" + "@tanstack/virtual-core": "3.0.0-beta.47" } }, "@tanstack/table-core": { @@ -353,9 +353,9 @@ "integrity": "sha512-4RkayPMV1oS2SKDXfQbFoct1w5k+pvGpmX18tCXMofK/VDRdA2hhxfsQlMvsJ4oTX8b0CI4Y3GDKn5T425jBCw==" }, "@tanstack/virtual-core": { - "version": "3.0.0-beta.45", - "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.0.0-beta.45.tgz", - "integrity": "sha512-RPEwL4BxsQlaO6F923WnElLnOIokJmdwVBK835s9JQPoY+CMJUotAXjJK2I/Gsy8AXLjdvTvS50uOiKHIUHBKw==" + "version": "3.0.0-beta.47", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.0.0-beta.47.tgz", + "integrity": "sha512-/sh1pycClyW5BBpMAItKxP9qD7w0KSL7k/tHLsOFulMOrGTGhWRUiZE7VDEN0nHk5DNMx5TsPfaXC1jy6DxnVA==" }, "@types/prop-types": { "version": "15.7.5", diff --git a/package.json b/package.json index 5483450..23b3d87 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "dependencies": { "@tanstack/react-table": "^8.7.9", - "@tanstack/react-virtual": "^3.0.0-beta.45", + "@tanstack/react-virtual": "^3.0.0-beta.47", "@types/react-datepicker": "^4.8.0", "highcharts": "^10.3.3", "primereact": "^9.0.0-rc.1", diff --git a/project/plugins.sbt b/project/plugins.sbt index f40d584..2e52abe 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.10.8") +addSbtPlugin("edu.gemini" % "sbt-lucuma-lib" % "0.10.9") libraryDependencies ++= Seq( "org.scalablytyped.converter" %% "cli" % "1.0.0-beta41"