Skip to content

IS-11744 Consolidate on main: merge dev and document the branching model #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markoweb wants to merge 22 commits into
base: main
Choose a base branch
from
Open

IS-11744 Consolidate on main: merge dev and document the branching model #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5660ae5
IS-9818 Update .nvmrc to Node 24.19.0.
Aug 11, 2026
51f4c3b
IS-11682 Consume UI Kit CSS from source instead of the built artifact.
Aug 11, 2026
05bce6e
IS-9818 Pin cypress to 15.20.0.
Aug 11, 2026
62cc577
IS-11684 Add h5 and h6 styling.
Aug 11, 2026
ce0e6c8
IS-9818 Require Node 24.19.0 and npm 11.17.0 in engines.
Aug 11, 2026
b36887a
IS-11682 Declare the CSS package dependency and drop dead TS path ali…
Aug 12, 2026
7309198
IS-9818 Refer to .nvmrc for Node and npm versions in READMEs.
Aug 12, 2026
f74c1c8
IS-11682 Use js code fence for the CSS import snippet.
Aug 12, 2026
217b874
IS-9818 Add jsdom to the root devDependencies.
vahag-curity Aug 12, 2026
43710a2
Merge pull request #289 from curityio/IS-9818-update-nvmrc
renatoathaydes Aug 12, 2026
e7894e5
IS-11627 Add localised error-area messages for token-unknown and bind…
philippe-alexandremartin-crypto Aug 17, 2026
c3837cf
IS-11682 Document repo-based install and the no-bundler CSS path.
Aug 18, 2026
06ef4bf
IS-11682 Drop unused ui-kit-css dependency from the component library.
Aug 18, 2026
7d57454
IS-11682 Remove the orphaned CSS lib dev server scripts.
Aug 18, 2026
15b41ac
IS-11682 Drop the speculative src subpath from the CSS exports map.
Aug 18, 2026
f808b75
IS-11682 Remove the redundant plugins key and note the watch-mode lim…
Aug 18, 2026
3459cd3
Merge pull request #298 from curityio/fix/dev/IS-11627-error-descript…
phylexm Aug 18, 2026
7234f9a
Merge pull request #291 from curityio/feature/dev/IS-11684-h5-h6-styling
urre Aug 19, 2026
f177c11
Merge pull request #290 from curityio/feature/dev/IS-11682-css-source…
urre Aug 20, 2026
e767cd4
Merge remote-tracking branch 'origin/dev' into merge/main/IS-11744-co…
Aug 20, 2026
0b0db3a
IS-11744 Document the branching model for consumers.
Aug 20, 2026
9e57c8e
IS-11744 Correct the release-pinning guidance: tags only.
Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.22.0
24.19.0
12 changes: 12 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ This monorepo contains:
- UI Icons React Library
- React Component Library

## Branches and releases

`main` is the development branch. It holds the work for the next release and does **not** correspond to any released version. It previously mirrored the latest release; that is no longer the case.

To work against a specific Identity Server release, check out its tag:

```shell
git checkout ui-kit-11.4.0
```

Release tags are the only references that mark a released state, so pin a tag rather than following any branch. The `version/*` branches carry maintenance work for a released line and can contain changes that are not yet part of a release, so their tips are not release snapshots either.

## Prerequisites
- Node.js (version as specified in the `.nvmrc` file)

Expand Down
Loading
Loading