Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1685053 - Fix ESLint's setup_helper.py to continue working when a dependency section is missing in package.json. r=gbrown

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D100765
This commit is contained in:
Mark Banner 2021-01-06 14:14:30 +00:00
parent 17a7a2a463
commit d866ed81a6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/lint/eslint/setup_helper.py
View File

@ -190,8 +190,8 @@ def expected_eslint_modules():
expected_modules_path = os.path.join(get_project_root(), "package.json")
with open(expected_modules_path, "r", encoding="utf-8") as f:
sections = json.load(f)
expected_modules = sections["dependencies"]
expected_modules.update(sections["devDependencies"])
expected_modules = sections.get("dependencies", {})
expected_modules.update(sections.get("devDependencies", {}))
# Also read the in-tree ESLint plugin mozilla information, to ensure the
# dependencies are up to date.
@ -199,7 +199,7 @@ def expected_eslint_modules():
get_eslint_module_path(), "eslint-plugin-mozilla", "package.json"
)
with open(mozilla_json_path, "r", encoding="utf-8") as f:
expected_modules.update(json.load(f)["dependencies"])
expected_modules.update(json.load(f).get("dependencies", {}))
# Also read the in-tree ESLint plugin spidermonkey information, to ensure the
# dependencies are up to date.
@ -207,7 +207,7 @@ def expected_eslint_modules():
get_eslint_module_path(), "eslint-plugin-spidermonkey-js", "package.json"
)
with open(mozilla_json_path, "r", encoding="utf-8") as f:
expected_modules.update(json.load(f)["dependencies"])
expected_modules.update(json.load(f).get("dependencies", {}))
return expected_modules