Skip to content

Commit

Permalink
Upgrade most dev dependencies (#10384)
Browse files Browse the repository at this point in the history
* remove babelify in build-tape

* remove leftover suite_implementation.js

* upgrade eslint-related deps

* upgrade stylelint

* huge upgrade of dev deps

* revert jsdom upgrade, fix test suite build

* cleanup unused rules
  • Loading branch information
mourner authored Feb 15, 2021
1 parent d68855e commit a12cae3
Show file tree
Hide file tree
Showing 13 changed files with 3,706 additions and 3,191 deletions.
21 changes: 11 additions & 10 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
"plugin:flowtype/recommended",
"plugin:import/recommended"
],
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"sourceType": "module"
"sourceType": "module",
"requireConfigFile": false,
"babelOptions": {
"presets": ["@babel/preset-flow"]
}
},
"plugins": [
"flowtype",
"import",
"jsdoc"
],
"rules": {
// temporarily disabled due to https://github.com/babel/babel-eslint/issues/485
"no-use-before-define": "off",

// no-duplicate-imports doesn't play well with Flow
// https://github.com/babel/eslint-plugin-babel/issues/59
"no-duplicate-imports": "off",
Expand All @@ -29,13 +30,16 @@
}],

// temporarily disabled for easier upgrading of dependencies
"no-use-before-define": "off",
"implicit-arrow-linebreak": "off",
"arrow-parens": "off",
"arrow-body-style": "off",
"no-confusing-arrow": "off",
"no-control-regex": "off",
"no-invalid-this": "off",
"no-buffer-constructor": "off",
"no-prototype-builtins": "off",
"accessor-pairs": "off",
"require-atomic-updates": "off",

"array-bracket-spacing": "off",
"consistent-return": "off",
Expand All @@ -52,10 +56,6 @@
"no-eq-null": "off",
"no-lonely-if": "off",
"no-new": "off",
"no-restricted-properties": [2, {
"object": "Object",
"property": "assign"
}],
"no-unused-vars": ["error", {"argsIgnorePattern": "^_$"}],
"no-warning-comments": "error",
"object-curly-spacing": ["error", "never"],
Expand Down Expand Up @@ -97,6 +97,7 @@
{
"files": ["debug/**", "bench/**", "test/**", "src/style-spec/**"],
"rules": {
"flowtype/require-valid-file-annotation": "off",
"jsdoc/check-param-names": "off",
"jsdoc/require-param": "off",
"jsdoc/require-param-description": "off",
Expand Down
4 changes: 0 additions & 4 deletions bench/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"rules": {
"flowtype/require-valid-file-annotation": [0],
"no-restricted-properties": "off"
},
"env": {
"browser": true
}
Expand Down
1 change: 0 additions & 1 deletion build/test/build-tape.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {fileURLToPath} from 'url';
export default function() {
return new Promise((resolve, reject) => {
browserify(fileURLToPath(new URL('../../test/util/tape_config.js', import.meta.url)), { standalone: 'tape' })
.transform("babelify", {presets: ["@babel/preset-env"], global: true, compact: true})
.bundle((err, buff) => {
if (err) { throw err; }

Expand Down
2 changes: 0 additions & 2 deletions debug/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
"sourceType": "module"
},
"rules": {
"flowtype/require-valid-file-annotation": [0],
"prefer-arrow-callback": "off",
"no-var": "off",
"strict": "off",
"no-restricted-properties": "off",
"no-unused-vars": "off",
"prefer-template": "off",
"import/no-unresolved": "off"
Expand Down
2 changes: 1 addition & 1 deletion debug/iframe-blob.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Mapbox GL JS debug page</title>
<title>Mapbox GL JS debug page<\/title>
<meta charset='utf-8'>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel='stylesheet' href='${css.href}' />
Expand Down
72 changes: 36 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"csscolorparser": "~1.0.3",
"earcut": "^2.2.2",
"geojson-vt": "^3.2.1",
"gl-matrix": "^3.2.1",
"gl-matrix": "^3.3.0",
"grid-index": "^1.1.0",
"minimist": "^1.2.5",
"murmurhash-js": "^1.0.0",
Expand All @@ -39,73 +39,73 @@
"vt-pbf": "^3.1.1"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@babel/core": "^7.12.16",
"@babel/eslint-parser": "^7.12.16",
"@babel/preset-flow": "^7.12.13",
"@mapbox/flow-remove-types": "^2.0.0",
"@mapbox/gazetteer": "^4.0.4",
"@mapbox/mapbox-gl-rtl-text": "^0.2.1",
"@mapbox/mapbox-gl-rtl-text": "^0.2.3",
"@mapbox/mvt-fixtures": "^3.6.0",
"@octokit/auth-app": "^2.4.7",
"@octokit/rest": "^18.0.0",
"@octokit/auth-app": "^2.11.0",
"@octokit/rest": "^18.1.1",
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^11.1.1",
"@rollup/plugin-node-resolve": "^11.2.0",
"@rollup/plugin-replace": "^2.3.4",
"@rollup/plugin-strip": "^2.0.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",
"chokidar": "^3.0.2",
"chalk": "^4.1.0",
"chokidar": "^3.5.1",
"cssnano": "^4.1.10",
"d3": "^6.5.0",
"d3-queue": "^3.0.7",
"diff": "^4.0.1",
"documentation": "~12.1.1",
"ejs": "^2.5.7",
"eslint": "^5.15.3",
"diff": "^5.0.0",
"documentation": "~13.1.1",
"ejs": "^3.1.6",
"eslint": "^7.20.0",
"eslint-config-mourner": "^3.0.0",
"eslint-plugin-flowtype": "^3.9.1",
"eslint-plugin-html": "^5.0.5",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-jsdoc": "^17.1.2",
"eslint-plugin-flowtype": "^5.2.0",
"eslint-plugin-html": "^6.1.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsdoc": "^32.0.0",
"flow-bin": "^0.100.0",
"gl": "^4.5.3",
"glob": "^7.1.4",
"gl": "^4.9.0",
"glob": "^7.1.6",
"is-builtin-module": "^3.0.0",
"jsdom": "^13.0.0",
"jsdom": "^13.2.0",
"json-stringify-pretty-compact": "^2.0.0",
"jsonwebtoken": "^8.3.0",
"jsonwebtoken": "^8.5.1",
"list-npm-contents": "^1.0.2",
"lodash.template": "^4.5.0",
"mapbox-gl-styles": "^2.0.2",
"mock-geolocation": "^1.0.11",
"node-notifier": "^5.4.3",
"node-notifier": "^9.0.0",
"npm-font-open-sans": "^1.1.0",
"npm-packlist": "^2.1.1",
"npm-packlist": "^2.1.4",
"npm-run-all": "^4.1.5",
"nyc": "^13.3.0",
"nyc": "^15.1.0",
"pirates": "^4.0.1",
"pixelmatch": "^5.1.0",
"postcss": "^8.2.4",
"pixelmatch": "^5.2.1",
"postcss": "^8.2.6",
"postcss-cli": "^8.3.1",
"postcss-inline-svg": "^5.0.0",
"pretty-bytes": "^5.1.0",
"puppeteer": "^1.18.0",
"pretty-bytes": "^5.5.0",
"puppeteer": "^7.1.0",
"qrcode-terminal": "^0.12.0",
"request": "^2.88.0",
"rollup": "^2.38.4",
"rollup": "^2.39.0",
"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",
"selenium-webdriver": "^4.0.0-alpha.8",
"shuffle-seed": "^1.1.6",
"sinon": "^7.3.2",
"st": "^1.2.2",
"stylelint": "^9.10.1",
"stylelint-config-standard": "^18.2.0",
"sinon": "^9.2.4",
"st": "^2.0.0",
"stylelint": "^13.10.0",
"stylelint-config-standard": "^20.0.0",
"tap": "~12.4.1",
"tape": "^4.13.2",
"tape-filter": "^1.0.4",
Expand Down
5 changes: 0 additions & 5 deletions src/style-spec/.eslintrc

This file was deleted.

2 changes: 1 addition & 1 deletion src/ui/camera.js
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,7 @@ function addAssertions(camera: Camera) { //eslint-disable-line
});

// Canary used to test whether this function is stripped in prod build
canary = 'canary debug run';
canary = 'canary debug run'; //eslint-disable-line
});
}

Expand Down
6 changes: 0 additions & 6 deletions test/.eslintrc

This file was deleted.

2 changes: 1 addition & 1 deletion test/integration/lib/json-diff.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import diff from 'diff';
import * as diff from 'diff';

export function generateDiffLog(expected, actual) {
return diff.diffJson(expected, actual).map((hunk) => {
Expand Down
Loading

0 comments on commit a12cae3

Please sign in to comment.