diff options
| author | baymer <[email protected]> | 2026-03-31 21:10:23 +0300 |
|---|---|---|
| committer | baymer <[email protected]> | 2026-03-31 21:38:38 +0300 |
| commit | 1f3ba70cb78667e4e5aaa34bb383dc4a6cdbbf4d (patch) | |
| tree | c8d36e820482a25988bd4d2ade084d03bc010cda | |
| parent | 78de008d27e8d65c157c7f5cb1e81e4d0079f122 (diff) | |
подчистить граф сборки
commit_hash:8fa2c50ab7d98e6e265b6690f03b0a58928fe76b
| -rw-r--r-- | build/conf/ts/node_modules.conf | 6 | ||||
| -rw-r--r-- | build/conf/ts/ts_library.conf | 1 | ||||
| -rw-r--r-- | build/conf/ts/ts_next.conf | 1 | ||||
| -rw-r--r-- | build/conf/ts/ts_rspack.conf | 1 | ||||
| -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 | ||||
| -rw-r--r-- | build/plugins/lib/nots/package_manager/package_manager.py | 1 |
8 files changed, 3 insertions, 10 deletions
diff --git a/build/conf/ts/node_modules.conf b/build/conf/ts/node_modules.conf index 92e5107b12a..557283c6358 100644 --- a/build/conf/ts/node_modules.conf +++ b/build/conf/ts/node_modules.conf @@ -33,8 +33,7 @@ _PREPARE_DEPS_INOUTS= _PREPARE_DEPS_RESOURCES= _PREPARE_DEPS_USE_RESOURCES_FLAG= _PREPARE_DEPS_TS_PROTO_AUTO_FLAG= -_PREPARE_DEPS_CMD=$TOUCH_UNIT \ - && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS prepare-deps \ +_PREPARE_DEPS_CMD=$NOTS_TOOL $NOTS_TOOL_BASE_ARGS prepare-deps \ --tarballs-store $_TARBALLS_STORE \ $_PREPARE_DEPS_INOUTS \ $_PREPARE_DEPS_RESOURCES \ @@ -60,7 +59,8 @@ module _PREPARE_DEPS_BASE: _BARE_UNIT { # we have several modules in the same dir (.PEERDIRSELF=TS_PREPARE_DEPS in BUILD) # we need different names for module identity file # .fake tells builder to not materialize it in results - SET(MODULE_SUFFIX .prepare_deps.fake) + SET(REALPRJNAME pre.pnpm-lock.yaml) + # .NODE_TYPE=Bundle is required for peers propagation, but it also affects # how merging of pic/nopic graphs. Here we can override this merging behaviour SET(MODULE_TYPE LIBRARY) diff --git a/build/conf/ts/ts_library.conf b/build/conf/ts/ts_library.conf index 7c23bdd0f08..db632f2cdf7 100644 --- a/build/conf/ts/ts_library.conf +++ b/build/conf/ts/ts_library.conf @@ -13,7 +13,6 @@ TS_LIBRARY_CMD=${EXTRACT_GENTAR_CMD} \ ${hide;input=TEXT:_TS_GLOB_FILES} \ ${hide;input:"ya.make"} \ ${hide;input:"package.json"} \ - ${hide;output:"package.json"} \ ${hide;kv:"pc magenta"} ${hide;kv:"p TS_LIB"} ### @usage: TS_LIBRARY([name]) diff --git a/build/conf/ts/ts_next.conf b/build/conf/ts/ts_next.conf index 676667351d4..97650758cf1 100644 --- a/build/conf/ts/ts_next.conf +++ b/build/conf/ts/ts_next.conf @@ -55,7 +55,6 @@ TS_NEXT_CMD=$_TS_PROJECT_SETUP_CMD \ $_NODE_MODULES_INOUTS $_TS_FILES_INOUTS ${hide:PEERS} \ ${hide;input:"ya.make"} \ ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \ - ${hide;output:"package.json"} \ ${hide;kv:"pc magenta"} ${hide;kv:"p TS_NXT"} ### @usage: TS_NEXT([name]) diff --git a/build/conf/ts/ts_rspack.conf b/build/conf/ts/ts_rspack.conf index 2fe0681231e..5223b085387 100644 --- a/build/conf/ts/ts_rspack.conf +++ b/build/conf/ts/ts_rspack.conf @@ -31,7 +31,6 @@ TS_RSPACK_CMD=$_TS_PROJECT_SETUP_CMD \ $_NODE_MODULES_INOUTS $_TS_FILES_INOUTS ${hide:PEERS} \ ${hide;input:"ya.make"} \ ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \ - ${hide;output:"package.json"} \ ${hide;kv:"pc magenta"} ${hide;kv:"p TS_RSPK"} ### @usage: TS_RSPACK([name]) diff --git a/build/conf/ts/ts_tsc.conf b/build/conf/ts/ts_tsc.conf index bfd7bebd062..9c862debbd7 100644 --- a/build/conf/ts/ts_tsc.conf +++ b/build/conf/ts/ts_tsc.conf @@ -3,7 +3,6 @@ TS_TSC_CMD=$_TS_PROJECT_SETUP_CMD \ $_NODE_MODULES_INOUTS $_TS_FILES_INOUTS ${hide:PEERS} \ ${hide;input:"ya.make"} \ ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \ - ${hide;output:"package.json"} \ ${hide;kv:"pc magenta"} ${hide;kv:"p TS_TSC"} ### @usage: TS_TSC([name]) diff --git a/build/conf/ts/ts_vite.conf b/build/conf/ts/ts_vite.conf index 8e180a21f6e..1bc71a99c72 100644 --- a/build/conf/ts/ts_vite.conf +++ b/build/conf/ts/ts_vite.conf @@ -40,7 +40,6 @@ TS_VITE_CMD=$_TS_PROJECT_SETUP_CMD \ $_NODE_MODULES_INOUTS $_TS_FILES_INOUTS ${hide:PEERS} \ ${hide;input:"ya.make"} \ ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \ - ${hide;output:"package.json"} \ ${hide;kv:"pc magenta"} ${hide;kv:"p TS_VIT"} ### @usage: TS_VITE([name]) diff --git a/build/conf/ts/ts_webpack.conf b/build/conf/ts/ts_webpack.conf index b68ef52c200..45f169d58b4 100644 --- a/build/conf/ts/ts_webpack.conf +++ b/build/conf/ts/ts_webpack.conf @@ -38,7 +38,6 @@ TS_WEBPACK_CMD=$_TS_PROJECT_SETUP_CMD \ $_NODE_MODULES_INOUTS $_TS_FILES_INOUTS ${hide:PEERS} \ ${hide;input:"ya.make"} \ ${hide;input:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \ - ${hide;output:"package.json"} \ ${hide;kv:"pc magenta"} ${hide;kv:"p TS_WPK"} ### @usage: TS_WEBPACK([name]) diff --git a/build/plugins/lib/nots/package_manager/package_manager.py b/build/plugins/lib/nots/package_manager/package_manager.py index 1295456ce31..ef69465d09d 100644 --- a/build/plugins/lib/nots/package_manager/package_manager.py +++ b/build/plugins/lib/nots/package_manager/package_manager.py @@ -429,7 +429,6 @@ class PackageManager(object): ] outs = [ b_rooted(build_ws_config_path(self.module_path)), - b_rooted(build_pre_lockfile_path(self.module_path)), ] resources = [] |
