diff --git a/tools/postinstall/apply-patches.js b/tools/postinstall/apply-patches.js index 28148a41af03..69ef0a19098c 100644 --- a/tools/postinstall/apply-patches.js +++ b/tools/postinstall/apply-patches.js @@ -55,9 +55,6 @@ function applyPatches() { // Workaround for https://github.com/angular/angular/issues/18810. shelljs.exec('ngc -p angular-tsconfig.json'); - // TODO(devversion): Remove once https://github.com/bazelbuild/rules_nodejs/commit/4965db6b775d99c370fe0fad7582168d55d520ec is available. - applyPatch(path.join(__dirname, 'bazel-protractor-server-configuration.patch')); - // Workaround for: https://github.com/angular/angular/issues/32651. We just do not // generate re-exports for secondary entry-points. Similar to what "ng-packagr" does. searchAndReplace( diff --git a/tools/postinstall/bazel-protractor-server-configuration.patch b/tools/postinstall/bazel-protractor-server-configuration.patch deleted file mode 100644 index d103daba57d1..000000000000 --- a/tools/postinstall/bazel-protractor-server-configuration.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git node_modules/@bazel/protractor/protractor_web_test.bzl node_modules/@bazel/protractor/protractor_web_test.bzl -index 123c526..15b62a7 100644 ---- node_modules/@bazel/protractor/protractor_web_test.bzl -+++ node_modules/@bazel/protractor/protractor_web_test.bzl -@@ -105,6 +105,15 @@ def _protractor_web_test_impl(ctx): - - runfiles = [configuration] + configuration_sources + on_prepare_sources - -+ server_runfiles = depset() -+ -+ # If a server has been specified, add it to the runfiles together with it's required runfiles. This is necessary -+ # as the test executable references the server executable as per `TMPL_server` and executes it. -+ if ctx.executable.server: -+ server_runfiles = depset( -+ [ctx.executable.server], -+ transitive = [ctx.attr.server[DefaultInfo].default_runfiles.files]) -+ - ctx.actions.write( - output = ctx.outputs.script, - is_executable = True, -@@ -160,7 +169,7 @@ ${{COMMAND}} - files = depset([ctx.outputs.script]), - runfiles = ctx.runfiles( - files = runfiles, -- transitive_files = depset(transitive = [files, node_modules]), -+ transitive_files = depset(transitive = [files, node_modules, server_runfiles]), - # Propagate protractor_bin and its runfiles - collect_data = True, - collect_default = True, -@@ -263,8 +272,6 @@ def protractor_web_test( - # Our binary dependency must be in data[] for collect_data to pick it up - # FIXME: maybe we can just ask :protractor_bin_name for its runfiles attr - web_test_data = data + [":" + protractor_bin_name] -- if server: -- web_test_data += [server] - - _protractor_web_test( - name = name,