diff options
| author | cjihrig <cjihrig@gmail.com> | 2019-07-21 00:15:32 -0400 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2019-07-23 08:15:42 +0200 |
| commit | ed43880d6ba1ab6e499ef027c1e9e11a2376ba50 (patch) | |
| tree | bd9551f12adfd0dc9f333adf306fc92f2417b2ad /tools/node_modules/eslint/node_modules/ajv/lib/dotjs/allOf.js | |
| parent | 302865e8b9756812b45d9ff60403c2a231c01152 (diff) | |
| download | android-node-v8-ed43880d6ba1ab6e499ef027c1e9e11a2376ba50.tar.gz android-node-v8-ed43880d6ba1ab6e499ef027c1e9e11a2376ba50.tar.bz2 android-node-v8-ed43880d6ba1ab6e499ef027c1e9e11a2376ba50.zip | |
tools: update ESLint to 6.1.0
Update ESLint to 6.1.0
PR-URL: https://github.com/nodejs/node/pull/28793
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Diffstat (limited to 'tools/node_modules/eslint/node_modules/ajv/lib/dotjs/allOf.js')
| -rw-r--r-- | tools/node_modules/eslint/node_modules/ajv/lib/dotjs/allOf.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/node_modules/eslint/node_modules/ajv/lib/dotjs/allOf.js b/tools/node_modules/eslint/node_modules/ajv/lib/dotjs/allOf.js index 5107b18cfc..4bad914d60 100644 --- a/tools/node_modules/eslint/node_modules/ajv/lib/dotjs/allOf.js +++ b/tools/node_modules/eslint/node_modules/ajv/lib/dotjs/allOf.js @@ -17,7 +17,7 @@ module.exports = function generate_allOf(it, $keyword, $ruleType) { l1 = arr1.length - 1; while ($i < l1) { $sch = arr1[$i += 1]; - if (it.util.schemaHasRules($sch, it.RULES.all)) { + if ((it.opts.strictKeywords ? typeof $sch == 'object' && Object.keys($sch).length > 0 : it.util.schemaHasRules($sch, it.RULES.all))) { $allSchemasEmpty = false; $it.schema = $sch; $it.schemaPath = $schemaPath + '[' + $i + ']'; |