third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-19 17:14:43 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1521 from pre-commit/npm_config_userconfig

Browse source 
fix node hooks when NPM_CONFIG_USERCONFIG is set
This commit is contained in:
Anthony Sottile 2020-06-19 14:15:32 -07:00 • committed by GitHub
commit e2fe94cbe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pre_commit/languages/node.py
View file

@ -10,6 +10,7 @@ import pre_commit.constants as C
from pre_commit import parse_shebang from pre_commit import parse_shebang
from pre_commit.envcontext import envcontext from pre_commit.envcontext import envcontext
from pre_commit.envcontext import PatchesT from pre_commit.envcontext import PatchesT
from pre_commit.envcontext import UNSET
from pre_commit.envcontext import Var from pre_commit.envcontext import Var
from pre_commit.hook import Hook from pre_commit.hook import Hook
from pre_commit.languages import helpers from pre_commit.languages import helpers
@ -56,6 +57,8 @@ def get_env_patch(venv: str) -> PatchesT:
('NODE_VIRTUAL_ENV', venv), ('NODE_VIRTUAL_ENV', venv),
('NPM_CONFIG_PREFIX', install_prefix), ('NPM_CONFIG_PREFIX', install_prefix),
('npm_config_prefix', install_prefix), ('npm_config_prefix', install_prefix),
('NPM_CONFIG_USERCONFIG', UNSET),
('npm_config_userconfig', UNSET),
('NODE_PATH', os.path.join(venv, lib_dir, 'node_modules')), ('NODE_PATH', os.path.join(venv, lib_dir, 'node_modules')),
('PATH', (bin_dir(venv), os.pathsep, Var('PATH'))), ('PATH', (bin_dir(venv), os.pathsep, Var('PATH'))),
) )

8
tests/repository_test.py
View file

@ -260,6 +260,14 @@ def test_run_versioned_node_hook(tempdir_factory, store):
) )
@xfailif_windows # pragma: win32 no cover
def test_node_hook_with_npm_userconfig_set(tempdir_factory, store, tmpdir):
cfg = tmpdir.join('cfg')
cfg.write('cache=/dne\n')
with mock.patch.dict(os.environ, NPM_CONFIG_USERCONFIG=str(cfg)):
test_run_a_node_hook(tempdir_factory, store)
def test_run_a_ruby_hook(tempdir_factory, store): def test_run_a_ruby_hook(tempdir_factory, store):
_test_hook_repo( _test_hook_repo(
tempdir_factory, store, 'ruby_hooks_repo', tempdir_factory, store, 'ruby_hooks_repo',