Upgrade dependencies where possible (#12189)

* upgrade most deps * upgrade Node version in Circle CI * downgrade mvt-fixtures * try older node for render tests * fix warnings in postcss * inline style benchmark locations from gazetteer because it's not maintained * downgrade to gl 4.9.0 for benchmap :(
mapbox · Aug 24, 2022 · 47f3aac · 47f3aac
1 parent 2efa23f
commit 47f3aac
Show file tree

Hide file tree

Showing 8 changed files with 3,818 additions and 7,247 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -150,7 +150,7 @@ workflows:
 
 defaults: &defaults
   docker:
-    - image: cimg/node:14.15-browsers
+    - image: cimg/node:14.16-browsers
   working_directory: ~/mapbox-gl-js
 
 jobs:

diff --git a/bench/data/style-benchmark-locations.json b/bench/data/style-benchmark-locations.json
@@ -0,0 +1,198 @@
+{
+  "type": "FeatureCollection",
+  "name": "style-benchmark-locations",
+  "features": [
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-95.392, 29.799]
+      },
+      "properties": {
+        "place_name": "Roads, Houston, z12",
+        "zoom": 12,
+        "tags": ["road"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-95.381, 29.749]
+      },
+      "properties": {
+        "place_name": "Roads, Houston, z13",
+        "zoom": 13,
+        "tags": ["road", "poi_label", "landuse"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-73.985, 40.758]
+      },
+      "properties": {
+        "place_name": "High zoom labels, buildings, roads, New York City, z16",
+        "zoom": 16,
+        "tags": ["poi_label", "building", "road"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-73.985, 40.758]
+      },
+      "properties": {
+        "place_name": "High zoom labels, buildings, roads, New York City, z17, overzoomed",
+        "zoom": 17,
+        "tags": ["poi_label", "road", "building"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [139.76, 35.695]
+      },
+      "properties": {
+        "place_name": "High zoom cjk labels, when using local lang, buildings, roads, Tokyo, z16",
+        "zoom": 16,
+        "tags": ["poi_label", "building", "road"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [139.76, 35.695]
+      },
+      "properties": {
+        "place_name": "High zoom cjk labels, when using local lang, buildings, roads, Tokyo, z17, overzoomed",
+        "zoom": 17,
+        "tags": ["poi_label", "road", "building"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [27.602, 61.521]
+      },
+      "properties": {
+        "place_name": "Water, Finland, z10",
+        "zoom": 10,
+        "tags": ["water"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [2.21, 48.745]
+      },
+      "properties": {
+        "place_name": "Landuse and roads, Paris, z11",
+        "zoom": 11,
+        "tags": [
+          "place_label:settlement",
+          "road",
+          "landuse",
+          "poi_label",
+          "hillshade"
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [-118.314, 33.996]
+      },
+      "properties": {
+        "place_name": "Buildings, LA, z16",
+        "zoom": 16,
+        "tags": ["building", "road"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [2.316, 48.867]
+      },
+      "properties": {
+        "place_name": "High zoom roads, paths, landuse, labels, Paris, 15",
+        "zoom": 15,
+        "tags": [
+          "road",
+          "road:pedestrian",
+          "poi_label",
+          "landuse",
+          "transit_stop_label"
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [2.316, 48.867]
+      },
+      "properties": {
+        "place_name": "High zoom pedestrian polygon fills, roads, paths, landuse, labels, Paris, z16",
+        "zoom": 16,
+        "tags": ["landuse", "road", "road:pedestrian", "poi_label", "road:path"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [8.835, 46.317]
+      },
+      "properties": {
+        "place_name": "Hillshading, Switzerland, z9",
+        "zoom": 9,
+        "tags": ["hillshade", "place_label"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [8.835, 46.317]
+      },
+      "properties": {
+        "place_name": "Hillshading and contours, Switzerland, z12",
+        "zoom": 12,
+        "tags": ["hillshade"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [8.416, 51.056]
+      },
+      "properties": {
+        "place_name": "Landcover, Germany z6",
+        "zoom": 6,
+        "tags": ["landcover", "place_label:settlement", "road", "admin"]
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [7.762, 50.322]
+      },
+      "properties": {
+        "place_name": "Landcover, Germany z8",
+        "zoom": 8,
+        "tags": ["place_label:settlement", "road", "hillshade"]
+      }
+    }
+  ]
+}
diff --git a/bench/styles/benchmarks.js b/bench/styles/benchmarks.js
@@ -1,7 +1,7 @@
 import mapboxgl from '../../src/index.js';
 import accessToken from '../lib/access_token.js';
 import locationsWithTileID from '../lib/locations_with_tile_id.js';
-import styleBenchmarkLocations from '@mapbox/gazetteer/benchmark/style-benchmark-locations.json';
+import styleBenchmarkLocations from '../data/style-benchmark-locations.json';
 import StyleLayerCreate from '../benchmarks/style_layer_create.js';
 import Validate from '../benchmarks/style_validate.js';
 import Layout from '../benchmarks/layout.js';

diff --git a/bench/versions/benchmarks.js b/bench/versions/benchmarks.js
@@ -1,7 +1,7 @@
 import mapboxgl from '../../src/index.js';
 import accessToken from '../lib/access_token.js';
 import locationsWithTileID from '../lib/locations_with_tile_id.js';
-import styleBenchmarkLocations from '@mapbox/gazetteer/benchmark/style-benchmark-locations.json';
+import styleBenchmarkLocations from '../data/style-benchmark-locations.json';
 import Layout from '../benchmarks/layout.js';
 import Placement from '../benchmarks/placement.js';
 import LayoutDDS from '../benchmarks/layout_dds.js';

diff --git a/package.json b/package.json
@@ -11,13 +11,13 @@
     "url": "git://github.com/mapbox/mapbox-gl-js.git"
   },
   "dependencies": {
-    "@mapbox/geojson-rewind": "^0.5.1",
+    "@mapbox/geojson-rewind": "^0.5.2",
     "@mapbox/geojson-types": "^1.0.2",
     "@mapbox/jsonlint-lines-primitives": "^2.0.2",
     "@mapbox/mapbox-gl-supported": "^2.0.1",
     "@mapbox/point-geometry": "^0.1.0",
     "@mapbox/tiny-sdf": "^2.0.5",
-    "@mapbox/unitbezier": "^0.0.0",
+    "@mapbox/unitbezier": "^0.0.1",
     "@mapbox/vector-tile": "^1.3.1",
     "@mapbox/whoots-js": "^3.1.0",
     "csscolorparser": "~1.0.3",
@@ -30,73 +30,72 @@
     "potpack": "^1.0.2",
     "quickselect": "^2.0.0",
     "rw": "^1.3.3",
-    "supercluster": "^7.1.4",
+    "supercluster": "^7.1.5",
     "tinyqueue": "^2.0.3",
     "vt-pbf": "^3.1.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.8",
-    "@babel/eslint-parser": "^7.17.0",
-    "@babel/preset-flow": "^7.16.7",
+    "@babel/core": "^7.18.13",
+    "@babel/eslint-parser": "^7.18.9",
+    "@babel/preset-flow": "^7.18.6",
     "@mapbox/flow-remove-types": "^2.0.0",
-    "@mapbox/gazetteer": "^4.0.4",
     "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
-    "@mapbox/mvt-fixtures": "^3.8.0",
-    "@octokit/auth-app": "^2.11.0",
-    "@octokit/rest": "^18.12.0",
-    "@rollup/plugin-commonjs": "^17.1.0",
+    "@mapbox/mvt-fixtures": "^3.10.0",
+    "@octokit/auth-app": "^4.0.5",
+    "@octokit/rest": "^19.0.4",
+    "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@rollup/plugin-replace": "^2.4.2",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-replace": "^4.0.0",
     "@rollup/plugin-strip": "^2.1.0",
     "address": "^1.2.0",
     "browserify": "^17.0.0",
-    "chalk": "^4.1.2",
+    "chalk": "^5.0.1",
     "chokidar": "^3.5.3",
-    "cssnano": "^4.1.11",
-    "d3": "^6.7.0",
+    "cssnano": "^5.1.13",
+    "d3": "^7.6.1",
     "d3-queue": "^3.0.7",
     "diff": "^5.1.0",
-    "documentation": "~13.1.1",
-    "ejs": "^3.1.6",
+    "documentation": "~14.0.0",
+    "ejs": "^3.1.8",
     "envify": "^4.1.0",
-    "eslint": "^7.30.0",
+    "eslint": "^7.32.0",
     "eslint-config-mourner": "^3.0.0",
-    "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-html": "^6.1.1",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsdoc": "^32.3.4",
+    "eslint-plugin-flowtype": "^8.0.3",
+    "eslint-plugin-html": "^7.1.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jsdoc": "^39.3.6",
     "flow-bin": "0.142.0",
     "gl": "4.9.0",
-    "glob": "^7.2.0",
-    "is-builtin-module": "^3.1.0",
-    "jsdom": "^13.2.0",
-    "json-stringify-pretty-compact": "^2.0.0",
+    "glob": "^8.0.3",
+    "is-builtin-module": "^3.2.0",
+    "jsdom": "^14.1.0",
+    "json-stringify-pretty-compact": "^4.0.0",
     "lodash.template": "^4.5.0",
     "mapbox-gl-styles": "^2.0.2",
     "minimist": "^1.2.6",
     "mock-geolocation": "^1.0.11",
-    "node-notifier": "^9.0.1",
+    "node-notifier": "^10.0.1",
     "npm-font-open-sans": "^1.1.0",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
-    "pixelmatch": "^5.2.1",
-    "postcss": "^8.4.12",
-    "postcss-cli": "^8.3.1",
+    "pixelmatch": "^5.3.0",
+    "postcss": "^8.4.16",
+    "postcss-cli": "^10.0.0",
     "postcss-inline-svg": "^5.0.0",
-    "pretty-bytes": "^5.6.0",
+    "pretty-bytes": "^6.0.0",
     "puppeteer-core": "^16.2.0",
     "qrcode-terminal": "^0.12.0",
-    "rollup": "^2.70.1",
+    "rollup": "^2.78.1",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-unassert": "^0.3.0",
+    "rollup-plugin-unassert": "^0.5.0",
     "selenium-webdriver": "^4.4.0",
     "shuffle-seed": "^1.1.6",
     "sinon": "^14.0.0",
-    "st": "^2.0.0",
-    "stylelint": "^14.6.1",
-    "stylelint-config-standard": "^25.0.0",
+    "st": "^3.0.0",
+    "stylelint": "^14.11.0",
+    "stylelint-config-standard": "^28.0.0",
     "tap": "~16.3.0",
     "tape": "^5.6.0",
     "tape-filter": "^1.0.4",

diff --git a/postcss.config.cjs b/postcss.config.cjs
@@ -5,9 +5,11 @@ module.exports = {
             preset: ['default', {
                 svgo: {
                     plugins: [{
-                        removeViewBox: false
+                        name: 'removeViewBox',
+                        active: false
                     }, {
-                        removeDimensions: false
+                        name: 'removeDimensions',
+                        active: false
                     }],
                 },
             }],

diff --git a/src/types/window.js b/src/types/window.js
@@ -1,6 +1,6 @@
 // @flow strict
 
-/* global EventTarget, IDBEnvironment */
+/* global IDBEnvironment */
 
 export interface Window extends EventTarget, IDBEnvironment {
     +caches: CacheStorage;