diff --git a/CHANGELOG.md b/CHANGELOG.md index 810e353c7..a558e3e4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.4.2](https://github.com/dhis2/app-platform/compare/v1.4.1...v1.4.2) (2019-09-24) + + +### Bug Fixes + +* upgrade app-runtime to 2.0.1 ([d2c0c13](https://github.com/dhis2/app-platform/commit/d2c0c13)) + ## [1.4.1](https://github.com/dhis2/app-platform/compare/v1.4.0...v1.4.1) (2019-09-24) diff --git a/cli/config/standard-libs.json b/cli/config/standard-libs.json index cb87e8572..cf3768200 100644 --- a/cli/config/standard-libs.json +++ b/cli/config/standard-libs.json @@ -1,5 +1,5 @@ { - "@dhis2/app-runtime": "^2.0.0", + "@dhis2/app-runtime": "^2.0.1", "@dhis2/d2-i18n": "^1.0.5", "@dhis2/ui-core": "^3.7.1", "classnames": "^2.2.6", diff --git a/cli/package.json b/cli/package.json index f0c4c68f8..2af0b9abb 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/cli-app-scripts", - "version": "1.4.1", + "version": "1.4.2", "main": "src/index.js", "repository": "https://github.com/amcgee/dhis2-app-platform", "author": "Austin McGee ", @@ -22,7 +22,7 @@ "@babel/preset-env": "^7.6.0", "@babel/preset-react": "^7.0.0", "@babel/preset-typescript": "^7.6.0", - "@dhis2/app-runtime": "^2.0.0", + "@dhis2/app-runtime": "^2.0.1", "@dhis2/cli-helpers-engine": "^1.4.2", "@dhis2/d2-i18n": "^1.0.5", "@dhis2/ui-core": "^3.10.0", diff --git a/docs/getting-started.md b/docs/getting-started.md index 5d3d7cae4..a711a7d3b 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -51,7 +51,7 @@ To create a new template application (or upgrade and existing React app), use th "@dhis2/cli-app-scripts": "1.4.1" }, "dependencies": { - "@dhis2/app-runtime": "^2.0.0" + "@dhis2/app-runtime": "^2.0.1" } } diff --git a/examples/simple-app/src/App.js b/examples/simple-app/src/App.js index 084e9cc2c..04e66db17 100644 --- a/examples/simple-app/src/App.js +++ b/examples/simple-app/src/App.js @@ -1,26 +1,25 @@ import React from 'react' import i18n from './locales' -import { DataQuery } from '@dhis2/app-runtime' +import { useDataQuery } from '@dhis2/app-runtime' import style from './App.style' -const Component = () => ( -
- - {({ error, loading, data }) => { - if (error) return ERROR - if (loading) return ... - return ( -

{i18n.t('Hello {{name}}', { name: data.me.name })}

- ) - }} -
-
-) +const query = { + me: { + resource: 'me', + }, +} + +const Component = () => { + const { error, loading, data } = useDataQuery(query) + return ( +
+ {error && ERROR} + {loading && ...} + {data && ( +

{i18n.t('Hello {{name}}', { name: data.me.name })}

+ )} +
+ ) +} export default Component diff --git a/examples/simple-app/yarn.lock b/examples/simple-app/yarn.lock index 8154852a5..fb061ee1f 100644 --- a/examples/simple-app/yarn.lock +++ b/examples/simple-app/yarn.lock @@ -917,13 +917,13 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@dhis2/app-runtime@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.0.tgz#c70df3e9c50e65957cc698ac2042f33e858238f6" - integrity sha512-bORXasVYxyHCRtecceoOaVqsc+qKlbIQXnI+vDjTNDiimMBovIEE8usK6HoK9BnEAy8XRaOSbpCMHJPqqiwV6A== +"@dhis2/app-runtime@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.1.tgz#a230924116b43352bf07a46f5085f76be36d0707" + integrity sha512-+Rmw+QshbgiBielN7UH4VXfEeSnSj1N3d4HGqf3iekyUXCNdpZX2bD9QrH43KvdfH+lDp71Uh7y3FKEhzSbRLA== "@dhis2/cli-app-scripts@file:../../cli": - version "1.4.0" + version "1.4.1" dependencies: "@babel/core" "^7.6.0" "@babel/plugin-proposal-class-properties" "^7.4.4" @@ -931,7 +931,7 @@ "@babel/preset-env" "^7.6.0" "@babel/preset-react" "^7.0.0" "@babel/preset-typescript" "^7.6.0" - "@dhis2/app-runtime" "^2.0.0" + "@dhis2/app-runtime" "^2.0.1" "@dhis2/cli-helpers-engine" "^1.4.2" "@dhis2/d2-i18n" "^1.0.5" "@dhis2/ui-core" "^3.10.0" diff --git a/package.json b/package.json index d878f51e2..e06cee1e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "root", - "version": "1.4.1", + "version": "1.4.2", "private": true, "repository": { "type": "git", diff --git a/shell/adapter/package.json b/shell/adapter/package.json index 0f66ceb41..101a3a5a9 100644 --- a/shell/adapter/package.json +++ b/shell/adapter/package.json @@ -19,7 +19,7 @@ "build": "d2-app-scripts build" }, "peerDependencies": { - "@dhis2/app-runtime": "^2.0.0", + "@dhis2/app-runtime": "^2.0.1", "@dhis2/d2-i18n": "^1.0.5", "@dhis2/ui-core": "^3.7.1", "classnames": "^2.2.6", diff --git a/shell/adapter/yarn.lock b/shell/adapter/yarn.lock index ab424bf40..eeb0cc2db 100644 --- a/shell/adapter/yarn.lock +++ b/shell/adapter/yarn.lock @@ -845,13 +845,13 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@dhis2/app-runtime@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.0.tgz#c70df3e9c50e65957cc698ac2042f33e858238f6" - integrity sha512-bORXasVYxyHCRtecceoOaVqsc+qKlbIQXnI+vDjTNDiimMBovIEE8usK6HoK9BnEAy8XRaOSbpCMHJPqqiwV6A== +"@dhis2/app-runtime@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.1.tgz#a230924116b43352bf07a46f5085f76be36d0707" + integrity sha512-+Rmw+QshbgiBielN7UH4VXfEeSnSj1N3d4HGqf3iekyUXCNdpZX2bD9QrH43KvdfH+lDp71Uh7y3FKEhzSbRLA== "@dhis2/cli-app-scripts@file:../../cli": - version "1.4.0" + version "1.4.1" dependencies: "@babel/core" "^7.6.0" "@babel/plugin-proposal-class-properties" "^7.4.4" @@ -859,7 +859,7 @@ "@babel/preset-env" "^7.6.0" "@babel/preset-react" "^7.0.0" "@babel/preset-typescript" "^7.6.0" - "@dhis2/app-runtime" "^2.0.0" + "@dhis2/app-runtime" "^2.0.1" "@dhis2/cli-helpers-engine" "^1.4.2" "@dhis2/d2-i18n" "^1.0.5" "@dhis2/ui-core" "^3.10.0" diff --git a/shell/package.json b/shell/package.json index 415e42ff7..8adcfa2cc 100644 --- a/shell/package.json +++ b/shell/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@dhis2/app-adapter": "file:./adapter", - "@dhis2/app-runtime": "^2.0.0", + "@dhis2/app-runtime": "^2.0.1", "@dhis2/d2-i18n": "^1.0.5", "@dhis2/ui-core": "^3.10.0", "classnames": "^2.2.6", diff --git a/shell/yarn.lock b/shell/yarn.lock index da50c3004..7ab7d689e 100644 --- a/shell/yarn.lock +++ b/shell/yarn.lock @@ -977,10 +977,10 @@ "@dhis2/ui-widgets" "^1.0.4" moment "^2.24.0" -"@dhis2/app-runtime@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.0.tgz#c70df3e9c50e65957cc698ac2042f33e858238f6" - integrity sha512-bORXasVYxyHCRtecceoOaVqsc+qKlbIQXnI+vDjTNDiimMBovIEE8usK6HoK9BnEAy8XRaOSbpCMHJPqqiwV6A== +"@dhis2/app-runtime@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.1.tgz#a230924116b43352bf07a46f5085f76be36d0707" + integrity sha512-+Rmw+QshbgiBielN7UH4VXfEeSnSj1N3d4HGqf3iekyUXCNdpZX2bD9QrH43KvdfH+lDp71Uh7y3FKEhzSbRLA== "@dhis2/d2-i18n@1.0.5", "@dhis2/d2-i18n@^1.0.5": version "1.0.5" diff --git a/yarn.lock b/yarn.lock index b58f8c175..b806b5d3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -880,10 +880,10 @@ dependencies: find-up "^4.0.0" -"@dhis2/app-runtime@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.0.tgz#c70df3e9c50e65957cc698ac2042f33e858238f6" - integrity sha512-bORXasVYxyHCRtecceoOaVqsc+qKlbIQXnI+vDjTNDiimMBovIEE8usK6HoK9BnEAy8XRaOSbpCMHJPqqiwV6A== +"@dhis2/app-runtime@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.1.tgz#a230924116b43352bf07a46f5085f76be36d0707" + integrity sha512-+Rmw+QshbgiBielN7UH4VXfEeSnSj1N3d4HGqf3iekyUXCNdpZX2bD9QrH43KvdfH+lDp71Uh7y3FKEhzSbRLA== "@dhis2/cli-helpers-engine@1.3.0": version "1.3.0"