diff options
| author | baymer <[email protected]> | 2026-07-07 02:08:05 +0300 |
|---|---|---|
| committer | baymer <[email protected]> | 2026-07-07 02:28:04 +0300 |
| commit | 41faac0906f3d43235e5da203bf09a32eb5292be (patch) | |
| tree | a706933a316fce49351e06fd5e7c91930074a020 | |
| parent | a6597fc54472134f73988c1e383655809b088be9 (diff) | |
ts: починить сендбоксинг в TS_LIBRARY
commit_hash:bcacda2e083511ba2092dc78c91a0137bafaa7e8
| -rw-r--r-- | build/conf/ts/ts.conf | 1 | ||||
| -rw-r--r-- | build/plugins/lib/nots/package_manager/package_manager.py | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/build/conf/ts/ts.conf b/build/conf/ts/ts.conf index 0adb0a098ef..0c54d5559b1 100644 --- a/build/conf/ts/ts.conf +++ b/build/conf/ts/ts.conf @@ -200,7 +200,6 @@ TS_GLOB_EXCLUDE=$TS_CONFIG_PATH \ $TS_EXCLUDE_DIR_GLOB \ $TS_COMMON_OUTDIR_GLOB \ $TS_GLOB_EXCLUDE_ADDITIONAL \ - package.json pnpm-lock.yaml .* \ $TS_GLOB_TESTS # Ugly hack for using inputs from the variable diff --git a/build/plugins/lib/nots/package_manager/package_manager.py b/build/plugins/lib/nots/package_manager/package_manager.py index d9851ca7353..36ea6c099ce 100644 --- a/build/plugins/lib/nots/package_manager/package_manager.py +++ b/build/plugins/lib/nots/package_manager/package_manager.py @@ -14,7 +14,6 @@ from .constants import ( from .lockfile import Lockfile from .utils import ( build_lockfile_path, - build_build_backup_lockfile_path, build_pre_lockfile_path, build_ws_config_path, b_rooted, @@ -342,7 +341,6 @@ class PackageManager(object): self._run_pnpm_install(store_dir, self.build_path, local_cli, virtual_store_dir, self.inject_peers) self._run_apply_addons_if_need(yatool_prebuilder_path, virtual_store_dir or global_virtual_store_dir) - self._restore_original_lockfile(original_lf_path, virtual_store_dir) if nm_bundle: # TODO: how to bundle node_modules with GVS? @@ -582,19 +580,6 @@ class PackageManager(object): ) @timeit - def _restore_original_lockfile(self, original_lf_path: str, virtual_store_dir: str | None): - original_lf_path = original_lf_path or build_lockfile_path(self.sources_path) - build_lf_path = build_lockfile_path(self.build_path) - build_bkp_lf_path = build_build_backup_lockfile_path(self.build_path) - - if virtual_store_dir: - vs_lf_path = os.path.join(virtual_store_dir, "lock.yaml") - shutil.copyfile(original_lf_path, vs_lf_path) - - shutil.copyfile(build_lf_path, build_bkp_lf_path) - shutil.copyfile(original_lf_path, build_lf_path) - - @timeit def _copy_pnpm_patches(self): pj = self.load_package_json_from_dir(self.build_path) patched_dependencies: dict[str, str] = pj.data.get("pnpm", {}).get("patchedDependencies", {}) |