From b0534177e01a07dd0c19e8610912e8305ad7c032 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 29 Nov 2019 09:50:30 -0800 Subject: [PATCH] build: remove html_insert_assets complication from integration/bazel (#34112) For the purposes of the integration test the zone.js script & bundle script tags could just go into the source index.html itself. The purpose of the integration test is is to test @angular/bazel & ng_module & ng_package so there is no need to exercise html_insert_assets. PR Close #34112 --- integration/bazel/package.json | 1 - integration/bazel/src/BUILD.bazel | 38 ++++--------------------------- integration/bazel/src/index.html | 2 ++ integration/bazel/yarn.lock | 12 ---------- 4 files changed, 6 insertions(+), 47 deletions(-) diff --git a/integration/bazel/package.json b/integration/bazel/package.json index cd8ee4a371..af8854f90a 100644 --- a/integration/bazel/package.json +++ b/integration/bazel/package.json @@ -29,7 +29,6 @@ "@bazel/terser": "0.42.1", "@bazel/typescript": "0.42.1", "@types/jasmine": "2.8.8", - "html-insert-assets": "0.2.0", "http-server": "0.12.0", "karma": "4.4.1", "karma-chrome-launcher": "3.1.0", diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel index 38cf8b463d..033b70f429 100644 --- a/integration/bazel/src/BUILD.bazel +++ b/integration/bazel/src/BUILD.bazel @@ -1,7 +1,6 @@ package(default_visibility = ["//visibility:public"]) load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web") -load("@npm//html-insert-assets:index.bzl", "html_insert_assets") load("@npm//http-server:index.bzl", "http_server") load("@npm_angular_bazel//:index.bzl", "ng_module") load("@npm_bazel_rollup//:index.bzl", "rollup_bundle") @@ -35,37 +34,9 @@ filegroup( ], ) -html_insert_assets( - name = "inject_scripts", - # We can't output "index.html" since that collides with the input file. - # We output "_/index.html" instead and remap in ts_devserver & pkg_web - # using additional_root_paths. - outs = ["_/index.html"], - args = [ - "--html", - "$(location :index.html)", - "--out", - "$@", - "--assets", - # We load zone.js outside the bundle. That's because it's a "polyfill" - # which speculates that such features might be available in a browser. - # Also it's tricky to configure dead code elimination to understand that - # zone.js is used, given that we don't have any import statement that - # imports from it. - "$(location @npm//:node_modules/zone.js/dist/zone.min.js)", - # Bundle path for both prodapp & devserver - "bundle.min.js", - ], - data = [ - ":index.html", - "@npm//:node_modules/zone.js/dist/zone.min.js", - ], -) - ts_devserver( name = "devserver", - # Remap "_/index.html" => "index.html" - additional_root_paths = ["src/_"], + additional_root_paths = ["npm/node_modules/zone.js/dist"], entry_module = "bazel_integration_test/src/main", scripts = [ ":rxjs_umd_modules", @@ -74,7 +45,7 @@ ts_devserver( # an index.html file. serving_path = "/bundle.min.js", static_files = [ - ":inject_scripts", + "index.html", "@npm//:node_modules/zone.js/dist/zone.min.js", ], deps = ["//src"], @@ -99,12 +70,11 @@ terser_minified( pkg_web( name = "prodapp", srcs = [ + "index.html", ":bundle.min", - ":inject_scripts", "@npm//:node_modules/zone.js/dist/zone.min.js", ], - # Remap "_/index.html" => "index.html" - additional_root_paths = ["src/_"], + additional_root_paths = ["npm/node_modules/zone.js/dist"], ) http_server( diff --git a/integration/bazel/src/index.html b/integration/bazel/src/index.html index f4ab9d187d..f1bbe5db37 100644 --- a/integration/bazel/src/index.html +++ b/integration/bazel/src/index.html @@ -9,5 +9,7 @@ + + diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock index f2b45155c9..934210ef65 100644 --- a/integration/bazel/yarn.lock +++ b/integration/bazel/yarn.lock @@ -1524,13 +1524,6 @@ he@^1.1.1: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -html-insert-assets@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/html-insert-assets/-/html-insert-assets-0.2.0.tgz#9b54223616aa85056dd637231e73029771c12d47" - integrity sha512-UsI4Bvczhk6kvQZXkSlAsy0R6jsdpVDpkmtpmO7NfYMaJ9N06u/AnsQOwL14uujEy3iVdW9w0UvAz/VMNZYAWw== - dependencies: - parse5 "^5.1.1" - http-errors@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" @@ -2522,11 +2515,6 @@ parse5@^5.0.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== -parse5@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== - parseqs@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"