Skip to content

Commit

Permalink
Merge branch 'master' into embed-demo
Browse files Browse the repository at this point in the history
  • Loading branch information
Topener committed Sep 9, 2024
2 parents dbd6354 + 18a230e commit 1da0844
Show file tree
Hide file tree
Showing 63 changed files with 5,653 additions and 10,098 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/dhis2-verify-lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: 20.x

- uses: c-hive/gha-yarn-cache@v1
- run: |
yarn install --frozen-lockfile
NODE_OPTIONS=--openssl-legacy-provider yarn setup
yarn setup
- name: Build
run: yarn build
Expand All @@ -59,7 +59,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: 20.x

Expand All @@ -80,7 +80,7 @@ jobs:
needs: [build]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: 20.x

Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: 20.x

Expand Down Expand Up @@ -181,7 +181,6 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 20.x
cache: 'yarn'

- uses: actions/download-artifact@v2
with:
Expand All @@ -190,9 +189,10 @@ jobs:
- run: ./scripts/extract-artifact.sh

# ensure that d2-app-scripts is available
- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile

- uses: dhis2/action-semantic-release@master
- uses: dhis2/action-semantic-release@node20
with:
publish-npm: true
publish-github: true
Expand Down
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
## [9.11.3](https://github.com/dhis2/ui/compare/v9.11.2...v9.11.3) (2024-08-21)


### Bug Fixes

* select-field not showing in correct place ([#1400](https://github.com/dhis2/ui/issues/1400)) ([d97d640](https://github.com/dhis2/ui/commit/d97d640f92c1c42dbc92e46771b6a58870add895))

## [9.11.2](https://github.com/dhis2/ui/compare/v9.11.1...v9.11.2) (2024-08-18)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([2f82be2](https://github.com/dhis2/ui/commit/2f82be21006c25b40b3d4e29f479a2c7ee0bd2fa))
* **translations:** sync translations from transifex (master) ([e8b0559](https://github.com/dhis2/ui/commit/e8b05595730f02fdf58e12eb58daf346fc66ffd8))

## [9.11.1](https://github.com/dhis2/ui/compare/v9.11.0...v9.11.1) (2024-08-08)


### Bug Fixes

* fix publishing to npm ([#1577](https://github.com/dhis2/ui/issues/1577)) ([1889a7b](https://github.com/dhis2/ui/commit/1889a7baf0ad1b6709272be61094da80cad65fe1))
* get rid of storybook references in docs ([1904b17](https://github.com/dhis2/ui/commit/1904b172bfde066a17a0edf82c196959ba35c8bb))
* get storybook 8 working ([8c6be62](https://github.com/dhis2/ui/commit/8c6be62c2df9261109df12e51c7dc2339b59eedf))
* issue with production build not loading some dependent modules ([5060c61](https://github.com/dhis2/ui/commit/5060c6143e3788895ab4282ba7dc84283d62bae8))
* pin react version in resolution ([#1573](https://github.com/dhis2/ui/issues/1573)) ([46cdd79](https://github.com/dhis2/ui/commit/46cdd79c27b28d69eb8e5d72a6946376961ba670))
* resolve react version ([#1567](https://github.com/dhis2/ui/issues/1567)) ([c18a73d](https://github.com/dhis2/ui/commit/c18a73d71a1a59e4229adae2f964e06041eaab8b))
* **calendar:** pin temporal dependency to version 0.4.3 due to breaking changes ([3b5a586](https://github.com/dhis2/ui/commit/3b5a58614eb6992469d5c5d74aa19aa225fb2b1c))

# [9.11.0](https://github.com/dhis2/ui/compare/v9.10.3...v9.11.0) (2024-07-29)


Expand Down
20 changes: 10 additions & 10 deletions collections/forms/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/ui-forms",
"version": "9.11.0",
"version": "9.11.3",
"main": "./build/cjs/index.js",
"module": "./build/es/index.js",
"sideEffects": [
Expand Down Expand Up @@ -35,15 +35,15 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2-ui/button": "9.11.0",
"@dhis2-ui/checkbox": "9.11.0",
"@dhis2-ui/field": "9.11.0",
"@dhis2-ui/file-input": "9.11.0",
"@dhis2-ui/input": "9.11.0",
"@dhis2-ui/radio": "9.11.0",
"@dhis2-ui/select": "9.11.0",
"@dhis2-ui/switch": "9.11.0",
"@dhis2-ui/text-area": "9.11.0",
"@dhis2-ui/button": "9.11.3",
"@dhis2-ui/checkbox": "9.11.3",
"@dhis2-ui/field": "9.11.3",
"@dhis2-ui/file-input": "9.11.3",
"@dhis2-ui/input": "9.11.3",
"@dhis2-ui/radio": "9.11.3",
"@dhis2-ui/select": "9.11.3",
"@dhis2-ui/switch": "9.11.3",
"@dhis2-ui/text-area": "9.11.3",
"classnames": "^2.3.1",
"final-form": "^4.20.2",
"prop-types": "^15.7.2",
Expand Down
98 changes: 49 additions & 49 deletions collections/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/ui",
"version": "9.11.0",
"version": "9.11.3",
"main": "./build/cjs/index.js",
"module": "./build/es/index.js",
"exports": {
Expand All @@ -21,54 +21,54 @@
"build": "d2-app-scripts build"
},
"dependencies": {
"@dhis2-ui/alert": "9.11.0",
"@dhis2-ui/box": "9.11.0",
"@dhis2-ui/button": "9.11.0",
"@dhis2-ui/calendar": "9.11.0",
"@dhis2-ui/card": "9.11.0",
"@dhis2-ui/center": "9.11.0",
"@dhis2-ui/checkbox": "9.11.0",
"@dhis2-ui/chip": "9.11.0",
"@dhis2-ui/cover": "9.11.0",
"@dhis2-ui/css": "9.11.0",
"@dhis2-ui/divider": "9.11.0",
"@dhis2-ui/field": "9.11.0",
"@dhis2-ui/file-input": "9.11.0",
"@dhis2-ui/header-bar": "9.11.0",
"@dhis2-ui/help": "9.11.0",
"@dhis2-ui/input": "9.11.0",
"@dhis2-ui/intersection-detector": "9.11.0",
"@dhis2-ui/label": "9.11.0",
"@dhis2-ui/layer": "9.11.0",
"@dhis2-ui/legend": "9.11.0",
"@dhis2-ui/loader": "9.11.0",
"@dhis2-ui/logo": "9.11.0",
"@dhis2-ui/menu": "9.11.0",
"@dhis2-ui/modal": "9.11.0",
"@dhis2-ui/node": "9.11.0",
"@dhis2-ui/notice-box": "9.11.0",
"@dhis2-ui/organisation-unit-tree": "9.11.0",
"@dhis2-ui/pagination": "9.11.0",
"@dhis2-ui/popover": "9.11.0",
"@dhis2-ui/popper": "9.11.0",
"@dhis2-ui/portal": "9.11.0",
"@dhis2-ui/radio": "9.11.0",
"@dhis2-ui/required": "9.11.0",
"@dhis2-ui/segmented-control": "9.11.0",
"@dhis2-ui/select": "9.11.0",
"@dhis2-ui/selector-bar": "9.11.0",
"@dhis2-ui/sharing-dialog": "9.11.0",
"@dhis2-ui/switch": "9.11.0",
"@dhis2-ui/tab": "9.11.0",
"@dhis2-ui/table": "9.11.0",
"@dhis2-ui/tag": "9.11.0",
"@dhis2-ui/text-area": "9.11.0",
"@dhis2-ui/tooltip": "9.11.0",
"@dhis2-ui/transfer": "9.11.0",
"@dhis2-ui/user-avatar": "9.11.0",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-forms": "9.11.0",
"@dhis2/ui-icons": "9.11.0",
"@dhis2-ui/alert": "9.11.3",
"@dhis2-ui/box": "9.11.3",
"@dhis2-ui/button": "9.11.3",
"@dhis2-ui/calendar": "9.11.3",
"@dhis2-ui/card": "9.11.3",
"@dhis2-ui/center": "9.11.3",
"@dhis2-ui/checkbox": "9.11.3",
"@dhis2-ui/chip": "9.11.3",
"@dhis2-ui/cover": "9.11.3",
"@dhis2-ui/css": "9.11.3",
"@dhis2-ui/divider": "9.11.3",
"@dhis2-ui/field": "9.11.3",
"@dhis2-ui/file-input": "9.11.3",
"@dhis2-ui/header-bar": "9.11.3",
"@dhis2-ui/help": "9.11.3",
"@dhis2-ui/input": "9.11.3",
"@dhis2-ui/intersection-detector": "9.11.3",
"@dhis2-ui/label": "9.11.3",
"@dhis2-ui/layer": "9.11.3",
"@dhis2-ui/legend": "9.11.3",
"@dhis2-ui/loader": "9.11.3",
"@dhis2-ui/logo": "9.11.3",
"@dhis2-ui/menu": "9.11.3",
"@dhis2-ui/modal": "9.11.3",
"@dhis2-ui/node": "9.11.3",
"@dhis2-ui/notice-box": "9.11.3",
"@dhis2-ui/organisation-unit-tree": "9.11.3",
"@dhis2-ui/pagination": "9.11.3",
"@dhis2-ui/popover": "9.11.3",
"@dhis2-ui/popper": "9.11.3",
"@dhis2-ui/portal": "9.11.3",
"@dhis2-ui/radio": "9.11.3",
"@dhis2-ui/required": "9.11.3",
"@dhis2-ui/segmented-control": "9.11.3",
"@dhis2-ui/select": "9.11.3",
"@dhis2-ui/selector-bar": "9.11.3",
"@dhis2-ui/sharing-dialog": "9.11.3",
"@dhis2-ui/switch": "9.11.3",
"@dhis2-ui/tab": "9.11.3",
"@dhis2-ui/table": "9.11.3",
"@dhis2-ui/tag": "9.11.3",
"@dhis2-ui/text-area": "9.11.3",
"@dhis2-ui/tooltip": "9.11.3",
"@dhis2-ui/transfer": "9.11.3",
"@dhis2-ui/user-avatar": "9.11.3",
"@dhis2/ui-constants": "9.11.3",
"@dhis2/ui-forms": "9.11.3",
"@dhis2/ui-icons": "9.11.3",
"prop-types": "^15.7.2"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions components/alert/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/alert",
"version": "9.11.0",
"version": "9.11.3",
"description": "UI Alert",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,9 +33,9 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2-ui/portal": "9.11.0",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-icons": "9.11.0",
"@dhis2-ui/portal": "9.11.3",
"@dhis2/ui-constants": "9.11.3",
"@dhis2/ui-icons": "9.11.3",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
4 changes: 2 additions & 2 deletions components/box/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/box",
"version": "9.11.0",
"version": "9.11.3",
"description": "UI Box",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-constants": "9.11.3",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
12 changes: 6 additions & 6 deletions components/button/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/button",
"version": "9.11.0",
"version": "9.11.3",
"description": "UI Button",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,11 +33,11 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2-ui/layer": "9.11.0",
"@dhis2-ui/loader": "9.11.0",
"@dhis2-ui/popper": "9.11.0",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-icons": "9.11.0",
"@dhis2-ui/layer": "9.11.3",
"@dhis2-ui/loader": "9.11.3",
"@dhis2-ui/popper": "9.11.3",
"@dhis2/ui-constants": "9.11.3",
"@dhis2/ui-icons": "9.11.3",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
16 changes: 8 additions & 8 deletions components/calendar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/calendar",
"version": "9.11.0",
"version": "9.11.3",
"description": "UI Calendar",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,15 +33,15 @@
"styled-jsx": "^4"
},
"dependencies": {
"@dhis2-ui/button": "9.11.0",
"@dhis2-ui/card": "9.11.0",
"@dhis2-ui/input": "9.11.0",
"@dhis2-ui/layer": "9.11.0",
"@dhis2-ui/popper": "9.11.0",
"@dhis2-ui/button": "9.11.3",
"@dhis2-ui/card": "9.11.3",
"@dhis2-ui/input": "9.11.3",
"@dhis2-ui/layer": "9.11.3",
"@dhis2-ui/popper": "9.11.3",
"@dhis2/multi-calendar-dates": "^1.2.3",
"@dhis2/prop-types": "^3.1.2",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-icons": "9.11.0",
"@dhis2/ui-constants": "9.11.3",
"@dhis2/ui-icons": "9.11.3",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
4 changes: 2 additions & 2 deletions components/card/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/card",
"version": "9.11.0",
"version": "9.11.3",
"description": "UI Card",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-constants": "9.11.3",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
4 changes: 2 additions & 2 deletions components/center/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/center",
"version": "9.11.0",
"version": "9.11.3",
"description": "UI Center",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-constants": "9.11.3",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
8 changes: 4 additions & 4 deletions components/checkbox/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/checkbox",
"version": "9.11.0",
"version": "9.11.3",
"description": "UI Checkbox",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,9 +33,9 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2-ui/field": "9.11.0",
"@dhis2-ui/required": "9.11.0",
"@dhis2/ui-constants": "9.11.0",
"@dhis2-ui/field": "9.11.3",
"@dhis2-ui/required": "9.11.3",
"@dhis2/ui-constants": "9.11.3",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
Loading

0 comments on commit 1da0844

Please sign in to comment.