diff options
author | miripiruni <miripiruni@yandex-team.com> | 2024-05-30 11:45:16 +0300 |
---|---|---|
committer | miripiruni <miripiruni@yandex-team.com> | 2024-05-30 12:40:38 +0300 |
commit | 1ff4836687e9ab394d8483e7187ab460583a214d (patch) | |
tree | e23e2f34d1fa348f74b7d08f074a3381c1c9be1a /build | |
parent | 637f7e21764edbec156d5a32424ad52d47ba0f12 (diff) | |
download | ydb-1ff4836687e9ab394d8483e7187ab460583a214d.tar.gz |
feat(): MODULE_LANG added for add TypeScript (multi)modules
80d3ed1b0b58e1552fde0c95b3f2f882146e9793
Diffstat (limited to 'build')
-rw-r--r-- | build/conf/ts/node_modules.conf | 2 | ||||
-rw-r--r-- | build/conf/ts/ts.conf | 1 | ||||
-rw-r--r-- | build/conf/ts/ts_next.conf | 1 | ||||
-rw-r--r-- | build/conf/ts/ts_package.conf | 1 | ||||
-rw-r--r-- | build/conf/ts/ts_proto.conf | 2 | ||||
-rw-r--r-- | build/conf/ts/ts_test.conf | 3 | ||||
-rw-r--r-- | build/conf/ts/ts_tsc.conf | 1 | ||||
-rw-r--r-- | build/conf/ts/ts_vite.conf | 1 | ||||
-rw-r--r-- | build/conf/ts/ts_webpack.conf | 1 |
9 files changed, 12 insertions, 1 deletions
diff --git a/build/conf/ts/node_modules.conf b/build/conf/ts/node_modules.conf index ac718d338d..cea668c3c1 100644 --- a/build/conf/ts/node_modules.conf +++ b/build/conf/ts/node_modules.conf @@ -23,6 +23,7 @@ module NPM_CONTRIBS: _BARE_UNIT { .EXTS=_ # Ignore all files, so module is not affected by FROM_NPM output (.EXTS=* is inherited from _BARE_UNIT) SET(MODULE_TAG NPM_CONTRIBS) + SET(MODULE_LANG TS) # .fake tells builder to not materialize it in results SET(MODULE_SUFFIX .fake) @@ -83,6 +84,7 @@ module _PREPARE_DEPS_BASE: _BARE_UNIT { SET(MODULE_TYPE LIBRARY) # define own tag SET(MODULE_TAG TS_PREPARE_DEPS) + SET(MODULE_LANG TS) # what modules it can PEERDIR to SET(PEERDIR_TAGS TS_PREPARE_DEPS) # do not include it into "results" of graph diff --git a/build/conf/ts/ts.conf b/build/conf/ts/ts.conf index 8343f8077e..513d8b100d 100644 --- a/build/conf/ts/ts.conf +++ b/build/conf/ts/ts.conf @@ -73,6 +73,7 @@ module _TS_BASE_UNIT: _BARE_UNIT { SET(MODULE_TYPE LIBRARY) # Include processor works only for TS tag SET(MODULE_TAG TS) + SET(MODULE_LANG TS) # TS should peer to TS SET(PEERDIR_TAGS TS TS_PROTO) # .fake tells builder to not materialize it in results diff --git a/build/conf/ts/ts_next.conf b/build/conf/ts/ts_next.conf index 1201fa6267..fa3cddd631 100644 --- a/build/conf/ts/ts_next.conf +++ b/build/conf/ts/ts_next.conf @@ -52,6 +52,7 @@ multimodule TS_NEXT { # by default multimodule overrides inherited MODULE_TAG to submodule name (BUILD in this case) # but we have to set it to TS for include processor to work SET(MODULE_TAG TS) + SET(MODULE_LANG TS) _PEERDIR_TS_RESOURCE(next) diff --git a/build/conf/ts/ts_package.conf b/build/conf/ts/ts_package.conf index 76f833bc9c..b93ac6216a 100644 --- a/build/conf/ts/ts_package.conf +++ b/build/conf/ts/ts_package.conf @@ -35,6 +35,7 @@ multimodule TS_PACKAGE { # by default multimodule overrides inherited MODULE_TAG to submodule name (BUILD in this case) # but we have to set it to TS for include processor to work SET(MODULE_TAG TS) + SET(MODULE_LANG TS) SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${CURDIR}/package.json ${CURDIR}/pnpm-lock.yaml) _TS_ADD_NODE_MODULES_FOR_BUILDER() diff --git a/build/conf/ts/ts_proto.conf b/build/conf/ts/ts_proto.conf index c2cde484fc..9450da6f77 100644 --- a/build/conf/ts/ts_proto.conf +++ b/build/conf/ts/ts_proto.conf @@ -28,6 +28,8 @@ module _TS_PROTO_IMPL: _TS_BASE_UNIT { # Disable linting NO_LINT() + SET(MODULE_LANG TS) + _PEERDIR_TS_RESOURCE(typescript) DISABLE(TS_CONFIG_DEDUCE_OUT) diff --git a/build/conf/ts/ts_test.conf b/build/conf/ts/ts_test.conf index e9dcd799b8..2629861c41 100644 --- a/build/conf/ts/ts_test.conf +++ b/build/conf/ts/ts_test.conf @@ -93,7 +93,7 @@ TS_TEST_PLAYWRIGHT_CMD=$TOUCH_UNIT \ ### module TS_TEST_PLAYWRIGHT_FOR: _TS_TEST_BASE { .CMD=TS_TEST_PLAYWRIGHT_CMD - + # for multimodule peers we should choose TS SET(PEERDIR_TAGS TS) @@ -118,6 +118,7 @@ module _TS_TEST_BASE: _BARE_UNIT { SET(MODULE_SUFFIX .ts_test.fake) # include processor works only for TS tag SET(MODULE_TAG TS) + SET(MODULE_LANG TS) # we read erm-packages.json during configuration, so we have to include it to configuration cache key SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/$ERM_PACKAGES_PATH) diff --git a/build/conf/ts/ts_tsc.conf b/build/conf/ts/ts_tsc.conf index b96e1751bc..6cd4a94290 100644 --- a/build/conf/ts/ts_tsc.conf +++ b/build/conf/ts/ts_tsc.conf @@ -26,6 +26,7 @@ multimodule TS_TSC { # by default multimodule overrides inherited MODULE_TAG to submodule name (BUILD in this case) # but we have to set it to TS for include processor to work SET(MODULE_TAG TS) + SET(MODULE_LANG TS) _PEERDIR_TS_RESOURCE(typescript) diff --git a/build/conf/ts/ts_vite.conf b/build/conf/ts/ts_vite.conf index 10a1a21602..14c0495017 100644 --- a/build/conf/ts/ts_vite.conf +++ b/build/conf/ts/ts_vite.conf @@ -58,6 +58,7 @@ multimodule TS_VITE { # by default multimodule overrides inherited MODULE_TAG to submodule name (BUILD in this case) # but we have to set it to TS for include processor to work SET(MODULE_TAG TS) + SET(MODULE_LANG TS) _PEERDIR_TS_RESOURCE(vite) diff --git a/build/conf/ts/ts_webpack.conf b/build/conf/ts/ts_webpack.conf index 38a74600b0..04eaf2421b 100644 --- a/build/conf/ts/ts_webpack.conf +++ b/build/conf/ts/ts_webpack.conf @@ -56,6 +56,7 @@ multimodule TS_WEBPACK { # by default multimodule overrides inherited MODULE_TAG to submodule name (BUILD in this case) # but we have to set it to TS for include processor to work SET(MODULE_TAG TS) + SET(MODULE_LANG TS) _PEERDIR_TS_RESOURCE(webpack webpack-cli) |