Skip to content

Commit d2648d9

Browse files
kormideAndrewKushnir
authored andcommitted
build(bazel): remove tsec patch to enable runfiles on Windows (angular#46447)
tsec previously did not use runfiles on Windows even when the flag was enabled. The latest version now adds an option to force its usage. PR Close angular#46447
1 parent db5d268 commit d2648d9

File tree

15 files changed

+24
-33
lines changed

15 files changed

+24
-33
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
"semver": "^7.3.5",
211211
"send": "^0.18.0",
212212
"ts-node": "^10.8.1",
213-
"tsec": "0.2.2",
213+
"tsec": "0.2.5",
214214
"tslint-eslint-rules": "5.4.0",
215215
"tslint-no-toplevel-property-access": "0.0.2",
216216
"typed-graphqlify": "^3.1.1",

packages/compiler/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_package", "ts_library")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "ng_package", "ts_library", "tsec_test")
32

43
package(default_visibility = ["//visibility:public"])
54

packages/core/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
2-
load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_module", "ng_package")
3-
load("@npm//tsec:index.bzl", "tsec_test")
2+
load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_module", "ng_package", "tsec_test")
43
load("//packages/common/locales:index.bzl", "generate_base_locale_file")
54

65
package(default_visibility = ["//visibility:public"])

packages/core/src/compiler/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "ts_library", "tsec_test")
32

43
package(default_visibility = [
54
"//packages/compiler/test:__pkg__",

packages/core/src/di/interface/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "ts_library", "tsec_test")
32

43
package(default_visibility = [
54
"//devtools:__subpackages__",

packages/core/src/interface/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "ts_library", "tsec_test")
32

43
package(default_visibility = [
54
"//packages/core:__subpackages__",

packages/core/src/reflection/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "ts_library", "tsec_test")
32

43
package(default_visibility = [
54
"//packages/core:__subpackages__",

packages/core/src/util/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "ts_library", "tsec_test")
32

43
package(default_visibility = [
54
"//devtools:__subpackages__",

packages/platform-browser/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package", "tsec_test")
32

43
package(default_visibility = ["//visibility:public"])
54

packages/platform-browser/animations/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_module")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "ng_module", "tsec_test")
32

43
package(default_visibility = ["//visibility:public"])
54

packages/platform-server/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package", "tsec_test")
32

43
package(default_visibility = ["//visibility:public"])
54

packages/platform-server/init/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_module")
2-
load("@npm//tsec:index.bzl", "tsec_test")
1+
load("//tools:defaults.bzl", "ng_module", "tsec_test")
32

43
package(default_visibility = ["//visibility:public"])
54

tools/defaults.bzl

+8
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ load("@npm//@angular/dev-infra-private/bazel/karma:index.bzl", _karma_web_test =
1515
load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", _api_golden_test = "api_golden_test", _api_golden_test_npm_package = "api_golden_test_npm_package")
1616
load("@npm//@angular/dev-infra-private/bazel:extract_js_module_output.bzl", "extract_js_module_output")
1717
load("@npm//@angular/dev-infra-private/bazel/esbuild:index.bzl", _esbuild = "esbuild", _esbuild_config = "esbuild_config")
18+
load("@npm//tsec:index.bzl", _tsec_test = "tsec_test")
1819

1920
_DEFAULT_TSCONFIG_TEST = "//packages:tsconfig-test"
2021
_INTERNAL_NG_MODULE_COMPILER = "//packages/bazel/src/ngc-wrapped"
@@ -590,3 +591,10 @@ def api_golden_test_npm_package(**kwargs):
590591
_api_golden_test_npm_package(
591592
**kwargs
592593
)
594+
595+
def tsec_test(**kwargs):
596+
"""Default values for tsec_test"""
597+
_tsec_test(
598+
use_runfiles_on_windows = True, # We explicitly enable runfiles in .bazelrc
599+
**kwargs
600+
)

tools/postinstall-patches.js

-6
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ ls('node_modules/@types').filter(f => f.startsWith('babel__')).forEach(pkg => {
6161
}
6262
});
6363

64-
// patch tsec 0.2.2 to enable runfiles on windows
65-
// Note that we need to use tsec 0.2.2 as future versions don't publish this bzl file
66-
log('\n# patch: tsec to enable using runfiles on windows');
67-
sed('-i', '@platforms//os:windows": False', '@platforms//os:windows": True',
68-
'node_modules/tsec/index.bzl');
69-
7064
log('\n# patch: use local version of @angular/* and zone.js in Starlark files from @angular/dev-infra-private');
7165

7266
const ngDevPatches = new Map();

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -15364,10 +15364,10 @@ tsconfig-paths@^3.10.1:
1536415364
minimist "^1.2.6"
1536515365
strip-bom "^3.0.0"
1536615366

15367-
tsec@0.2.2:
15368-
version "0.2.2"
15369-
resolved "https://registry.yarnpkg.com/tsec/-/tsec-0.2.2.tgz#d86d771215fb09a5e226f2b252a1c038c7fa17ca"
15370-
integrity sha512-gKm+nnIKcE9xtrJw2cIJFjfuDGK0AvH3r4RayTEIkUvja/s9z9GPFgcSdEaapm6N10KrmWWcLjsHlKmH2tqzMw==
15367+
tsec@0.2.5:
15368+
version "0.2.5"
15369+
resolved "https://registry.yarnpkg.com/tsec/-/tsec-0.2.5.tgz#5943f48c13b15442a858d8d405d6eb9ab8b11f4d"
15370+
integrity sha512-Tp5AJWwYwifFO/+Puprhe/ooZpLmZctQI1eprkxOqU/nUmPuCvosYh0ky9LLcrvJGOF9NqryID4sBBm/1PBSKg==
1537115371
dependencies:
1537215372
glob "^7.1.1"
1537315373
minimatch "^3.0.3"

0 commit comments

Comments
 (0)