diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json index 80131fc617..97e601b744 100644 --- a/app/assets/javascripts/discourse-common/package.json +++ b/app/assets/javascripts/discourse-common/package.json @@ -17,7 +17,7 @@ "@ember/string": "^3.1.1", "@uppy/aws-s3": "3.0.6", "@uppy/aws-s3-multipart": "3.1.3", - "@uppy/core": "3.0.4", + "@uppy/core": "3.9.0", "@uppy/drop-target": "2.0.1", "@uppy/utils": "5.4.3", "@uppy/xhr-upload": "3.1.1", diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 6db9a9a099..ed548ba590 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -72,7 +72,7 @@ "@types/rsvp": "^4.0.8", "@uppy/aws-s3": "3.0.6", "@uppy/aws-s3-multipart": "3.1.3", - "@uppy/core": "3.0.4", + "@uppy/core": "3.9.0", "@uppy/drop-target": "2.0.1", "@uppy/utils": "5.4.3", "@uppy/xhr-upload": "3.1.1", diff --git a/app/assets/javascripts/yarn-ember3.lock b/app/assets/javascripts/yarn-ember3.lock index 754a15f5e1..eab6f30a79 100644 --- a/app/assets/javascripts/yarn-ember3.lock +++ b/app/assets/javascripts/yarn-ember3.lock @@ -1662,10 +1662,10 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== -"@transloadit/prettier-bytes@0.0.9": - version "0.0.9" - resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.9.tgz#8d3146f75fd9d3c544cb63ec7dbdeb6670d3e2d7" - integrity sha512-pCvdmea/F3Tn4hAtHqNXmjcixSaroJJ+L3STXlYJdir1g1m2mRQpWbN8a4SvgQtaw2930Ckhdx8qXdXBFMKbAA== +"@transloadit/prettier-bytes@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.2.0.tgz#78b55377d66bcc1679ce79cdb40a7de5d5119b35" + integrity sha512-nTFbcKEik+v4gEUlTAD3MAIAF3wOTFch3iNNBUVNhsrQPgY6SpSdV06+mR/hX9TJGb6tjbJ04LqJQP/qmT2sHw== "@types/babel__code-frame@^7.0.2": version "7.0.3" @@ -2084,15 +2084,15 @@ "@uppy/utils" "^5.3.0" namespace-emitter "^2.0.1" -"@uppy/core@3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@uppy/core/-/core-3.0.4.tgz#3bdc08e50ab72749e6f9afa60eec6c836e8b3442" - integrity sha512-vFofKmmVVsQE9bnOXozAPy94kLQMUdMH/l8m4ncXmxyyGRc2e9VfvY9wiy2EEsoj11O7YVzHOP70FYdRReUpVw== +"@uppy/core@3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@uppy/core/-/core-3.9.0.tgz#e830d27eeaec2c85d14f6739746b4be63ef64b87" + integrity sha512-RA3sEpSE0FXSHozofugrfaccoJ+SKTPwkMUItp06EYsEfZwMlvZf0lYUTy2sxUxURm+C/9Tl5TYmX+YFPziStg== dependencies: - "@transloadit/prettier-bytes" "0.0.9" - "@uppy/store-default" "^3.0.2" - "@uppy/utils" "^5.0.2" - lodash.throttle "^4.1.1" + "@transloadit/prettier-bytes" "^0.2.0" + "@uppy/store-default" "^3.2.1" + "@uppy/utils" "^5.7.1" + lodash "^4.17.21" mime-match "^1.0.2" namespace-emitter "^2.0.1" nanoid "^4.0.0" @@ -2105,12 +2105,12 @@ dependencies: "@uppy/utils" "^5.0.2" -"@uppy/store-default@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-3.0.3.tgz#37d0e95c8fd360b3283bca7fdf94cce7400008e7" - integrity sha512-/zlvQNj4HjkthI+7dNdj/8mOlTg1Zb1gJ/ZsOxof0g3xXD+OAwm7asRnOwpfj2dos+lExdW/zMn8XsRGsuvb6Q== +"@uppy/store-default@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-3.2.1.tgz#faa180ff671c41efd90c7b1bb6afc6b7d30d3885" + integrity sha512-koExp9GcKw94CqZZki2ylEbJ2IAz4ji0xzT+uObc02wwjtha3nOZOfNodL6hLK8pCf1izZ7042Ec1qEo8yoTSQ== -"@uppy/utils@5.4.3", "@uppy/utils@^5.0.2", "@uppy/utils@^5.2.0", "@uppy/utils@^5.3.0", "@uppy/utils@^5.4.0": +"@uppy/utils@5.4.3": version "5.4.3" resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-5.4.3.tgz#5d8c238805a35dec5b0d3cd4bea4e0a1b7e54584" integrity sha512-ewQTWQ5Wu1/ocz/lLCkhoXQwHLRktFK4CxrOsZmeCLK9LxjD1GOwSFjOuL199WDQKXiCle6SVlAJGQ3SDlXVkg== @@ -2118,6 +2118,14 @@ lodash "^4.17.21" preact "^10.5.13" +"@uppy/utils@^5.0.2", "@uppy/utils@^5.2.0", "@uppy/utils@^5.3.0", "@uppy/utils@^5.4.0", "@uppy/utils@^5.7.1": + version "5.7.1" + resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-5.7.1.tgz#a2013b7e7eff2b4638595ceb02da6411b18d669a" + integrity sha512-o4WXNDEmldCvxek6O9QaafKdimy5C0dcxE/Bo/EaY4UMqeQeGovNBeQzwxFvyiojXQcqJzjKw0oYM7+jLiqhEQ== + dependencies: + lodash "^4.17.21" + preact "^10.5.13" + "@uppy/xhr-upload@3.1.1": version "3.1.1" resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-3.1.1.tgz#7d6b3585e7ae298fb3340a6e327c73f60d25beca" @@ -8000,11 +8008,6 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" -lodash.throttle@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" - integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ== - lodash.uniq@^4.2.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" diff --git a/app/assets/javascripts/yarn-ember5.lock b/app/assets/javascripts/yarn-ember5.lock index 724d449827..04ee168f3e 100644 --- a/app/assets/javascripts/yarn-ember5.lock +++ b/app/assets/javascripts/yarn-ember5.lock @@ -1821,10 +1821,10 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== -"@transloadit/prettier-bytes@0.0.9": - version "0.0.9" - resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.9.tgz#8d3146f75fd9d3c544cb63ec7dbdeb6670d3e2d7" - integrity sha512-pCvdmea/F3Tn4hAtHqNXmjcixSaroJJ+L3STXlYJdir1g1m2mRQpWbN8a4SvgQtaw2930Ckhdx8qXdXBFMKbAA== +"@transloadit/prettier-bytes@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.2.0.tgz#78b55377d66bcc1679ce79cdb40a7de5d5119b35" + integrity sha512-nTFbcKEik+v4gEUlTAD3MAIAF3wOTFch3iNNBUVNhsrQPgY6SpSdV06+mR/hX9TJGb6tjbJ04LqJQP/qmT2sHw== "@types/babel__code-frame@^7.0.2": version "7.0.3" @@ -2243,15 +2243,15 @@ "@uppy/utils" "^5.3.0" namespace-emitter "^2.0.1" -"@uppy/core@3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@uppy/core/-/core-3.0.4.tgz#3bdc08e50ab72749e6f9afa60eec6c836e8b3442" - integrity sha512-vFofKmmVVsQE9bnOXozAPy94kLQMUdMH/l8m4ncXmxyyGRc2e9VfvY9wiy2EEsoj11O7YVzHOP70FYdRReUpVw== +"@uppy/core@3.9.0": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@uppy/core/-/core-3.9.0.tgz#e830d27eeaec2c85d14f6739746b4be63ef64b87" + integrity sha512-RA3sEpSE0FXSHozofugrfaccoJ+SKTPwkMUItp06EYsEfZwMlvZf0lYUTy2sxUxURm+C/9Tl5TYmX+YFPziStg== dependencies: - "@transloadit/prettier-bytes" "0.0.9" - "@uppy/store-default" "^3.0.2" - "@uppy/utils" "^5.0.2" - lodash.throttle "^4.1.1" + "@transloadit/prettier-bytes" "^0.2.0" + "@uppy/store-default" "^3.2.1" + "@uppy/utils" "^5.7.1" + lodash "^4.17.21" mime-match "^1.0.2" namespace-emitter "^2.0.1" nanoid "^4.0.0" @@ -2264,12 +2264,12 @@ dependencies: "@uppy/utils" "^5.0.2" -"@uppy/store-default@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-3.0.3.tgz#37d0e95c8fd360b3283bca7fdf94cce7400008e7" - integrity sha512-/zlvQNj4HjkthI+7dNdj/8mOlTg1Zb1gJ/ZsOxof0g3xXD+OAwm7asRnOwpfj2dos+lExdW/zMn8XsRGsuvb6Q== +"@uppy/store-default@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-3.2.1.tgz#faa180ff671c41efd90c7b1bb6afc6b7d30d3885" + integrity sha512-koExp9GcKw94CqZZki2ylEbJ2IAz4ji0xzT+uObc02wwjtha3nOZOfNodL6hLK8pCf1izZ7042Ec1qEo8yoTSQ== -"@uppy/utils@5.4.3", "@uppy/utils@^5.0.2", "@uppy/utils@^5.2.0", "@uppy/utils@^5.3.0", "@uppy/utils@^5.4.0": +"@uppy/utils@5.4.3": version "5.4.3" resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-5.4.3.tgz#5d8c238805a35dec5b0d3cd4bea4e0a1b7e54584" integrity sha512-ewQTWQ5Wu1/ocz/lLCkhoXQwHLRktFK4CxrOsZmeCLK9LxjD1GOwSFjOuL199WDQKXiCle6SVlAJGQ3SDlXVkg== @@ -2277,6 +2277,14 @@ lodash "^4.17.21" preact "^10.5.13" +"@uppy/utils@^5.0.2", "@uppy/utils@^5.2.0", "@uppy/utils@^5.3.0", "@uppy/utils@^5.4.0", "@uppy/utils@^5.7.1": + version "5.7.1" + resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-5.7.1.tgz#a2013b7e7eff2b4638595ceb02da6411b18d669a" + integrity sha512-o4WXNDEmldCvxek6O9QaafKdimy5C0dcxE/Bo/EaY4UMqeQeGovNBeQzwxFvyiojXQcqJzjKw0oYM7+jLiqhEQ== + dependencies: + lodash "^4.17.21" + preact "^10.5.13" + "@uppy/xhr-upload@3.1.1": version "3.1.1" resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-3.1.1.tgz#7d6b3585e7ae298fb3340a6e327c73f60d25beca" @@ -8187,11 +8195,6 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" -lodash.throttle@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" - integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ== - lodash.uniq@^4.2.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -9997,13 +10000,20 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3: +semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" +semver@^7.5.2: + version "7.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" + integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== + dependencies: + lru-cache "^6.0.0" + send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"