Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/index-website.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require('codemirror/addon/fold/foldgutter');
require('codemirror/addon/edit/matchbrackets');

// Colorbrewer
window.colorbrewer = require('colorbrewer').default;
window.colorbrewer = require('colorbrewer/index.ts').default;

// d3
window.d3 = require('d3');
2 changes: 1 addition & 1 deletion examples/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require('codemirror/addon/fold/foldgutter');
require('codemirror/addon/edit/matchbrackets');

// Colorbrewer
window.colorbrewer = require('colorbrewer').default;
window.colorbrewer = require('colorbrewer/index.ts').default;

// d3
window.d3 = require('d3');
Expand Down
862 changes: 343 additions & 519 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
"@babel/preset-env": "^7.16.5",
"@fontsource/lato": "^5.1.1",
"@jsdevtools/coverage-istanbul-loader": "^3.0.5",
"babel-loader": "^9.0.1",
"babel-loader": "^10.0.0",
"babel-plugin-istanbul": "^7.0.0",
"bootstrap": "^3.4.1",
"bootswatch": "^3.4.1",
"codemirror": "^5.65.0",
"colorbrewer": "^1.5.1",
"colorbrewer": "^1.6.0",
"css-loader": "^7.1.0",
"docco": "^0.9.1",
"eslint": "^8.57.1",
Expand Down Expand Up @@ -74,6 +74,7 @@
"karma-spec-reporter": "^0.0.36",
"karma-webpack": "^5.0.0",
"nib": "^1.1.2",
"nise": "^6.1.1",
"npm-run-all": "^4.1.5",
"pako": "^2.0.4",
"pug": "^3.0.2",
Expand All @@ -83,7 +84,7 @@
"resemblejs": "^5.0.0",
"serve-index": "^1.9.1",
"shader-loader": "git+https://github.com/Makio64/shader-loader",
"sinon": "^19.0.2",
"sinon": "^20.0.0",
"style-loader": "^4.0.0",
"stylelint": "<16.3.0 || >16.3.0",
"stylelint-stylus": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/cases/colorLegend.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var $ = require('jquery');
var createMap = require('../test-utils').createMap;
var colorbrewer = require('colorbrewer/index.js');
var colorbrewer = require('colorbrewer/index.ts').default;

describe('color legend', function () {
'use strict';
Expand Down
4 changes: 2 additions & 2 deletions tests/cases/tile.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ describe('geo.tile', function () {
});

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

var t = geo.tile({
index: {x: 0, y: 0},
Expand Down
4 changes: 2 additions & 2 deletions tests/cases/tileLayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,7 @@ describe('geo.tileLayer', function () {
});

it('invalid tile url', function (done) {
var server = sinon.fakeServer.create();
var server = require('nise').fakeServer.create();
var spy = sinon.spy();
sinon.stub(console, 'warn').callsFake(function () {});

Expand Down Expand Up @@ -1607,7 +1607,7 @@ describe('geo.tileLayer', function () {
}

beforeEach(function () {
server = sinon.fakeServer.create({respondImmediately: true});
server = require('nise').fakeServer.create({respondImmediately: true});
sinon.stub(console, 'warn');
});
afterEach(function () {
Expand Down
2 changes: 1 addition & 1 deletion tests/cases/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe('geo.transform', function () {
var server;

beforeEach(function () {
server = sinon.fakeServer.create();
server = require('nise').fakeServer.create();
});

afterEach(function () {
Expand Down