From e2d8bad8965231a9d01d6920bf253706eeb666a3 Mon Sep 17 00:00:00 2001 From: Vladimir Agafonkin Date: Mon, 15 Apr 2019 13:14:43 +0300 Subject: [PATCH 1/2] inline test suite deps in root package.json --- package.json | 9 ++++++++- test/integration/package.json | 21 --------------------- yarn.lock | 23 +---------------------- 3 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 test/integration/package.json diff --git a/package.json b/package.json index eb51fda4e12..2f53feded27 100644 --- a/package.json +++ b/package.json @@ -46,14 +46,17 @@ "@mapbox/flow-remove-types": "^1.3.0-await.upstream.2", "@mapbox/gazetteer": "^3.1.2", "@mapbox/mapbox-gl-rtl-text": "^0.2.1", - "@mapbox/mapbox-gl-test-suite": "file:test/integration", "@mapbox/mbx-assembly": "^0.28.2", + "@mapbox/mvt-fixtures": "^3.2.0", "@mapbox/mr-ui": "0.5.0", "@octokit/rest": "^15.15.1", "babel-eslint": "^10.0.1", "benchmark": "^2.1.4", "browserify": "^16.2.3", + "chalk": "^2.3.0", "d3": "^4.12.0", + "d3-queue": "^3.0.3", + "diff": "^1.4.0", "documentation": "~9.1.1", "ejs": "^2.5.7", "eslint": "^5.15.3", @@ -70,11 +73,14 @@ "jsdom": "^13.0.0", "json-stringify-pretty-compact": "^2.0.0", "jsonwebtoken": "^8.3.0", + "lodash.template": "^4.4.0", + "mapbox-gl-styles": "2.0.2", "mock-geolocation": "^1.0.11", "npm-run-all": "^4.1.5", "nyc": "^13.3.0", "object.entries": "^1.1.0", "pirates": "^4.0.1", + "pixelmatch": "^4.0.2", "pngjs": "^3.4.0", "postcss-cli": "^6.1.2", "postcss-inline-svg": "^3.1.1", @@ -99,6 +105,7 @@ "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-terser": "^4.0.4", "rollup-plugin-unassert": "^0.3.0", + "shuffle-seed": "^1.1.6", "sinon": "^7.3.0", "slugg": "^1.2.1", "st": "^1.2.2", diff --git a/test/integration/package.json b/test/integration/package.json deleted file mode 100644 index a0377c97ded..00000000000 --- a/test/integration/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "@mapbox/mapbox-gl-test-suite", - "description": "Rendering tests for Mapbox GL", - "version": "0.0.0", - "license": "BSD", - "main": "index.js", - "dependencies": { - "@mapbox/mvt-fixtures": "^3.2.0", - "chalk": "^2.3.0", - "d3-queue": "^3.0.3", - "diff": "^1.4.0", - "json-stringify-pretty-compact": "^1.0.4", - "lodash.template": "^4.4.0", - "mapbox-gl-styles": "2.0.2", - "pixelmatch": "^4.0.2", - "pngjs": "^3.0.0", - "shuffle-seed": "^1.1.6", - "st": "^1.1.0", - "glob": "^7.0.3" - } -} diff --git a/yarn.lock b/yarn.lock index eabd73ef41d..760aceb2184 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1197,22 +1197,6 @@ resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.4.0.tgz#36946b22944fe2cfa43cfafd5ef36fdb54a069e4" integrity sha512-ZD0Io4XK+/vU/4zpANjOtdWfVszAgnaMPsGR6LKsWh4kLIEv9qoobTVmJPPuwuM+ZI2b3BlZ6DYw1XHVmv6YTA== -"@mapbox/mapbox-gl-test-suite@file:test/integration": - version "0.0.0" - dependencies: - "@mapbox/mvt-fixtures" "^3.2.0" - chalk "^2.3.0" - d3-queue "^3.0.3" - diff "^1.4.0" - glob "^7.0.3" - json-stringify-pretty-compact "^1.0.4" - lodash.template "^4.4.0" - mapbox-gl-styles "2.0.2" - pixelmatch "^4.0.2" - pngjs "^3.0.0" - shuffle-seed "^1.1.6" - st "^1.1.0" - "@mapbox/mbx-assembly@^0.28.2": version "0.28.2" resolved "https://registry.yarnpkg.com/@mapbox/mbx-assembly/-/mbx-assembly-0.28.2.tgz#5b654b7b5377aa29223ea32938c11762be8ac219" @@ -8532,11 +8516,6 @@ json-stable-stringify@~0.0.0: dependencies: jsonify "~0.0.0" -json-stringify-pretty-compact@^1.0.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" - integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== - json-stringify-pretty-compact@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" @@ -13182,7 +13161,7 @@ ssri@^5.2.4: dependencies: safe-buffer "^5.1.1" -st@^1.1.0, st@^1.2.2: +st@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/st/-/st-1.2.2.tgz#b95554f41b457bf0ed1c48f2bad8fccff894b14f" integrity sha512-goKkumvz0BMLs6KjjPf5Fub/3T34tRVQxInUI5lqtbaKD+s4HcRlJYP2GPJ8RgAmrsnYOPGmOFEP6ho0KJ+E8g== From 96ad97aadc1defcc0b5267a52f4f753c475a90b5 Mon Sep 17 00:00:00 2001 From: Vladimir Agafonkin Date: Mon, 15 Apr 2019 13:20:14 +0300 Subject: [PATCH 2/2] remove d3-queue dep because we already have d3 --- package.json | 1 - test/integration/lib/harness.js | 2 +- test/integration/tiles/upgrade.js | 2 +- yarn.lock | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2f53feded27..ca2206a1360 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "browserify": "^16.2.3", "chalk": "^2.3.0", "d3": "^4.12.0", - "d3-queue": "^3.0.3", "diff": "^1.4.0", "documentation": "~9.1.1", "ejs": "^2.5.7", diff --git a/test/integration/lib/harness.js b/test/integration/lib/harness.js index 9b248413ada..19b881f08cb 100644 --- a/test/integration/lib/harness.js +++ b/test/integration/lib/harness.js @@ -4,7 +4,7 @@ import path from 'path'; import fs from 'fs'; import glob from 'glob'; import {shuffle} from 'shuffle-seed'; -import {queue} from 'd3-queue'; +import {queue} from 'd3'; import colors from 'chalk'; import template from 'lodash.template'; import createServer from './server'; diff --git a/test/integration/tiles/upgrade.js b/test/integration/tiles/upgrade.js index bb4ffd38f0a..5d8b573b84a 100644 --- a/test/integration/tiles/upgrade.js +++ b/test/integration/tiles/upgrade.js @@ -2,7 +2,7 @@ const mapnik = require('mapnik'); const fs = require('fs'); -const queue = require('d3-queue').queue; +const queue = require('d3').queue; function upgrade(z, x, y, path, callback) { console.log('Updating ', path); diff --git a/yarn.lock b/yarn.lock index 760aceb2184..6258bc2cf43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4480,7 +4480,7 @@ d3-quadtree@1.0.3: resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.3.tgz#ac7987e3e23fe805a990f28e1b50d38fcb822438" integrity sha1-rHmH4+I/6AWpkPKOG1DTj8uCJDg= -d3-queue@3.0.7, d3-queue@^3.0.3, d3-queue@^3.0.7: +d3-queue@3.0.7, d3-queue@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.7.tgz#c93a2e54b417c0959129d7d73f6cf7d4292e7618" integrity sha1-yTouVLQXwJWRKdfXP2z31Ckudhg=