Skip to content

Commit 6169111

Browse files
committedAug 23, 2020
d3 dependencies
update tests (they assume a hyphen-minus, but d3-scale@2 can give a unicode minus)
1 parent 0a55cc8 commit 6169111

File tree

6 files changed

+67
-32
lines changed

6 files changed

+67
-32
lines changed
 

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
"sideEffects": false,
3636
"dependencies": {
3737
"d3-array": "1.2.0 - 2",
38-
"d3-format": "1",
39-
"d3-interpolate": "^1.2.0",
40-
"d3-time": "1",
41-
"d3-time-format": "2"
38+
"d3-format": "1 - 2",
39+
"d3-interpolate": "1.2.0 - 2",
40+
"d3-time": "1 - 2",
41+
"d3-time-format": "2 - 3"
4242
},
4343
"devDependencies": {
44-
"d3-color": "1",
44+
"d3-color": "1 - 2",
4545
"eslint": "6",
4646
"rollup": "1",
4747
"rollup-plugin-terser": "5",

‎test/linear-test.js

+9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
var tape = require("tape"),
22
scale = require("../"),
3+
format = require("d3-format"),
34
roundEpsilon = require("./roundEpsilon");
45

6+
format.formatDefaultLocale({
7+
decimal: ".",
8+
thousands: ",",
9+
grouping: [3],
10+
currency: ["$", ""],
11+
minus: "-"
12+
});
13+
514
tape("scaleLinear() has the expected defaults", function(test) {
615
var s = scale.scaleLinear();
716
test.deepEqual(s.domain(), [0, 1]);

‎test/log-test.js

+8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ var tape = require("tape"),
66

77
require("./inDelta");
88

9+
format.formatDefaultLocale({
10+
decimal: ".",
11+
thousands: ",",
12+
grouping: [3],
13+
currency: ["$", ""],
14+
minus: "-"
15+
});
16+
917
tape("scaleLog() has the expected defaults", function(test) {
1018
var x = scale.scaleLog();
1119
test.deepEqual(x.domain(), [1, 10]);

‎test/pow-test.js

+9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
var tape = require("tape"),
22
scale = require("../"),
3+
format = require("d3-format"),
34
roundEpsilon = require("./roundEpsilon");
45

6+
format.formatDefaultLocale({
7+
decimal: ".",
8+
thousands: ",",
9+
grouping: [3],
10+
currency: ["$", ""],
11+
minus: "-"
12+
});
13+
514
require("./inDelta");
615

716
tape("scalePow() has the expected defaults", function(test) {

‎test/tickFormat-test.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
var tape = require("tape"),
2-
scale = require("../");
2+
scale = require("../"),
3+
format = require("d3-format");
4+
5+
format.formatDefaultLocale({
6+
decimal: ".",
7+
thousands: ",",
8+
grouping: [3],
9+
currency: ["$", ""],
10+
minus: "-"
11+
});
312

413
tape("d3.tickFormat(start, stop, count) returns a format suitable for the ticks", function(test) {
514
test.equal(scale.tickFormat(0, 1, 10)(0.2), "0.2");

‎yarn.lock

+26-26
Original file line numberDiff line numberDiff line change
@@ -169,39 +169,39 @@ cross-spawn@^6.0.5:
169169
shebang-command "^1.2.0"
170170
which "^1.2.9"
171171

172-
"d3-array@1.2.0 - 2":
173-
version "2.4.0"
174-
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.4.0.tgz#87f8b9ad11088769c82b5ea846bcb1cc9393f242"
175-
integrity sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw==
172+
d3-array@2:
173+
version "2.5.1"
174+
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.5.1.tgz#cc785e1c4b560a34b8c77af9e6709bdf3f2ee117"
175+
integrity sha512-cKvAlQZUKhXInw5mosJMtAYsY3dDYwTess/WOFUQTGcr8xV04SZMJs6n6QznsqZC5vJTkvZuCgsH9fo981ysPA==
176176

177-
d3-color@1:
178-
version "1.4.0"
179-
resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.0.tgz#89c45a995ed773b13314f06460df26d60ba0ecaf"
180-
integrity sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg==
177+
"d3-color@1 - 2", d3-color@2:
178+
version "2.0.0"
179+
resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e"
180+
integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==
181181

182-
d3-format@1:
183-
version "1.4.2"
184-
resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.2.tgz#2a8c0ebf500f315981c2110eaaf70b82f472cb2b"
185-
integrity sha512-gco1Ih54PgMsyIXgttLxEhNy/mXxq8+rLnCb5shQk+P5TsiySrwWU5gpB4zen626J4LIwBxHvDChyA8qDm57ww==
182+
d3-format@2:
183+
version "2.0.0"
184+
resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-2.0.0.tgz#a10bcc0f986c372b729ba447382413aabf5b0767"
185+
integrity sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==
186186

187-
d3-interpolate@^1.2.0:
188-
version "1.4.0"
189-
resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
190-
integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
187+
d3-interpolate@2:
188+
version "2.0.1"
189+
resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.1.tgz#98be499cfb8a3b94d4ff616900501a64abc91163"
190+
integrity sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==
191191
dependencies:
192-
d3-color "1"
192+
d3-color "1 - 2"
193193

194-
d3-time-format@2:
195-
version "2.2.2"
196-
resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.2.tgz#187597ffc6a0f37cb36bb7a1d7167cdc887ecda0"
197-
integrity sha512-pweL2Ri2wqMY+wlW/wpkl8T3CUzKAha8S9nmiQlMABab8r5MJN0PD1V4YyRNVaKQfeh4Z0+VO70TLw6ESVOYzw==
194+
d3-time-format@3:
195+
version "3.0.0"
196+
resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-3.0.0.tgz#df8056c83659e01f20ac5da5fdeae7c08d5f1bb6"
197+
integrity sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==
198198
dependencies:
199-
d3-time "1"
199+
d3-time "1 - 2"
200200

201-
d3-time@1:
202-
version "1.1.0"
203-
resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
204-
integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
201+
"d3-time@1 - 2", d3-time@2:
202+
version "2.0.0"
203+
resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-2.0.0.tgz#ad7c127d17c67bd57a4c61f3eaecb81108b1e0ab"
204+
integrity sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==
205205

206206
debug@^4.0.1:
207207
version "4.1.1"

1 commit comments

Comments
 (1)

mbostock commented on Sep 23, 2020

@mbostock
Member

Looks like you forgot to run yarn again before committing this… I’ll fix.

Please sign in to comment.