From 0978685e7125b1dc3f3716bcc057e2312733d552 Mon Sep 17 00:00:00 2001 From: pangratz Date: Tue, 2 Nov 2021 21:52:19 +0100 Subject: [PATCH 1/5] test: ensure we return a valid JSON response An empty string is not a valid JSON response which is expected by this endpoint. --- ui/tests/acceptance/job-versions-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/tests/acceptance/job-versions-test.js b/ui/tests/acceptance/job-versions-test.js index 127b67793..902bd2a47 100644 --- a/ui/tests/acceptance/job-versions-test.js +++ b/ui/tests/acceptance/job-versions-test.js @@ -114,7 +114,7 @@ module('Acceptance | job versions', function(hooks) { if (versionRowToRevertTo) { // The default Mirage implementation updates the job version as passed in, this does nothing - server.pretender.post('/v1/job/:id/revert', () => [200, {}, '']); + server.pretender.post('/v1/job/:id/revert', () => [200, {}, '{}']); await versionRowToRevertTo.revertToButton.idle(); await versionRowToRevertTo.revertToButton.confirm(); From 0fdedc344b4ca4deb114dad6f7c6682fedcdf421 Mon Sep 17 00:00:00 2001 From: pangratz Date: Tue, 2 Nov 2021 22:07:47 +0100 Subject: [PATCH 2/5] fix: ensure reloading an allocation doesn't result in an infinite loop `allocation.reload()` has differnt semantics for reloading, as it will reload the record in the background and immediately resolve [1]. By using the stores' findRecord and specifying `backgroundReload: false`, we make sure we await the response from the server and hereby have the complete record once we continue in the code. Using `allocation.reoad()` causes and infinite loop when we upgrade ember-data to 3.16 (and model fragments to 5.0.0-beta.2). [1] This is, unless `shouldBackgroundReload` on the adapter returns false, but it's true by default. --- ui/app/components/allocation-row.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/components/allocation-row.js b/ui/app/components/allocation-row.js index a92c618ad..4ef9a5680 100644 --- a/ui/app/components/allocation-row.js +++ b/ui/app/components/allocation-row.js @@ -86,7 +86,7 @@ async function qualifyAllocation() { // Make sure the allocation is a complete record and not a partial so we // can show information such as preemptions and rescheduled allocation. if (allocation.isPartial) { - await allocation.reload(); + await this.store.findRecord('allocation', allocation.id, { backgroundReload: false }); } if (allocation.get('job.isPending')) { From 021adc5af2f1efff5d86049bed179892a134f8eb Mon Sep 17 00:00:00 2001 From: pangratz Date: Tue, 2 Nov 2021 22:08:12 +0100 Subject: [PATCH 3/5] chore: upgrade ember-data to 3.16 (and ember-data-model-fragments to 5.0.0-beta.2) --- ui/package.json | 4 +- ui/yarn.lock | 214 ++++++++++++++++++++++++++++-------------------- 2 files changed, 129 insertions(+), 89 deletions(-) diff --git a/ui/package.json b/ui/package.json index b0b729693..eb0557773 100644 --- a/ui/package.json +++ b/ui/package.json @@ -77,8 +77,8 @@ "ember-composable-helpers": "^4.4.1", "ember-concurrency": "^1.0.0", "ember-copy": "^1.0.0", - "ember-data": "~3.12.0", - "ember-data-model-fragments": "4.0.0", + "ember-data": "~3.16", + "ember-data-model-fragments": "5.0.0-beta.2", "ember-decorators": "^6.1.1", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.2", diff --git a/ui/yarn.lock b/ui/yarn.lock index ad79d489b..d12032bb2 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -1197,14 +1197,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-block-scoping@^7.12.11", "@babel/plugin-transform-block-scoping@^7.5.5", "@babel/plugin-transform-block-scoping@^7.8.3": +"@babel/plugin-transform-block-scoping@^7.12.11", "@babel/plugin-transform-block-scoping@^7.8.3": version "7.12.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca" integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.15.3": +"@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.15.3", "@babel/plugin-transform-block-scoping@^7.7.4": version "7.15.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf" integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q== @@ -2105,16 +2105,63 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA== -"@ember-data/-build-infra@3.12.6": - version "3.12.6" - resolved "https://registry.yarnpkg.com/@ember-data/-build-infra/-/-build-infra-3.12.6.tgz#27071ea3a92a546947cf7f9b4cebf0326300fcd1" - integrity sha512-sLSNLAArND5Xk9cRPRZjtt+hlcrl6HXL8pLH01BEYHeumjx2U1+hokY9xqeDBg3e/221AxuagWA6/so5U7tbfg== +"@ember-data/adapter@3.16.9": + version "3.16.9" + resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.16.9.tgz#d4cb172b708c18ea077becae9ad8b784ce306c85" + integrity sha512-3DsJE34lhwCcA/RhsNIjzrRylxh91guBHDflRZV7Vb6rwtPHjd/a4HotwJPH4mL07Ec7UhWd5dHk+O2hKQ5/Hg== dependencies: - "@babel/plugin-transform-block-scoping" "^7.5.5" - "@ember-data/canary-features" "3.12.6" - babel-plugin-debug-macros "^0.3.2" - babel-plugin-feature-flags "^0.3.1" - babel-plugin-filter-imports "^3.0.0" + "@ember-data/private-build-infra" "3.16.9" + "@ember-data/store" "3.16.9" + "@ember/edition-utils" "^1.2.0" + ember-cli-babel "^7.20.5" + ember-cli-test-info "^1.0.0" + ember-cli-typescript "^3.1.3" + +"@ember-data/canary-features@3.16.9": + version "3.16.9" + resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.16.9.tgz#f68eec8cf73ccf8b9cbfe9e163313251144cd958" + integrity sha512-ENnSGmgGofd0lPzKPuWIavTXosYSiikASQAEaoa7wQ49ACaIVLqobpPfqnBeUI+Ng/UNAuKrum+gc7t8uDmSew== + dependencies: + ember-cli-babel "^7.20.5" + ember-cli-typescript "^3.1.3" + +"@ember-data/debug@3.16.9": + version "3.16.9" + resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.16.9.tgz#598247819f85bda371f46438d6c807c8c72e5475" + integrity sha512-dUJAyK8ciJMHmhn/7jVIho6x0Yq6AlY6sZCaBQX9sojC38E+l3P0QgDBc+ic1w86V45DPwZKOCHG9I5i0kV4Bg== + dependencies: + "@ember-data/private-build-infra" "3.16.9" + "@ember/edition-utils" "^1.2.0" + ember-cli-babel "^7.20.5" + ember-cli-test-info "^1.0.0" + ember-cli-typescript "^3.1.3" + +"@ember-data/model@3.16.9": + version "3.16.9" + resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.16.9.tgz#de002feedf100acd47b93916a7dbef436e9b770a" + integrity sha512-K9pl2eOTtGH2z/XUwydZYn5Lsnz15gudm9oAjTvvU9yxMlrkRx09TmBr0m0TDMZOl64vTPbQySrHBtguJM0Ppg== + dependencies: + "@ember-data/canary-features" "3.16.9" + "@ember-data/private-build-infra" "3.16.9" + "@ember-data/store" "3.16.9" + "@ember/edition-utils" "^1.2.0" + ember-cli-babel "^7.20.5" + ember-cli-string-utils "^1.1.0" + ember-cli-test-info "^1.0.0" + ember-cli-typescript "^3.1.3" + ember-compatibility-helpers "^1.2.0" + inflection "1.12.0" + +"@ember-data/private-build-infra@3.16.9": + version "3.16.9" + resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.16.9.tgz#992bff2ff2fdcb5db1b147f723830b2a2a4b1369" + integrity sha512-2IDMNlglsN5v44UZ4FGBYK88ZXPh504+o5cSjKW9CnlZd4imqcxp0KXYWfiGffzGxKllDCWuRsc43lpNu5Clng== + dependencies: + "@babel/plugin-transform-block-scoping" "^7.7.4" + "@ember-data/canary-features" "3.16.9" + "@ember/edition-utils" "^1.2.0" + babel-plugin-debug-macros "^0.3.3" + babel-plugin-filter-imports "^4.0.0" babel6-plugin-strip-class-callcheck "^6.0.0" broccoli-debug "^0.6.5" broccoli-file-creator "^2.1.1" @@ -2122,75 +2169,61 @@ broccoli-merge-trees "^3.0.2" broccoli-rollup "^4.1.1" calculate-cache-key-for-tree "^2.0.0" - chalk "^2.4.1" + chalk "^3.0.0" + ember-cli-babel "^7.20.5" ember-cli-path-utils "^1.0.0" ember-cli-string-utils "^1.1.0" + ember-cli-typescript "^3.1.3" ember-cli-version-checker "^3.1.2" esm "^3.2.25" - git-repo-info "^2.0.0" - glob "^7.1.4" + git-repo-info "^2.1.1" + glob "^7.1.6" npm-git-info "^1.0.3" - rimraf "^2.6.2" + rimraf "^3.0.0" rsvp "^4.8.5" + semver "^6.3.0" silent-error "^1.1.1" -"@ember-data/adapter@3.12.6": - version "3.12.6" - resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.12.6.tgz#eda74e72c8df95481f7b0ce5d05185f56a5f32f4" - integrity sha512-eX+cVms8kFsovvpIKVcYM+bxOZzUCeFBU/7jAtKs7jd72YRgIWtLOl3uQ/vCMURl4gssTT+pGcGz0qXfrSJ4Gg== +"@ember-data/record-data@3.16.9": + version "3.16.9" + resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.16.9.tgz#6cb50e8402081cb50422dfd72247d23063fb6008" + integrity sha512-uKGY5TyzpHaoN6UBV00B1j3xF/X2oqV14jm4y+EFvwiGC3mY+qDHuTUXUmBAKzB664JykEPKjIBPSBWFj2eHQg== dependencies: - "@ember-data/-build-infra" "3.12.6" - ember-cli-babel "^7.8.0" + "@ember-data/canary-features" "3.16.9" + "@ember-data/private-build-infra" "3.16.9" + "@ember-data/store" "3.16.9" + "@ember/edition-utils" "^1.2.0" + "@ember/ordered-set" "^2.0.3" + ember-cli-babel "^7.20.5" ember-cli-test-info "^1.0.0" - ember-cli-typescript "^2.0.2" - -"@ember-data/canary-features@3.12.6": - version "3.12.6" - resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.12.6.tgz#610d00e066b3d63e85722eeb8b61edfeca5f582e" - integrity sha512-Cs8NQxsOaVBp+8CoMw09U0kf/21+0ygqbMSEGvHAWYPkCJFF9bCTj8XWLVWUhRIDh5TFb5CyYiM638PJq8B9hg== - dependencies: - ember-cli-babel "^7.8.0" - -"@ember-data/model@3.12.6": - version "3.12.6" - resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.12.6.tgz#5145e8077aa53fc088f6bfde1df774d98fcffc3b" - integrity sha512-Q26CkiZgvA5KgpUyjIz8dIspJoDQezLz0cWp/95OnyD3b/+6DNBMxJcXJJRCYZxi9SsaCUGOxDMHP00viAhu5Q== - dependencies: - "@ember-data/-build-infra" "3.12.6" - "@ember-data/store" "3.12.6" - ember-cli-babel "^7.8.0" - ember-cli-string-utils "^1.1.0" - ember-cli-test-info "^1.0.0" - ember-cli-typescript "^2.0.2" - inflection "1.12.0" + ember-cli-typescript "^3.1.3" "@ember-data/rfc395-data@^0.0.4": version "0.0.4" resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843" integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ== -"@ember-data/serializer@3.12.6": - version "3.12.6" - resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.12.6.tgz#2aae91d0eeb46de714bc1fba582504d69ff1f0c8" - integrity sha512-RBNcuaJ+cVkds0a3yIw7IakHDP/bEyboZefCzNYesfVmfeZzoTmbR8odjFvyCSp4eAaSkwo+pqSwhUjTH5NIsw== +"@ember-data/serializer@3.16.9": + version "3.16.9" + resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.16.9.tgz#78a4688c488329024e717a35a6ec9018b3a0a568" + integrity sha512-4mB8v/lhH/fup8lGOxBVvQphULNZLlCryVIl1JE8jLZf7tiGIr0flwMtoYOmapU44EaTsoq7Xa+NzAttxWKH7A== dependencies: - "@ember-data/-build-infra" "3.12.6" - "@ember-data/store" "3.12.6" - ember-cli-babel "^7.8.0" + "@ember-data/private-build-infra" "3.16.9" + "@ember-data/store" "3.16.9" + ember-cli-babel "^7.20.5" ember-cli-test-info "^1.0.0" - ember-cli-typescript "^2.0.2" + ember-cli-typescript "^3.1.3" -"@ember-data/store@3.12.6": - version "3.12.6" - resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.12.6.tgz#97199b49c314b9304bf570d234d43b7ef737595c" - integrity sha512-LoA/4aK0Xxe4V8uRXxgIbKCY0pYLVDzeZ7FnSvl4LH9XM/O42eySfRxgJ074QxkSs1UlKk0o0YA6MRP+Qxor9A== +"@ember-data/store@3.16.9": + version "3.16.9" + resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.16.9.tgz#4336ea1d0b6b597df85573bbd87ebc9889cf4fa6" + integrity sha512-xD04Ljz78DTcz3io5maH+AgJMhXKTR/vM4PkPUOgP8H1hrfYc3BFo6sWiOHrE6Lh3lIS2Ux0GdkWlUDNdQXMdg== dependencies: - "@ember-data/-build-infra" "3.12.6" - "@ember-data/adapter" "3.12.6" - "@ember-data/canary-features" "3.12.6" - ember-cli-babel "^7.8.0" + "@ember-data/canary-features" "3.16.9" + "@ember-data/private-build-infra" "3.16.9" + ember-cli-babel "^7.20.5" ember-cli-path-utils "^1.0.0" - ember-cli-typescript "^2.0.2" + ember-cli-typescript "^3.1.3" heimdalljs "^0.3.0" "@ember-decorators/component@^6.1.1": @@ -4792,7 +4825,7 @@ babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6: dependencies: semver "^5.3.0" -babel-plugin-debug-macros@^0.3.0, babel-plugin-debug-macros@^0.3.2, babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4: +babel-plugin-debug-macros@^0.3.0, babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075" integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw== @@ -4857,11 +4890,6 @@ babel-plugin-extract-import-names@1.6.22: dependencies: "@babel/helper-plugin-utils" "7.10.4" -babel-plugin-feature-flags@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.3.1.tgz#9c827cf9a4eb9a19f725ccb239e85cab02036fc1" - integrity sha1-nIJ8+aTrmhn3JcyyOehcqwIDb8E= - babel-plugin-filter-imports@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-3.0.0.tgz#a849683837ad29960da17492fb32789ab6b09a11" @@ -8323,7 +8351,7 @@ ember-cli-babel@7.13.2: ensure-posix-path "^1.0.2" semver "^5.5.0" -ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.16.0, ember-cli-babel@^6.18.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1: +ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.16.0, ember-cli-babel@^6.18.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.1: version "6.18.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957" integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA== @@ -8342,7 +8370,7 @@ ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.16.0, ember-cli-babel@^6.18.0, ember-cli-version-checker "^2.1.2" semver "^5.5.0" -ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3, ember-cli-babel@^7.8.0: +ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3: version "7.23.1" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.23.1.tgz#d1517228ede08a5d4b045c78a7429728e956b30b" integrity sha512-qYggmt3hRs6QJ6cRkww3ahMpyP8IEV2KFrIRO/Z6hu9MkE/8Y28Xd5NjQl6fPV3oLoG0vwuHzhNe3Jr7Wec8zw== @@ -8971,40 +8999,52 @@ ember-concurrency@^1.0.0: ember-compatibility-helpers "^1.2.0" ember-maybe-import-regenerator "^0.1.6" -ember-copy@1.0.0, ember-copy@^1.0.0: +ember-copy@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/ember-copy/-/ember-copy-2.0.1.tgz#13192b12a250324bb4a8b4547a680b113f4e3041" + integrity sha512-N/XFvZszrzyyX4IcNoeK4mJvIItNuONumhPLqi64T8NDjJkxBj4Pq61rvMkJx/9eZ8alzE4I8vYKOLxT0FvRuQ== + dependencies: + ember-cli-babel "^7.22.1" + +ember-copy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-copy/-/ember-copy-1.0.0.tgz#426554ba6cf65920f31d24d0a3ca2cb1be16e4aa" integrity sha512-aiZNAvOmdemHdvZNn0b5b/0d9g3JFpcOsrDgfhYEbfd7SzE0b69YiaVK2y3wjqfjuuiA54vOllGN4pjSzECNSw== dependencies: ember-cli-babel "^6.6.0" -ember-data-model-fragments@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ember-data-model-fragments/-/ember-data-model-fragments-4.0.0.tgz#8570d8b6bef12e8a3518279af01478ef8818a44f" - integrity sha512-DcRRQAWrrfRQBW8+v6takQdS2hNJ9rKWU/uHjnPY6+Vg/y6TxyPU8mo0PF2z0DYAeXwoIQ05iYTJT0sqFPEo+w== +ember-data-model-fragments@5.0.0-beta.2: + version "5.0.0-beta.2" + resolved "https://registry.yarnpkg.com/ember-data-model-fragments/-/ember-data-model-fragments-5.0.0-beta.2.tgz#cc5f6e37363216a227394b31beb8eecc4c267a3e" + integrity sha512-LMObs51btOpHFX0DABReU68hpzkZp/yCKCh5w6CSGEm7MM5Bcj8p7Wb4GQIPZANKidVSvdCOT4qnyCREyUatBg== dependencies: broccoli-file-creator "^2.1.1" broccoli-merge-trees "^3.0.0" calculate-cache-key-for-tree "^1.1.0" - ember-cli-babel "^6.8.0" - ember-copy "1.0.0" - git-repo-info "^2.0.0" + ember-cli-babel "^7.23.0" + ember-compatibility-helpers "^1.2.1" + ember-copy "2.0.1" + git-repo-info "^2.1.1" npm-git-info "^1.0.3" -ember-data@~3.12.0: - version "3.12.6" - resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.12.6.tgz#3599e7200abf9cc4686324bdb3ba8f2404b605f0" - integrity sha512-oNA2ijd4/JF214dGtqPpLmkBviI617Q+VeyFyGLuvzDU0F1SKsTbBNuApAfih4fabWwZBXlDQHfEA1jS+ccoHQ== +ember-data@~3.16: + version "3.16.9" + resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.16.9.tgz#02789dbf03adb76abb68a6b959e1ec8bfa29674e" + integrity sha512-CAiftBDrrXSsnx7fEJojKE/OG3h/IZxGRMNqL0B0LPLUDWTzPV6LwtQEehUAUcuRCVDODdMW4e71136pG1cFQQ== dependencies: - "@ember-data/-build-infra" "3.12.6" - "@ember-data/adapter" "3.12.6" - "@ember-data/model" "3.12.6" - "@ember-data/serializer" "3.12.6" - "@ember-data/store" "3.12.6" + "@ember-data/adapter" "3.16.9" + "@ember-data/debug" "3.16.9" + "@ember-data/model" "3.16.9" + "@ember-data/private-build-infra" "3.16.9" + "@ember-data/record-data" "3.16.9" + "@ember-data/serializer" "3.16.9" + "@ember-data/store" "3.16.9" + "@ember/edition-utils" "^1.2.0" "@ember/ordered-set" "^2.0.3" "@glimmer/env" "^0.1.7" - ember-cli-babel "^7.8.0" - ember-cli-typescript "^2.0.2" + broccoli-merge-trees "^3.0.2" + ember-cli-babel "^7.20.5" + ember-cli-typescript "^3.1.3" ember-inflector "^3.0.1" ember-debug-handlers-polyfill@^1.1.1: @@ -10864,7 +10904,7 @@ git-hooks-list@1.0.3: resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-1.0.3.tgz#be5baaf78203ce342f2f844a9d2b03dba1b45156" integrity sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ== -git-repo-info@^2.0.0, git-repo-info@^2.1.1: +git-repo-info@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058" integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg== From 4623d7d2d08e1ea590da5e64f5dcc3118d6f8924 Mon Sep 17 00:00:00 2001 From: pangratz Date: Tue, 2 Nov 2021 22:21:01 +0100 Subject: [PATCH 4/5] chore: upgrade ember-data to 3.20 --- ui/package.json | 2 +- ui/yarn.lock | 154 ++++++++++++++++++++++++------------------------ 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/ui/package.json b/ui/package.json index eb0557773..894a7d2ce 100644 --- a/ui/package.json +++ b/ui/package.json @@ -77,7 +77,7 @@ "ember-composable-helpers": "^4.4.1", "ember-concurrency": "^1.0.0", "ember-copy": "^1.0.0", - "ember-data": "~3.16", + "ember-data": "~3.20", "ember-data-model-fragments": "5.0.0-beta.2", "ember-decorators": "^6.1.1", "ember-export-application-global": "^2.0.1", diff --git a/ui/yarn.lock b/ui/yarn.lock index d12032bb2..fcd7f0f10 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -1204,7 +1204,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.15.3", "@babel/plugin-transform-block-scoping@^7.7.4": +"@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.15.3": version "7.15.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf" integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q== @@ -2105,60 +2105,60 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA== -"@ember-data/adapter@3.16.9": - version "3.16.9" - resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.16.9.tgz#d4cb172b708c18ea077becae9ad8b784ce306c85" - integrity sha512-3DsJE34lhwCcA/RhsNIjzrRylxh91guBHDflRZV7Vb6rwtPHjd/a4HotwJPH4mL07Ec7UhWd5dHk+O2hKQ5/Hg== +"@ember-data/adapter@3.20.5": + version "3.20.5" + resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.20.5.tgz#2348cc0a6a46d5b25f6e356802f05ce0db5c75a0" + integrity sha512-J/tyinlUW+lQCcHomJkPpiu4PHEqDiVzsrQ8AgKPk6UgPTz4h1oTo8bxJvfC8xfCRGGBSZ/sTT8mrOtyIn0GWg== dependencies: - "@ember-data/private-build-infra" "3.16.9" - "@ember-data/store" "3.16.9" + "@ember-data/private-build-infra" "3.20.5" + "@ember-data/store" "3.20.5" "@ember/edition-utils" "^1.2.0" - ember-cli-babel "^7.20.5" + ember-cli-babel "^7.18.0" ember-cli-test-info "^1.0.0" ember-cli-typescript "^3.1.3" -"@ember-data/canary-features@3.16.9": - version "3.16.9" - resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.16.9.tgz#f68eec8cf73ccf8b9cbfe9e163313251144cd958" - integrity sha512-ENnSGmgGofd0lPzKPuWIavTXosYSiikASQAEaoa7wQ49ACaIVLqobpPfqnBeUI+Ng/UNAuKrum+gc7t8uDmSew== +"@ember-data/canary-features@3.20.5": + version "3.20.5" + resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.20.5.tgz#7856b84498498b3fed32ddbe7ac5e59a7ce4c70d" + integrity sha512-UGAojn6uAr1yVHiTQ3Zy9W3pfrib+c8BXx7pZ2j1y71ztIMAJ6kNB8h6Gl+Ms1OxEMElnjBEJrfaoV8U1MLY2A== dependencies: - ember-cli-babel "^7.20.5" + ember-cli-babel "^7.18.0" ember-cli-typescript "^3.1.3" -"@ember-data/debug@3.16.9": - version "3.16.9" - resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.16.9.tgz#598247819f85bda371f46438d6c807c8c72e5475" - integrity sha512-dUJAyK8ciJMHmhn/7jVIho6x0Yq6AlY6sZCaBQX9sojC38E+l3P0QgDBc+ic1w86V45DPwZKOCHG9I5i0kV4Bg== +"@ember-data/debug@3.20.5": + version "3.20.5" + resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.20.5.tgz#a3af700f82ba01a40290db706ce607e51ecf5141" + integrity sha512-psG8y6CgWTehelWXp14XOc4dOEJmrnbF+E7Myy/eHXTv7Hyri0iLw0R2WrlO0QjTC8RehgRO4LhRpa0i3VxIlw== dependencies: - "@ember-data/private-build-infra" "3.16.9" + "@ember-data/private-build-infra" "3.20.5" "@ember/edition-utils" "^1.2.0" - ember-cli-babel "^7.20.5" + ember-cli-babel "^7.18.0" ember-cli-test-info "^1.0.0" ember-cli-typescript "^3.1.3" -"@ember-data/model@3.16.9": - version "3.16.9" - resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.16.9.tgz#de002feedf100acd47b93916a7dbef436e9b770a" - integrity sha512-K9pl2eOTtGH2z/XUwydZYn5Lsnz15gudm9oAjTvvU9yxMlrkRx09TmBr0m0TDMZOl64vTPbQySrHBtguJM0Ppg== +"@ember-data/model@3.20.5": + version "3.20.5" + resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.20.5.tgz#522008a6b3c6334792cb3674cd19c8972d5bbbf9" + integrity sha512-d5FToKjtjkSKnoOAqFS/IWtyGxag2RDsOk/j+VNQPFQITlrcDV/j2LeF82laXpF04SfCWyenvXxjqCIEsbeZVQ== dependencies: - "@ember-data/canary-features" "3.16.9" - "@ember-data/private-build-infra" "3.16.9" - "@ember-data/store" "3.16.9" + "@ember-data/canary-features" "3.20.5" + "@ember-data/private-build-infra" "3.20.5" + "@ember-data/store" "3.20.5" "@ember/edition-utils" "^1.2.0" - ember-cli-babel "^7.20.5" + ember-cli-babel "^7.18.0" ember-cli-string-utils "^1.1.0" ember-cli-test-info "^1.0.0" ember-cli-typescript "^3.1.3" ember-compatibility-helpers "^1.2.0" inflection "1.12.0" -"@ember-data/private-build-infra@3.16.9": - version "3.16.9" - resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.16.9.tgz#992bff2ff2fdcb5db1b147f723830b2a2a4b1369" - integrity sha512-2IDMNlglsN5v44UZ4FGBYK88ZXPh504+o5cSjKW9CnlZd4imqcxp0KXYWfiGffzGxKllDCWuRsc43lpNu5Clng== +"@ember-data/private-build-infra@3.20.5": + version "3.20.5" + resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.20.5.tgz#92d52dfcc35c25a3c0fad7d27a4f8d2a9cf04451" + integrity sha512-9qS8VC2ZQwN/aD6RGO9FNWzdVHFUvjNgXfk1PYPo6QDmLwU/3m+WqXO0ZkhQx6hjHjGWi5HOu+vjUwdO8nghfg== dependencies: - "@babel/plugin-transform-block-scoping" "^7.7.4" - "@ember-data/canary-features" "3.16.9" + "@babel/plugin-transform-block-scoping" "^7.8.3" + "@ember-data/canary-features" "3.20.5" "@ember/edition-utils" "^1.2.0" babel-plugin-debug-macros "^0.3.3" babel-plugin-filter-imports "^4.0.0" @@ -2166,35 +2166,35 @@ broccoli-debug "^0.6.5" broccoli-file-creator "^2.1.1" broccoli-funnel "^2.0.2" - broccoli-merge-trees "^3.0.2" + broccoli-merge-trees "^4.2.0" broccoli-rollup "^4.1.1" calculate-cache-key-for-tree "^2.0.0" - chalk "^3.0.0" - ember-cli-babel "^7.20.5" + chalk "^4.0.0" + ember-cli-babel "^7.18.0" ember-cli-path-utils "^1.0.0" ember-cli-string-utils "^1.1.0" ember-cli-typescript "^3.1.3" - ember-cli-version-checker "^3.1.2" + ember-cli-version-checker "^5.1.1" esm "^3.2.25" git-repo-info "^2.1.1" glob "^7.1.6" npm-git-info "^1.0.3" - rimraf "^3.0.0" + rimraf "^3.0.2" rsvp "^4.8.5" - semver "^6.3.0" + semver "^7.1.3" silent-error "^1.1.1" -"@ember-data/record-data@3.16.9": - version "3.16.9" - resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.16.9.tgz#6cb50e8402081cb50422dfd72247d23063fb6008" - integrity sha512-uKGY5TyzpHaoN6UBV00B1j3xF/X2oqV14jm4y+EFvwiGC3mY+qDHuTUXUmBAKzB664JykEPKjIBPSBWFj2eHQg== +"@ember-data/record-data@3.20.5": + version "3.20.5" + resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.20.5.tgz#c4a27226449d7be01bdf5752518cd5c01dd7a0a9" + integrity sha512-lYkfptsbMc/FAvMKH3M6mMq6DLXUTNFIOBejC76EKNa9+Alxl84QiNxO4kpZdAsZGzT9gJLsWQ/0TXQlk44gyQ== dependencies: - "@ember-data/canary-features" "3.16.9" - "@ember-data/private-build-infra" "3.16.9" - "@ember-data/store" "3.16.9" + "@ember-data/canary-features" "3.20.5" + "@ember-data/private-build-infra" "3.20.5" + "@ember-data/store" "3.20.5" "@ember/edition-utils" "^1.2.0" "@ember/ordered-set" "^2.0.3" - ember-cli-babel "^7.20.5" + ember-cli-babel "^7.18.0" ember-cli-test-info "^1.0.0" ember-cli-typescript "^3.1.3" @@ -2203,25 +2203,25 @@ resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843" integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ== -"@ember-data/serializer@3.16.9": - version "3.16.9" - resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.16.9.tgz#78a4688c488329024e717a35a6ec9018b3a0a568" - integrity sha512-4mB8v/lhH/fup8lGOxBVvQphULNZLlCryVIl1JE8jLZf7tiGIr0flwMtoYOmapU44EaTsoq7Xa+NzAttxWKH7A== +"@ember-data/serializer@3.20.5": + version "3.20.5" + resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.20.5.tgz#7977ee5178a377f30743460f29d973aa17656ff4" + integrity sha512-eNxw9vPSFfiA97I4yURteUM5WgtRjrDVNRPhVDEU7OOHDAa6Q9P/7ASJCTp7SNxI+pqAWgobRWyDH7tE7LMRRg== dependencies: - "@ember-data/private-build-infra" "3.16.9" - "@ember-data/store" "3.16.9" - ember-cli-babel "^7.20.5" + "@ember-data/private-build-infra" "3.20.5" + "@ember-data/store" "3.20.5" + ember-cli-babel "^7.18.0" ember-cli-test-info "^1.0.0" ember-cli-typescript "^3.1.3" -"@ember-data/store@3.16.9": - version "3.16.9" - resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.16.9.tgz#4336ea1d0b6b597df85573bbd87ebc9889cf4fa6" - integrity sha512-xD04Ljz78DTcz3io5maH+AgJMhXKTR/vM4PkPUOgP8H1hrfYc3BFo6sWiOHrE6Lh3lIS2Ux0GdkWlUDNdQXMdg== +"@ember-data/store@3.20.5": + version "3.20.5" + resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.20.5.tgz#9855ac3ac24c780a05941b2ecf47c0be4f52ebdc" + integrity sha512-Ti5npYeORvis5TzsIIhSlXi5tbFaRixVad3BpI6PRZn4hXskrIBAVlLIAd0vbpj+kIprFrwe5NsMJTR11jU/Pw== dependencies: - "@ember-data/canary-features" "3.16.9" - "@ember-data/private-build-infra" "3.16.9" - ember-cli-babel "^7.20.5" + "@ember-data/canary-features" "3.20.5" + "@ember-data/private-build-infra" "3.20.5" + ember-cli-babel "^7.18.0" ember-cli-path-utils "^1.0.0" ember-cli-typescript "^3.1.3" heimdalljs "^0.3.0" @@ -8435,7 +8435,7 @@ ember-cli-babel@^7.17.2, ember-cli-babel@^7.23.1: rimraf "^3.0.1" semver "^5.5.0" -ember-cli-babel@^7.26.6: +ember-cli-babel@^7.18.0, ember-cli-babel@^7.26.6: version "7.26.6" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39" integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ== @@ -8829,7 +8829,7 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-ve resolve "^1.3.3" semver "^5.3.0" -ember-cli-version-checker@^3.1.2, ember-cli-version-checker@^3.1.3: +ember-cli-version-checker@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c" integrity sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg== @@ -9027,23 +9027,23 @@ ember-data-model-fragments@5.0.0-beta.2: git-repo-info "^2.1.1" npm-git-info "^1.0.3" -ember-data@~3.16: - version "3.16.9" - resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.16.9.tgz#02789dbf03adb76abb68a6b959e1ec8bfa29674e" - integrity sha512-CAiftBDrrXSsnx7fEJojKE/OG3h/IZxGRMNqL0B0LPLUDWTzPV6LwtQEehUAUcuRCVDODdMW4e71136pG1cFQQ== +ember-data@~3.20: + version "3.20.5" + resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.20.5.tgz#1d0968983e1b6e71ba1539b623c1cd112c14ea20" + integrity sha512-rYcW7NkLT8bXec2Z1ODbrO9y/pdpk5ICn63aRA1UDL3nZ6hijowa9vNr+SnkzdLIDrfF40rP+f1N/oTkuqgwjw== dependencies: - "@ember-data/adapter" "3.16.9" - "@ember-data/debug" "3.16.9" - "@ember-data/model" "3.16.9" - "@ember-data/private-build-infra" "3.16.9" - "@ember-data/record-data" "3.16.9" - "@ember-data/serializer" "3.16.9" - "@ember-data/store" "3.16.9" + "@ember-data/adapter" "3.20.5" + "@ember-data/debug" "3.20.5" + "@ember-data/model" "3.20.5" + "@ember-data/private-build-infra" "3.20.5" + "@ember-data/record-data" "3.20.5" + "@ember-data/serializer" "3.20.5" + "@ember-data/store" "3.20.5" "@ember/edition-utils" "^1.2.0" "@ember/ordered-set" "^2.0.3" "@glimmer/env" "^0.1.7" - broccoli-merge-trees "^3.0.2" - ember-cli-babel "^7.20.5" + broccoli-merge-trees "^4.2.0" + ember-cli-babel "^7.18.0" ember-cli-typescript "^3.1.3" ember-inflector "^3.0.1" @@ -16221,7 +16221,7 @@ semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: dependencies: lru-cache "^6.0.0" -semver@^7.3.5: +semver@^7.1.3, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== From baabf1cb7fe4ae5f28dd93a50a72cc9ff65eaa4d Mon Sep 17 00:00:00 2001 From: pangratz Date: Tue, 2 Nov 2021 22:32:09 +0100 Subject: [PATCH 5/5] chore: upgrade ember-data to 3.24 --- ui/package.json | 2 +- ui/yarn.lock | 142 ++++++++++++++++++++++++++---------------------- 2 files changed, 78 insertions(+), 66 deletions(-) diff --git a/ui/package.json b/ui/package.json index 894a7d2ce..2e33302eb 100644 --- a/ui/package.json +++ b/ui/package.json @@ -77,7 +77,7 @@ "ember-composable-helpers": "^4.4.1", "ember-concurrency": "^1.0.0", "ember-copy": "^1.0.0", - "ember-data": "~3.20", + "ember-data": "~3.24", "ember-data-model-fragments": "5.0.0-beta.2", "ember-decorators": "^6.1.1", "ember-export-application-global": "^2.0.1", diff --git a/ui/yarn.lock b/ui/yarn.lock index fcd7f0f10..1c181b96a 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2105,46 +2105,49 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA== -"@ember-data/adapter@3.20.5": - version "3.20.5" - resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.20.5.tgz#2348cc0a6a46d5b25f6e356802f05ce0db5c75a0" - integrity sha512-J/tyinlUW+lQCcHomJkPpiu4PHEqDiVzsrQ8AgKPk6UgPTz4h1oTo8bxJvfC8xfCRGGBSZ/sTT8mrOtyIn0GWg== +"@ember-data/adapter@3.24.2": + version "3.24.2" + resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.24.2.tgz#dd0b0f4f3c6e83dcba8c1a65d799a4c737f5eeec" + integrity sha512-3NmgrGNOUYKseJjUHcre3IOhLlpPMg7o9o8ZNRyi7r2M1n9flsXuKzJPMiteAic3U7bhODk44gorYjQ6goCzHw== dependencies: - "@ember-data/private-build-infra" "3.20.5" - "@ember-data/store" "3.20.5" + "@ember-data/private-build-infra" "3.24.2" + "@ember-data/store" "3.24.2" "@ember/edition-utils" "^1.2.0" + "@ember/string" "^1.0.0" ember-cli-babel "^7.18.0" ember-cli-test-info "^1.0.0" ember-cli-typescript "^3.1.3" -"@ember-data/canary-features@3.20.5": - version "3.20.5" - resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.20.5.tgz#7856b84498498b3fed32ddbe7ac5e59a7ce4c70d" - integrity sha512-UGAojn6uAr1yVHiTQ3Zy9W3pfrib+c8BXx7pZ2j1y71ztIMAJ6kNB8h6Gl+Ms1OxEMElnjBEJrfaoV8U1MLY2A== +"@ember-data/canary-features@3.24.2": + version "3.24.2" + resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.24.2.tgz#bd91beda313fc4d7ef3d8fc5dc709d53350c246c" + integrity sha512-duCgl99T6QQ4HuXNMI1l1vA8g7cvi7Ol/loVFOtkJn+MOlcQOzXNATuNqC/LPjTiHpPdQTL18+fq2wIZEDnq0w== dependencies: ember-cli-babel "^7.18.0" ember-cli-typescript "^3.1.3" -"@ember-data/debug@3.20.5": - version "3.20.5" - resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.20.5.tgz#a3af700f82ba01a40290db706ce607e51ecf5141" - integrity sha512-psG8y6CgWTehelWXp14XOc4dOEJmrnbF+E7Myy/eHXTv7Hyri0iLw0R2WrlO0QjTC8RehgRO4LhRpa0i3VxIlw== +"@ember-data/debug@3.24.2": + version "3.24.2" + resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.24.2.tgz#6b96fb9cd0914071efb9ac3c6befc1a3a55f5d38" + integrity sha512-RPTGoSFPGjhB7ZVbv3eGFL6NeZKCtWv9BrZwrZH7ZvHWN1Vc7vYG3NAsLAafpjbkfSo4KG2OKHZGftpXCIl2Og== dependencies: - "@ember-data/private-build-infra" "3.20.5" + "@ember-data/private-build-infra" "3.24.2" "@ember/edition-utils" "^1.2.0" + "@ember/string" "^1.0.0" ember-cli-babel "^7.18.0" ember-cli-test-info "^1.0.0" ember-cli-typescript "^3.1.3" -"@ember-data/model@3.20.5": - version "3.20.5" - resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.20.5.tgz#522008a6b3c6334792cb3674cd19c8972d5bbbf9" - integrity sha512-d5FToKjtjkSKnoOAqFS/IWtyGxag2RDsOk/j+VNQPFQITlrcDV/j2LeF82laXpF04SfCWyenvXxjqCIEsbeZVQ== +"@ember-data/model@3.24.2": + version "3.24.2" + resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.24.2.tgz#8d718b8151eb2489328c5957d9ffc367b5b9a512" + integrity sha512-vKBYlWZYk0uh+7TiEYADQakUpJLbZ+ahU9ez2WEMtsdl4cDHpEBwyFH76Zmh3dp2Pz/aq5UwOtEHz/ggpUo7fQ== dependencies: - "@ember-data/canary-features" "3.20.5" - "@ember-data/private-build-infra" "3.20.5" - "@ember-data/store" "3.20.5" + "@ember-data/canary-features" "3.24.2" + "@ember-data/private-build-infra" "3.24.2" + "@ember-data/store" "3.24.2" "@ember/edition-utils" "^1.2.0" + "@ember/string" "^1.0.0" ember-cli-babel "^7.18.0" ember-cli-string-utils "^1.1.0" ember-cli-test-info "^1.0.0" @@ -2152,13 +2155,13 @@ ember-compatibility-helpers "^1.2.0" inflection "1.12.0" -"@ember-data/private-build-infra@3.20.5": - version "3.20.5" - resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.20.5.tgz#92d52dfcc35c25a3c0fad7d27a4f8d2a9cf04451" - integrity sha512-9qS8VC2ZQwN/aD6RGO9FNWzdVHFUvjNgXfk1PYPo6QDmLwU/3m+WqXO0ZkhQx6hjHjGWi5HOu+vjUwdO8nghfg== +"@ember-data/private-build-infra@3.24.2": + version "3.24.2" + resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.24.2.tgz#2b77fb4490a6c657d9f82ce8c54fe22157e03963" + integrity sha512-uYv9BOGaNxsSacE0jFRFhrs/Xg6f8Rma2Ap/mVjwouBvu+DV2cl5E2zIMalygu/ngIiGhiNUeUp2RpjSpR054w== dependencies: "@babel/plugin-transform-block-scoping" "^7.8.3" - "@ember-data/canary-features" "3.20.5" + "@ember-data/canary-features" "3.24.2" "@ember/edition-utils" "^1.2.0" babel-plugin-debug-macros "^0.3.3" babel-plugin-filter-imports "^4.0.0" @@ -2184,16 +2187,16 @@ semver "^7.1.3" silent-error "^1.1.1" -"@ember-data/record-data@3.20.5": - version "3.20.5" - resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.20.5.tgz#c4a27226449d7be01bdf5752518cd5c01dd7a0a9" - integrity sha512-lYkfptsbMc/FAvMKH3M6mMq6DLXUTNFIOBejC76EKNa9+Alxl84QiNxO4kpZdAsZGzT9gJLsWQ/0TXQlk44gyQ== +"@ember-data/record-data@3.24.2": + version "3.24.2" + resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.24.2.tgz#cf07dd13c74d02046af2dc4a9102f9f6cb897184" + integrity sha512-vdsWiPp29lwgMeyf4O1sXZ8xJf/zPCIEfksYeGaJ9VhiTKOucqiRxIFeI2cdyqxkM0frtCyNwYEntpy871Os2Q== dependencies: - "@ember-data/canary-features" "3.20.5" - "@ember-data/private-build-infra" "3.20.5" - "@ember-data/store" "3.20.5" + "@ember-data/canary-features" "3.24.2" + "@ember-data/private-build-infra" "3.24.2" + "@ember-data/store" "3.24.2" "@ember/edition-utils" "^1.2.0" - "@ember/ordered-set" "^2.0.3" + "@ember/ordered-set" "^4.0.0" ember-cli-babel "^7.18.0" ember-cli-test-info "^1.0.0" ember-cli-typescript "^3.1.3" @@ -2203,24 +2206,25 @@ resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843" integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ== -"@ember-data/serializer@3.20.5": - version "3.20.5" - resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.20.5.tgz#7977ee5178a377f30743460f29d973aa17656ff4" - integrity sha512-eNxw9vPSFfiA97I4yURteUM5WgtRjrDVNRPhVDEU7OOHDAa6Q9P/7ASJCTp7SNxI+pqAWgobRWyDH7tE7LMRRg== +"@ember-data/serializer@3.24.2": + version "3.24.2" + resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.24.2.tgz#d95816f4af4b9d3031bdd198cd10e6bde3fa8b17" + integrity sha512-so/NkQgtecXqPdFMjUHkXQ73n9TFVMigZeCFuippkP3lQu2HquJ9u/e+WRcgLzziU7q+eBTnt2Lar9uLkXMNyw== dependencies: - "@ember-data/private-build-infra" "3.20.5" - "@ember-data/store" "3.20.5" + "@ember-data/private-build-infra" "3.24.2" + "@ember-data/store" "3.24.2" ember-cli-babel "^7.18.0" ember-cli-test-info "^1.0.0" ember-cli-typescript "^3.1.3" -"@ember-data/store@3.20.5": - version "3.20.5" - resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.20.5.tgz#9855ac3ac24c780a05941b2ecf47c0be4f52ebdc" - integrity sha512-Ti5npYeORvis5TzsIIhSlXi5tbFaRixVad3BpI6PRZn4hXskrIBAVlLIAd0vbpj+kIprFrwe5NsMJTR11jU/Pw== +"@ember-data/store@3.24.2": + version "3.24.2" + resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.24.2.tgz#2583e03f8c51c5b049a29bbed304ae78085e8b9b" + integrity sha512-FJVZIrCwFDebh/s3Gy4YC+PK7BRaDIudor53coia236hpAW9eO/itO/ZbOGt9eFumWzX6eUFxJixD0o9FvGybA== dependencies: - "@ember-data/canary-features" "3.20.5" - "@ember-data/private-build-infra" "3.20.5" + "@ember-data/canary-features" "3.24.2" + "@ember-data/private-build-infra" "3.24.2" + "@ember/string" "^1.0.0" ember-cli-babel "^7.18.0" ember-cli-path-utils "^1.0.0" ember-cli-typescript "^3.1.3" @@ -2267,12 +2271,12 @@ silent-error "^1.1.1" util.promisify "^1.0.0" -"@ember/ordered-set@^2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@ember/ordered-set/-/ordered-set-2.0.3.tgz#2ac1ca73b3bd116063cae814898832ef434a57f9" - integrity sha512-F4yfVk6WMc4AUHxeZsC3CaKyTvO0qSZJy7WWHCFTlVDQw6vubn+FvnGdhzpN1F00EiXMI4Tv1tJdSquHcCnYrA== +"@ember/ordered-set@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@ember/ordered-set/-/ordered-set-4.0.0.tgz#c5ec021ab8d4734c6db92708a81edd499d45fd31" + integrity sha512-cUCcme4R5H37HyK8w0qzdG5+lpb3XVr2RQHLyWEP4JsKI66Ob4tizoJOs8rb/XdHCv+F5WeA321hfPMi3DrZbg== dependencies: - ember-cli-babel "^6.16.0" + ember-cli-babel "^7.22.1" ember-compatibility-helpers "^1.1.1" "@ember/render-modifiers@^1.0.2": @@ -2283,6 +2287,13 @@ ember-cli-babel "^7.10.0" ember-modifier-manager-polyfill "^1.1.0" +"@ember/string@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@ember/string/-/string-1.0.0.tgz#3a2254caedacb95e09071204d36cad49e0f8b855" + integrity sha512-KZ+CcIXFdyIBMztxDMgza4SdLJgIeUgTjDAoHk6M50C2u1X/BK7KWUIN7MIK2LNTOMvbib9lWwEzKboxdI4lBw== + dependencies: + ember-cli-babel "^7.4.0" + "@ember/test-helpers@^1.7.1": version "1.7.2" resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.7.2.tgz#5b128dc5f6524c3850abf52668e6bd4fda401194" @@ -8435,7 +8446,7 @@ ember-cli-babel@^7.17.2, ember-cli-babel@^7.23.1: rimraf "^3.0.1" semver "^5.5.0" -ember-cli-babel@^7.18.0, ember-cli-babel@^7.26.6: +ember-cli-babel@^7.18.0, ember-cli-babel@^7.26.6, ember-cli-babel@^7.4.0: version "7.26.6" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39" integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ== @@ -9027,20 +9038,21 @@ ember-data-model-fragments@5.0.0-beta.2: git-repo-info "^2.1.1" npm-git-info "^1.0.3" -ember-data@~3.20: - version "3.20.5" - resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.20.5.tgz#1d0968983e1b6e71ba1539b623c1cd112c14ea20" - integrity sha512-rYcW7NkLT8bXec2Z1ODbrO9y/pdpk5ICn63aRA1UDL3nZ6hijowa9vNr+SnkzdLIDrfF40rP+f1N/oTkuqgwjw== +ember-data@~3.24: + version "3.24.2" + resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.24.2.tgz#34d72b0bc83fce1791bf09a8391425717b9c3f55" + integrity sha512-dfpLagJn09eEcoVqU4NfMs3J+750jJU7rLZA7uFY2/+0M0a4iGhjbm1dVVZQTkrfNiYHXvOOItr1bOT9sMC8Hg== dependencies: - "@ember-data/adapter" "3.20.5" - "@ember-data/debug" "3.20.5" - "@ember-data/model" "3.20.5" - "@ember-data/private-build-infra" "3.20.5" - "@ember-data/record-data" "3.20.5" - "@ember-data/serializer" "3.20.5" - "@ember-data/store" "3.20.5" + "@ember-data/adapter" "3.24.2" + "@ember-data/debug" "3.24.2" + "@ember-data/model" "3.24.2" + "@ember-data/private-build-infra" "3.24.2" + "@ember-data/record-data" "3.24.2" + "@ember-data/serializer" "3.24.2" + "@ember-data/store" "3.24.2" "@ember/edition-utils" "^1.2.0" - "@ember/ordered-set" "^2.0.3" + "@ember/ordered-set" "^4.0.0" + "@ember/string" "^1.0.0" "@glimmer/env" "^0.1.7" broccoli-merge-trees "^4.2.0" ember-cli-babel "^7.18.0"