Skip to content

Commit 7787110

Browse files
committed
build: Update to handle the latest colorbrewer package
1 parent 76a88e5 commit 7787110

File tree

8 files changed

+355
-530
lines changed

8 files changed

+355
-530
lines changed

examples/index-website.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require('codemirror/addon/fold/foldgutter');
1717
require('codemirror/addon/edit/matchbrackets');
1818

1919
// Colorbrewer
20-
window.colorbrewer = require('colorbrewer').default;
20+
window.colorbrewer = require('colorbrewer/index.ts').default;
2121

2222
// d3
2323
window.d3 = require('d3');

examples/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require('codemirror/addon/fold/foldgutter');
2222
require('codemirror/addon/edit/matchbrackets');
2323

2424
// Colorbrewer
25-
window.colorbrewer = require('colorbrewer').default;
25+
window.colorbrewer = require('colorbrewer/index.ts').default;
2626

2727
// d3
2828
window.d3 = require('d3');

package-lock.json

Lines changed: 343 additions & 519 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
"@babel/preset-env": "^7.16.5",
3939
"@fontsource/lato": "^5.1.1",
4040
"@jsdevtools/coverage-istanbul-loader": "^3.0.5",
41-
"babel-loader": "^9.0.1",
41+
"babel-loader": "^10.0.0",
4242
"babel-plugin-istanbul": "^7.0.0",
4343
"bootstrap": "^3.4.1",
4444
"bootswatch": "^3.4.1",
4545
"codemirror": "^5.65.0",
46-
"colorbrewer": "^1.5.1",
46+
"colorbrewer": "^1.6.0",
4747
"css-loader": "^7.1.0",
4848
"docco": "^0.9.1",
4949
"eslint": "^8.57.1",
@@ -74,6 +74,7 @@
7474
"karma-spec-reporter": "^0.0.36",
7575
"karma-webpack": "^5.0.0",
7676
"nib": "^1.1.2",
77+
"nise": "^6.1.1",
7778
"npm-run-all": "^4.1.5",
7879
"pako": "^2.0.4",
7980
"pug": "^3.0.2",
@@ -83,7 +84,7 @@
8384
"resemblejs": "^5.0.0",
8485
"serve-index": "^1.9.1",
8586
"shader-loader": "git+https://github.com/Makio64/shader-loader",
86-
"sinon": "^19.0.2",
87+
"sinon": "^20.0.0",
8788
"style-loader": "^4.0.0",
8889
"stylelint": "<16.3.0 || >16.3.0",
8990
"stylelint-stylus": "^1.0.0",

tests/cases/colorLegend.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var $ = require('jquery');
22
var createMap = require('../test-utils').createMap;
3-
var colorbrewer = require('colorbrewer/index.js');
3+
var colorbrewer = require('colorbrewer/index.ts').default;
44

55
describe('color legend', function () {
66
'use strict';

tests/cases/tile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ describe('geo.tile', function () {
148148
});
149149

150150
it('failure', function (done) {
151-
// create a mocked sinon server instance that always responds with 404.
152-
var server = sinon.fakeServer.create();
151+
// create a mocked nise server instance that always responds with 404.
152+
var server = require('nise').fakeServer.create();
153153

154154
var t = geo.tile({
155155
index: {x: 0, y: 0},

tests/cases/tileLayer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,7 @@ describe('geo.tileLayer', function () {
15491549
});
15501550

15511551
it('invalid tile url', function (done) {
1552-
var server = sinon.fakeServer.create();
1552+
var server = require('nise').fakeServer.create();
15531553
var spy = sinon.spy();
15541554
sinon.stub(console, 'warn').callsFake(function () {});
15551555

@@ -1607,7 +1607,7 @@ describe('geo.tileLayer', function () {
16071607
}
16081608

16091609
beforeEach(function () {
1610-
server = sinon.fakeServer.create({respondImmediately: true});
1610+
server = require('nise').fakeServer.create({respondImmediately: true});
16111611
sinon.stub(console, 'warn');
16121612
});
16131613
afterEach(function () {

tests/cases/transform.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe('geo.transform', function () {
9999
var server;
100100

101101
beforeEach(function () {
102-
server = sinon.fakeServer.create();
102+
server = require('nise').fakeServer.create();
103103
});
104104

105105
afterEach(function () {

0 commit comments

Comments
 (0)