Skip to content

Commit

Permalink
fix: maps gl upgrade and increased node memory for travis (#452)
Browse files Browse the repository at this point in the history 
* fix: maps-gl upgrade and terser plugin fix

* fix: increase node memory for travis
  • Loading branch information
@turban
turban committed Feb 21, 2020
1 parent 01ebc23 commit 9c7058b
Show file tree
Hide file tree
Showing 4 changed files with 189 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
View file
Expand Up @@ -25,4 +25,5 @@ deploy:
all_branches: true
env:
global:
secure: hL7GzkmHaNnLzgrqNNdMjJiBxyB5v0KAeztVSDsglafAJhByBq4mDaMwoe3TeFg87Ui8txtg4thHfmkPBNC4WdoBFKtc37O3vDxno84ybB5Timmc8oCV0QubobZk6zI4hc+tMO2F2Ke5pgAwzqFVj2r2ue6mEcy4JXXd6+yxGOho7uGHOnpY6y9I5pJ5rreE9F4PpbHz176EuhJPz5dy0YRGnREHWzDvR8O8VXIMq1RZLSYQOpfKv6wbaUtzmNWcNO8cPjJw1h8OBRKNqaMrDOOq/4u6PnZcON2As7O99bJbY0hWK4UsRs6+//PWef496sxH5+AR4ws6jHQ6AjOvNOvC0PNXZ8Jtyui7BTO1zSjefd3Y7kGPn+D8WIzNjpK67BcJF9+okyTffkpfBi3kXY9gdOPGUm/4SMYyRyxePxEo0OwlvU80Ivz9kUtKhC+Iltw6Ent0GSscloAihal/sy2K28bSjVhAXjJD3utz+vqHJvUrxoAGmwPyU76qtI+CPew5tYeBu26DTS0P77s94NeB/0N4Am4vqOpmxqOcJc3AZyGpkZjIe0qjwR4CyhkP6i6vm15rE5o9JlAIQKeCHTcKpZpiz4vAhJeywqJeyfAeU1RDVWWpTAE0nBdAxo7pokrjrJT95fn7Wf3+xZzv93MIjWzQpndXSqeav+8HWDg=
- NODE_OPTIONS="--max_old_space_size=4096"
- secure: hL7GzkmHaNnLzgrqNNdMjJiBxyB5v0KAeztVSDsglafAJhByBq4mDaMwoe3TeFg87Ui8txtg4thHfmkPBNC4WdoBFKtc37O3vDxno84ybB5Timmc8oCV0QubobZk6zI4hc+tMO2F2Ke5pgAwzqFVj2r2ue6mEcy4JXXd6+yxGOho7uGHOnpY6y9I5pJ5rreE9F4PpbHz176EuhJPz5dy0YRGnREHWzDvR8O8VXIMq1RZLSYQOpfKv6wbaUtzmNWcNO8cPjJw1h8OBRKNqaMrDOOq/4u6PnZcON2As7O99bJbY0hWK4UsRs6+//PWef496sxH5+AR4ws6jHQ6AjOvNOvC0PNXZ8Jtyui7BTO1zSjefd3Y7kGPn+D8WIzNjpK67BcJF9+okyTffkpfBi3kXY9gdOPGUm/4SMYyRyxePxEo0OwlvU80Ivz9kUtKhC+Iltw6Ent0GSscloAihal/sy2K28bSjVhAXjJD3utz+vqHJvUrxoAGmwPyU76qtI+CPew5tYeBu26DTS0P77s94NeB/0N4Am4vqOpmxqOcJc3AZyGpkZjIe0qjwR4CyhkP6i6vm15rE5o9JlAIQKeCHTcKpZpiz4vAhJeywqJeyfAeU1RDVWWpTAE0nBdAxo7pokrjrJT95fn7Wf3+xZzv93MIjWzQpndXSqeav+8HWDg=
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -53,7 +53,7 @@
"@dhis2/d2-ui-interpretations": "6.2.1",
"@dhis2/d2-ui-org-unit-dialog": "5.2.10",
"@dhis2/d2-ui-org-unit-tree": "5.2.10",
"@dhis2/maps-gl": "1.0.5",
"@dhis2/maps-gl": "1.0.6",
"@dhis2/ui-core": "^4.1.1",
"@dhis2/ui-widgets": "^2.0.5",
"@material-ui/core": "^4.9.3",
Expand Down
6 changes: 5 additions & 1 deletion webpack.config.js
View file
Expand Up @@ -143,7 +143,11 @@ if (!isDevBuild) {
})
);
*/
webpackConfig.plugins.push(new TerserPlugin());
webpackConfig.plugins.push(
new TerserPlugin({
parallel: true,
})
);
} else {
webpackConfig.plugins.push(
new webpack.DefinePlugin({
Expand Down
185 changes: 181 additions & 4 deletions yarn.lock
View file
Expand Up @@ -417,14 +417,16 @@
recompose "^0.26.0"
rxjs "^5.5.7"

"@dhis2/maps-gl@1.0.5":
version "1.0.5"
resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-1.0.5.tgz#2df0ff3b0cd85b62bd02e576ce1ebf28e13e29c3"
integrity sha512-fHdpEtepKlhAJ2iQGIP/8DgyTMZz/ceLQghGo2dPqewTkUnpxHmUavj5QU39F32pugmcMyhJZBGTH38uTdnkAQ==
"@dhis2/maps-gl@1.0.6":
version "1.0.6"
resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-1.0.6.tgz#1f3fd5ef366dd47f0fc1a33371753f1e3b67f8ab"
integrity sha512-Re/2hm0cE33RyryY+kxQNAKs2+ITlbh7ihcOTd0rgFKp9AgllqWZyr1y3q2Abi0u/x3jK52fDPI1Mi/2hChi8Q==
dependencies:
"@mapbox/sphericalmercator" "^1.1.0"
"@turf/area" "^6.0.1"
"@turf/bbox" "^6.0.1"
"@turf/buffer" "^5.1.5"
"@turf/center-of-mass" "^6.0.1"
"@turf/circle" "^6.0.1"
"@turf/length" "^6.0.2"
fetch-jsonp "^1.1.3"
Expand Down Expand Up @@ -769,6 +771,14 @@
"@turf/helpers" "6.x"
"@turf/meta" "6.x"

"@turf/bbox@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-5.1.5.tgz#3051df514ad4c50f4a4f9b8a2d15fd8b6840eda3"
integrity sha1-MFHfUUrUxQ9KT5uKLRX9i2hA7aM=
dependencies:
"@turf/helpers" "^5.1.5"
"@turf/meta" "^5.1.5"

"@turf/bbox@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-6.0.1.tgz#b966075771475940ee1c16be2a12cf389e6e923a"
Expand All @@ -777,6 +787,46 @@
"@turf/helpers" "6.x"
"@turf/meta" "6.x"

"@turf/buffer@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@turf/buffer/-/buffer-5.1.5.tgz#841c9627cfb974b122ac4e1a956f0466bc0231c4"
integrity sha1-hByWJ8+5dLEirE4alW8EZrwCMcQ=
dependencies:
"@turf/bbox" "^5.1.5"
"@turf/center" "^5.1.5"
"@turf/helpers" "^5.1.5"
"@turf/meta" "^5.1.5"
"@turf/projection" "^5.1.5"
d3-geo "1.7.1"
turf-jsts "*"

"@turf/center-of-mass@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/@turf/center-of-mass/-/center-of-mass-6.0.1.tgz#be8904edfd6523683706429ea2f4adf5badd5b26"
integrity sha512-cY+RndzVzDBMlEShRmvLko0CSG1+iC+WdeMAtauCGL61e23LTYHxFSjVOOo4gF+aKqKia1veZPol8ENJoOU4ow==
dependencies:
"@turf/centroid" "6.x"
"@turf/convex" "6.x"
"@turf/helpers" "6.x"
"@turf/invariant" "6.x"
"@turf/meta" "6.x"

"@turf/center@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@turf/center/-/center-5.1.5.tgz#44ab2cd954f63c0d37757f7158a99c3ef5114b80"
integrity sha1-RKss2VT2PA03dX9xWKmcPvURS4A=
dependencies:
"@turf/bbox" "^5.1.5"
"@turf/helpers" "^5.1.5"

"@turf/centroid@6.x":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@turf/centroid/-/centroid-6.0.2.tgz#c4eb16b4bc60b692f74e1809cf9a7c4a4f5ba1cc"
integrity sha512-auyDauOtC4eddH7GC3CHFTDu2PKhpSeKCRhwhHhXtJqn2dWCJQNIoCeJRmfXRIbzCWhWvgvQafvvhq8HNvmvWw==
dependencies:
"@turf/helpers" "6.x"
"@turf/meta" "6.x"

"@turf/circle@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/@turf/circle/-/circle-6.0.1.tgz#0ab72083373ae3c76b700c17a504ab1b5c0910b9"
Expand All @@ -785,6 +835,22 @@
"@turf/destination" "6.x"
"@turf/helpers" "6.x"

"@turf/clone@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@turf/clone/-/clone-5.1.5.tgz#253e8d35477181976e33adfab50a0f02a7f0e367"
integrity sha1-JT6NNUdxgZduM636tQoPAqfw42c=
dependencies:
"@turf/helpers" "^5.1.5"

"@turf/convex@6.x":
version "6.0.3"
resolved "https://registry.yarnpkg.com/@turf/convex/-/convex-6.0.3.tgz#d7e9912b96483f1504cdd2f60b4b1bbdbf77416c"
integrity sha512-S9zvcKiqkIiQ/fhnEP5ftDrsVY3Sh0XeLDVZY761nlvuvzLVzz26Gq7H3NMsCJlmIcQS9jPARFBVpRZi6eTV8Q==
dependencies:
"@turf/helpers" "6.x"
"@turf/meta" "6.x"
concaveman "*"

"@turf/destination@6.x":
version "6.0.1"
resolved "https://registry.yarnpkg.com/@turf/destination/-/destination-6.0.1.tgz#5275887fa96ec463f44864a2c17f0b712361794a"
Expand All @@ -806,6 +872,11 @@
resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-6.1.4.tgz#d6fd7ebe6782dd9c87dca5559bda5c48ae4c3836"
integrity sha512-vJvrdOZy1ngC7r3MDA7zIGSoIgyrkWcGnNIEaqn/APmw+bVLF2gAW7HIsdTxd12s5wQMqEpqIQrmrbRRZ0xC7g==

"@turf/helpers@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-5.1.5.tgz#153405227ab933d004a5bb9641a9ed999fcbe0cf"
integrity sha1-FTQFInq5M9AEpbuWQantmZ/L4M8=

"@turf/invariant@6.x":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-6.1.2.tgz#6013ed6219f9ac2edada9b31e1dfa5918eb0a2f7"
Expand All @@ -829,6 +900,22 @@
dependencies:
"@turf/helpers" "6.x"

"@turf/meta@^5.1.5":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-5.2.0.tgz#3b1ad485ee0c3b0b1775132a32c384d53e4ba53d"
integrity sha1-OxrUhe4MOwsXdRMqMsOE1T5LpT0=
dependencies:
"@turf/helpers" "^5.1.5"

"@turf/projection@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@turf/projection/-/projection-5.1.5.tgz#24517eeeb2f36816ba9f712e7ae6d6a368edf757"
integrity sha1-JFF+7rLzaBa6n3EueubWo2jt91c=
dependencies:
"@turf/clone" "^5.1.5"
"@turf/helpers" "^5.1.5"
"@turf/meta" "^5.1.5"

"@types/jss@^9.5.6":
version "9.5.8"
resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.8.tgz#258391f42211c042fc965508d505cbdc579baa5b"
Expand Down Expand Up @@ -3546,6 +3633,17 @@ concat-stream@1.6.2, concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^
readable-stream "^2.2.2"
typedarray "^0.0.6"

concaveman@*:
version "1.1.1"
resolved "https://registry.yarnpkg.com/concaveman/-/concaveman-1.1.1.tgz#6c2482580b2523cef82fc2bec00a0415e6e68162"
integrity sha1-bCSCWAslI874L8K+wAoEFebmgWI=
dependencies:
monotone-convex-hull-2d "^1.0.1"
point-in-polygon "^1.0.1"
rbush "^2.0.1"
robust-orientation "^1.1.3"
tinyqueue "^1.1.0"

config-chain@^1.1.11:
version "1.1.12"
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
Expand Down Expand Up @@ -4070,6 +4168,11 @@ d2@~31.7:
dependencies:
isomorphic-fetch "^2.2.1"

d3-array@1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==

"d3-array@1.2.0 - 2":
version "2.4.0"
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.4.0.tgz#87f8b9ad11088769c82b5ea846bcb1cc9393f242"
Expand All @@ -4090,6 +4193,13 @@ d3-format@1, d3-format@^1.3.2:
resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.3.tgz#4e8eb4dff3fdcb891a8489ec6e698601c41b96f1"
integrity sha512-mm/nE2Y9HgGyjP+rKIekeITVgBtX97o1nrvHCWX8F/yBYyevUTvu9vb5pUnKwrcSw7o7GuwMOWjS9gFDs4O+uQ==

d3-geo@1.7.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.7.1.tgz#44bbc7a218b1fd859f3d8fd7c443ca836569ce99"
integrity sha512-O4AempWAr+P5qbk2bC2FuN/sDW4z+dN2wDf9QV3bxQt4M5HfOEeXLgJ/UKQW0+o1Dj8BE+L5kiDbdWUMjsmQpw==
dependencies:
d3-array "1"

d3-interpolate@^1.2.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
Expand Down Expand Up @@ -9513,6 +9623,13 @@ moment@2.24.0, moment@^2.22.1, moment@^2.24.0:
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==

monotone-convex-hull-2d@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/monotone-convex-hull-2d/-/monotone-convex-hull-2d-1.0.1.tgz#47f5daeadf3c4afd37764baa1aa8787a40eee08c"
integrity sha1-R/Xa6t88Sv03dkuqGqh4ekDu4Iw=
dependencies:
robust-orientation "^1.1.3"

moo@^0.5.0:
version "0.5.1"
resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
Expand Down Expand Up @@ -10554,6 +10671,11 @@ pngquant-bin@^5.0.0:
execa "^0.10.0"
logalot "^2.0.0"

point-in-polygon@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/point-in-polygon/-/point-in-polygon-1.0.1.tgz#d59b64e8fee41c49458aac82b56718c5957b2af7"
integrity sha1-1Ztk6P7kHElFiqyCtWcYxZV7Kvc=

polylabel@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/polylabel/-/polylabel-1.0.2.tgz#90c11602fb217a65b78ac2110ac5fcb00b652560"
Expand Down Expand Up @@ -11107,6 +11229,11 @@ querystringify@^2.1.1:
resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==

quickselect@^1.0.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2"
integrity sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==

quickselect@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-2.0.0.tgz#f19680a486a5eefb581303e023e98faaf25dd018"
Expand Down Expand Up @@ -11186,6 +11313,13 @@ raw-loader@~0.5.1:
resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=

rbush@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/rbush/-/rbush-2.0.2.tgz#bb6005c2731b7ba1d5a9a035772927d16a614605"
integrity sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==
dependencies:
quickselect "^1.0.1"

rc@^1.1.2:
version "1.2.8"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
Expand Down Expand Up @@ -12019,6 +12153,34 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"

robust-orientation@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/robust-orientation/-/robust-orientation-1.1.3.tgz#daff5b00d3be4e60722f0e9c0156ef967f1c2049"
integrity sha1-2v9bANO+TmByLw6cAVbvln8cIEk=
dependencies:
robust-scale "^1.0.2"
robust-subtract "^1.0.0"
robust-sum "^1.0.0"
two-product "^1.0.2"

robust-scale@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/robust-scale/-/robust-scale-1.0.2.tgz#775132ed09542d028e58b2cc79c06290bcf78c32"
integrity sha1-d1Ey7QlULQKOWLLMecBikLz3jDI=
dependencies:
two-product "^1.0.2"
two-sum "^1.0.0"

robust-subtract@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/robust-subtract/-/robust-subtract-1.0.0.tgz#e0b164e1ed8ba4e3a5dda45a12038348dbed3e9a"
integrity sha1-4LFk4e2LpOOl3aRaEgODSNvtPpo=

robust-sum@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/robust-sum/-/robust-sum-1.0.0.tgz#16646e525292b4d25d82757a286955e0bbfa53d9"
integrity sha1-FmRuUlKStNJdgnV6KGlV4Lv6U9k=

rst-selector-parser@^2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
Expand Down Expand Up @@ -13464,11 +13626,26 @@ tunnel-agent@^0.6.0:
dependencies:
safe-buffer "^5.0.1"

turf-jsts@*:
version "1.2.3"
resolved "https://registry.yarnpkg.com/turf-jsts/-/turf-jsts-1.2.3.tgz#59757f542afbff9a577bbf411f183b8f48d38aa4"
integrity sha512-Ja03QIJlPuHt4IQ2FfGex4F4JAr8m3jpaHbFbQrgwr7s7L6U8ocrHiF3J1+wf9jzhGKxvDeaCAnGDot8OjGFyA==

tweetnacl@^0.14.3, tweetnacl@~0.14.0:
version "0.14.5"
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=

two-product@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/two-product/-/two-product-1.0.2.tgz#67d95d4b257a921e2cb4bd7af9511f9088522eaa"
integrity sha1-Z9ldSyV6kh4stL16+VEfkIhSLqo=

two-sum@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/two-sum/-/two-sum-1.0.0.tgz#31d3f32239e4f731eca9df9155e2b297f008ab64"
integrity sha1-MdPzIjnk9zHsqd+RVeKyl/AIq2Q=

type-check@~0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
Expand Down

0 comments on commit 9c7058b

Please sign in to comment.