From cdb971bb58736d9ff75a186fb1c1894fa728e95e Mon Sep 17 00:00:00 2001 From: Austin McGee <947888+amcgee@users.noreply.github.com> Date: Mon, 15 Mar 2021 18:08:20 +0100 Subject: [PATCH] fix: upgrade to @dhis2/cli-app-scripts@6 (DHIS2-9893) (#895) --- package.json | 5 +- src/app.router.js | 2 +- webpack.config.js | 2 +- yarn.lock | 146 +++++++++++++++++++++++++++++----------------- 4 files changed, 98 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index c076a9a5..023f90aa 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,9 @@ "author": "Adheesh Bhatia", "license": "BSD-3-Clause", "dependencies": { - "@dhis2/app-runtime": "^2.0.4", - "@dhis2/ui-widgets": "^5.0.1", + "@dhis2/app-runtime": "^2.8.0", + "@dhis2/d2-i18n": "^1.1.0", + "@dhis2/ui": "^6.5.5", "babel-polyfill": "^6.26.0", "d2": "^30.0.0", "d2-ui": "^29.0.29", diff --git a/src/app.router.js b/src/app.router.js index f6894d04..c968e939 100644 --- a/src/app.router.js +++ b/src/app.router.js @@ -5,7 +5,7 @@ import { Router, Route, hashHistory, Redirect } from 'react-router'; import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider'; import { DataProvider } from '@dhis2/app-runtime' -import { HeaderBar } from '@dhis2/ui-widgets' +import { HeaderBar } from '@dhis2/ui' import AppTheme from './layout/theme'; diff --git a/webpack.config.js b/webpack.config.js index 5bcd3267..810d1c24 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,7 +14,7 @@ try { console.warn('\nWARNING! Failed to load DHIS config:', e.message); console.info('Using default config'); dhisConfig = { - baseUrl: 'http://localhost:8080', + baseUrl: process.env.DHIS2_BASE_URL || 'http://localhost:8080', authorization: 'Basic YWRtaW46ZGlzdHJpY3Q=', // admin:district }; } diff --git a/yarn.lock b/yarn.lock index f23c546a..0e7b3ff6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -860,6 +860,13 @@ dependencies: regenerator-runtime "^0.12.0" +"@babel/runtime@^7.10.0", "@babel/runtime@^7.12.1": + version "7.13.10" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d" + integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/runtime@^7.8.4": version "7.10.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839" @@ -909,28 +916,34 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@dhis2/app-runtime@^2.0.4", "@dhis2/app-runtime@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.2.1.tgz#9c2192c247bbca44e721c2ece1a0d6f8bcdf00d6" - integrity sha512-rX4+Dz31zov0OZNKxcOBbVdXwac5nxX0a4e6G0MKE2OCuHZtvASNbahl86IAasCjuNOclUSgLmIJpEhqlnUxpw== +"@dhis2/app-runtime@^2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.8.0.tgz#83ca6e96c299686ee72eea3e1825e04aa53cd5d2" + integrity sha512-Ru6x9L61fD7ITzVaxFqx88kV5/ypB9xSr8nHgRj4EE/kHl/aVejXuwnSS2OIWh80J3mtD1dpNRN/GJ8o0x0HYg== dependencies: - "@dhis2/app-service-config" "2.2.1" - "@dhis2/app-service-data" "2.2.1" + "@dhis2/app-service-alerts" "2.8.0" + "@dhis2/app-service-config" "2.8.0" + "@dhis2/app-service-data" "2.8.0" -"@dhis2/app-service-config@2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-2.2.1.tgz#5417b6ec266fa0e3d84a9405010cee43ed6a0027" - integrity sha512-o841GSzjg/VaucWN/9Axo42Dv6CS4Wra3BAw+qFsMtZ7agFKbSssbxyloDiB0/TDv9moR8xivfAHn8kfcVwuNQ== +"@dhis2/app-service-alerts@2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-2.8.0.tgz#f480043a15b5a2b7d90a6e74931ddd3ebb65aa1c" + integrity sha512-hpMqdxCG9w5H2EZyLPQKcKzCdp/Sof68ZGd85lNHo+1c10+1pWhKAjt/p3zoRllHppp17TbEgKoXa1oRx2NeHg== -"@dhis2/app-service-data@2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-2.2.1.tgz#b418a9624761cedded3ebddc3459db90bdaa3c16" - integrity sha512-XeAmjjt8sL1sbu8rsEEQDBQyc//cHww79kCGXpuFHR5tytzhT31cQ457/zNqU3DW61xKgv+bCWk845kuD26UbQ== +"@dhis2/app-service-config@2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-2.8.0.tgz#4ce7520e28a7700fa11ad7bcba6468a0a58751a4" + integrity sha512-SZnoa2EjsgV8a1QfnSk6fqxORV3pRcA+SYyz/H/nkr/VodkdgmO5CiwlZxXW8pG+4i6sbMGjGualam2jHF34wg== -"@dhis2/d2-i18n@^1": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.0.6.tgz#2914be8acf296f3a6bf7b51c76c46da6a120b0ff" - integrity sha512-7YdA4ppFosjuyf7ZMm47BrdsA5TWLM9lmS0lUPgjcCVeeWfUgagqzf4W5JGB9XQ3w1vzK+yy5zH2Ij8IgRAGhA== +"@dhis2/app-service-data@2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-2.8.0.tgz#9cd347127968cb6f3c8a4ab0fc6699ea7058f835" + integrity sha512-5doyL4bxRMdMXY4RtWo2O3NVGwSDOSUY3hGPXaF1TeFWAqujlPTx17uDw6wEelN6LaryAnVwId2Ep3FOV8v5MA== + +"@dhis2/d2-i18n@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.0.tgz#ec777c5091f747e4c5aa4f9801c62ba4d1ef3d16" + integrity sha512-x3u58goDQsMfBzy50koxNrJjofJTtjRZOfz6f6Py/wMMJfp/T6vZjWMQgcfWH0JrV6d04K1RTt6bI05wqsVQvg== dependencies: i18next "^10.3" moment "^2.24.0" @@ -942,51 +955,64 @@ dependencies: prop-types "^15" -"@dhis2/ui-constants@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-5.0.1.tgz#6e85e8aa1790c4cb37edd7218edfe57b5de13c33" - integrity sha512-9YKKUUSLX4vI/StkhxmRnXglMCcWkBun0dNNQUFWV28RyJIeu9YeWlpdxHEPRvCVgcguoFwHQxJ6ULdFqYO65A== +"@dhis2/ui-constants@6.5.5": + version "6.5.5" + resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-6.5.5.tgz#e70139857a15edbc7f693004d982ff2d85d18d29" + integrity sha512-WVNigzt/qyc28P4EaEjUOjKRChMhbbVgqlPwqdrQUmxrtDHPzILwxASW7cBGCSP7uGhGZBSMXEM6y4zj77XOKA== dependencies: "@dhis2/prop-types" "^1.6.4" -"@dhis2/ui-core@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-5.0.1.tgz#cf0fc11e826c919bcb25270d1a808d6a4597ee3f" - integrity sha512-lZ7FC1F+LSQvYWOR2VwoOw28B98rOKT1T4YhPKzOlBkGO6TlOE5V2+VwDOFA8mPr7I0ZanQfSnmMJRoLbo4Bog== +"@dhis2/ui-core@6.5.5": + version "6.5.5" + resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-6.5.5.tgz#83c0b64352345cb7d284d4236c282b3f8d2e7169" + integrity sha512-/VChpke0uLmPK/MGEqmDp4v1b5d2wiVGbgvesw5d/cbgef7xxYSVIB3M2ioLJGPpiyH3L9PawQwcBFGcATWKRQ== dependencies: "@dhis2/prop-types" "^1.6.4" - "@dhis2/ui-constants" "5.0.1" - "@dhis2/ui-icons" "5.0.1" - "@popperjs/core" "^2.4.0" + "@popperjs/core" "^2.6.0" classnames "^2.2.6" react-popper "^2.2.3" resize-observer-polyfill "^1.5.1" -"@dhis2/ui-icons@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-5.0.1.tgz#67ca1f0ec3b98c08986758527917df0d4aa4e78f" - integrity sha512-Gmh+nRsRiK3JNCB7BY/pBQAStBCX7/c/EOovUY0UzdYXhoA88pwDpRDtfhFhwaDx63rdWzs45AjEMng5DxqQNw== +"@dhis2/ui-forms@6.5.5": + version "6.5.5" + resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-6.5.5.tgz#26a2ba0e2b3d80416fa3b2c5efc6d008a84f2463" + integrity sha512-AktWbS1EOE/TD7LgPVRom20APdxBjmb8g6aHyxl5gTdLGXAZW6YEQWtZNV58cFEPb3DTvIKU1NCzNVbEC9ly3A== dependencies: "@dhis2/prop-types" "^1.6.4" + classnames "^2.2.6" + final-form "^4.20.1" + react-final-form "^6.5.1" -"@dhis2/ui-widgets@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-5.0.1.tgz#ecb5a2ae3319cd5345450bb11dc85a3b0956b709" - integrity sha512-v5fRMEyXHVLvZ7dsHMFSn3HQSO0t4E6/Fd630/ja+oOw/GbDnyGfK8xayr62vu4zpjUZu14NbP5o5THTBpnSTw== +"@dhis2/ui-icons@6.5.5": + version "6.5.5" + resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-6.5.5.tgz#8f3b08048e83805b5684ad95921ea4d29098c4d6" + integrity sha512-InYldIdsUK4zZy5h3Bwv/ZZh18KlFaGnLXos9QW6GGRlswunqdfUo+R/6BFXtELHRJlkhGcFuYFaSUgQoQtUgg== + dependencies: + "@dhis2/prop-types" "^1.6.4" + +"@dhis2/ui-widgets@6.5.5": + version "6.5.5" + resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-6.5.5.tgz#e9311596b8e785e676367dd9b95b7942b77d5ed0" + integrity sha512-Z+1B16waQTq23IX7iyvC/5vPYTz87b5bemsKkLVW2zzOiHffZpR++ve1lKW0igujU5ZAdRmdNf751Sa/GE12Kg== dependencies: - "@dhis2/app-runtime" "^2.2.1" - "@dhis2/d2-i18n" "^1" "@dhis2/prop-types" "^1.6.4" - "@dhis2/ui-constants" "5.0.1" - "@dhis2/ui-core" "5.0.1" - "@dhis2/ui-icons" "5.0.1" classnames "^2.2.6" - resize-observer-polyfill "^1.5.1" -"@popperjs/core@^2.4.0": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.1.tgz#8fea7d588b33e277d7252f3ea608787c5cabd8c8" - integrity sha512-hdRh4Xul0S4VVJz8/T2EXuaVGnRp+bC/AksVp2DGtmvE4X4OKYsiZC4H2PlZmVhJZT58KFb5+xIog8BE3hpiSA== +"@dhis2/ui@^6.5.5": + version "6.5.5" + resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-6.5.5.tgz#42ea27c8a22efb0059985cb8ec07a3dfca0241f9" + integrity sha512-eB2hhhPYnEPwCIXxThBwpYg8WG+pUh2XEGXEV6qOPdbFUGlWQ9qLEPpDkn/WgXjRf10btkiwkKdnDbhazDJJUw== + dependencies: + "@dhis2/ui-constants" "6.5.5" + "@dhis2/ui-core" "6.5.5" + "@dhis2/ui-forms" "6.5.5" + "@dhis2/ui-icons" "6.5.5" + "@dhis2/ui-widgets" "6.5.5" + +"@popperjs/core@^2.6.0": + version "2.9.1" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.1.tgz#7f554e7368c9ab679a11f4a042ca17149d70cf12" + integrity sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA== "@types/glob@^7.1.1": version "7.1.2" @@ -3238,6 +3264,13 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +final-form@^4.20.1: + version "4.20.2" + resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.20.2.tgz#c820b37d7ebb73d71169480256a36c7e6e6c9155" + integrity sha512-5i0IxqwjjPG1nUNCjWhqPCvQJJ2R+QwTwaAnjPmFnLbyjIHWuBPU8u+Ps4G3TcX2Sjno+O5xCZJzYcMJEzzfCQ== + dependencies: + "@babel/runtime" "^7.10.0" + finalhandler@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -4773,9 +4806,9 @@ mkdirp@^0.5.3: minimist "^1.2.5" moment@^2.24.0: - version "2.26.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a" - integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw== + version "2.29.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" + integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== move-concurrently@^1.0.1: version "1.0.1" @@ -5844,15 +5877,22 @@ react-fast-compare@^3.0.1: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== +react-final-form@^6.5.1: + version "6.5.2" + resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.5.2.tgz#d04d1eb7d92eabc6f6c35206bb0eebfc4bfd924b" + integrity sha512-c5l45FYOoxtfpvsvMFh3w2WW8KNxbuebBUrM16rUrooQkewTs0Zahmv0TuKFX5jsC9BKn5Fo84j3ZVXQdURS4w== + dependencies: + "@babel/runtime" "^7.12.1" + react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== react-popper@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.3.tgz#33d425fa6975d4bd54d9acd64897a89d904b9d97" - integrity sha512-mOEiMNT1249js0jJvkrOjyHsGvqcJd3aGW/agkiMoZk3bZ1fXN1wQszIQSjHIai48fE67+zwF8Cs+C4fWqlfjw== + version "2.2.4" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.4.tgz#d2ad3d2474ac9f1abf93df3099d408e5aa6a2e22" + integrity sha512-NacOu4zWupdQjVXq02XpTD3yFPSfg5a7fex0wa3uGKVkFK7UN6LvVxgcb+xYr56UCuWiNPMH20tntdVdJRwYew== dependencies: react-fast-compare "^3.0.1" warning "^4.0.2"