diff --git a/config/ember-try.js b/config/ember-try.js index ea457bb3..d9269f56 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -12,6 +12,7 @@ module.exports = async function () { npm: { devDependencies: { 'ember-source': '~3.28.0', + 'ember-data': '~3.28.0', }, }, }, @@ -27,7 +28,9 @@ module.exports = async function () { name: 'ember-release', npm: { devDependencies: { + '@ember/string': '3.0.1', 'ember-source': await getChannelURL('release'), + 'ember-data': 'latest', }, }, }, @@ -35,7 +38,9 @@ module.exports = async function () { name: 'ember-beta', npm: { devDependencies: { + '@ember/string': '3.0.1', 'ember-source': await getChannelURL('beta'), + 'ember-data': 'beta', }, }, }, @@ -43,7 +48,9 @@ module.exports = async function () { name: 'ember-canary', npm: { devDependencies: { + '@ember/string': '3.0.1', 'ember-source': await getChannelURL('canary'), + 'ember-data': 'canary', }, }, }, diff --git a/package.json b/package.json index 87abab76..d2b9e0a6 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "ember-cli-terser": "^4.0.2", "ember-cli-yuidoc": "^0.8.8", "ember-code-snippet": "^3.0.0", - "ember-data": "~3.28.0", + "ember-data": "~4.0.0", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", "ember-font-awesome": "^3.0.5", diff --git a/yarn.lock b/yarn.lock index a02124d1..320c4549 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1006,49 +1006,52 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@ember-data/adapter@3.28.10": - version "3.28.10" - resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.28.10.tgz#ca46a124b19096a0be6940c008f1e6cf7d653d36" - integrity sha512-/ocqzP2dPw/wTUMiE0A5YE5lUvUVLslnKCTQYLCmgKYhBaKihAiyhrug2XXHsUsi065GODuY9tpt2YO+mGiotQ== +"@ember-data/adapter@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-4.0.2.tgz#b7d05f80722f0f92d7876ae0538b7ac0d30ecd0b" + integrity sha512-tOqlpaJSlgsA0xv+kXcLYFlhsgIJ/pJc/ldUPkJAyq47LP0l/u7zqY+u+ek6TA+qRGU1YLT5eUVQ9GwdEbRcQA== dependencies: - "@ember-data/private-build-infra" "3.28.10" - "@ember-data/store" "3.28.10" + "@ember-data/private-build-infra" "4.0.2" + "@ember-data/store" "4.0.2" "@ember/edition-utils" "^1.2.0" "@ember/string" "^3.0.0" + ember-auto-import "^2.2.4" ember-cli-babel "^7.26.6" ember-cli-test-info "^1.0.0" ember-cli-typescript "^4.1.0" -"@ember-data/canary-features@3.28.10": - version "3.28.10" - resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.28.10.tgz#860602536ca2ee526f7bffa9e9ccdf6686a259b8" - integrity sha512-QaRMNSzsH1XvwCKyCXlimZhVSYAcs1x42cBemaiRMg5/LDrDZKMhWbFTNomM/k+0D2a0zHsCO91FXG8m1K19qQ== +"@ember-data/canary-features@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-4.0.2.tgz#1adcdc537aa96daff446c741d36bede8e85b6bc6" + integrity sha512-apTSVB+ayY9rMXg8N8mGREFHd5Ymfi7tM30815L5Yb96VlYDk5u8vGImCXqdXKPIgFVn+WGao0uHWCXRB2KNWg== dependencies: ember-cli-babel "^7.26.6" ember-cli-typescript "^4.1.0" -"@ember-data/debug@3.28.10": - version "3.28.10" - resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.28.10.tgz#a5d680a7ef9dccfc23c088f8b91d420e7d3a8d89" - integrity sha512-smR2X8J0jycq5i3og0nFrYEEbwxjUPcXJ75tlAz9Rahqxz6U3UWAv29TKBNVUFeDQvJuOvdLzcfLK9YZ9i9bxQ== +"@ember-data/debug@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-4.0.2.tgz#b244e07689305ae9dd070915d12b7cfe371ad19c" + integrity sha512-MhyPF90LsksihSn8GvqslG/H8ASGLiaNJ2YfdcI+lOGgoCsuNtxbcfcfFxQE5WNbnjkNxohZznAQ/tcwch4TjA== dependencies: - "@ember-data/private-build-infra" "3.28.10" + "@ember-data/private-build-infra" "4.0.2" "@ember/edition-utils" "^1.2.0" "@ember/string" "^3.0.0" + ember-auto-import "^2.2.4" ember-cli-babel "^7.26.6" ember-cli-test-info "^1.0.0" ember-cli-typescript "^4.1.0" -"@ember-data/model@3.28.10": - version "3.28.10" - resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.28.10.tgz#a1890bc69bfc6aac33ed4c37834810984a8f3c66" - integrity sha512-k72fqbKjSSmDHLGr0U/kHRsFI7gamN2nMGs0Qh1c2ZPR7CLXaNUCOQnJ/itxRInTX8WO996hjMUB+IMiKqfwYQ== +"@ember-data/model@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-4.0.2.tgz#37d65838f1cd1704781fc4cffa6acbe18abdd4f9" + integrity sha512-dkwz3iKNp03ACqbD6oTp4ouqSz/ja41Q17jjb/KKK65ym6J0Y6OvtMVBlzHb+UpnHfKVkKAdpslk8svUm3T8vg== dependencies: - "@ember-data/canary-features" "3.28.10" - "@ember-data/private-build-infra" "3.28.10" - "@ember-data/store" "3.28.10" + "@ember-data/canary-features" "4.0.2" + "@ember-data/private-build-infra" "4.0.2" + "@ember-data/store" "4.0.2" "@ember/edition-utils" "^1.2.0" "@ember/string" "^3.0.0" + ember-auto-import "^2.2.4" ember-cached-decorator-polyfill "^0.1.4" ember-cli-babel "^7.26.6" ember-cli-string-utils "^1.1.0" @@ -1057,13 +1060,13 @@ ember-compatibility-helpers "^1.2.0" inflection "~1.13.1" -"@ember-data/private-build-infra@3.28.10": - version "3.28.10" - resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.28.10.tgz#ba4f764a54bbb7d62822a24adbd2a1b976fbec7c" - integrity sha512-Fd9n2SOsndFOuDISkYQZsWRkif8gu0UG/1Yvloy3eOAPNLJBbGovZOFRgO4bxcPg3iHUl6THbYSLl/rXYv/Xiw== +"@ember-data/private-build-infra@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-4.0.2.tgz#e2af4a9cab3f720c4f702da1236c1034d5c7d3cd" + integrity sha512-bFPTSVvcGkvpCRn5dkvZLEZgjPxzWAakpqsKpC6UCmWkVHj1eDeuPBPpGkBZD9MVK95Y8VFmD0vIABwDlBFTmw== dependencies: "@babel/plugin-transform-block-scoping" "^7.8.3" - "@ember-data/canary-features" "3.28.10" + "@ember-data/canary-features" "4.0.2" "@ember/edition-utils" "^1.2.0" babel-plugin-debug-macros "^0.3.3" babel-plugin-filter-imports "^4.0.0" @@ -1089,15 +1092,16 @@ semver "^7.1.3" silent-error "^1.1.1" -"@ember-data/record-data@3.28.10": - version "3.28.10" - resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.28.10.tgz#af90e8b81f32253970f6c276b2f1988097138456" - integrity sha512-LYAAAlN6EgZFAXAzmyDlnnhQjgVnjA127y3EV1aRJR0xzjDfk5rFU2lsPM4D/ClKKBWN5WwiQRBb9ljyzCP7xw== +"@ember-data/record-data@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-4.0.2.tgz#7e5aab655591758346b20954ace27c83331b2346" + integrity sha512-F1oiMcmeGQkaVp50j6MTeE7sAPSBLUhMnfNRDO70jhVIcMmj0W1W6qvRbk3tVOq+TZ7+Jc8TFWh+43gC6EBfsQ== dependencies: - "@ember-data/canary-features" "3.28.10" - "@ember-data/private-build-infra" "3.28.10" - "@ember-data/store" "3.28.10" + "@ember-data/canary-features" "4.0.2" + "@ember-data/private-build-infra" "4.0.2" + "@ember-data/store" "4.0.2" "@ember/edition-utils" "^1.2.0" + ember-auto-import "^2.2.4" ember-cli-babel "^7.26.6" ember-cli-test-info "^1.0.0" ember-cli-typescript "^4.1.0" @@ -1107,26 +1111,28 @@ 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.28.10": - version "3.28.10" - resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.28.10.tgz#4b560dbdd6ba43f8576e4cae59c67ca77639bdee" - integrity sha512-HJa5gSigSaBHd+4mmbbKUe3Y2GlfThbC+RP5hJ/K9feo1ckBhAVbkM1q523RYdvqHLV+cpDX5irt9A2WGmGjWw== +"@ember-data/serializer@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-4.0.2.tgz#8aeaa458787a0d2bb54836674110a5c93049e791" + integrity sha512-He8olHmgARXrHx+Gi1F2z4BSN2YmLm3GnIjPuTXjrRpgRV1u7EFrt1H84yo3voYA9c7PIIHoxhLyitm2sfWyBQ== dependencies: - "@ember-data/private-build-infra" "3.28.10" - "@ember-data/store" "3.28.10" + "@ember-data/private-build-infra" "4.0.2" + "@ember-data/store" "4.0.2" + ember-auto-import "^2.2.4" ember-cli-babel "^7.26.6" ember-cli-test-info "^1.0.0" ember-cli-typescript "^4.1.0" -"@ember-data/store@3.28.10": - version "3.28.10" - resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.28.10.tgz#023ae0a821efc23f712b543d5df0e3077739a914" - integrity sha512-GmAHKZJnBuAIfczrLKUCMGz3kWdMAfKjVgWH6jFHekWPypMMDFgiSeSotYi1l49uIgKcgzEKoV1iCYHUz2+1mA== +"@ember-data/store@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-4.0.2.tgz#7fe95a9e1ff1b146244a5742962293080c6ecadf" + integrity sha512-+WJUAP1Xz+N+UAssEqipuBsQ38HoHCmQL470Hr6aZ5jK2rs3yZ4X3GGa+Mj2aRNTTDbNEP3w7tnTQyXElzZkJA== dependencies: - "@ember-data/canary-features" "3.28.10" - "@ember-data/private-build-infra" "3.28.10" + "@ember-data/canary-features" "4.0.2" + "@ember-data/private-build-infra" "4.0.2" "@ember/string" "^3.0.0" "@glimmer/tracking" "^1.0.4" + ember-auto-import "^2.2.4" ember-cached-decorator-polyfill "^0.1.4" ember-cli-babel "^7.26.6" ember-cli-path-utils "^1.0.0" @@ -5370,7 +5376,7 @@ ember-auto-import@^1.11.3: walk-sync "^0.3.3" webpack "^4.43.0" -ember-auto-import@^2.1.0, ember-auto-import@^2.4.0, ember-auto-import@^2.4.2: +ember-auto-import@^2.1.0, ember-auto-import@^2.2.4, ember-auto-import@^2.4.0, ember-auto-import@^2.4.2: version "2.6.3" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a" integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ== @@ -5932,22 +5938,23 @@ ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-co fs-extra "^9.1.0" semver "^5.4.1" -ember-data@~3.28.0: - version "3.28.10" - resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.28.10.tgz#c8705df95b5d6067946953c73879dacb5742518d" - integrity sha512-6S8869S6o2iYWv2uMhMphX7WsAgvm2pA+qg1LMZX3UdMFq57BkrSuDBU43uxSbuwmKmGlzoNqVwVOtSsgBPiLg== - dependencies: - "@ember-data/adapter" "3.28.10" - "@ember-data/debug" "3.28.10" - "@ember-data/model" "3.28.10" - "@ember-data/private-build-infra" "3.28.10" - "@ember-data/record-data" "3.28.10" - "@ember-data/serializer" "3.28.10" - "@ember-data/store" "3.28.10" +ember-data@~4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-4.0.2.tgz#57e5aac358466ce52a3264051ddc268dc44c3a26" + integrity sha512-vpz44QuQS1QRRV18idb7N2UH8PIvfwtBXyxrAetB9W/9rZP7aU00y38flJN6ioeZRI3iVhdpNoqhkpUsm/xztQ== + dependencies: + "@ember-data/adapter" "4.0.2" + "@ember-data/debug" "4.0.2" + "@ember-data/model" "4.0.2" + "@ember-data/private-build-infra" "4.0.2" + "@ember-data/record-data" "4.0.2" + "@ember-data/serializer" "4.0.2" + "@ember-data/store" "4.0.2" "@ember/edition-utils" "^1.2.0" "@ember/string" "^3.0.0" "@glimmer/env" "^0.1.7" broccoli-merge-trees "^4.2.0" + ember-auto-import "^2.2.4" ember-cli-babel "^7.26.6" ember-cli-typescript "^4.1.0" ember-inflector "^4.0.1"