fix: upgrade app-runtime to 2.0 (#65)

dhis2 · Sep 24, 2019 · 239dd19 · 239dd19
1 parent 112cbdd
commit 239dd19
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 42 deletions.
diff --git a/cli/config/standard-libs.json b/cli/config/standard-libs.json
@@ -1,5 +1,5 @@
 {
- "@dhis2/app-runtime": "^1.5.1",
+ "@dhis2/app-runtime": "^2.0.0",
  "@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
@@ -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": "^1.5.1",
+ "@dhis2/app-runtime": "^2.0.0",
  "@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
@@ -48,10 +48,10 @@ To create a new template application (or upgrade and existing React app), use th
  "test": "d2-app-scripts test"
  },
  "devDependencies": {
- "@dhis2/cli-app-scripts": "1.2.2"
+ "@dhis2/cli-app-scripts": "1.4.1"
  },
  "dependencies": {
- "@dhis2/app-runtime": "^1.5.1"
+ "@dhis2/app-runtime": "^2.0.0"
  }
 }
 

diff --git a/examples/simple-app/yarn.lock b/examples/simple-app/yarn.lock
@@ -917,24 +917,24 @@
  exec-sh "^0.3.2"
  minimist "^1.2.0"
 
-"@dhis2/app-runtime@^1.5.1":
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-1.5.1.tgz#2e32efd3f704411d5ef970c07d531155f8978f04"
- integrity sha512-2HWuvdTvb574rV0WuHmj0muhqyeWzvmDwkxAsesSKuAwB3O+Jd+LgeALsXADH3GOmh1/Q32C0udg6nl60CyCbA==
+"@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/cli-app-scripts@file:../../cli":
- version "1.3.1"
+ version "1.4.0"
  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" "^1.5.1"
+ "@dhis2/app-runtime" "^2.0.0"
  "@dhis2/cli-helpers-engine" "^1.4.2"
  "@dhis2/d2-i18n" "^1.0.5"
- "@dhis2/ui-core" "^3.9.1"
+ "@dhis2/ui-core" "^3.10.0"
  archiver "^3.1.1"
  babel-jest "^24.9.0"
  chalk "^2.4.2"
@@ -943,7 +943,7 @@
  dotenv-expand "^5.1.0"
  fs-extra "^8.1.0"
  gaze "^1.1.3"
- handlebars "^4.2.0"
+ handlebars "^4.2.1"
  i18next-conv "^9"
  i18next-scanner "^2.9.1"
  jest-cli "^24.9.0"
@@ -983,17 +983,19 @@
  i18next "^10.3"
  moment "^2.24.0"
 
-"@dhis2/prop-types@^1.0.4":
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.0.4.tgz#37eb55a3baf7bc9cf76e19222ad4e2d0e465be8f"
- integrity sha512-BiDR0KKn5fyUQ12u6XPq9pLs/tKR3hwiLzSWc+wVxN/enwgb8XUnLpt+Schc/ZBZq+sGozeUfPbFMRqIsifsIA==
+"@dhis2/prop-types@^1.1.0":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-1.1.1.tgz#a70dd59e56cff13f6e49470677a4def0ac78ff6f"
+ integrity sha512-ILyRcpPjFVtfxuZhyZ2yBp5NkIiTKBF/KfTtr6cSGqXnBIeV9XqHR+IT+C9jwcB96hxhuxBKmvfiaFQFT8uU6g==
+ dependencies:
+ prop-types "^15"
 
-"@dhis2/ui-core@^3.9.1":
- version "3.9.1"
- resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-3.9.1.tgz#a5ce88537347a016edb453b9ae5039ec63300681"
- integrity sha512-derVmZZHrRAbAVlf029V0Pjlr3y7aBwj4Uyd/MqhlUfz3xkeS8X3dMiFpGLk0+4p2Y7q0/r/vPhK5l1zI5OFHA==
+"@dhis2/ui-core@^3.10.0":
+ version "3.11.0"
+ resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-3.11.0.tgz#eb74e229192d53e26087f5f344abbbd5417ea1fd"
+ integrity sha512-d3iFXDSe9+BTvl70LlSfz3S+Ec+l7fNz+Qh8T7EcOg+MAKUEA1tNjRp+B5Fh8A6LElXWc1CMkJYcDZNcO285vQ==
  dependencies:
- "@dhis2/prop-types" "^1.0.4"
+ "@dhis2/prop-types" "^1.1.0"
  classnames "^2.2.6"
  styled-jsx "^3.2.2"
 
@@ -3152,10 +3154,10 @@ handlebars@^4.1.2:
  optionalDependencies:
  uglify-js "^3.1.4"
 
-handlebars@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.0.tgz#57ce8d2175b9bbb3d8b3cf3e4217b1aec8ddcb2e"
- integrity sha512-Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==
+handlebars@^4.2.1:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.3.0.tgz#427391b584626c9c9c6ffb7d1fb90aa9789221cc"
+ integrity sha512-7XlnO8yBXOdi7AzowjZssQr47Ctidqm7GbgARapOaqSN9HQhlClnOkR9HieGauIT3A8MBC6u9wPCXs97PCYpWg==
  dependencies:
  neo-async "^2.6.0"
  optimist "^0.6.1"
@@ -5568,7 +5570,7 @@ prompts@^2.0.1:
  kleur "^3.0.3"
  sisteransi "^1.0.3"
 
-prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15, prop-types@^15.6.2, prop-types@^15.7.2:
  version "15.7.2"
  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==

diff --git a/shell/adapter/package.json b/shell/adapter/package.json
@@ -19,7 +19,7 @@
  "build": "d2-app-scripts build"
  },
  "peerDependencies": {
- "@dhis2/app-runtime": "^1.5.1",
+ "@dhis2/app-runtime": "^2.0.0",
  "@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
@@ -845,21 +845,21 @@
  exec-sh "^0.3.2"
  minimist "^1.2.0"
 
-"@dhis2/app-runtime@^1.5.1":
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-1.5.1.tgz#2e32efd3f704411d5ef970c07d531155f8978f04"
- integrity sha512-2HWuvdTvb574rV0WuHmj0muhqyeWzvmDwkxAsesSKuAwB3O+Jd+LgeALsXADH3GOmh1/Q32C0udg6nl60CyCbA==
+"@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/cli-app-scripts@file:../../cli":
- version "1.3.1"
+ version "1.4.0"
  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" "^1.5.1"
+ "@dhis2/app-runtime" "^2.0.0"
  "@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
@@ -4,7 +4,7 @@
  "private": true,
  "dependencies": {
  "@dhis2/app-adapter": "file:./adapter",
- "@dhis2/app-runtime": "^1.5.1",
+ "@dhis2/app-runtime": "^2.0.0",
  "@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
@@ -977,10 +977,10 @@
  "@dhis2/ui-widgets" "^1.0.4"
  moment "^2.24.0"
 
-"@dhis2/app-runtime@^1.5.1":
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-1.5.1.tgz#2e32efd3f704411d5ef970c07d531155f8978f04"
- integrity sha512-2HWuvdTvb574rV0WuHmj0muhqyeWzvmDwkxAsesSKuAwB3O+Jd+LgeALsXADH3GOmh1/Q32C0udg6nl60CyCbA==
+"@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/[email protected]", "@dhis2/d2-i18n@^1.0.5":
  version "1.0.5"

diff --git a/yarn.lock b/yarn.lock
@@ -880,10 +880,10 @@
  dependencies:
  find-up "^4.0.0"
 
-"@dhis2/app-runtime@^1.5.1":
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-1.5.1.tgz#2e32efd3f704411d5ef970c07d531155f8978f04"
- integrity sha512-2HWuvdTvb574rV0WuHmj0muhqyeWzvmDwkxAsesSKuAwB3O+Jd+LgeALsXADH3GOmh1/Q32C0udg6nl60CyCbA==
+"@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/[email protected]":
  version "1.3.0"