Skip to content

Commit

Permalink
Upgrade @headlessui/react to 1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mainej committed May 3, 2022
1 parent 5848ddc commit 26fbc98
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 25 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 14 additions & 3 deletions dev/build.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down Expand Up @@ -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."
Expand All @@ -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]
Expand Down
14 changes: 7 additions & 7 deletions example/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"tailwindcss": "^3.0.23"
},
"dependencies": {
"@headlessui/react": "1.6.0",
"@headlessui/react": "1.6.1",
"@heroicons/react": "^1.0.5"
}
}
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -19,6 +19,6 @@
},
"homepage": "https://github.com/mainej/headlessui-reagent#readme",
"devDependencies": {
"@headlessui/react": "^1.6.0"
"@headlessui/react": "^1.6.1"
}
}
2 changes: 1 addition & 1 deletion src/deps.cljs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{:npm-deps { "@headlessui/react" "^1.6.0"}}
{:npm-deps { "@headlessui/react" "^1.6.1"}}

0 comments on commit 26fbc98

Please sign in to comment.