Skip to content

Commit 2e135ec

Browse files
author
Robert Jackson
committed
Add d3 dep and lock d3-tip branches.
The `d3` direct devdep is needed to ensure that the dep on d3-tip doesn't force `yarn` to put d3@3 at the top level and nest d3@4 inside ember-d3. Migrating to `d3-tip` branch fixes issues with `yarn` not being able to resolve `#pull/198/head`.
1 parent e25c9c9 commit 2e135ec

File tree

2 files changed

+150
-17
lines changed

2 files changed

+150
-17
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
},
1919
"devDependencies": {
2020
"broccoli-asset-rev": "^2.4.5",
21-
"d3-tip": "Caged/d3-tip#pull/198/head",
21+
"d3": "^4.9.0",
22+
"d3-tip": "github:vlascik/d3-tip#fix-offscreen-tooltips",
2223
"ember-cli": "^2.13.0-beta.3",
2324
"ember-cli-app-version": "^3.0.0",
2425
"ember-cli-babel": "^6.0.0-beta.3",

yarn.lock

Lines changed: 148 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
22
# yarn lockfile v1
33

44

@@ -1910,14 +1910,18 @@ crypto-random-string@^1.0.0:
19101910
version "1.0.0"
19111911
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
19121912

1913-
d3-array@1, [email protected]:
1913+
d3-array@1, [email protected], d3-array@^1.2.0:
19141914
version "1.2.0"
19151915
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.0.tgz#147d269720e174c4057a7f42be8b0f3f2ba53108"
19161916

19171917
19181918
version "1.0.6"
19191919
resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.6.tgz#dccbc21a73e5786de820bf1a22b237f522b878be"
19201920

1921+
1922+
version "1.0.7"
1923+
resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.7.tgz#048433d307061f62d1d248e2930c01d7b6738cd8"
1924+
19211925
19221926
version "1.0.4"
19231927
resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.4.tgz#00c2f238019f24f6c0a194a26d41a1530ffe7bc4"
@@ -1935,7 +1939,7 @@ [email protected]:
19351939
d3-array "1"
19361940
d3-path "1"
19371941

1938-
d3-collection@1, [email protected]:
1942+
d3-collection@1, [email protected], d3-collection@^1.0.1:
19391943
version "1.0.3"
19401944
resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.3.tgz#00bdea94fbc1628d435abbae2f4dc2164e37dd34"
19411945

@@ -1954,6 +1958,13 @@ d3-drag@1, [email protected]:
19541958
d3-dispatch "1"
19551959
d3-selection "1"
19561960

1961+
1962+
version "1.1.0"
1963+
resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.1.0.tgz#4a49b4d77a42e9e3d5a0ef3b492b14aaa2e5a733"
1964+
dependencies:
1965+
d3-dispatch "1"
1966+
d3-selection "1"
1967+
19571968
19581969
version "1.0.5"
19591970
resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.5.tgz#419f7db47f628789fc3fdb636e678449d0821136"
@@ -1966,6 +1977,13 @@ d3-ease@1, [email protected]:
19661977
version "1.0.3"
19671978
resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e"
19681979

1980+
d3-flame-graphs@^3.1.0:
1981+
version "3.1.0"
1982+
resolved "https://registry.yarnpkg.com/d3-flame-graphs/-/d3-flame-graphs-3.1.0.tgz#a23b13b25979c61109beb2c405f60e0ae48da5b6"
1983+
dependencies:
1984+
d3 "^3.5.6"
1985+
d3-tip "^0.6.7"
1986+
19691987
19701988
version "1.0.6"
19711989
resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.0.6.tgz#ea7e1b7730e2664cd314f594d6718c57cc132b79"
@@ -1995,6 +2013,12 @@ d3-interpolate@1, [email protected]:
19952013
dependencies:
19962014
d3-color "1"
19972015

2016+
2017+
version "1.1.5"
2018+
resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.5.tgz#69e099ff39214716e563c9aec3ea9d1ea4b8a79f"
2019+
dependencies:
2020+
d3-color "1"
2021+
19982022
d3-path@1, [email protected]:
19992023
version "1.0.5"
20002024
resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz#241eb1849bd9e9e8021c0d0a799f8a0e8e441764"
@@ -2011,10 +2035,18 @@ [email protected]:
20112035
version "3.0.5"
20122036
resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.5.tgz#0ceffe1f131c459b13b9f69f1056b41dfc33c00d"
20132037

2038+
2039+
version "3.0.7"
2040+
resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.7.tgz#c93a2e54b417c0959129d7d73f6cf7d4292e7618"
2041+
20142042
20152043
version "1.0.3"
20162044
resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.0.3.tgz#6526c844aa5e7c457e29ddacd6f2734f845b42c1"
20172045

2046+
2047+
version "1.1.0"
2048+
resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.0.tgz#6642e506c6fa3a648595d2b2469788a8d12529d3"
2049+
20182050
20192051
version "1.0.5"
20202052
resolved "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.5.tgz#4daae946d1dd0d57dfe01f022956354958d51f23"
@@ -2036,16 +2068,38 @@ [email protected]:
20362068
d3-time "1"
20372069
d3-time-format "2"
20382070

2039-
d3-selection@1, [email protected]:
2071+
2072+
version "1.0.6"
2073+
resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.6.tgz#bce19da80d3a0cf422c9543ae3322086220b34ed"
2074+
dependencies:
2075+
d3-array "^1.2.0"
2076+
d3-collection "1"
2077+
d3-color "1"
2078+
d3-format "1"
2079+
d3-interpolate "1"
2080+
d3-time "1"
2081+
d3-time-format "2"
2082+
2083+
d3-selection@1, [email protected], d3-selection@^1.0.2:
20402084
version "1.0.5"
20412085
resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.0.5.tgz#948c73b41a44e28d1742ae2ff207c2aebca2734b"
20422086

2087+
[email protected], d3-selection@^1.1.0:
2088+
version "1.1.0"
2089+
resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.1.0.tgz#1998684896488f839ca0372123da34f1d318809c"
2090+
20432091
20442092
version "1.0.6"
20452093
resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.0.6.tgz#b09e305cf0c7c6b9a98c90e6b42f62dac4bcfd5b"
20462094
dependencies:
20472095
d3-path "1"
20482096

2097+
2098+
version "1.1.0"
2099+
resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.1.0.tgz#cdedfee735801e4058b5b31f9a1192b631564f6d"
2100+
dependencies:
2101+
d3-path "1"
2102+
20492103
d3-time-format@2, [email protected]:
20502104
version "2.0.5"
20512105
resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.0.5.tgz#9d7780204f7c9119c9170b1a56db4de9a8af972e"
@@ -2060,6 +2114,19 @@ d3-timer@1, [email protected]:
20602114
version "1.0.5"
20612115
resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.5.tgz#b266d476c71b0d269e7ac5f352b410a3b6fe6ef0"
20622116

2117+
d3-tip@^0.6.7:
2118+
version "0.6.8"
2119+
resolved "https://registry.yarnpkg.com/d3-tip/-/d3-tip-0.6.8.tgz#e5b4491ae8983fde646ea49008ff542a033c0a2c"
2120+
dependencies:
2121+
d3 "^3.5.5"
2122+
2123+
"d3-tip@github:vlascik/d3-tip#fix-offscreen-tooltips":
2124+
version "0.8.0-alpha.1"
2125+
resolved "https://codeload.github.com/vlascik/d3-tip/tar.gz/f1380aef3790122ecea7a816abec3cfc2c71c0ed"
2126+
dependencies:
2127+
d3-collection "^1.0.1"
2128+
d3-selection "^1.0.2"
2129+
20632130
d3-transition@1, [email protected]:
20642131
version "1.0.4"
20652132
resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.0.4.tgz#e1a9ebae3869a9d9c2874ab00841fa8313ae5de5"
@@ -2071,6 +2138,17 @@ d3-transition@1, [email protected]:
20712138
d3-selection "1"
20722139
d3-timer "1"
20732140

2141+
2142+
version "1.1.0"
2143+
resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.0.tgz#cfc85c74e5239324290546623572990560c3966f"
2144+
dependencies:
2145+
d3-color "1"
2146+
d3-dispatch "1"
2147+
d3-ease "1"
2148+
d3-interpolate "1"
2149+
d3-selection "^1.1.0"
2150+
d3-timer "1"
2151+
20742152
20752153
version "1.1.2"
20762154
resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c"
@@ -2085,6 +2163,20 @@ [email protected]:
20852163
d3-selection "1"
20862164
d3-transition "1"
20872165

2166+
2167+
version "1.2.0"
2168+
resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.2.0.tgz#b3231f4f9386241475defe1c557bfd3fde1065fb"
2169+
dependencies:
2170+
d3-dispatch "1"
2171+
d3-drag "1"
2172+
d3-interpolate "1"
2173+
d3-selection "1"
2174+
d3-transition "1"
2175+
2176+
d3@^3.5.5, d3@^3.5.6:
2177+
version "3.5.17"
2178+
resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"
2179+
20882180
d3@^4.0.0:
20892181
version "4.8.0"
20902182
resolved "https://registry.yarnpkg.com/d3/-/d3-4.8.0.tgz#1ad8d18997869c90b6ad6114e9b92425cee78460"
@@ -2120,6 +2212,41 @@ d3@^4.0.0:
21202212
d3-voronoi "1.1.2"
21212213
d3-zoom "1.1.4"
21222214

2215+
d3@^4.9.0:
2216+
version "4.9.0"
2217+
resolved "https://registry.yarnpkg.com/d3/-/d3-4.9.0.tgz#1cf031e29fe440f09b167484014dd7437adf7087"
2218+
dependencies:
2219+
d3-array "1.2.0"
2220+
d3-axis "1.0.7"
2221+
d3-brush "1.0.4"
2222+
d3-chord "1.0.4"
2223+
d3-collection "1.0.3"
2224+
d3-color "1.0.3"
2225+
d3-dispatch "1.0.3"
2226+
d3-drag "1.1.0"
2227+
d3-dsv "1.0.5"
2228+
d3-ease "1.0.3"
2229+
d3-force "1.0.6"
2230+
d3-format "1.2.0"
2231+
d3-geo "1.6.3"
2232+
d3-hierarchy "1.1.4"
2233+
d3-interpolate "1.1.5"
2234+
d3-path "1.0.5"
2235+
d3-polygon "1.0.3"
2236+
d3-quadtree "1.0.3"
2237+
d3-queue "3.0.7"
2238+
d3-random "1.1.0"
2239+
d3-request "1.0.5"
2240+
d3-scale "1.0.6"
2241+
d3-selection "1.1.0"
2242+
d3-shape "1.1.0"
2243+
d3-time "1.0.6"
2244+
d3-time-format "2.0.5"
2245+
d3-timer "1.0.5"
2246+
d3-transition "1.1.0"
2247+
d3-voronoi "1.1.2"
2248+
d3-zoom "1.2.0"
2249+
21232250
d@1:
21242251
version "1.0.0"
21252252
resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
@@ -2293,7 +2420,7 @@ ember-cli-app-version@^3.0.0:
22932420
ember-cli-htmlbars "^1.0.0"
22942421
git-repo-version "0.4.1"
22952422

2296-
ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
2423+
ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
22972424
version "5.2.4"
22982425
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz#5ce4f46b08ed6f6d21e878619fb689719d6e8e13"
22992426
dependencies:
@@ -2534,9 +2661,9 @@ ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-ve
25342661
dependencies:
25352662
semver "^5.3.0"
25362663

2537-
ember-cli@^2.13.0-beta.1:
2538-
version "2.13.0-beta.3"
2539-
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.13.0-beta.3.tgz#a4bf6a76ec27b72a67d0b665f191077db02f8e2b"
2664+
ember-cli@^2.13.0-beta.3:
2665+
version "2.13.1"
2666+
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.13.1.tgz#ac02ca2d967bb660b577286e4c88c7cea13806b3"
25402667
dependencies:
25412668
amd-name-resolver "0.0.6"
25422669
babel-plugin-transform-es2015-modules-amd "^6.24.0"
@@ -2571,7 +2698,7 @@ ember-cli@^2.13.0-beta.1:
25712698
ember-cli-normalize-entity-name "^1.0.0"
25722699
ember-cli-preprocess-registry "^3.1.0"
25732700
ember-cli-string-utils "^1.0.0"
2574-
ember-try "^0.2.11"
2701+
ember-try "^0.2.14"
25752702
ensure-posix-path "^1.0.2"
25762703
escape-string-regexp "^1.0.3"
25772704
execa "^0.6.0"
@@ -2602,7 +2729,7 @@ ember-cli@^2.13.0-beta.1:
26022729
minimatch "^3.0.0"
26032730
morgan "^1.8.1"
26042731
node-modules-path "^1.0.0"
2605-
nopt "^4.0.0"
2732+
nopt "^3.0.6"
26062733
npm-package-arg "^4.1.1"
26072734
portfinder "^1.0.7"
26082735
promise-map-series "^0.2.1"
@@ -2623,7 +2750,7 @@ ember-cli@^2.13.0-beta.1:
26232750
walk-sync "^0.3.0"
26242751
yam "0.0.22"
26252752

2626-
ember-d3@^0.3.1:
2753+
ember-d3@^0.3.2:
26272754
version "0.3.2"
26282755
resolved "https://registry.yarnpkg.com/ember-d3/-/ember-d3-0.3.2.tgz#14988346cd94104d1d4560c21fc6ba1f56135c0c"
26292756
dependencies:
@@ -2737,15 +2864,14 @@ ember-try-config@^2.0.1:
27372864
rsvp "^3.2.1"
27382865
semver "^5.1.0"
27392866

2740-
ember-try@^0.2.11:
2741-
version "0.2.13"
2742-
resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-0.2.13.tgz#3d91f46950a40bba54da0edbbbb30480f83a9fdb"
2867+
ember-try@^0.2.14:
2868+
version "0.2.14"
2869+
resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-0.2.14.tgz#d47e8fa38858d5683e47856e24a260b39e9caf4a"
27432870
dependencies:
27442871
chalk "^1.0.0"
27452872
cli-table2 "^0.2.0"
27462873
core-object "^1.1.0"
27472874
debug "^2.2.0"
2748-
ember-cli-babel "^5.1.3"
27492875
ember-cli-version-checker "^1.1.6"
27502876
ember-try-config "^2.0.1"
27512877
extend "^3.0.0"
@@ -4582,7 +4708,13 @@ node-pre-gyp@^0.6.29:
45824708
tar "^2.2.1"
45834709
tar-pack "^3.4.0"
45844710

4585-
nopt@^4.0.0, nopt@^4.0.1:
4711+
nopt@^3.0.6:
4712+
version "3.0.6"
4713+
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
4714+
dependencies:
4715+
abbrev "1"
4716+
4717+
nopt@^4.0.1:
45864718
version "4.0.1"
45874719
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
45884720
dependencies:

0 commit comments

Comments
 (0)