diff options
| author | khoden <khoden@yandex-team.com> | 2024-04-11 12:12:46 +0300 |
|---|---|---|
| committer | khoden <khoden@yandex-team.com> | 2024-04-11 13:14:17 +0300 |
| commit | b2dd3109ecde5869a2c8856501d27ef16f055782 (patch) | |
| tree | fbf5ee727d433115e0a71ae6c4fea2d78d6f92b3 | |
| parent | 4814576bfe95ed19aaaa8b8a02ce13ef441b0436 (diff) | |
| download | ydb-b2dd3109ecde5869a2c8856501d27ef16f055782.tar.gz | |
TS_WEBPACK: Поддержать несколько выходных директорий (вторая попытка)
adef71a669e1a634917cbda95bcff2b327b03444
| -rw-r--r-- | build/conf/ts/ts.conf | 2 | ||||
| -rw-r--r-- | build/conf/ts/ts_next.conf | 2 | ||||
| -rw-r--r-- | build/conf/ts/ts_vite.conf | 2 | ||||
| -rw-r--r-- | build/conf/ts/ts_webpack.conf | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/build/conf/ts/ts.conf b/build/conf/ts/ts.conf index 6c5953491e..4d419a0bd5 100644 --- a/build/conf/ts/ts.conf +++ b/build/conf/ts/ts.conf @@ -33,7 +33,7 @@ TS_CONFIG_PATH=tsconfig.json TS_OUTPUT_FILE=output.tar TS_OUTPUT_FILE_UUID=output.tar.uuid TS_EXCLUDE_DIR_GLOB=(.idea|.vscode|node_modules)/**/* -TS_COMMON_OUTDIR_GLOB=(build|dist|bundle|$WEBPACK_OUTPUT_DIR|$TS_NEXT_OUTPUT_DIR|$VITE_OUTPUT_DIR)/**/* +TS_COMMON_OUTDIR_GLOB=(build|dist|bundle|\${join=|:WEBPACK_OUTPUT_DIR}|$TS_NEXT_OUTPUT_DIR|$VITE_OUTPUT_DIR)/**/* TS_GLOB_EXCLUDE_ADDITIONAL= module _TS_BASE_UNIT: _BARE_UNIT { diff --git a/build/conf/ts/ts_next.conf b/build/conf/ts/ts_next.conf index 58465b3a0d..b4f1c63a5c 100644 --- a/build/conf/ts/ts_next.conf +++ b/build/conf/ts/ts_next.conf @@ -6,7 +6,7 @@ TS_NEXT_CMD=$TOUCH_UNIT \ && $ADD_VCS_INFO_FILE_CMD \ && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-next $NOTS_TOOL_COMMON_BUILDER_ARGS \ --bundler-config-path ${input:TS_NEXT_CONFIG_PATH} \ - --output-dir ${TS_NEXT_OUTPUT_DIR} \ + --output-dirs ${TS_NEXT_OUTPUT_DIR} \ $_NODE_MODULES_INOUTS ${hide:PEERS} \ ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \ ${output;hide:"package.json"} \ diff --git a/build/conf/ts/ts_vite.conf b/build/conf/ts/ts_vite.conf index 04ee37227e..d34520e97c 100644 --- a/build/conf/ts/ts_vite.conf +++ b/build/conf/ts/ts_vite.conf @@ -6,7 +6,7 @@ TS_VITE_CMD=$TOUCH_UNIT \ && $ADD_VCS_INFO_FILE_CMD \ && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-vite $NOTS_TOOL_COMMON_BUILDER_ARGS \ --bundler-config-path ${input:VITE_CONFIG_PATH} \ - --output-dir ${VITE_OUTPUT_DIR} \ + --output-dirs ${VITE_OUTPUT_DIR} \ $_NODE_MODULES_INOUTS ${hide:PEERS} \ ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \ ${output;hide:"package.json"} \ diff --git a/build/conf/ts/ts_webpack.conf b/build/conf/ts/ts_webpack.conf index 6e9e0571cf..091b73bb70 100644 --- a/build/conf/ts/ts_webpack.conf +++ b/build/conf/ts/ts_webpack.conf @@ -6,19 +6,19 @@ TS_WEBPACK_CMD=$TOUCH_UNIT \ && $ADD_VCS_INFO_FILE_CMD \ && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-webpack $NOTS_TOOL_COMMON_BUILDER_ARGS \ --bundler-config-path ${input:WEBPACK_CONFIG_PATH} \ - --output-dir ${WEBPACK_OUTPUT_DIR} \ + --output-dirs ${WEBPACK_OUTPUT_DIR} \ $_NODE_MODULES_INOUTS ${hide:PEERS} \ ${input;hide:"package.json"} ${TS_CONFIG_FILES} $_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES) \ ${output;hide:"package.json"} \ ${kv;hide:"pc magenta"} ${kv;hide:"p TS_WPK"} -### @usage: WEBPACK_OUTPUT(DirName) +### @usage: WEBPACK_OUTPUT(DirNames) ### -### Macro sets the output directory name for TS_WEBPACK module. +### Macro sets the output directory name/names for TS_WEBPACK module. ### -### - DirName - output directory name ("bundle" by default). -macro WEBPACK_OUTPUT(DirName) { - SET(WEBPACK_OUTPUT_DIR $DirName) +### - DirNames - output directory name/names ("bundle" by default). +macro WEBPACK_OUTPUT(DirNames...) { + SET(WEBPACK_OUTPUT_DIR $DirNames) } ### @usage: TS_WEBPACK([name]) |