summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLuigi Pinca <luigipinca@gmail.com>2020-11-08 07:24:43 +0100
committerNode.js GitHub Bot <github-bot@iojs.org>2020-11-11 00:42:19 +0000
commit39a7f7663e8f70fc774105d8fa41b8e4cc69149f (patch)
tree7a8a8e2a17939b5fabe7e8f0b3a818459813863f /tools
parent7cba7865319fd00c8c8bbc4ff162489e9f5876c6 (diff)
downloadios-node-v8-39a7f7663e8f70fc774105d8fa41b8e4cc69149f.tar.gz
ios-node-v8-39a7f7663e8f70fc774105d8fa41b8e4cc69149f.tar.bz2
ios-node-v8-39a7f7663e8f70fc774105d8fa41b8e4cc69149f.zip
tools: update ESLint to 7.13.0
Update ESLint to 7.13.0 PR-URL: https://github.com/nodejs/node/pull/36031 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/node_modules/eslint/README.md6
-rw-r--r--tools/node_modules/eslint/lib/linter/timing.js25
-rw-r--r--tools/node_modules/eslint/node_modules/import-fresh/index.js3
-rw-r--r--tools/node_modules/eslint/node_modules/import-fresh/package.json2
-rw-r--r--tools/node_modules/eslint/node_modules/trim-trailing-lines/index.js11
-rw-r--r--tools/node_modules/eslint/node_modules/trim-trailing-lines/package.json18
-rw-r--r--tools/node_modules/eslint/node_modules/v8-compile-cache/README.md4
-rw-r--r--tools/node_modules/eslint/node_modules/v8-compile-cache/package.json19
-rw-r--r--tools/node_modules/eslint/node_modules/v8-compile-cache/v8-compile-cache.js12
-rw-r--r--tools/node_modules/eslint/package.json2
10 files changed, 61 insertions, 41 deletions
diff --git a/tools/node_modules/eslint/README.md b/tools/node_modules/eslint/README.md
index 7740b392f7..0ea302e2cb 100644
--- a/tools/node_modules/eslint/README.md
+++ b/tools/node_modules/eslint/README.md
@@ -14,7 +14,7 @@
[Rules](https://eslint.org/docs/rules/) |
[Contributing](https://eslint.org/docs/developer-guide/contributing) |
[Reporting Bugs](https://eslint.org/docs/developer-guide/contributing/reporting-bugs) |
-[Code of Conduct](https://js.foundation/community/code-of-conduct) |
+[Code of Conduct](https://eslint.org/conduct) |
[Twitter](https://twitter.com/geteslint) |
[Mailing List](https://groups.google.com/group/eslint) |
[Chat Room](https://eslint.org/chat)
@@ -85,7 +85,7 @@ The three error levels allow you fine-grained control over how ESLint applies ru
## <a name="code-of-conduct"></a>Code of Conduct
-ESLint adheres to the [JS Foundation Code of Conduct](https://js.foundation/community/code-of-conduct).
+ESLint adheres to the [JS Foundation Code of Conduct](https://eslint.org/conduct).
## <a name="filing-issues"></a>Filing Issues
@@ -267,7 +267,7 @@ The following companies, organizations, and individuals support ESLint's ongoing
<p><a href="https://automattic.com"><img src="https://images.opencollective.com/photomatt/ff91f0b/logo.png" alt="Automattic" height="undefined"></a></p><h3>Gold Sponsors</h3>
<p><a href="https://www.shopify.com"><img src="https://images.opencollective.com/shopify/e780cd4/logo.png" alt="Shopify" height="96"></a> <a href="https://www.salesforce.com"><img src="https://images.opencollective.com/salesforce/ca8f997/logo.png" alt="Salesforce" height="96"></a> <a href="https://www.airbnb.com/"><img src="https://images.opencollective.com/airbnb/d327d66/logo.png" alt="Airbnb" height="96"></a> <a href="https://aka.ms/microsoftfossfund"><img src="https://avatars1.githubusercontent.com/u/67931232?u=7fddc652a464d7151b97e8f108392af7d54fa3e8&v=4" alt="Microsoft FOSS Fund Sponsorships" height="96"></a></p><h3>Silver Sponsors</h3>
<p><a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/5c4fa84/logo.png" alt="Liftoff" height="64"></a> <a href="https://www.ampproject.org/"><img src="https://images.opencollective.com/amp/c8a3b25/logo.png" alt="AMP Project" height="64"></a></p><h3>Bronze Sponsors</h3>
-<p><a href="https://writersperhour.com"><img src="https://images.opencollective.com/writersperhour/5787d4b/logo.png" alt="Writers Per Hour" height="32"></a> <a href="https://www.betacalendars.com/printable-calendar"><img src="https://images.opencollective.com/betacalendars/9334b33/logo.png" alt="2021 calendar" height="32"></a> <a href="https://buy.fineproxy.org/eng/"><img src="https://images.opencollective.com/buy-fineproxy-org/2002c40/logo.png" alt="Buy.Fineproxy.Org" height="32"></a> <a href="https://www.veikkaajat.com"><img src="https://images.opencollective.com/veikkaajat/b92b427/logo.png" alt="Veikkaajat.com" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="null"><img src="https://images.opencollective.com/bugsnag-stability-monitoring/c2cef36/logo.png" alt="Bugsnag Stability Monitoring" height="32"></a> <a href="https://mixpanel.com"><img src="https://images.opencollective.com/mixpanel/cd682f7/logo.png" alt="Mixpanel" height="32"></a> <a href="https://www.vpsserver.com"><img src="https://images.opencollective.com/vpsservercom/logo.png" alt="VPS Server" height="32"></a> <a href="https://icons8.com"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8: free icons, photos, illustrations, and music" height="32"></a> <a href="https://discordapp.com"><img src="https://images.opencollective.com/discordapp/7e3d9a9/logo.png" alt="Discord" height="32"></a> <a href="https://themeisle.com"><img src="https://images.opencollective.com/themeisle/d5592fe/logo.png" alt="ThemeIsle" height="32"></a> <a href="https://www.marfeel.com/"><img src="https://images.opencollective.com/marfeel/4b88e30/logo.png" alt="Marfeel" height="32"></a> <a href="https://www.firesticktricks.com"><img src="https://images.opencollective.com/fire-stick-tricks/b8fbe2c/logo.png" alt="Fire Stick Tricks" height="32"></a></p>
+<p><a href="https://writersperhour.com"><img src="https://images.opencollective.com/writersperhour/5787d4b/logo.png" alt="Writers Per Hour" height="32"></a> <a href="https://www.betacalendars.com/printable-calendar"><img src="https://images.opencollective.com/betacalendars/9334b33/logo.png" alt="2021 calendar" height="32"></a> <a href="https://buy.fineproxy.org/eng/"><img src="https://images.opencollective.com/buy-fineproxy-org/b282e39/logo.png" alt="Buy.Fineproxy.Org" height="32"></a> <a href="https://www.veikkaajat.com"><img src="https://images.opencollective.com/veikkaajat/b92b427/logo.png" alt="Veikkaajat.com" height="32"></a> <a href="https://www.crosswordsolver.org/anagram-solver/"><img src="https://images.opencollective.com/anagram-solver/2666271/logo.png" alt="Anagram Solver" height="32"></a> <a href="null"><img src="https://images.opencollective.com/bugsnag-stability-monitoring/c2cef36/logo.png" alt="Bugsnag Stability Monitoring" height="32"></a> <a href="https://mixpanel.com"><img src="https://images.opencollective.com/mixpanel/cd682f7/logo.png" alt="Mixpanel" height="32"></a> <a href="https://www.vpsserver.com"><img src="https://images.opencollective.com/vpsservercom/logo.png" alt="VPS Server" height="32"></a> <a href="https://icons8.com"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8: free icons, photos, illustrations, and music" height="32"></a> <a href="https://discordapp.com"><img src="https://images.opencollective.com/discordapp/7e3d9a9/logo.png" alt="Discord" height="32"></a> <a href="https://themeisle.com"><img src="https://images.opencollective.com/themeisle/d5592fe/logo.png" alt="ThemeIsle" height="32"></a> <a href="https://www.firesticktricks.com"><img src="https://images.opencollective.com/fire-stick-tricks/b8fbe2c/logo.png" alt="Fire Stick Tricks" height="32"></a></p>
<!--sponsorsend-->
## <a name="technology-sponsors"></a>Technology Sponsors
diff --git a/tools/node_modules/eslint/lib/linter/timing.js b/tools/node_modules/eslint/lib/linter/timing.js
index 8396d9215b..5823030685 100644
--- a/tools/node_modules/eslint/lib/linter/timing.js
+++ b/tools/node_modules/eslint/lib/linter/timing.js
@@ -44,6 +44,26 @@ const enabled = !!process.env.TIMING;
const HEADERS = ["Rule", "Time (ms)", "Relative"];
const ALIGN = [alignLeft, alignRight, alignRight];
+/**
+ * Decide how many rules to show in the output list.
+ * @returns {number} the number of rules to show
+ */
+function getListSize() {
+ const MINIMUM_SIZE = 10;
+
+ if (typeof process.env.TIMING !== "string") {
+ return MINIMUM_SIZE;
+ }
+
+ if (process.env.TIMING.toLowerCase() === "all") {
+ return Number.POSITIVE_INFINITY;
+ }
+
+ const TIMING_ENV_VAR_AS_INTEGER = Number.parseInt(process.env.TIMING, 10);
+
+ return TIMING_ENV_VAR_AS_INTEGER > 10 ? TIMING_ENV_VAR_AS_INTEGER : MINIMUM_SIZE;
+}
+
/* istanbul ignore next */
/**
* display the data
@@ -61,7 +81,7 @@ function display(data) {
return [key, time];
})
.sort((a, b) => b[1] - a[1])
- .slice(0, 10);
+ .slice(0, getListSize());
rows.forEach(row => {
row.push(`${(row[1] * 100 / total).toFixed(1)}%`);
@@ -133,7 +153,8 @@ module.exports = (function() {
return {
time,
- enabled
+ enabled,
+ getListSize
};
}());
diff --git a/tools/node_modules/eslint/node_modules/import-fresh/index.js b/tools/node_modules/eslint/node_modules/import-fresh/index.js
index 425ed98c42..0a4c5d52f6 100644
--- a/tools/node_modules/eslint/node_modules/import-fresh/index.js
+++ b/tools/node_modules/eslint/node_modules/import-fresh/index.js
@@ -10,7 +10,8 @@ module.exports = moduleId => {
const parentPath = parentModule(__filename);
- const filePath = resolveFrom(path.dirname(parentPath), moduleId);
+ const cwd = parentPath ? path.dirname(parentPath) : __dirname;
+ const filePath = resolveFrom(cwd, moduleId);
const oldModule = require.cache[filePath];
// Delete itself from module parent
diff --git a/tools/node_modules/eslint/node_modules/import-fresh/package.json b/tools/node_modules/eslint/node_modules/import-fresh/package.json
index 38892a62e4..893bb4a523 100644
--- a/tools/node_modules/eslint/node_modules/import-fresh/package.json
+++ b/tools/node_modules/eslint/node_modules/import-fresh/package.json
@@ -47,5 +47,5 @@
"heapdump": "node heapdump.js",
"test": "xo && ava && tsd"
},
- "version": "3.2.1"
+ "version": "3.2.2"
} \ No newline at end of file
diff --git a/tools/node_modules/eslint/node_modules/trim-trailing-lines/index.js b/tools/node_modules/eslint/node_modules/trim-trailing-lines/index.js
index 0f2d48b52f..eff85c6bae 100644
--- a/tools/node_modules/eslint/node_modules/trim-trailing-lines/index.js
+++ b/tools/node_modules/eslint/node_modules/trim-trailing-lines/index.js
@@ -2,16 +2,7 @@
module.exports = trimTrailingLines
-var line = '\n'
-
// Remove final newline characters from `value`.
function trimTrailingLines(value) {
- var val = String(value)
- var index = val.length
-
- while (val.charAt(--index) === line) {
- // Empty
- }
-
- return val.slice(0, index + 1)
+ return String(value).replace(/\n+$/, '')
}
diff --git a/tools/node_modules/eslint/node_modules/trim-trailing-lines/package.json b/tools/node_modules/eslint/node_modules/trim-trailing-lines/package.json
index bbf4660f41..c0242dc129 100644
--- a/tools/node_modules/eslint/node_modules/trim-trailing-lines/package.json
+++ b/tools/node_modules/eslint/node_modules/trim-trailing-lines/package.json
@@ -19,14 +19,14 @@
"deprecated": false,
"description": "Remove final line feeds from a string",
"devDependencies": {
- "browserify": "^16.0.0",
+ "browserify": "^17.0.0",
"nyc": "^15.0.0",
- "prettier": "^1.0.0",
- "remark-cli": "^7.0.0",
- "remark-preset-wooorm": "^6.0.0",
- "tape": "^4.0.0",
- "tinyify": "^2.0.0",
- "xo": "^0.25.0"
+ "prettier": "^2.0.0",
+ "remark-cli": "^9.0.0",
+ "remark-preset-wooorm": "^8.0.0",
+ "tape": "^5.0.0",
+ "tinyify": "^3.0.0",
+ "xo": "^0.34.0"
},
"files": [
"index.js"
@@ -72,12 +72,12 @@
"build": "npm run build-bundle && npm run build-mangle",
"build-bundle": "browserify . -s trimTrailingLines -o trim-trailing-lines.js",
"build-mangle": "browserify . -s trimTrailingLines -p tinyify -o trim-trailing-lines.min.js",
- "format": "remark . -qfo && prettier --write \"**/*.js\" && xo --fix",
+ "format": "remark . -qfo && prettier . -w --loglevel warn && xo --fix",
"test": "npm run format && npm run build && npm run test-coverage",
"test-api": "node test",
"test-coverage": "nyc --reporter lcov tape test.js"
},
- "version": "1.1.3",
+ "version": "1.1.4",
"xo": {
"prettier": true,
"esnext": false,
diff --git a/tools/node_modules/eslint/node_modules/v8-compile-cache/README.md b/tools/node_modules/eslint/node_modules/v8-compile-cache/README.md
index 9580f69432..6e0b99fbaa 100644
--- a/tools/node_modules/eslint/node_modules/v8-compile-cache/README.md
+++ b/tools/node_modules/eslint/node_modules/v8-compile-cache/README.md
@@ -26,9 +26,11 @@ The ability to tap into V8 to produce/consume this cache was introduced in [Node
Set the environment variable `DISABLE_V8_COMPILE_CACHE=1` to disable the cache.
+Cache directory is defined by environment variable `V8_COMPILE_CACHE_CACHE_DIR` or defaults to `<os.tmpdir()>/v8-compile-cache-<V8_VERSION>`.
+
## Internals
-The caches are stored in `$TMP/v8-compile-cache/V8_VERSION`, where there are `.BLOB` and `.MAP` files corresponding to the entry module that required `v8-compile-cache`. The cache is _entry module specific_ because it is faster to load the entire code cache into memory at once, than it is to read it from disk on a file-by-file basis.
+Cache files are suffixed `.BLOB` and `.MAP` corresponding to the entry module that required `v8-compile-cache`. The cache is _entry module specific_ because it is faster to load the entire code cache into memory at once, than it is to read it from disk on a file-by-file basis.
## Benchmarks
diff --git a/tools/node_modules/eslint/node_modules/v8-compile-cache/package.json b/tools/node_modules/eslint/node_modules/v8-compile-cache/package.json
index 83d66522f0..25540b7301 100644
--- a/tools/node_modules/eslint/node_modules/v8-compile-cache/package.json
+++ b/tools/node_modules/eslint/node_modules/v8-compile-cache/package.json
@@ -11,15 +11,15 @@
"deprecated": false,
"description": "Require hook for automatic V8 compile cache persistence",
"devDependencies": {
- "babel-core": "6.23.1",
- "eslint": "^3.15.0",
- "flow-parser": "0.38.0",
+ "babel-core": "6.26.3",
+ "eslint": "^7.12.1",
+ "flow-parser": "0.136.0",
"rimraf": "^2.5.4",
- "rxjs": "5.2.0",
+ "rxjs": "6.6.3",
"semver": "^5.3.0",
"tap": "^10.1.1",
"temp": "^0.8.3",
- "yarn": "0.20.3"
+ "yarn": "1.22.10"
},
"files": [
"v8-compile-cache.js"
@@ -34,9 +34,10 @@
},
"scripts": {
"bench": "bench/run.sh",
- "lint": "eslint --max-warnings=0 .",
- "posttest": "npm run lint",
- "test": "tap test/*-test.js"
+ "eslint": "eslint --max-warnings=0 .",
+ "posttest": "npm run eslint",
+ "tap": "tap test/*-test.js",
+ "test": "npm run tap"
},
- "version": "2.1.1"
+ "version": "2.2.0"
} \ No newline at end of file
diff --git a/tools/node_modules/eslint/node_modules/v8-compile-cache/v8-compile-cache.js b/tools/node_modules/eslint/node_modules/v8-compile-cache/v8-compile-cache.js
index 69f0536670..b9c09288cb 100644
--- a/tools/node_modules/eslint/node_modules/v8-compile-cache/v8-compile-cache.js
+++ b/tools/node_modules/eslint/node_modules/v8-compile-cache/v8-compile-cache.js
@@ -86,8 +86,6 @@ class FileSystemBlobStore {
try {
fs.writeFileSync(this._blobFilename, blobToStore);
fs.writeFileSync(this._mapFilename, mapToStore);
- } catch (error) {
- throw error;
} finally {
fs.unlinkSync(this._lockFilename);
}
@@ -301,7 +299,8 @@ function slashEscape(str) {
'\x00': 'z0',
'z': 'zZ',
};
- return str.replace(/[\\:\/\x00z]/g, match => (ESCAPE_LOOKUP[match]));
+ const ESCAPE_REGEX = /[\\:/\x00z]/g; // eslint-disable-line no-control-regex
+ return str.replace(ESCAPE_REGEX, match => ESCAPE_LOOKUP[match]);
}
function supportsCachedData() {
@@ -311,6 +310,11 @@ function supportsCachedData() {
}
function getCacheDir() {
+ const v8_compile_cache_cache_dir = process.env.V8_COMPILE_CACHE_CACHE_DIR;
+ if (v8_compile_cache_cache_dir) {
+ return v8_compile_cache_cache_dir;
+ }
+
// Avoid cache ownership issues on POSIX systems.
const dirname = typeof process.getuid === 'function'
? 'v8-compile-cache-' + process.getuid()
@@ -348,7 +352,7 @@ if (!process.env.DISABLE_V8_COMPILE_CACHE && supportsCachedData()) {
nativeCompileCache.setCacheStore(blobStore);
nativeCompileCache.install();
- process.once('exit', code => {
+ process.once('exit', () => {
if (blobStore.isDirty()) {
blobStore.save();
}
diff --git a/tools/node_modules/eslint/package.json b/tools/node_modules/eslint/package.json
index a5f0c57b98..53d055bc09 100644
--- a/tools/node_modules/eslint/package.json
+++ b/tools/node_modules/eslint/package.json
@@ -154,5 +154,5 @@
"test:cli": "mocha",
"webpack": "node Makefile.js webpack"
},
- "version": "7.12.1"
+ "version": "7.13.0"
} \ No newline at end of file