diff --git a/modules/benchmarks/src/views/BUILD.bazel b/modules/benchmarks/src/views/BUILD.bazel index 8f9e23ce33f..2bad0fbd08d 100644 --- a/modules/benchmarks/src/views/BUILD.bazel +++ b/modules/benchmarks/src/views/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults.bzl", "app_bundle", "ng_module", "ts_devserver") +load("//tools:defaults.bzl", "app_bundle", "http_server", "ng_module") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) @@ -25,27 +25,14 @@ app_bundle( ], ) -ts_devserver( - name = "prodserver", - static_files = [ +http_server( + name = "server", + srcs = [ + "index.html", + ], + deps = [ ":bundle.debug.min.js", ":bundle.min.js", "//packages/zone.js/bundles:zone.umd.js", - "index.html", ], ) - -ts_devserver( - name = "devserver", - entry_module = "angular/modules/benchmarks/src/views/index", - scripts = [ - "@npm//:node_modules/tslib/tslib.js", - "//tools/rxjs:rxjs_umd_modules", - ], - serving_path = "/index.js", - static_files = [ - "//packages/zone.js/bundles:zone.umd.js", - "index.html", - ], - deps = [":application_lib"], -) diff --git a/modules/benchmarks/src/views/index.html b/modules/benchmarks/src/views/index.html index 93f6e76f20e..c2499d20ee8 100644 --- a/modules/benchmarks/src/views/index.html +++ b/modules/benchmarks/src/views/index.html @@ -1,38 +1,38 @@ - + + + + + - - - - + +

Views traversal benchmark

- + loading... -

Views traversal benchmark

- - loading... - - - - + }); + + diff --git a/packages/core/test/bundling/animation_world/BUILD.bazel b/packages/core/test/bundling/animation_world/BUILD.bazel index d50d5820db9..8ad0a1b02af 100644 --- a/packages/core/test/bundling/animation_world/BUILD.bazel +++ b/packages/core/test/bundling/animation_world/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "app_bundle", "ng_module", "ts_devserver") -load("@npm//http-server:index.bzl", "http_server") +load("//tools:defaults.bzl", "app_bundle", "http_server", "ng_module") package(default_visibility = ["//visibility:public"]) @@ -23,34 +22,15 @@ app_bundle( ], ) -ts_devserver( - name = "devserver", - additional_root_paths = [ - "npm/node_modules/tslib", - ], - entry_module = "@angular/core/test/bundling/animation_world", - scripts = [ - "//tools/rxjs:rxjs_umd_modules", - ], - # Use a serving_path that matches the common static index.html used - # in both devserver & prodserver - serving_path = "/bundle.min.js.br", - static_files = [ - "animation_world.css", - "base.css", - "index.html", - "@npm//tslib", - ], - deps = [":animation_world"], -) - http_server( - name = "prodserver", - data = [ + name = "server", + srcs = [ "animation_world.css", "base.css", "index.html", - ":bundle.debug.min.js", - ":bundle.min.js", + ], + deps = [ + ":bundle.debug.min", + ":bundle.min.js.br", ], ) diff --git a/packages/core/test/bundling/animation_world/index.html b/packages/core/test/bundling/animation_world/index.html index edf00b994b7..38a420f7117 100644 --- a/packages/core/test/bundling/animation_world/index.html +++ b/packages/core/test/bundling/animation_world/index.html @@ -1,15 +1,15 @@ - - - - - - Angular Hello World Example - - - - + + + + + + Angular Hello World Example + + + + - - - - + + + diff --git a/packages/core/test/bundling/image-directive/e2e/browser-logs-util.ts b/packages/core/test/bundling/image-directive/e2e/browser-logs-util.ts index ec13bd282d5..0c730f28531 100644 --- a/packages/core/test/bundling/image-directive/e2e/browser-logs-util.ts +++ b/packages/core/test/bundling/image-directive/e2e/browser-logs-util.ts @@ -19,19 +19,6 @@ export async function collectBrowserLogs( browserLog.forEach(logEntry => { const msg = logEntry.message; - // Since we currently use the `ts_devserver` from the Bazel TypeScript rules, which does - // fallback to the "index.html" file for HTML5 pushState routing but does always serve the - // expected fallback with a 404 status code, the browser will print a message about the 404, - // while the page loaded properly. Ideally the "ts_devserver" would allow us to opt-in for - // just returning a 200 status code, but the devserver is intended to be kept manually, so - // we manually filter this error before ensuring there are no console errors. - // TODO: This is a current limitation of using the "ts_devserver" with Angular routing. - // Tracked with: TOOL-629 - if (msg.includes( - `Failed to load resource: the server responded with a status of 404 (Not Found)`)) { - return; - } - console.log('>> ' + msg, logEntry); if ((!collectMoreSevereErrors && logEntry.level.value === loggingLevel.value) || diff --git a/packages/core/test/bundling/router/BUILD.bazel b/packages/core/test/bundling/router/BUILD.bazel index 2909f227838..af6cb0e6500 100644 --- a/packages/core/test/bundling/router/BUILD.bazel +++ b/packages/core/test/bundling/router/BUILD.bazel @@ -1,6 +1,5 @@ -load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test", "ng_module", "ts_devserver", "ts_library") +load("//tools:defaults.bzl", "app_bundle", "http_server", "jasmine_node_test", "ng_module", "ts_library") load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test") -load("@npm//http-server:index.bzl", "http_server") package(default_visibility = ["//visibility:public"]) @@ -59,36 +58,14 @@ js_expected_symbol_test( golden = ":bundle.golden_symbols.json", ) -genrule( - name = "tslib", - srcs = [ - "@npm//:node_modules/tslib/tslib.js", - ], - outs = [ - "tslib.js", - ], - cmd = "cp $< $@", -) - -ts_devserver( - name = "devserver", - entry_module = "@angular/core/test/bundling/router", - scripts = [ - "//tools/rxjs:rxjs_umd_modules", - ], - serving_path = "/bundle.min.js", - static_files = [ - "index.html", - ":tslib", - ], - deps = [":router"], -) - http_server( - name = "prodserver", - data = [ + name = "server", + srcs = [ "index.html", + ], + deps = [ ":bundle.debug.min.js", ":bundle.min.js", + "//packages/zone.js/bundles:zone.umd.js", ], ) diff --git a/packages/core/test/bundling/router/index.html b/packages/core/test/bundling/router/index.html index a46d644371e..cd202e47cbe 100644 --- a/packages/core/test/bundling/router/index.html +++ b/packages/core/test/bundling/router/index.html @@ -1,4 +1,4 @@ - + @@ -9,6 +9,7 @@ + diff --git a/packages/core/test/bundling/router/index.ts b/packages/core/test/bundling/router/index.ts index 384fa1cf2f2..c6f9b3a4c14 100644 --- a/packages/core/test/bundling/router/index.ts +++ b/packages/core/test/bundling/router/index.ts @@ -5,6 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ + import {APP_BASE_HREF} from '@angular/common'; import {Component, OnInit} from '@angular/core'; import {bootstrapApplication} from '@angular/platform-browser'; diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel index c979693ecad..579e4c650aa 100644 --- a/packages/core/test/bundling/todo/BUILD.bazel +++ b/packages/core/test/bundling/todo/BUILD.bazel @@ -1,6 +1,5 @@ -load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test", "ng_module", "ts_devserver", "ts_library") +load("//tools:defaults.bzl", "app_bundle", "http_server", "jasmine_node_test", "ng_module", "ts_library") load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test") -load("@npm//http-server:index.bzl", "http_server") package(default_visibility = ["//visibility:public"]) @@ -62,41 +61,14 @@ js_expected_symbol_test( golden = ":bundle.golden_symbols.json", ) -genrule( - name = "tslib", - srcs = [ - "@npm//:node_modules/tslib/tslib.js", - ], - outs = [ - "tslib.js", - ], - cmd = "cp $< $@", -) - -ts_devserver( - name = "devserver", - entry_module = "@angular/core/test/bundling/todo", - scripts = [ - "//tools/rxjs:rxjs_umd_modules", - ], - # Use a serving_path that matches the common static index.html used - # in both devserver & prodserver - serving_path = "/bundle.min.js.br", - static_files = [ - "index.html", - ":tslib", - "todo.css", - "base.css", - ], - deps = [":todo"], -) - http_server( - name = "prodserver", - data = [ + name = "server", + srcs = [ "base.css", "index.html", "todo.css", + ], + deps = [ ":bundle.debug.min.js", ":bundle.min.js.br", ], diff --git a/packages/core/test/bundling/todo/index.html b/packages/core/test/bundling/todo/index.html index b2f8dbc9433..81fceeca242 100644 --- a/packages/core/test/bundling/todo/index.html +++ b/packages/core/test/bundling/todo/index.html @@ -1,23 +1,22 @@ - + + + Angular Todo Example + + + + - - Angular Todo Example - - - - + + + - - - - - - - - + + + diff --git a/packages/core/test/bundling/todo_i18n/BUILD.bazel b/packages/core/test/bundling/todo_i18n/BUILD.bazel index 150dffd0e8a..aa496b09d86 100644 --- a/packages/core/test/bundling/todo_i18n/BUILD.bazel +++ b/packages/core/test/bundling/todo_i18n/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test", "ng_module", "ts_devserver", "ts_library") -load("@npm//http-server:index.bzl", "http_server") +load("//tools:defaults.bzl", "app_bundle", "http_server", "jasmine_node_test", "ng_module", "ts_library") package(default_visibility = ["//visibility:public"]) @@ -56,41 +55,14 @@ jasmine_node_test( deps = [":test_lib"], ) -genrule( - name = "tslib", - srcs = [ - "@npm//:node_modules/tslib/tslib.js", - ], - outs = [ - "tslib.js", - ], - cmd = "cp $< $@", -) - -ts_devserver( - name = "devserver", - entry_module = "@angular/core/test/bundling/todo_i18n", - scripts = [ - "//tools/rxjs:rxjs_umd_modules", - ], - # Use a serving_path that matches the common static index.html used - # in both devserver & prodserver - serving_path = "/bundle.min.js.br", - static_files = [ - "index.html", - ":tslib", - "todo.css", - "base.css", - ], - deps = [":todo_i18n"], -) - http_server( - name = "prodserver", - data = [ + name = "server", + srcs = [ "base.css", "index.html", "todo.css", + ], + deps = [ ":bundle.debug.min.js", ":bundle.min.js", ], diff --git a/packages/examples/test-utils/index.ts b/packages/examples/test-utils/index.ts index 79c8a53afcb..5701abc6c31 100644 --- a/packages/examples/test-utils/index.ts +++ b/packages/examples/test-utils/index.ts @@ -19,19 +19,6 @@ export async function verifyNoBrowserErrors() { browserLog.forEach(logEntry => { const msg = logEntry.message; - // Since we currently use the `ts_devserver` from the Bazel TypeScript rules, which does - // fallback to the "index.html" file for HTML5 pushState routing but does always serve the - // expected fallback with a 404 status code, the browser will print a message about the 404, - // while the page loaded properly. Ideally the "ts_devserver" would allow us to opt-in for - // just returning a 200 status code, but the devserver is intended to be kept manually, so - // we manually filter this error before ensuring there are no console errors. - // TODO: This is a current limitation of using the "ts_devserver" with Angular routing. - // Tracked with: TOOL-629 - if (msg.includes( - `Failed to load resource: the server responded with a status of 404 (Not Found)`)) { - return; - } - console.log('>> ' + msg, logEntry); if (logEntry.level.value >= logging.Level.INFO.value) { diff --git a/tools/defaults.bzl b/tools/defaults.bzl index e114aaf016c..69ead0d4c1e 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -3,7 +3,7 @@ load("@rules_pkg//:pkg.bzl", "pkg_tar") load("@build_bazel_rules_nodejs//:index.bzl", _npm_package_bin = "npm_package_bin", _pkg_npm = "pkg_npm") load("@npm//@bazel/jasmine:index.bzl", _jasmine_node_test = "jasmine_node_test") -load("@npm//@bazel/concatjs:index.bzl", _concatjs_devserver = "concatjs_devserver", _ts_config = "ts_config", _ts_library = "ts_library") +load("@npm//@bazel/concatjs:index.bzl", _ts_config = "ts_config", _ts_library = "ts_library") load("@npm//@bazel/rollup:index.bzl", _rollup_bundle = "rollup_bundle") load("@npm//@bazel/terser:index.bzl", "terser_minified") load("@npm//@bazel/protractor:index.bzl", _protractor_web_test_suite = "protractor_web_test_suite") @@ -95,14 +95,6 @@ def _default_module_name(testonly): return None -def ts_devserver(**kwargs): - """Default values for ts_devserver""" - serving_path = kwargs.pop("serving_path", "/app_bundle.js") - _concatjs_devserver( - serving_path = serving_path, - **kwargs - ) - ts_config = _ts_config def ts_library(