Skip to content

Commit

Permalink
fix: upgrade app-runtime to 2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
amcgee committed Sep 24, 2019
1 parent 8fef50b commit d2c0c13
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 45 deletions.
2 changes: 1 addition & 1 deletion cli/config/standard-libs.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down
39 changes: 19 additions & 20 deletions examples/simple-app/src/App.js
Original file line number Diff line number Diff line change
@@ -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 = () => (
<div style={style}>
<DataQuery
query={{
me: {
resource: 'me',
},
}}
>
{({ error, loading, data }) => {
if (error) return <span>ERROR</span>
if (loading) return <span>...</span>
return (
<h1>{i18n.t('Hello {{name}}', { name: data.me.name })}</h1>
)
}}
</DataQuery>
</div>
)
const query = {
me: {
resource: 'me',
},
}

const Component = () => {
const { error, loading, data } = useDataQuery(query)
return (
<div style={style}>
{error && <span>ERROR</span>}
{loading && <span>...</span>}
{data && (
<h1>{i18n.t('Hello {{name}}', { name: data.me.name })}</h1>
)}
</div>
)
}

export default Component
12 changes: 6 additions & 6 deletions examples/simple-app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -917,21 +917,21 @@
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"
"@babel/plugin-proposal-object-rest-spread" "^7.4.4"
"@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"
Expand Down
2 changes: 1 addition & 1 deletion shell/adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions shell/adapter/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -845,21 +845,21 @@
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"
"@babel/plugin-proposal-object-rest-spread" "^7.4.4"
"@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"
Expand Down
2 changes: 1 addition & 1 deletion shell/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions shell/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]", "@dhis2/d2-i18n@^1.0.5":
version "1.0.5"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]":
version "1.3.0"
Expand Down

0 comments on commit d2c0c13

Please sign in to comment.