Skip to content
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.

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

chore: merge alpha to master #841

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
## [11.1.1-alpha.3](https://github.com/dhis2/app-platform/compare/v11.1.1-alpha.2...v11.1.1-alpha.3) (2024-04-09)


### Bug Fixes

* **deps:** new versions of UI and app runtime ([#840](https://github.com/dhis2/app-platform/issues/840)) ([54c984d](https://github.com/dhis2/app-platform/commit/54c984d475ee38904abe794f489f564e07e2b7e6))

## [11.1.1-alpha.2](https://github.com/dhis2/app-platform/compare/v11.1.1-alpha.1...v11.1.1-alpha.2) (2024-04-05)


### Bug Fixes

* **deps:** resolution for app-runtime alpha ([#839](https://github.com/dhis2/app-platform/issues/839)) ([c4a90d9](https://github.com/dhis2/app-platform/commit/c4a90d956ce0f0d22c1b4ef740a05b1bbdd8d404))

## [11.1.1-alpha.1](https://github.com/dhis2/app-platform/compare/v11.1.0...v11.1.1-alpha.1) (2024-04-02)


### Bug Fixes

* **deps:** use alpha version of app-runtime ([#838](https://github.com/dhis2/app-platform/issues/838)) ([e863ec5](https://github.com/dhis2/app-platform/commit/e863ec5b36e80ffca984a08cbfd3516077ef8306))

# [11.1.0](https://github.com/dhis2/app-platform/compare/v11.0.0...v11.1.0) (2024-03-25)


Expand Down
8 changes: 4 additions & 4 deletions adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/app-adapter",
"version": "11.1.0",
"version": "11.1.1-alpha.3",
"repository": {
"type": "git",
"url": "https://github.com/amcgee/dhis2-app-platform",
Expand All @@ -21,11 +21,11 @@
"build"
],
"dependencies": {
"@dhis2/pwa": "11.1.0",
"@dhis2/pwa": "11.1.1-alpha.3",
"moment": "^2.24.0"
},
"devDependencies": {
"@dhis2/cli-app-scripts": "11.1.0",
"@dhis2/cli-app-scripts": "11.1.1-alpha.3",
"@testing-library/react": "^12.0.0",
"@testing-library/react-hooks": "^8.0.1",
"enzyme": "^3.11.0",
Expand All @@ -38,7 +38,7 @@
"test": "d2-app-scripts test"
},
"peerDependencies": {
"@dhis2/app-runtime": "^3.10.2",
"@dhis2/app-runtime": "^3.10.4",
"@dhis2/d2-i18n": "^1",
"@dhis2/ui": ">=9.2.0",
"classnames": "^2",
Expand Down
4 changes: 2 additions & 2 deletions cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/cli-app-scripts",
"version": "11.1.0",
"version": "11.1.1-alpha.3",
"engines": {
"node": ">=14"
},
Expand Down Expand Up @@ -28,7 +28,7 @@
"@babel/preset-env": "^7.14.7",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.6.0",
"@dhis2/app-shell": "11.1.0",
"@dhis2/app-shell": "11.1.1-alpha.3",
"@dhis2/cli-helpers-engine": "^3.2.0",
"@jest/core": "^27.0.6",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
Expand Down
2 changes: 1 addition & 1 deletion examples/pwa-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pwa-app",
"version": "11.1.0",
"version": "11.1.1-alpha.3",
"description": "",
"license": "BSD-3-Clause",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simple-app",
"version": "11.1.0",
"version": "11.1.1-alpha.3",
"repository": "https://github.com/amcgee/dhis2-app-platform",
"author": "Austin McGee <[email protected]>",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "root",
"version": "11.1.0",
"version": "11.1.1-alpha.3",
"private": true,
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions pwa/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/pwa",
"version": "11.1.0",
"version": "11.1.1-alpha.3",
"description": "",
"license": "BSD-3-Clause",
"publishConfig": {
Expand All @@ -13,7 +13,7 @@
"deploy": "d2-app-scripts deploy"
},
"devDependencies": {
"@dhis2/cli-app-scripts": "11.1.0"
"@dhis2/cli-app-scripts": "11.1.1-alpha.3"
},
"dependencies": {
"idb": "^6.0.0",
Expand Down
10 changes: 5 additions & 5 deletions shell/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/app-shell",
"version": "11.1.0",
"version": "11.1.1-alpha.3",
"engines": {
"node": ">=14"
},
Expand All @@ -15,11 +15,11 @@
"access": "public"
},
"dependencies": {
"@dhis2/app-adapter": "11.1.0",
"@dhis2/app-runtime": "^3.10.2",
"@dhis2/app-adapter": "11.1.1-alpha.3",
"@dhis2/app-runtime": "^3.10.4",
"@dhis2/d2-i18n": "^1.1.1",
"@dhis2/pwa": "11.1.0",
"@dhis2/ui": "^9.2.0",
"@dhis2/pwa": "11.1.1-alpha.3",
"@dhis2/ui": "^9.4.4",
"classnames": "^2.2.6",
"moment": "^2.29.1",
"post-robot": "^10.0.46",
Expand Down
Loading
Loading