Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: #270 update dependencies #276

Closed
wants to merge 8 commits into from
Closed

WIP: #270 update dependencies #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
503c547
blindly update lots of npm and make some changes WIP
chippieTV Jul 26, 2021
86e2430
update most libs WIP
chippieTV Aug 29, 2021
83bcca9
test-query running but failing
chippieTV Aug 29, 2021
d5d9be3
fixing unit test issues from tap v15 deprecating callbacks in beforeE…
chippieTV Aug 29, 2021
11d1dee
fix WIP
chippieTV Aug 31, 2021
ae2ed24
update minor point releases
chippieTV Sep 2, 2021
a33735c
update octokit to v18
chippieTV Sep 2, 2021
7c3c900
update testem to 3.5.0
chippieTV Sep 2, 2021
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
23,127 changes: 12,129 additions & 10,998 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

95 changes: 49 additions & 46 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,121 +38,124 @@
"vt-pbf": "^3.1.1"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@mapbox/gazetteer": "^4.0.4",
"@babel/core": "^7.15.0",
"@babel/preset-env": "^7.15.0",
"@mapbox/gazetteer": "^5.1.0",
"@mapbox/mapbox-gl-rtl-text": "^0.2.1",
"@mapbox/mvt-fixtures": "^3.6.0",
"@octokit/rest": "^16.30.1",
"@octokit/rest": "^18.10.0",
"@rollup/plugin-commonjs": "^20.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.4",
"@rollup/plugin-replace": "^3.0.0",
"@rollup/plugin-strip": "^1.3.1",
"@rollup/plugin-strip": "^2.1.0",
"@types/babel__core": "^7.1.12",
"@types/babelify": "^7.3.6",
"@types/benchmark": "^2.1.0",
"@types/browserify": "^12.0.36",
"@types/cssnano": "^4.0.0",
"@types/d3": "^4.13.12",
"@types/diff": "^4.0.2",
"@types/d3": "^7.0.0",
"@types/diff": "^5.0.1",
"@types/earcut": "^2.1.1",
"@types/ejs": "^2.7.0",
"@types/ejs": "^3.1.0",
"@types/eslint": "^7.2.6",
"@types/geojson": "^7946.0.7",
"@types/gl": "^4.1.0",
"@types/glob": "^7.1.3",
"@types/jsdom": "^16.2.5",
"@types/jsonwebtoken": "^8.5.0",
"@types/jsonwebtoken": "^8.5.5",
"@types/lodash.template": "^4.5.0",
"@types/minimist": "^1.2.1",
"@types/murmurhash-js": "^1.0.3",
"@types/node-notifier": "^8.0.0",
"@types/npm-packlist": "^1.1.1",
"@types/offscreencanvas": "^2019.6.3",
"@types/pbf": "^3.0.2",
"@types/pixelmatch": "^5.2.2",
"@types/pngjs": "^3.4.2",
"@types/puppeteer": "^1.20.7",
"@types/react": "^16.14.2",
"@types/react-dom": "^16.9.10",
"@types/request": "^2.48.5",
"@types/pngjs": "^6.0.1",
"@types/puppeteer": "^5.4.4",
"@types/react": "^17.0.19",
"@types/react-dom": "^17.0.9",
"@types/request": "^2.48.7",
"@types/rollup-plugin-json": "^3.0.2",
"@types/rollup-plugin-sourcemaps": "^0.4.2",
"@types/rollup-plugin-sourcemaps": "^0.5.0",
"@types/selenium-webdriver": "^4.0.10",
"@types/shuffle-seed": "^1.1.0",
"@types/sinon": "^7.5.2",
"@types/stylelint": "^9.10.1",
"@types/sinon": "^10.0.2",
"@types/stylelint": "^13.13.2",
"@types/supercluster": "^5.0.2",
"@types/tape": "^4.13.0",
"@types/tape": "^4.13.2",
"@types/window-or-global": "^1.0.4",
"@typescript-eslint/eslint-plugin": "^4.29.1",
"@typescript-eslint/parser": "^4.29.1",
"@typescript-eslint/eslint-plugin": "^4.30.0",
"@typescript-eslint/parser": "^4.30.0",
"address": "^1.1.2",
"babel-eslint": "^10.0.1",
"babelify": "^10.0.0",
"benchmark": "^2.1.4",
"browserify": "^16.5.0",
"browserify": "^17.0.0",
"canvas": "^2.6.1",
"chalk": "^3.0.0",
"chalk": "^4.1.2",
"chokidar": "^3.0.2",
"cross-env": "^7.0.3",
"cssnano": "^4.1.10",
"cssnano": "^5.0.8",
"d3": "^4.12.0",
"diff": "^4.0.1",
"documentation": "~12.1.1",
"ejs": "^2.5.7",
"deepmerge": "^4.2.2",
"diff": "^5.0.0",
"documentation": "^13.2.5",
"ejs": "^3.1.6",
"eslint": "^7.32.0",
"eslint-config-mourner": "^3.0.0",
"eslint-plugin-html": "^6.1.2",
"eslint-plugin-import": "^2.24.0",
"eslint-plugin-jsdoc": "^36.0.6",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react": "^7.25.1",
"gl": "^4.5.3",
"glob": "^7.1.4",
"is-builtin-module": "^3.0.0",
"jsdom": "^13.0.0",
"json-stringify-pretty-compact": "^2.0.0",
"jsdom": "^17.0.0",
"json-stringify-pretty-compact": "^3.0.0",
"jsonwebtoken": "^8.3.0",
"list-npm-contents": "^1.0.2",
"lodash": "^4.17.19",
"lodash.template": "^4.5.0",
"mapbox-gl-styles": "^2.0.2",
"mock-geolocation": "^1.0.11",
"node-notifier": "^5.4.3",
"node-notifier": "^10.0.0",
"node-plantuml": "^0.9.0",
"npm-font-open-sans": "^1.1.0",
"npm-packlist": "^2.1.1",
"npm-packlist": "^3.0.0",
"npm-run-all": "^4.1.5",
"nyc": "^13.3.0",
"nyc": "^15.1.0",
"pirates": "^4.0.1",
"pixelmatch": "^5.1.0",
"pngjs": "^3.4.0",
"pngjs": "^6.0.0",
"postcss": "^8.3.6",
"postcss-cli": "^8.3.1",
"postcss-inline-svg": "^5.0.0",
"pretty-bytes": "^5.1.0",
"puppeteer": "^1.18.0",
"puppeteer": "^10.2.0",
"qrcode-terminal": "^0.12.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"request": "^2.88.0",
"rollup": "^2.56.1",
"rollup": "^2.56.3",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-unassert": "^0.3.0",
"selenium-webdriver": "^4.0.0-alpha.5",
"semver": "^5.5.0",
"selenium-webdriver": "^4.0.0-rc-1",
"semver": "^7.3.5",
"shuffle-seed": "^1.1.6",
"sinon": "^7.3.2",
"sinon": "^11.1.2",
"source-map-explorer": "^2.5.1",
"st": "^1.2.2",
"stylelint": "^9.10.1",
"stylelint-config-standard": "^18.2.0",
"tap": "~12.4.1",
"st": "^3.0.0",
"stylelint": "^13.13.1",
"stylelint-config-standard": "^22.0.0",
"tap": "~15.0.9",
"tap-parser": "^10.0.1",
"tape": "^4.13.2",
"tape": "^5.3.1",
"tape-filter": "^1.0.4",
"testem": "^3.0.0",
"typescript": "^4.3.5"
"testem": "^3.5.0",
"typescript": "^4.4.2"
},
"browser": {
"./rollup/build/tsc/util/web_worker.js": "./build/web_worker_replacement.js"
Expand Down
4 changes: 2 additions & 2 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import WorkerPool from './util/worker_pool';
import {prewarm, clearPrewarmedResources} from './util/global_worker_pool';
import {clearTileCache} from './util/tile_request_cache';
import {PerformanceUtils} from './util/performance';
import type {RequestParameters, ResponseCallback} from './util/ajax';
import type {Cancelable} from './types/cancelable';
import {RequestParameters, ResponseCallback} from './util/ajax';
import {Cancelable} from './types/cancelable';

const exported = {
supported,
Expand Down
8 changes: 4 additions & 4 deletions src/source/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import assert from 'assert';
import {plugin as globalRTLTextPlugin} from './rtl_text_plugin';
import {enforceCacheSizeLimit} from '../util/tile_request_cache';

import type {
import {
WorkerSource,
WorkerTileParameters,
WorkerDEMTileParameters,
Expand All @@ -17,9 +17,9 @@ import type {
TileParameters
} from '../source/worker_source';

import type {WorkerGlobalScopeInterface} from '../util/web_worker';
import type {Callback} from '../types/callback';
import type {LayerSpecification} from '../style-spec/types';
import {WorkerGlobalScopeInterface} from '../util/web_worker';
import {Callback} from '../types/callback';
import {LayerSpecification} from '../style-spec/types';
import type {PluginState} from './rtl_text_plugin';

/**
Expand Down
4 changes: 2 additions & 2 deletions test/build/min.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import browserify from 'browserify';
import {fileURLToPath} from 'url';

const __dirname = dirname(fileURLToPath(import.meta.url));
const minBundle = fs.readFileSync('dist/maplibre-gl.js', 'utf8');
const minBundle = fs.readFileSync('dist/maplibre-gl-dev.js', 'utf8');

test('production build removes asserts', (t) => {
t.assert(minBundle.indexOf('canary assert') === -1);
Expand Down Expand Up @@ -47,7 +47,7 @@ test('evaluates without errors', async (t) => {
global.performance = {};
global.navigator = {};
try {
await import('../../dist/maplibre-gl.js');
await import('../../dist/maplibre-gl-dev.js');
} catch (e) {
t.error(e);
}
Expand Down
2 changes: 1 addition & 1 deletion test/suite_implementation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default function(style, options, _callback) {

} else if (operation[0] === 'wait') {
if (operation.length > 1) {
now += operation[1];
// now += operation[1];
map._render();
applyOperations(map, operations.slice(1), callback);

Expand Down
7 changes: 3 additions & 4 deletions test/unit/source/canvas_source.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {extend} from '../../../rollup/build/tsc/util/util';
let originalGetContext = HTMLCanvasElement.prototype.getContext;

function createSource(options) {

HTMLCanvasElement.prototype.getContext = () => { return '2d'; };


const c = options && options.canvas || window.document.createElement('canvas');
c.width = 20;
Expand Down Expand Up @@ -41,9 +41,8 @@ class StubMap extends Evented {
}

test('CanvasSource', (t) => {
t.afterEach((callback) => {
t.afterEach(() => {
HTMLCanvasElement.prototype.getContext = originalGetContext;
callback();
});

t.test('constructor', (t) => {
Expand Down
6 changes: 2 additions & 4 deletions test/unit/source/raster_dem_tile_source.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ function createSource(options, transformCallback) {
}

test('RasterTileSource', (t) => {
t.beforeEach((callback) => {
t.beforeEach(() => {
window.useFakeXMLHttpRequest();
callback();
});

t.afterEach((callback) => {
t.afterEach(() => {
window.clearFakeXMLHttpRequest();
callback();
});

t.test('transforms request for TileJSON URL', (t) => {
Expand Down
6 changes: 2 additions & 4 deletions test/unit/source/raster_tile_source.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ function createSource(options, transformCallback) {
}

test('RasterTileSource', (t) => {
t.beforeEach((callback) => {
t.beforeEach(() => {
window.useFakeXMLHttpRequest();
callback();
});

t.afterEach((callback) => {
t.afterEach(() => {
window.clearFakeXMLHttpRequest();
callback();
});

t.test('transforms request for TileJSON URL', (t) => {
Expand Down
6 changes: 2 additions & 4 deletions test/unit/source/vector_tile_source.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,12 @@ function createSource(options, transformCallback) {
}

test('VectorTileSource', (t) => {
t.beforeEach((callback) => {
t.beforeEach(() => {
window.useFakeXMLHttpRequest();
callback();
});

t.afterEach((callback) => {
t.afterEach(() => {
window.clearFakeXMLHttpRequest();
callback();
});

t.test('can be constructed from TileJSON', (t) => {
Expand Down
3 changes: 1 addition & 2 deletions test/unit/style-spec/feature_filter.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,8 @@ test('legacy filter detection', t => {
});

test('convert legacy filters to expressions', t => {
t.beforeEach(done => {
t.beforeEach(() => {
t.stub(console, 'warn');
done();
});

legacyFilterTests(t, (f) => {
Expand Down
19 changes: 9 additions & 10 deletions test/unit/style/style.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ class StubMap extends Evented {
}

test('Style', (t) => {
t.afterEach((callback) => {
t.afterEach(() => {
window.clearFakeXMLHttpRequest();
window.clearFakeWorkerPresence();
callback();
});

t.test('registers plugin state change listener', (t) => {
Expand Down Expand Up @@ -105,14 +104,12 @@ test('Style', (t) => {
});

test('Style#loadURL', (t) => {
t.beforeEach((callback) => {
t.beforeEach(() => {
window.useFakeXMLHttpRequest();
callback();
});

t.afterEach((callback) => {
t.afterEach(() => {
window.clearFakeXMLHttpRequest();
callback();
});

t.test('fires "dataloading"', (t) => {
Expand Down Expand Up @@ -182,9 +179,8 @@ test('Style#loadURL', (t) => {
});

test('Style#loadJSON', (t) => {
t.afterEach((callback) => {
t.afterEach(() => {
window.clearFakeXMLHttpRequest();
callback();
});

t.test('fires "dataloading" (synchronously)', (t) => {
Expand Down Expand Up @@ -2035,7 +2031,7 @@ test('Style#query*Features', (t) => {
let onError;
let transform;

t.beforeEach((callback) => {
t.beforeEach(() => {
transform = new Transform();
transform.resize(100, 100);
style = new Style(new StubMap());
Expand All @@ -2055,7 +2051,10 @@ test('Style#query*Features', (t) => {

style.on('error', onError)
.on('style.load', () => {
callback();
// hmm nested callback seems like we need async here..
// callback();
// changelog for tap 15.0
// Remove callback argument from t.beforeEach and t.afterEach. Return a promise if you wish these methods to be async.
});
});

Expand Down
6 changes: 2 additions & 4 deletions test/unit/ui/map.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ function createStyleSource() {
}

test('Map', (t) => {
t.beforeEach((callback) => {
t.beforeEach(() => {
window.useFakeXMLHttpRequest();
callback();
});

t.afterEach((callback) => {
t.afterEach(() => {
window.clearFakeXMLHttpRequest();
callback();
});

t.test('constructor', (t) => {
Expand Down
Loading