Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"url": "http://github.com/TerriaJS/TerriaMap"
},
"dependencies": {
"terriajs-server": "^4.0.2"
"terriajs-server": "^4.0.3"
},
"config": {
"docker": {
Expand Down Expand Up @@ -71,8 +71,8 @@
"sass": "^1.81.0",
"sass-loader": "^16.0.3",
"style-loader": "^4.0.0",
"terriajs": "8.11.0",
"terriajs-cesium": "21.0.0",
"terriajs": "8.11.1",
"terriajs-cesium": "21.0.1",
"svg-sprite": "^2.0.4",
"terriajs-plugin-api": "0.0.1-alpha.17",
"terriajs-plugin-sample": "0.0.1-alpha.7",
Expand Down
4 changes: 3 additions & 1 deletion serverconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"port": 3001,

"allowProxyFor": [
"githubusercontent.com",

// NOTE: The following default entries are deprecated and will be removed in a future release. If you rely ony terria proxying to any of these servers, please add them through a custom serverconfig.json. See https://docs.terria.io/guide/getting-started/#customizing-terriamap
"nicta.com.au",
"gov.au",
"csiro.au",
Expand All @@ -16,7 +19,6 @@
"geoserver.imos.org.au",
"nci.org.au",
"static.nationalmap.nicta.com.au",
"githubusercontent.com",
"gov",
"gov.uk",
"gov.nz",
Expand Down
123 changes: 111 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2734,6 +2734,11 @@ ansi-regex@^5.0.1:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==

ansi-regex@^6.0.1:
version "6.2.2"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==

ansi-styles@^4.0.0, ansi-styles@^4.1.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
Expand All @@ -2746,6 +2751,11 @@ ansi-styles@^5.0.0:
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==

ansi-styles@^6.2.1:
version "6.2.3"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==

ansi-wrap@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
Expand Down Expand Up @@ -3207,7 +3217,7 @@ but-unzip@^0.1.4:
resolved "https://registry.yarnpkg.com/but-unzip/-/but-unzip-0.1.7.tgz#2053602d4eaf6f72e373f81f4c429cd42163efd3"
integrity sha512-fGmYleG7dAYaoqMVZCoM6zjSeaIYNlyVreUVyUkVPtPLRTbKq8J8KdNnyqMaiLqun7P9bBuSMeqJs0YxN86GJA==

bytes@3.1.2:
bytes@3.1.2, bytes@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
Expand Down Expand Up @@ -3359,6 +3369,15 @@ cliui@^8.0.1:
strip-ansi "^6.0.1"
wrap-ansi "^7.0.0"

cliui@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-9.0.1.tgz#6f7890f386f6f1f79953adc1f78dec46fcc2d291"
integrity sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==
dependencies:
string-width "^7.2.0"
strip-ansi "^7.1.0"
wrap-ansi "^9.0.0"

clone-buffer@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
Expand Down Expand Up @@ -4184,6 +4203,11 @@ electron-to-chromium@^1.5.227:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.233.tgz#05db98476cee317527d6c48934571e13ad6b6f58"
integrity sha512-iUdTQSf7EFXsDdQsp8MwJz5SVk4APEFqXU/S47OtQ0YLqacSwPXdZ5vRlMX3neb07Cy2vgioNuRnWUXFwuslkg==

emoji-regex@^10.3.0:
version "10.6.0"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz#bf3d6e8f7f8fd22a65d9703475bc0147357a6b0d"
integrity sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==

emoji-regex@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
Expand Down Expand Up @@ -5018,6 +5042,11 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==

get-east-asian-width@^1.0.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz#9bc4caa131702b4b61729cb7e42735bc550c9ee6"
integrity sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==

get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, get-intrinsic@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
Expand Down Expand Up @@ -8144,6 +8173,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^7.0.0, string-width@^7.2.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc"
integrity sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==
dependencies:
emoji-regex "^10.3.0"
get-east-asian-width "^1.0.0"
strip-ansi "^7.1.0"

string.prototype.matchall@^4.0.12:
version "4.0.12"
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz#6c88740e49ad4956b1332a911e949583a275d4c0"
Expand Down Expand Up @@ -8224,6 +8262,13 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^7.1.0:
version "7.1.2"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
dependencies:
ansi-regex "^6.0.1"

strip-json-comments@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
Expand Down Expand Up @@ -8361,7 +8406,34 @@ terriajs-cesium-widgets@13.2.0:
nosleep.js "^0.12.0"
terriajs-cesium "^21.0.0"

terriajs-cesium@21.0.0, terriajs-cesium@^21.0.0:
terriajs-cesium@21.0.1:
version "21.0.1"
resolved "https://registry.yarnpkg.com/terriajs-cesium/-/terriajs-cesium-21.0.1.tgz#8529991ba962b95c0c55d96d52ff80374272294d"
integrity sha512-0F12Fodn/1VIm0x/gNgDj9bYZmkT8sIjTFNSMYCOtpan7aLrI7OWJjqXlcnkSxRf+bsQqqgvONLXlpSlZp/T5g==
dependencies:
"@cesium/wasm-splats" "^0.1.0-alpha.2"
"@spz-loader/core" "0.3.0"
"@tweenjs/tween.js" "^25.0.0"
"@zip.js/zip.js" "^2.8.1"
autolinker "^4.0.0"
bitmap-sdf "^1.0.3"
dompurify "^3.0.2"
draco3d "^1.5.1"
earcut "^3.0.0"
grapheme-splitter "^1.0.4"
jsep "^1.3.8"
kdbush "^4.0.1"
ktx-parse "^1.0.0"
lerc "^2.0.0"
mersenne-twister "^1.1.0"
meshoptimizer "^0.25.0"
pako "^2.0.4"
protobufjs "^7.1.0"
rbush "^4.0.1"
topojson-client "^3.1.0"
urijs "^1.19.7"

terriajs-cesium@^21.0.0:
version "21.0.0"
resolved "https://registry.yarnpkg.com/terriajs-cesium/-/terriajs-cesium-21.0.0.tgz#6fafe11e0b5a6463e595a840f373a064ee3d43d1"
integrity sha512-IUh8DIjM0fk3upKaeQIiwcyupsUMjOYgfaMw/Jw5/WtNNXewoM6uSq3ZlLDrCP+A7Bz1IG0rgQs9tcouxtf3+w==
Expand Down Expand Up @@ -8412,15 +8484,16 @@ terriajs-plugin-sample@0.0.1-alpha.7:
dependencies:
terriajs-plugin-api "0.0.1-alpha.6"

terriajs-server@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/terriajs-server/-/terriajs-server-4.0.2.tgz#b1f33473455048e473366ea04dc2df54da72c440"
integrity sha512-BZ53IS5ExAQQv9mzfnzlHXfg3N/pu+gY9j4b9Ay03AAJbwyXh/txWrvg1ouYin/LTeJ5MBacqiJgmHEjEheOAQ==
terriajs-server@^4.0.3:
version "4.0.3"
resolved "https://registry.yarnpkg.com/terriajs-server/-/terriajs-server-4.0.3.tgz#e0650db833e9c6d705bf86cfac2384b0b93709eb"
integrity sha512-JaCkzfA4vI7mQZpesC3XaWVwdmJ/p6GuDIbqAsWE48QZVzW+T399CreLIpoqNnvzcf4mGnOkZBkKbUYjhr2dEQ==
dependencies:
aws-sdk "^2.1336.0"
base-x "^5.0.1"
basic-auth "^2.0.1"
body-parser "^1.20.3"
bytes "^3.1.2"
compression "^1.6.0"
cors "^2.7.1"
express "^4.21.2"
Expand All @@ -8432,7 +8505,7 @@ terriajs-server@^4.0.2:
rate-limiter-flexible "^7.1.1"
request "^2.88.2"
request-promise "^4.0.1"
yargs "^17.7.2"
yargs "^18.0.0"

terriajs-tiff-imagery-provider@2.13.3-webpack5-3:
version "2.13.3-webpack5-3"
Expand All @@ -8452,10 +8525,10 @@ terriajs-typings-for-css-modules-loader@^2.5.2:
optionalDependencies:
prettier "*"

terriajs@8.11.0:
version "8.11.0"
resolved "https://registry.yarnpkg.com/terriajs/-/terriajs-8.11.0.tgz#1ed48f313a8cca87b7c3a4ac63034768d72069ca"
integrity sha512-USyYdbbaTfkw6Zh/nNKmo+MPAXEzR2WGDhoSfYd4cqi5ZeXdnn+KSHrT9dJPYT21jekQnW6Eyi7XIo/JPfxvTQ==
terriajs@8.11.1:
version "8.11.1"
resolved "https://registry.yarnpkg.com/terriajs/-/terriajs-8.11.1.tgz#d8347c725afbfd5c3257b5a3bdac010a1ece94b4"
integrity sha512-he7X9Z4XlgoM9UJbUMiPegamjwABKpOWJ3mzrh4t+bhl9QTih3yydE6eBlXIO5cILo53NIY6qcC+FTYhhoisCA==
dependencies:
"@babel/core" "^7.28.0"
"@babel/plugin-proposal-decorators" "^7.28.0"
Expand Down Expand Up @@ -8596,7 +8669,7 @@ terriajs@8.11.0:
shpjs "^6.1.0"
style-loader "^4.0.0"
styled-components "^5.3.11"
terriajs-cesium "21.0.0"
terriajs-cesium "21.0.1"
terriajs-cesium-widgets "13.2.0"
terriajs-html2canvas "1.0.0-alpha.12-terriajs-1"
terriajs-tiff-imagery-provider "2.13.3-webpack5-3"
Expand Down Expand Up @@ -9318,6 +9391,15 @@ wrap-ansi@^7.0.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^9.0.0:
version "9.0.2"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.2.tgz#956832dea9494306e6d209eb871643bb873d7c98"
integrity sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==
dependencies:
ansi-styles "^6.2.1"
string-width "^7.0.0"
strip-ansi "^7.1.0"

wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
Expand Down Expand Up @@ -9384,6 +9466,11 @@ yargs-parser@^21.1.1:
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==

yargs-parser@^22.0.0:
version "22.0.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-22.0.0.tgz#87b82094051b0567717346ecd00fd14804b357c8"
integrity sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==

yargs@^15.3.1:
version "15.4.1"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
Expand Down Expand Up @@ -9427,6 +9514,18 @@ yargs@^17.7.2:
y18n "^5.0.5"
yargs-parser "^21.1.1"

yargs@^18.0.0:
version "18.0.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-18.0.0.tgz#6c84259806273a746b09f579087b68a3c2d25bd1"
integrity sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==
dependencies:
cliui "^9.0.1"
escalade "^3.1.1"
get-caller-file "^2.0.5"
string-width "^7.2.0"
y18n "^5.0.5"
yargs-parser "^22.0.0"

yocto-queue@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
Expand Down