aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorvturov <vturov@yandex-team.com>2023-07-04 11:32:23 +0300
committervturov <vturov@yandex-team.com>2023-07-04 11:32:23 +0300
commit936c106520abdb0476529559db919854bafe4a0d (patch)
tree0d1c70e4e2e575a487cecb18d9a25b7848613663 /build
parent05e65abc4b8a3bee7da3888db0808aed846ee4ba (diff)
downloadydb-936c106520abdb0476529559db919854bafe4a0d.tar.gz
Убрать безусловный PEERDIR на eslint и typescript
Diffstat (limited to 'build')
-rw-r--r--build/conf/ts/ts.conf2
-rw-r--r--build/conf/ts/ts_library.conf2
-rw-r--r--build/plugins/nots.py2
3 files changed, 5 insertions, 1 deletions
diff --git a/build/conf/ts/ts.conf b/build/conf/ts/ts.conf
index c7770c9097..6d37b5bf39 100644
--- a/build/conf/ts/ts.conf
+++ b/build/conf/ts/ts.conf
@@ -27,7 +27,7 @@ module _TS_BASE_UNIT: _BARE_UNIT {
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/$ERM_PACKAGES_PATH)
# PEERDIR that reads required version of tool from package.json
- _PEERDIR_TS_RESOURCE(nodejs pnpm typescript eslint)
+ _PEERDIR_TS_RESOURCE(nodejs pnpm)
}
diff --git a/build/conf/ts/ts_library.conf b/build/conf/ts/ts_library.conf
index 6dd20851c0..781a8ebdd4 100644
--- a/build/conf/ts/ts_library.conf
+++ b/build/conf/ts/ts_library.conf
@@ -31,6 +31,8 @@ multimodule TS_LIBRARY {
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${CURDIR}/${TS_CONFIG_PATH} ${CURDIR}/package.json)
+ _PEERDIR_TS_RESOURCE(typescript)
+
SET(TS_CONFIG_DEDUCE_OUT yes)
# we should set NODE_MODULES_BUNDLE_AS_OUTPUT conditionally,
diff --git a/build/plugins/nots.py b/build/plugins/nots.py
index d246450d67..128a3ccac1 100644
--- a/build/plugins/nots.py
+++ b/build/plugins/nots.py
@@ -303,6 +303,8 @@ def _setup_eslint(unit):
if not lint_files:
return
+ unit.on_peerdir_ts_resource("eslint")
+
mod_dir = unit.get("MODDIR")
lint_files = _resolve_module_files(unit, mod_dir, lint_files)
deps = _create_pm(unit).get_peers_from_package_json()