diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a620c5..ddcb773 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ change log follows the conventions of ## [Unreleased] +## [1.6.1.63] +- Upgraded to @headlessui/react 1.6.1 + ## [1.6.0.62] ### Changed - Upgraded to @headlessui/react 1.6.0 @@ -93,7 +96,8 @@ Update clojars with more repository information. ### Added - Reagent interop with @headlessui/react for Disclosure, Transition and FocusTrap -[Unreleased]: https://github.com/mainej/headlessui-reagent/compare/v1.6.0.62...main +[Unreleased]: https://github.com/mainej/headlessui-reagent/compare/v1.6.1.63...main +[1.6.1.63]: https://github.com/mainej/headlessui-reagent/compare/v1.6.0.62...v1.6.1.63 [1.6.0.62]: https://github.com/mainej/headlessui-reagent/compare/v1.5.0.47...v1.6.0.62 [1.5.0.47]: https://github.com/mainej/headlessui-reagent/compare/v1.4.3.46...v1.5.0.47 [1.4.3.46]: https://github.com/mainej/headlessui-reagent/compare/v1.4.3.44...v1.4.3.46 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b800b5d..09b3a22 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ of 0. It will check that you have done the following things: 1. Proactively updated CHANGELOG.md -2. Proactively updated package.json +2. Proactively updated package.json and ran `npm install` 3. Commited 4. Tagged commit diff --git a/dev/build.clj b/dev/build.clj index defbc7f..60977cb 100644 --- a/dev/build.clj +++ b/dev/build.clj @@ -6,7 +6,7 @@ (def ^:private lib 'com.github.mainej/headlessui-reagent) (def ^:private rev-count (Integer/parseInt (b/git-count-revs nil))) -(def ^:private headlessui-react-version "1.6.0") +(def ^:private headlessui-react-version "1.6.1") (defn- format-version [revision] (str headlessui-react-version "." revision)) (def ^:private version (format-version rev-count)) (def ^:private next-version (format-version (inc rev-count))) @@ -37,8 +37,11 @@ (die "\nCouldn't sync with github.")) params) +(defn- occurrence-count [filename s] + (count (re-seq (re-pattern s) (slurp filename)))) + (defn- assert-changelog-updated [params] - (let [occurrences (count (re-seq (re-pattern version) (slurp "CHANGELOG.md")))] + (let [occurrences (occurrence-count "CHANGELOG.md" version)] (when (< occurrences 4) (die (string/join "\n" ["CHANGELOG.md must include version at least 4 times, but saw it %s times." @@ -48,12 +51,20 @@ params) (defn- assert-package-json-updated [params] - (when-not (string/includes? (slurp "package.json") version) + (when (zero? (occurrence-count "package.json" version)) (die (string/join "\n" ["package.json must include version." " * If you will amend the current commit, use %s" " * If you intend to create a new commit, use %s"]) version next-version)) + (let [occurrences (occurrence-count "package-lock.json" version)] + (when (< occurrences 2) + (die (string/join "\n" + ["package-lock.json must include version at least twice, but saw it %s times." + " * If you will amend the current commit, use %s" + " * If you intend to create a new commit, use %s" + "Run `npm install`"]) + occurrences version next-version))) params) (defn- assert-scm-clean [params] diff --git a/example/package-lock.json b/example/package-lock.json index 7489e0a..51223e8 100644 --- a/example/package-lock.json +++ b/example/package-lock.json @@ -8,7 +8,7 @@ "name": "example", "version": "0.0.1", "dependencies": { - "@headlessui/react": "1.6.0", + "@headlessui/react": "1.6.1", "@heroicons/react": "^1.0.5" }, "devDependencies": { @@ -114,9 +114,9 @@ } }, "node_modules/@headlessui/react": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.0.tgz", - "integrity": "sha512-PlDuytBC6iDC/uMvpANm5VpRSuayyXMEeo/dNIwAZNHCfhZUqDQgLXjGu48SHsvMw22Kc3c3u9TOAMZNg+1vzw==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.1.tgz", + "integrity": "sha512-gMd6uIs1U4Oz718Z5gFoV0o/vD43/4zvbyiJN9Dt7PK9Ubxn+TmJwTmYwyNJc5KxxU1t0CmgTNgwZX9+4NjCnQ==", "engines": { "node": ">=10" }, @@ -2230,9 +2230,9 @@ } }, "@headlessui/react": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.0.tgz", - "integrity": "sha512-PlDuytBC6iDC/uMvpANm5VpRSuayyXMEeo/dNIwAZNHCfhZUqDQgLXjGu48SHsvMw22Kc3c3u9TOAMZNg+1vzw==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.1.tgz", + "integrity": "sha512-gMd6uIs1U4Oz718Z5gFoV0o/vD43/4zvbyiJN9Dt7PK9Ubxn+TmJwTmYwyNJc5KxxU1t0CmgTNgwZX9+4NjCnQ==", "requires": {} }, "@heroicons/react": { diff --git a/example/package.json b/example/package.json index ed0a7f1..ed59980 100644 --- a/example/package.json +++ b/example/package.json @@ -7,7 +7,7 @@ "tailwindcss": "^3.0.23" }, "dependencies": { - "@headlessui/react": "1.6.0", + "@headlessui/react": "1.6.1", "@heroicons/react": "^1.0.5" } } diff --git a/package-lock.json b/package-lock.json index 8f16e46..ebd90e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,21 +1,21 @@ { "name": "headlessui-reagent", - "version": "1.6.0.62", + "version": "1.6.1.63", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "headlessui-reagent", - "version": "1.6.0.62", + "version": "1.6.1.63", "license": "MIT", "devDependencies": { - "@headlessui/react": "^1.6.0" + "@headlessui/react": "^1.6.1" } }, "node_modules/@headlessui/react": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.0.tgz", - "integrity": "sha512-PlDuytBC6iDC/uMvpANm5VpRSuayyXMEeo/dNIwAZNHCfhZUqDQgLXjGu48SHsvMw22Kc3c3u9TOAMZNg+1vzw==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.1.tgz", + "integrity": "sha512-gMd6uIs1U4Oz718Z5gFoV0o/vD43/4zvbyiJN9Dt7PK9Ubxn+TmJwTmYwyNJc5KxxU1t0CmgTNgwZX9+4NjCnQ==", "dev": true, "engines": { "node": ">=10" @@ -98,9 +98,9 @@ }, "dependencies": { "@headlessui/react": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.0.tgz", - "integrity": "sha512-PlDuytBC6iDC/uMvpANm5VpRSuayyXMEeo/dNIwAZNHCfhZUqDQgLXjGu48SHsvMw22Kc3c3u9TOAMZNg+1vzw==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.6.1.tgz", + "integrity": "sha512-gMd6uIs1U4Oz718Z5gFoV0o/vD43/4zvbyiJN9Dt7PK9Ubxn+TmJwTmYwyNJc5KxxU1t0CmgTNgwZX9+4NjCnQ==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index 70b63ac..86ab98d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "headlessui-reagent", - "version": "1.6.0.62", + "version": "1.6.1.63", "description": "Adapts headlessui for use with Reagent", "repository": { "type": "git", @@ -19,6 +19,6 @@ }, "homepage": "https://github.com/mainej/headlessui-reagent#readme", "devDependencies": { - "@headlessui/react": "^1.6.0" + "@headlessui/react": "^1.6.1" } } diff --git a/src/deps.cljs b/src/deps.cljs index 8ef6cff..e2b39a2 100644 --- a/src/deps.cljs +++ b/src/deps.cljs @@ -1 +1 @@ -{:npm-deps { "@headlessui/react" "^1.6.0"}} +{:npm-deps { "@headlessui/react" "^1.6.1"}}