diff --git a/package.json b/package.json index 62a7ecd..9c60764 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "build" ], "devDependencies": { - "@dhis2/cli-app-scripts": "^5.7.2", + "@dhis2/cli-app-scripts": "^6.0.1", "@dhis2/cli-style": "^7.3.0" }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index 69303f7..e47f2f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1333,48 +1333,48 @@ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18" integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== -"@dhis2/app-adapter@5.7.2": - version "5.7.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-5.7.2.tgz#41aff36d9f175d58c40c69c90ef00e6a26115a0a" - integrity sha512-Nm15gTc8mw+NO4UG9WPCKQD/VWV/585449wpAVaVmGo08gGQI+wUhseC+/gzlgw82diCKiSgNmT7w++Ob70qRQ== +"@dhis2/app-adapter@6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-6.0.1.tgz#d4b5ef6025878709e941b4ea105a7e8f0dc94df5" + integrity sha512-yhEGQ+FSCNoYc1cu/tlaTbhXeJtU2SQzkXH191fZ+uIdqBNOimkylOe+xOepkvGgwOgZheCmyWetqu7TLSAqhQ== dependencies: moment "^2.24.0" -"@dhis2/app-runtime@^2.6.1": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.7.0.tgz#66f383a85f3c937c94d6e47375eddb673e7b5e47" - integrity sha512-VAe0YyzMC93md/Cx6lQ5UyqMAD0/SqUAMHHLfPDW7qrun/dWaeQjCV4cmipOgpL7QQKpkoq+E7okfvuYWIe3Yg== - dependencies: - "@dhis2/app-service-alerts" "2.7.0" - "@dhis2/app-service-config" "2.7.0" - "@dhis2/app-service-data" "2.7.0" - -"@dhis2/app-service-alerts@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-2.7.0.tgz#08657728797696e488439d88d84ca8b1578bf38a" - integrity sha512-D95z/RrAlNrTaUCPBlvKWRm+F0mG/nguxWOole/XTshNNnlLU41rP9QShcZqqKy88GuNBP0bq/DmuZHM8eBwXA== - -"@dhis2/app-service-config@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-2.7.0.tgz#6579575b6481bcc95e346c70a912c6a3611eacf9" - integrity sha512-MT80E+OtHN8c/OotpjVL37UJIclid4hlmMwmueuDyIgP0EDsf3qzRR/MdjsCBuOeja2xuZpV/ivKu6/GWbQDPQ== - -"@dhis2/app-service-data@2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-2.7.0.tgz#adf6f2ec8e7add19b97107309d7f35f67f2c4ffd" - integrity sha512-dkjKAeJ6zR0dszjgeWc5035wQ8QEJI0PH3cGoNwzV92m+YgIG7g4Wu0qDpzw6n2y+xZmeHl/iiH27Zq5eL/clg== - -"@dhis2/app-shell@5.7.2": - version "5.7.2" - resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-5.7.2.tgz#5110179823d62c62ed59f45981e108386763c0f8" - integrity sha512-x6SVpucTeKLuK5I1LZaMzTLi3vs2CZckzydgg/wZvziTS9FEyXa4JJZFeB3EVi/rcrQ2wlI5gTA4w7gdgmB2Lg== - dependencies: - "@dhis2/app-adapter" "5.7.2" - "@dhis2/app-runtime" "^2.6.1" - "@dhis2/d2-i18n" "^1.0.5" - "@dhis2/ui" "^5.7.2" +"@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-alerts" "2.8.0" + "@dhis2/app-service-config" "2.8.0" + "@dhis2/app-service-data" "2.8.0" + +"@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-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/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/app-shell@6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-6.0.1.tgz#74654fdd055953a024ae861aa61deaccb816d122" + integrity sha512-BSyPlfjh8SQeg2ywGtfnQcIQHU1lBT8TOHRaM9rC9K2YcYW+nifB4OemTdKP0/iVCIBAvcvw98d/eTqAkz2ysA== + dependencies: + "@dhis2/app-adapter" "6.0.1" + "@dhis2/app-runtime" "^2.8.0" + "@dhis2/d2-i18n" "^1.1.0" + "@dhis2/ui" "^6.5.3" classnames "^2.2.6" - moment "^2.24.0" + moment "^2.29.1" prop-types "^15.7.2" react "^16.8.6" react-dom "^16.8.6" @@ -1384,10 +1384,10 @@ typeface-roboto "^0.0.75" typescript "^3.6.3" -"@dhis2/cli-app-scripts@^5.7.2": - version "5.7.2" - resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-5.7.2.tgz#8aac230fc8d1913bf4fb99ab4bb167a6737a748e" - integrity sha512-EH2UMpk2Tg8Axw+5MesoqEZo70hyBYyLOa9YOvTKt9qzFTfsa8dBEwht0a3Zblq4v4YqLNdzGPZKhkL4nSE5jA== +"@dhis2/cli-app-scripts@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-6.0.1.tgz#b7e01273a721c9c799013696cfaacbc3fe46102a" + integrity sha512-A1Xco//IFH3XAcxIG4h3s/bRuKU69TQUjHza8sdsjQLEP8HhVl311J4Vdis5jkfMlWO7FC1pZV1mWy1E3lEyww== dependencies: "@babel/core" "^7.6.2" "@babel/plugin-proposal-class-properties" "^7.8.3" @@ -1396,7 +1396,7 @@ "@babel/preset-env" "^7.9.0" "@babel/preset-react" "^7.0.0" "@babel/preset-typescript" "^7.6.0" - "@dhis2/app-shell" "5.7.2" + "@dhis2/app-shell" "6.0.1" "@dhis2/cli-helpers-engine" "^2.1.1" archiver "^3.1.1" axios "^0.20.0" @@ -1456,10 +1456,10 @@ semver "^7.3.2" yargs "^16.1.0" -"@dhis2/d2-i18n@^1.0.5": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.0.6.tgz#2914be8acf296f3a6bf7b51c76c46da6a120b0ff" - integrity sha512-7YdA4ppFosjuyf7ZMm47BrdsA5TWLM9lmS0lUPgjcCVeeWfUgagqzf4W5JGB9XQ3w1vzK+yy5zH2Ij8IgRAGhA== +"@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" @@ -1471,59 +1471,59 @@ dependencies: prop-types "^15" -"@dhis2/ui-constants@5.7.8": - version "5.7.8" - resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-5.7.8.tgz#3356de03c5e9ddc0b5fac5087df8ccd97f0dc3c0" - integrity sha512-Ca9PvKP8s0jcWtqLl5tyAyhoy0F6rAohAiLvoJvRmx1M7lXzxwpHjLZnaQ4b1js3tn7BPB7HRdvv+SREqYY+PA== +"@dhis2/ui-constants@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-6.6.0.tgz#46270830332f9061ed865db2adcd888c1f3ac720" + integrity sha512-8vEMMeZ7mDqtlNL+4DCFsju+dvdHnfCPnRY+rFSH2vfHQoFEkdVfRPB7AvIZQ6wHXmg+plBG9HA8xfx7tg+OCg== dependencies: "@dhis2/prop-types" "^1.6.4" -"@dhis2/ui-core@5.7.8": - version "5.7.8" - resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-5.7.8.tgz#063f8a10e583803d8b85d168ddbfb52e1f72750b" - integrity sha512-ijmXT8QlBS6RjHsbPOsBzaAb9j5DOvQeoLkhFo5eQZswavug2gW+S/Vh2tgxfNP8gybZ0tHKaJXeXN3bkg7Xnw== +"@dhis2/ui-core@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-core/-/ui-core-6.6.0.tgz#6696250c3666daba2fb5bc091c6fa3ae4911b433" + integrity sha512-+P+URqTG9xH7oMA4NMthncxE0WBbzKkbewA68rkuIJL0gBgCvLUsWEZhk5QLTjuv661T2iNfHtpvlf0YAJIFqg== dependencies: "@dhis2/prop-types" "^1.6.4" - "@popperjs/core" "^2.5.3" + "@popperjs/core" "^2.6.0" classnames "^2.2.6" react-popper "^2.2.3" resize-observer-polyfill "^1.5.1" -"@dhis2/ui-forms@5.7.8": - version "5.7.8" - resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-5.7.8.tgz#7b4489b796e2a79bebd1a24b8c1df59103e566c0" - integrity sha512-8c7IKJAqGL+IIZ7sjUbTrlwGHFpwX6KfF8eToDxXkkNONyyRIiFo7uVI43+rHii7+WmFwEhacWWjeYhfVBICfg== +"@dhis2/ui-forms@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-6.6.0.tgz#d98a4a20e8fd8b8863b4fd8eee990888caf2c22e" + integrity sha512-BTZYFuwghy28coJdrMUdjqaM6dhEwZkflaoga7wto6tPZ8KM0WEsj/Co9//Zw43AOFsunNmAVeNtI+Yf1MCw/Q== dependencies: "@dhis2/prop-types" "^1.6.4" classnames "^2.2.6" final-form "^4.20.1" react-final-form "^6.5.1" -"@dhis2/ui-icons@5.7.8": - version "5.7.8" - resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-5.7.8.tgz#cb18c1bfbbcf49b2dae4c2b3ff7a3aeff46aa7f2" - integrity sha512-3P/Ptsf6HEdi0q8q6ba4Hcr8yuK+Y29PJn1Z56IZNZ+sZmFYiU7vxk5aMwA+s1EnjcPWQjrdwLzqqBAJE2W3Qg== +"@dhis2/ui-icons@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-6.6.0.tgz#d54ba28481b6176eb356e3203122ca9f5dc57cb8" + integrity sha512-xuPajD0uOi6Mc3qh1dNKF9khYDwFkU7w5tg+yBz9zbKmyKSjzLqmv22mVpw6FfiosIdrUccUFWe4Mtg3pCklQA== dependencies: "@dhis2/prop-types" "^1.6.4" -"@dhis2/ui-widgets@5.7.8": - version "5.7.8" - resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-5.7.8.tgz#77318381dd92848f9ab2cbc5414a2b57599309fe" - integrity sha512-QVLOdB836uUXBRw4OT6x/z1WR7j2ykxpMyat4g9sOXngj6t9+2UXZUO7Zegudj/HsZjTMDiN9A285zwxsd+khQ== +"@dhis2/ui-widgets@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-widgets/-/ui-widgets-6.6.0.tgz#96ac15e434705f9e091b84ae2b60fe858dd25139" + integrity sha512-g1vZgqYvi0WmTbTihl9E5rzI8mbAfDOqXdrmPGEe4DeEouMuZx9so/iPQ8LBUajUcrtT32+SiEWabul3Ms63Lg== dependencies: "@dhis2/prop-types" "^1.6.4" classnames "^2.2.6" -"@dhis2/ui@^5.7.2": - version "5.7.8" - resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-5.7.8.tgz#17604580d02cd4a7756552154a089e730a0fdf02" - integrity sha512-FHyTP6geAkR/jwX1/xG8yl8PvGaNhms8zUmaNiBLQ0mUmD9oJb47U8YXhJ5nVd0SFJnmuckOWgAWMt3meZGJTA== +"@dhis2/ui@^6.5.3": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-6.6.0.tgz#038a6eadfc67304e7eb80219656b15067a96790a" + integrity sha512-k/dShHi1ozsf9OyYroEMEYe7YK+6Upt/s+Eh4akI6IFPfgNKukpNOljm1jp0hRXJheqVC/flQACmgkKTr2gDTA== dependencies: - "@dhis2/ui-constants" "5.7.8" - "@dhis2/ui-core" "5.7.8" - "@dhis2/ui-forms" "5.7.8" - "@dhis2/ui-icons" "5.7.8" - "@dhis2/ui-widgets" "5.7.8" + "@dhis2/ui-constants" "6.6.0" + "@dhis2/ui-core" "6.6.0" + "@dhis2/ui-forms" "6.6.0" + "@dhis2/ui-icons" "6.6.0" + "@dhis2/ui-widgets" "6.6.0" "@eslint/eslintrc@^0.3.0": version "0.3.0" @@ -1949,10 +1949,10 @@ schema-utils "^2.6.5" source-map "^0.7.3" -"@popperjs/core@^2.5.3": - version "2.8.5" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.8.5.tgz#5c281d27f57321f407ab8bd365d08c488c320b4c" - integrity sha512-FUh6/RcpCn5p80Dg51Zsb+TvSsbvc8b+29pBTqMr53lP8sKWTZ7Q6u6soENiSY5WumWoTs0RqiUt0QG2mofMFw== +"@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== "@rollup/plugin-node-resolve@^7.1.1": version "7.1.3" @@ -9352,7 +9352,7 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -moment@^2.24.0: +moment@^2.24.0, moment@^2.29.1: version "2.29.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==