From e25e6342f2af9cc73e46475b18b00ae0ef2625d2 Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Mon, 14 Jul 2025 21:51:00 +0000 Subject: [PATCH] build: remove rules_nodejs based protractor tooling (#62649) Remove the protractor setup based on rules_nodejs PR Close #62649 --- WORKSPACE | 1 - modules/playground/e2e_test/start-server.js | 17 -------------- .../image-directive/e2e/start-server.js | 21 ------------------ packages/examples/common/start-server.js | 17 -------------- packages/examples/core/start-server.js | 17 -------------- packages/examples/forms/start-server.js | 17 -------------- .../service-worker/push/start-server.js | 17 -------------- .../registration-options/start-server.js | 17 -------------- packages/examples/upgrade/start-server.js | 17 -------------- tools/defaults.bzl | 22 ------------------- .../patches/npm/@bazel+protractor+5.7.1.patch | 13 ----------- 11 files changed, 176 deletions(-) delete mode 100644 modules/playground/e2e_test/start-server.js delete mode 100644 packages/core/test/bundling/image-directive/e2e/start-server.js delete mode 100644 packages/examples/common/start-server.js delete mode 100644 packages/examples/core/start-server.js delete mode 100644 packages/examples/forms/start-server.js delete mode 100644 packages/examples/service-worker/push/start-server.js delete mode 100644 packages/examples/service-worker/registration-options/start-server.js delete mode 100644 packages/examples/upgrade/start-server.js delete mode 100644 tools/esm-interop/patches/npm/@bazel+protractor+5.7.1.patch diff --git a/WORKSPACE b/WORKSPACE index ab001609d5c..d9e321bbe67 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -89,7 +89,6 @@ yarn_install( "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch", "//tools/esm-interop:patches/npm/@bazel+concatjs+5.8.1.patch", "//tools/esm-interop:patches/npm/@bazel+esbuild+5.7.1.patch", - "//tools/esm-interop:patches/npm/@bazel+protractor+5.7.1.patch", "//tools/esm-interop:patches/npm/rxjs+6.6.7.patch", ], # Currently disabled due to: diff --git a/modules/playground/e2e_test/start-server.js b/modules/playground/e2e_test/start-server.js deleted file mode 100644 index 07d52c5eb3f..00000000000 --- a/modules/playground/e2e_test/start-server.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -const protractorUtils = require('@bazel/protractor/protractor-utils'); -const protractor = require('protractor'); - -module.exports = async function (config) { - const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []); - const serverUrl = `http://localhost:${port}`; - - protractor.browser.baseUrl = serverUrl; -}; diff --git a/packages/core/test/bundling/image-directive/e2e/start-server.js b/packages/core/test/bundling/image-directive/e2e/start-server.js deleted file mode 100644 index fef033b2a24..00000000000 --- a/packages/core/test/bundling/image-directive/e2e/start-server.js +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -const protractorUtils = require('@bazel/protractor/protractor-utils'); -const protractor = require('protractor'); - -/** - * Helper function to start up a server for testing using Protractor utils. - * Used as a part of the `protractor_web_test_suite` rule configuration. - */ -module.exports = async function (config) { - const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []); - const serverUrl = `http://localhost:${port}`; - - protractor.browser.baseUrl = serverUrl; -}; diff --git a/packages/examples/common/start-server.js b/packages/examples/common/start-server.js deleted file mode 100644 index 07d52c5eb3f..00000000000 --- a/packages/examples/common/start-server.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -const protractorUtils = require('@bazel/protractor/protractor-utils'); -const protractor = require('protractor'); - -module.exports = async function (config) { - const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []); - const serverUrl = `http://localhost:${port}`; - - protractor.browser.baseUrl = serverUrl; -}; diff --git a/packages/examples/core/start-server.js b/packages/examples/core/start-server.js deleted file mode 100644 index 07d52c5eb3f..00000000000 --- a/packages/examples/core/start-server.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -const protractorUtils = require('@bazel/protractor/protractor-utils'); -const protractor = require('protractor'); - -module.exports = async function (config) { - const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []); - const serverUrl = `http://localhost:${port}`; - - protractor.browser.baseUrl = serverUrl; -}; diff --git a/packages/examples/forms/start-server.js b/packages/examples/forms/start-server.js deleted file mode 100644 index 07d52c5eb3f..00000000000 --- a/packages/examples/forms/start-server.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -const protractorUtils = require('@bazel/protractor/protractor-utils'); -const protractor = require('protractor'); - -module.exports = async function (config) { - const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []); - const serverUrl = `http://localhost:${port}`; - - protractor.browser.baseUrl = serverUrl; -}; diff --git a/packages/examples/service-worker/push/start-server.js b/packages/examples/service-worker/push/start-server.js deleted file mode 100644 index 07d52c5eb3f..00000000000 --- a/packages/examples/service-worker/push/start-server.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -const protractorUtils = require('@bazel/protractor/protractor-utils'); -const protractor = require('protractor'); - -module.exports = async function (config) { - const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []); - const serverUrl = `http://localhost:${port}`; - - protractor.browser.baseUrl = serverUrl; -}; diff --git a/packages/examples/service-worker/registration-options/start-server.js b/packages/examples/service-worker/registration-options/start-server.js deleted file mode 100644 index 07d52c5eb3f..00000000000 --- a/packages/examples/service-worker/registration-options/start-server.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -const protractorUtils = require('@bazel/protractor/protractor-utils'); -const protractor = require('protractor'); - -module.exports = async function (config) { - const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []); - const serverUrl = `http://localhost:${port}`; - - protractor.browser.baseUrl = serverUrl; -}; diff --git a/packages/examples/upgrade/start-server.js b/packages/examples/upgrade/start-server.js deleted file mode 100644 index 07d52c5eb3f..00000000000 --- a/packages/examples/upgrade/start-server.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -const protractorUtils = require('@bazel/protractor/protractor-utils'); -const protractor = require('protractor'); - -module.exports = async function (config) { - const {port} = await protractorUtils.runServer(config.workspace, config.server, '--port', []); - const serverUrl = `http://localhost:${port}`; - - protractor.browser.baseUrl = serverUrl; -}; diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 0231d107cb4..7d57fb05858 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -9,7 +9,6 @@ load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", _api_golden_test load("@npm//@angular/build-tooling/bazel/spec-bundling:index.bzl", "spec_bundle") load("@npm//@bazel/concatjs:index.bzl", _ts_config = "ts_config", _ts_library = "ts_library") load("@npm//@bazel/jasmine:index.bzl", _jasmine_node_test = "jasmine_node_test") -load("@npm//@bazel/protractor:index.bzl", _protractor_web_test_suite = "protractor_web_test_suite") load("@npm//@bazel/rollup:index.bzl", _rollup_bundle = "rollup_bundle") load("@npm//@bazel/terser:index.bzl", "terser_minified") load("@npm//typescript:index.bzl", "tsc") @@ -157,27 +156,6 @@ def pkg_npm(name, deps = [], validate = True, **kwargs): visibility = visibility, ) -def protractor_web_test_suite( - name, - deps = [], - external = [], - browsers = ["@npm//@angular/build-tooling/bazel/browsers/chromium:chromium"], - **kwargs): - """Default values for protractor_web_test_suite""" - spec_bundle( - name = "%s_bundle" % name, - deps = deps, - platform = "cjs-legacy", - external = external + ["protractor"], - ) - - _protractor_web_test_suite( - name = name, - deps = [":%s_bundle" % name], - browsers = browsers, - **kwargs - ) - def nodejs_binary( name, templated_args = [], diff --git a/tools/esm-interop/patches/npm/@bazel+protractor+5.7.1.patch b/tools/esm-interop/patches/npm/@bazel+protractor+5.7.1.patch deleted file mode 100644 index 06fd404ce6f..00000000000 --- a/tools/esm-interop/patches/npm/@bazel+protractor+5.7.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/@bazel/protractor/protractor_web_test.bzl b/node_modules/@bazel/protractor/protractor_web_test.bzl -index 77fcd99..8c65658 100755 ---- a/node_modules/@bazel/protractor/protractor_web_test.bzl -+++ b/node_modules/@bazel/protractor/protractor_web_test.bzl -@@ -14,7 +14,7 @@ - "Run end-to-end tests with Protractor" - - load("@rules_nodejs//nodejs:providers.bzl", "JSModuleInfo") --load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") -+load("@angular//tools/esm-interop:index.bzl", "nodejs_binary") - load("@build_bazel_rules_nodejs//:providers.bzl", "ExternalNpmPackageInfo", "JSNamedModuleInfo", "node_modules_aspect") - load("@build_bazel_rules_nodejs//internal/common:windows_utils.bzl", "create_windows_native_launcher_script", "is_windows") - load("@io_bazel_rules_webtesting//web:web.bzl", "web_test_suite")