Skip to content

Commit

Permalink
Move to the upstream version of tracked-maps-and-sets
Browse files Browse the repository at this point in the history
Now that it makes sense to drop Ember `<3.24`, we can stop using our
fork of this. See #116.
  • Loading branch information
sandydoo committed Nov 21, 2021
1 parent c66f4e8 commit b1d6024
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 14 deletions.
2 changes: 1 addition & 1 deletion addon/components/g-map/directions.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';
import { Promise } from 'rsvp';
import { keepLatestTask } from 'ember-concurrency';
import { TrackedSet } from '@sandydoo/tracked-maps-and-sets';
import { TrackedSet } from 'tracked-maps-and-sets';
import { waitFor } from '@ember/test-waiters';
import { untrack } from '../../effects/tracking';

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
},
"dependencies": {
"@ember/test-waiters": "^3.0.0",
"@sandydoo/tracked-maps-and-sets": "^2.2.2",
"babel-plugin-ember-modules-api-polyfill": ">=3.5.0",
"broccoli-debug": "^0.6.5",
"broccoli-funnel": ">=3.0.8",
Expand All @@ -54,7 +53,8 @@
"ember-concurrency": "^2.1.0",
"ember-in-element-polyfill": "^1.0.0",
"ember-modifier": "^3.0.0",
"lodash": "^4.17.21"
"lodash": "^4.17.21",
"tracked-maps-and-sets": "^3.0.2"
},
"devDependencies": {
"@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
Expand Down
31 changes: 20 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1548,15 +1548,6 @@
dependencies:
"@octokit/openapi-types" "^11.2.0"

"@sandydoo/tracked-maps-and-sets@^2.2.2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@sandydoo/tracked-maps-and-sets/-/tracked-maps-and-sets-2.2.2.tgz#6c2b365618142f696b1e3a024c29f9081025528a"
integrity sha512-lnuf9fGvShbBxaX/ATHYi8tdADRFanxIWZGoJFsPdJbEpkXMWeMezVrq0DHUjwNvPcxTKKN3yACxmVEz8HvZkA==
dependencies:
"@glimmer/tracking" "^1.0.0"
ember-cli-babel "^7.26.5"
ember-compatibility-helpers "^1.2.4"

"@simple-dom/interface@^1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
Expand Down Expand Up @@ -4891,7 +4882,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==

ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
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==
Expand Down Expand Up @@ -5232,7 +5223,7 @@ ember-cli@~3.28.4:
workerpool "^6.1.4"
yam "^1.0.0"

ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.4:
ember-compatibility-helpers@^1.1.2:
version "1.2.4"
resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.4.tgz#70e0fef7048969141626eed6006f3880df612cd1"
integrity sha512-qjzQVtogyYJrSs6I4DuyCDwDCaj5JWBVNPoZDZBk8pt7caNoN0eBYRYJdin95QKaNMQODxTLPWaI4UUDQ1YWhg==
Expand Down Expand Up @@ -5429,6 +5420,14 @@ ember-template-recast@^5.0.3:
tmp "^0.2.1"
workerpool "^6.1.4"

ember-tracked-storage-polyfill@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/ember-tracked-storage-polyfill/-/ember-tracked-storage-polyfill-1.0.0.tgz#84d307a1e4badc5f84dca681db2cfea9bdee8a77"
integrity sha512-eL7lZat68E6P/D7b9UoTB5bB5Oh/0aju0Z7PCMi3aTwhaydRaxloE7TGrTRYU+NdJuyNVZXeGyxFxn2frvd3TA==
dependencies:
ember-cli-babel "^7.26.3"
ember-cli-htmlbars "^5.7.1"

ember-try-config@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-4.0.0.tgz#8dbdcc071e7acbcb34750b4ed7faf1ab009766f1"
Expand Down Expand Up @@ -12123,6 +12122,16 @@ tr46@~0.0.3:
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=

tracked-maps-and-sets@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/tracked-maps-and-sets/-/tracked-maps-and-sets-3.0.2.tgz#6ea1b9f2a367d24f2e9905b74b24437fbce76ea6"
integrity sha512-UIRcWsX1kDOcC/Q2R58weYWlw01EnmWWBwUv3okWS+zMBvsgIfYoO6veHhuNE3hgzWCEImNp46QS5CyKnw5QUA==
dependencies:
"@glimmer/tracking" "^1.0.0"
ember-cli-babel "^7.26.6"
ember-cli-typescript "^4.2.1"
ember-tracked-storage-polyfill "1.0.0"

tree-sync@^1.2.2:
version "1.4.0"
resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"
Expand Down

0 comments on commit b1d6024

Please sign in to comment.