Skip to content

Commit 77bdf77

Browse files
alan-agius4dylhunn
authored andcommitted
build: combine @bazel/concatjs patches (angular#49714)
This commit combines all the `@bazel/concatjs` patches PR Close angular#49714
1 parent 1c16be4 commit 77bdf77

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

tools/esm-interop/patches/npm/@bazel+concatjs+5.8.1.patch

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/node_modules/@bazel/concatjs/internal/build_defs.bzl b/node_modules/@bazel/concatjs/internal/build_defs.bzl
2-
index 9e5cda6..71abdb4 100755
2+
index 9e5cda6..cdbcf71 100755
33
--- a/node_modules/@bazel/concatjs/internal/build_defs.bzl
44
+++ b/node_modules/@bazel/concatjs/internal/build_defs.bzl
55
@@ -15,7 +15,7 @@
@@ -11,14 +11,19 @@ index 9e5cda6..71abdb4 100755
1111

1212
# pylint: disable=unused-argument
1313
# pylint: disable=missing-docstring
14-
@@ -72,7 +72,6 @@ my_rule(
14+
@@ -72,11 +72,10 @@ my_rule(
1515
_DEFAULT_COMPILER = "//@bazel/concatjs/bin:tsc_wrapped"
1616

1717
_TYPESCRIPT_TYPINGS = Label(
1818
-
1919
"//typescript:typescript__typings",
2020
)
2121

22+
-_TYPESCRIPT_SCRIPT_TARGETS = ["es3", "es5", "es2015", "es2016", "es2017", "es2018", "es2019", "es2020", "esnext"]
23+
+_TYPESCRIPT_SCRIPT_TARGETS = ["es3", "es5", "es2015", "es2016", "es2017", "es2018", "es2019", "es2020", "es2022", "esnext"]
24+
_TYPESCRIPT_MODULE_KINDS = ["none", "commonjs", "amd", "umd", "system", "es2015", "esnext"]
25+
26+
_DEVMODE_TARGET_DEFAULT = "es2015"
2227
@@ -331,11 +330,7 @@ def _ts_library_impl(ctx):
2328
# and issue https://github.com/bazelbuild/rules_nodejs/issues/57 for more details.
2429
ts_providers["providers"].extend([

tools/postinstall-patches.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,6 @@ ls('node_modules/@types').filter(f => f.startsWith('babel__')).forEach(pkg => {
6161
}
6262
});
6363

64-
// TODO: Remove when https://github.com/bazelbuild/rules_nodejs/pull/3517 is available.
65-
sed('-i', 'private rootDirsRelative;', 'rootDirsRelative(fileName: string): string;',
66-
'node_modules/@bazel/concatjs/internal/tsc_wrapped/compiler_host.d.ts');
67-
68-
// Add support for ES2022 in ts_library
69-
sed('-i', '"es2020", "esnext"', '"es2020", "es2022", "esnext"',
70-
'node_modules/@bazel/concatjs/internal/build_defs.bzl');
71-
7264
log('\n# patch: delete d.ts files referring to rxjs-compat');
7365
// more info in https://github.com/angular/angular/pull/33786
7466
rm('-rf', [

0 commit comments

Comments
 (0)