From c46d533b22267557a6b20db8f7eb8d77449627e6 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Thu, 16 Dec 2021 14:11:53 +0100 Subject: [PATCH] build: switch devmode output to es2015 (#44505) To make our test output i.e. devmode output more aligned with what we produce in the NPM packages, or to be more aligned with what Angular applications will usually consume, the devmode output is switched from ES5 to ES2015. Additionally various tsconfigs (outside of Bazel) have been updated to match with the other parts of the build. The rules are: ES2015 for test configurations, ES2020 for actual code that will end up being shipped (this includes the IDE-only tsconfigs). PR Close #44505 --- packages/animations/browser/test/BUILD.bazel | 2 +- packages/animations/test/BUILD.bazel | 2 +- packages/bazel/src/ng_module/ng_module.bzl | 4 ++ packages/bazel/src/ngc-wrapped/tsconfig.json | 2 +- packages/bazel/test/ngc-wrapped/tsconfig.json | 2 +- packages/benchpress/test/BUILD.bazel | 2 +- packages/common/http/test/BUILD.bazel | 2 +- packages/common/http/testing/test/BUILD.bazel | 2 +- packages/common/test/BUILD.bazel | 2 +- packages/common/upgrade/test/BUILD.bazel | 2 +- .../bazel/injectable_def/app/test/BUILD.bazel | 2 +- .../ivy_build/app/test/BUILD.bazel | 2 +- .../flat_module/tsconfig-build.json | 4 +- .../ngtools_src/tsconfig-build.json | 4 +- .../third_party_src/tsconfig-build.json | 4 +- .../integrationtest/tsconfig-build.json | 4 +- .../integrationtest/tsconfig-xi18n.json | 4 +- .../linker/babel/test/BUILD.bazel | 2 +- packages/compiler-cli/linker/test/BUILD.bazel | 2 +- packages/compiler-cli/ngcc/test/BUILD.bazel | 4 +- .../src/ngtsc/annotations/test/BUILD.bazel | 2 +- .../src/ngtsc/core/test/BUILD.bazel | 2 +- .../src/ngtsc/cycles/test/BUILD.bazel | 6 +-- .../src/ngtsc/entry_point/test/BUILD.bazel | 2 +- .../src/ngtsc/file_system/test/BUILD.bazel | 2 +- .../src/ngtsc/imports/test/BUILD.bazel | 2 +- .../src/ngtsc/incremental/test/BUILD.bazel | 2 +- .../src/ngtsc/indexer/test/BUILD.bazel | 2 +- .../src/ngtsc/logging/test/BUILD.bazel | 2 +- .../src/ngtsc/metadata/test/BUILD.bazel | 2 +- .../ngtsc/partial_evaluator/test/BUILD.bazel | 2 +- .../src/ngtsc/reflection/test/BUILD.bazel | 2 +- .../src/ngtsc/scope/test/BUILD.bazel | 6 +-- .../src/ngtsc/shims/test/BUILD.bazel | 2 +- .../src/ngtsc/sourcemaps/test/BUILD.bazel | 2 +- .../src/ngtsc/transform/test/BUILD.bazel | 2 +- .../src/ngtsc/translator/test/BUILD.bazel | 2 +- .../checks/invalid_banana_in_box/BUILD.bazel | 2 +- .../BUILD.bazel | 2 +- .../src/ngtsc/typecheck/test/BUILD.bazel | 2 +- .../src/ngtsc/util/test/BUILD.bazel | 2 +- packages/compiler-cli/test/BUILD.bazel | 12 ++--- .../test/compliance/full/BUILD.bazel | 2 +- .../test/compliance/linked/BUILD.bazel | 2 +- .../compiler-cli/test/extract_i18n_spec.ts | 5 +- packages/compiler-cli/test/ngtsc/BUILD.bazel | 2 +- packages/compiler-cli/test/ngtsc/env.ts | 4 +- packages/compiler/test/BUILD.bazel | 2 +- .../test/expression_parser/BUILD.bazel | 2 +- packages/compiler/test/ml_parser/BUILD.bazel | 2 +- packages/compiler/test/render3/BUILD.bazel | 2 +- packages/compiler/test/selector/BUILD.bazel | 2 +- packages/core/test/BUILD.bazel | 2 +- packages/core/test/acceptance/BUILD.bazel | 2 +- packages/core/test/compiler/BUILD.bazel | 2 +- packages/core/test/render3/BUILD.bazel | 26 ++-------- packages/core/test/render3/ivy/BUILD.bazel | 4 +- .../test/render3/providers_es2015_spec.ts | 45 ------------------ packages/elements/test/BUILD.bazel | 11 ----- packages/examples/core/BUILD.bazel | 6 +-- packages/examples/core/testing/ts/BUILD.bazel | 2 +- packages/forms/test/BUILD.bazel | 2 +- .../localize/schematics/ng-add/BUILD.bazel | 6 +-- .../localize/src/localize/test/BUILD.bazel | 2 +- packages/localize/src/utils/test/BUILD.bazel | 2 +- packages/localize/test/BUILD.bazel | 2 +- packages/localize/tools/test/BUILD.bazel | 2 +- .../test/extract/integration/BUILD.bazel | 2 +- .../test/migrate/integration/BUILD.bazel | 2 +- .../test/translate/integration/BUILD.bazel | 2 +- .../platform-browser-dynamic/test/BUILD.bazel | 2 +- .../animations/test/BUILD.bazel | 2 +- packages/platform-browser/test/BUILD.bazel | 2 +- .../platform-server/init/test/BUILD.bazel | 2 +- packages/platform-server/test/BUILD.bazel | 2 +- packages/router/test/BUILD.bazel | 2 +- .../test/aot_ngsummary_test/BUILD.bazel | 2 +- packages/service-worker/cli/tsconfig.json | 6 +-- .../service-worker/config/test/BUILD.bazel | 2 +- packages/service-worker/test/BUILD.bazel | 2 +- packages/tsconfig-build.json | 4 +- packages/tsconfig-test.json | 3 +- packages/tsconfig.json | 4 +- packages/zone.js/test/BUILD.bazel | 10 ++-- tools/defaults.bzl | 27 ++++++----- tools/testing/BUILD.bazel | 2 +- tools/utils.bzl | 47 ------------------- 87 files changed, 134 insertions(+), 250 deletions(-) delete mode 100644 packages/core/test/render3/providers_es2015_spec.ts delete mode 100644 tools/utils.bzl diff --git a/packages/animations/browser/test/BUILD.bazel b/packages/animations/browser/test/BUILD.bazel index cf52e08ab49..ac834ba0f8a 100644 --- a/packages/animations/browser/test/BUILD.bazel +++ b/packages/animations/browser/test/BUILD.bazel @@ -30,7 +30,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/animations/test/BUILD.bazel b/packages/animations/test/BUILD.bazel index 8153e436ab3..03f81005621 100644 --- a/packages/animations/test/BUILD.bazel +++ b/packages/animations/test/BUILD.bazel @@ -20,7 +20,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/bazel/src/ng_module/ng_module.bzl b/packages/bazel/src/ng_module/ng_module.bzl index bf9b3322257..2c13ca58db7 100644 --- a/packages/bazel/src/ng_module/ng_module.bzl +++ b/packages/bazel/src/ng_module/ng_module.bzl @@ -275,6 +275,10 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs): if not is_devmode: # Note: Keep in sync with the `prodmode_target` for `ts_library` in `tools/defaults.bzl` tsconfig["compilerOptions"]["target"] = "es2020" + else: + # For devmode output, we use ES2015 to match with what `ts_library` produces by default. + # https://github.com/bazelbuild/rules_nodejs/blob/9b36274dba34204625579463e3da054a9f42cb47/packages/typescript/internal/build_defs.bzl#L83. + tsconfig["compilerOptions"]["target"] = "es2015" return tsconfig diff --git a/packages/bazel/src/ngc-wrapped/tsconfig.json b/packages/bazel/src/ngc-wrapped/tsconfig.json index 90e4dab8d91..c272f4cd21c 100644 --- a/packages/bazel/src/ngc-wrapped/tsconfig.json +++ b/packages/bazel/src/ngc-wrapped/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "lib": ["es5", "es2015.collection", "es2015.core"], + "lib": ["es2015"], "types": ["node"], "esModuleInterop": true, "downlevelIteration": true diff --git a/packages/bazel/test/ngc-wrapped/tsconfig.json b/packages/bazel/test/ngc-wrapped/tsconfig.json index 27305ea3303..ba4878b5857 100644 --- a/packages/bazel/test/ngc-wrapped/tsconfig.json +++ b/packages/bazel/test/ngc-wrapped/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "lib": ["es5", "es2015.collection", "es2015.core"], + "lib": ["es2015"], "types": ["node", "jasmine"], "esModuleInterop": true } diff --git a/packages/benchpress/test/BUILD.bazel b/packages/benchpress/test/BUILD.bazel index 6b46415e574..65559ae6342 100644 --- a/packages/benchpress/test/BUILD.bazel +++ b/packages/benchpress/test/BUILD.bazel @@ -15,7 +15,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", "//packages/benchpress", diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel index 73a82e7e29e..086143a6ea7 100644 --- a/packages/common/http/test/BUILD.bazel +++ b/packages/common/http/test/BUILD.bazel @@ -27,7 +27,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/common/http/testing/test/BUILD.bazel b/packages/common/http/testing/test/BUILD.bazel index 51763ab4252..e96cd90285e 100644 --- a/packages/common/http/testing/test/BUILD.bazel +++ b/packages/common/http/testing/test/BUILD.bazel @@ -24,7 +24,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/common/test/BUILD.bazel b/packages/common/test/BUILD.bazel index e30eb7ccd60..0a170ed417d 100644 --- a/packages/common/test/BUILD.bazel +++ b/packages/common/test/BUILD.bazel @@ -38,7 +38,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/common/upgrade/test/BUILD.bazel b/packages/common/upgrade/test/BUILD.bazel index 64a6a6cd673..f4d0a01417b 100644 --- a/packages/common/upgrade/test/BUILD.bazel +++ b/packages/common/upgrade/test/BUILD.bazel @@ -23,7 +23,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel index 0cb9a2f5b1e..ee538e62693 100644 --- a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel @@ -21,7 +21,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", "//packages/platform-server", diff --git a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel index a571819fcad..e2ce94858eb 100644 --- a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel @@ -19,7 +19,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/integrationtest/flat_module/tsconfig-build.json b/packages/compiler-cli/integrationtest/flat_module/tsconfig-build.json index d2dca0bb492..fa47ca08690 100644 --- a/packages/compiler-cli/integrationtest/flat_module/tsconfig-build.json +++ b/packages/compiler-cli/integrationtest/flat_module/tsconfig-build.json @@ -10,12 +10,12 @@ "baseUrl": ".", "declaration": true, "experimentalDecorators": true, - "lib": ["es6", "dom"], + "lib": ["es2015", "dom"], "moduleResolution": "node", "noImplicitAny": true, "outDir": "../node_modules/flat_module", "rootDir": "", - "target": "es5", + "target": "es2015", "typeRoots": ["../node_modules/@types"] }, diff --git a/packages/compiler-cli/integrationtest/ngtools_src/tsconfig-build.json b/packages/compiler-cli/integrationtest/ngtools_src/tsconfig-build.json index bf7ec968176..7899fe775a3 100644 --- a/packages/compiler-cli/integrationtest/ngtools_src/tsconfig-build.json +++ b/packages/compiler-cli/integrationtest/ngtools_src/tsconfig-build.json @@ -8,11 +8,11 @@ "baseUrl": ".", "declaration": true, "experimentalDecorators": true, - "lib": ["es6", "dom"], + "lib": ["es2015", "dom"], "moduleResolution": "node", "noImplicitAny": true, "rootDir": "", - "target": "es5", + "target": "es2015", "types": [] } } diff --git a/packages/compiler-cli/integrationtest/third_party_src/tsconfig-build.json b/packages/compiler-cli/integrationtest/third_party_src/tsconfig-build.json index c68d662e044..42a20413b30 100644 --- a/packages/compiler-cli/integrationtest/third_party_src/tsconfig-build.json +++ b/packages/compiler-cli/integrationtest/third_party_src/tsconfig-build.json @@ -8,12 +8,12 @@ "baseUrl": ".", "declaration": true, "experimentalDecorators": true, - "lib": ["es6", "dom"], + "lib": ["es2015", "dom"], "moduleResolution": "node", "noImplicitAny": true, "outDir": "../node_modules/third_party", "rootDir": "", - "target": "es5", + "target": "es2015", "typeRoots": ["../node_modules/@types"] } } diff --git a/packages/compiler-cli/integrationtest/tsconfig-build.json b/packages/compiler-cli/integrationtest/tsconfig-build.json index 3554e8f7331..b5a73bd4c62 100644 --- a/packages/compiler-cli/integrationtest/tsconfig-build.json +++ b/packages/compiler-cli/integrationtest/tsconfig-build.json @@ -12,7 +12,7 @@ "baseUrl": ".", "declaration": true, "experimentalDecorators": true, - "lib": ["es6", "dom"], + "lib": ["es2015", "dom"], "moduleResolution": "node", "noImplicitAny": true, "noUnusedLocals": true, @@ -23,7 +23,7 @@ // compatible with the option. Disabled until the integration test support the strict flag. // TODO(devversion): this has been enabled without the integration test code being "strictPropertyInitialization": false, - "target": "es5", + "target": "es2015", "typeRoots": ["node_modules/@types"] }, diff --git a/packages/compiler-cli/integrationtest/tsconfig-xi18n.json b/packages/compiler-cli/integrationtest/tsconfig-xi18n.json index 15d3ed9cab6..3e08ef46dbe 100644 --- a/packages/compiler-cli/integrationtest/tsconfig-xi18n.json +++ b/packages/compiler-cli/integrationtest/tsconfig-xi18n.json @@ -9,13 +9,13 @@ "baseUrl": ".", "declaration": true, "experimentalDecorators": true, - "lib": ["es6", "dom"], + "lib": ["es2015", "dom"], "moduleResolution": "node", "noImplicitAny": true, "outDir": "./xi18n-out", "rootDir": "", "skipLibCheck": true, - "target": "es5", + "target": "es2015", "typeRoots": ["node_modules/@types"] }, diff --git a/packages/compiler-cli/linker/babel/test/BUILD.bazel b/packages/compiler-cli/linker/babel/test/BUILD.bazel index 23261d5ac52..64a676e3a5d 100644 --- a/packages/compiler-cli/linker/babel/test/BUILD.bazel +++ b/packages/compiler-cli/linker/babel/test/BUILD.bazel @@ -29,7 +29,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/linker/test/BUILD.bazel b/packages/compiler-cli/linker/test/BUILD.bazel index c5759733141..fa3ba37fb48 100644 --- a/packages/compiler-cli/linker/test/BUILD.bazel +++ b/packages/compiler-cli/linker/test/BUILD.bazel @@ -24,7 +24,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/ngcc/test/BUILD.bazel b/packages/compiler-cli/ngcc/test/BUILD.bazel index ec50d8a2fae..967477a1fe6 100644 --- a/packages/compiler-cli/ngcc/test/BUILD.bazel +++ b/packages/compiler-cli/ngcc/test/BUILD.bazel @@ -38,7 +38,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], data = [ "//packages/compiler-cli/src/ngtsc/testing/fake_core:npm_package", ], @@ -90,7 +90,7 @@ babel( jasmine_node_test( name = "integration", timeout = "long", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], data = [ ":fesm5_angular_core", "@npm//@angular/common-12", diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel index 88a4280c2e7..bfe1897493b 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel @@ -31,7 +31,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/core/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/core/test/BUILD.bazel index 9ff0a5b7504..a14d09de3a1 100644 --- a/packages/compiler-cli/src/ngtsc/core/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/core/test/BUILD.bazel @@ -25,7 +25,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel index 21b3aaae069..e16b2965d28 100644 --- a/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel @@ -1,7 +1,7 @@ -package(default_visibility = ["//visibility:public"]) - load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +package(default_visibility = ["//visibility:public"]) + ts_library( name = "test_lib", testonly = True, @@ -21,7 +21,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel index 7895a913302..742947dde31 100644 --- a/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel @@ -19,7 +19,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel index 4cdee34cae6..e47122c5821 100644 --- a/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel @@ -17,7 +17,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/imports/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/imports/test/BUILD.bazel index 569b513b7a7..b9697f52a6b 100644 --- a/packages/compiler-cli/src/ngtsc/imports/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/imports/test/BUILD.bazel @@ -23,7 +23,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/incremental/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/incremental/test/BUILD.bazel index 77fb8e15f5e..f187a7e88c0 100644 --- a/packages/compiler-cli/src/ngtsc/incremental/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/incremental/test/BUILD.bazel @@ -23,7 +23,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/indexer/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/indexer/test/BUILD.bazel index 0fa0fc3270e..06b1e98d507 100644 --- a/packages/compiler-cli/src/ngtsc/indexer/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/indexer/test/BUILD.bazel @@ -23,7 +23,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/logging/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/logging/test/BUILD.bazel index ef486835c20..5ee9c38b9c1 100644 --- a/packages/compiler-cli/src/ngtsc/logging/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/logging/test/BUILD.bazel @@ -15,7 +15,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel index a1e12f6bd7f..404dde87d38 100644 --- a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel @@ -24,7 +24,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], data = [ "//packages/compiler-cli/src/ngtsc/testing/fake_core:npm_package", ], diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel index fce987b98d2..02b63e7ea3c 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel @@ -24,7 +24,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel index 0ef634cd56d..a21d0ae9094 100644 --- a/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel @@ -20,7 +20,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel index 3dbf78b9d8c..4c997e726fa 100644 --- a/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel @@ -1,7 +1,7 @@ -package(default_visibility = ["//visibility:public"]) - load("//tools:defaults.bzl", "jasmine_node_test", "ts_library") +package(default_visibility = ["//visibility:public"]) + ts_library( name = "test_lib", testonly = True, @@ -25,7 +25,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel index 33a31133332..0b14e259724 100644 --- a/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel @@ -21,7 +21,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/sourcemaps/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/sourcemaps/test/BUILD.bazel index d678c8a3cf1..2e89c99f4f4 100644 --- a/packages/compiler-cli/src/ngtsc/sourcemaps/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/sourcemaps/test/BUILD.bazel @@ -21,7 +21,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/transform/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/transform/test/BUILD.bazel index ca3f71a02e2..a7db76b8071 100644 --- a/packages/compiler-cli/src/ngtsc/transform/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/transform/test/BUILD.bazel @@ -24,7 +24,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/translator/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/translator/test/BUILD.bazel index ab5851162f3..aea240eaf2d 100644 --- a/packages/compiler-cli/src/ngtsc/translator/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/translator/test/BUILD.bazel @@ -18,7 +18,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/invalid_banana_in_box/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/invalid_banana_in_box/BUILD.bazel index 061f91a6651..96ea5886131 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/invalid_banana_in_box/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/invalid_banana_in_box/BUILD.bazel @@ -19,7 +19,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/nullish_coalescing_not_nullable/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/nullish_coalescing_not_nullable/BUILD.bazel index 99743638e5a..92e13ae4b59 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/nullish_coalescing_not_nullable/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/nullish_coalescing_not_nullable/BUILD.bazel @@ -19,7 +19,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel index 7e3036f547d..8309aa42722 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel @@ -34,7 +34,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel index 58c32aab77b..77e2e588900 100644 --- a/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel @@ -20,7 +20,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler-cli/test/BUILD.bazel b/packages/compiler-cli/test/BUILD.bazel index 9d87c9738a3..5aa8d10bf6d 100644 --- a/packages/compiler-cli/test/BUILD.bazel +++ b/packages/compiler-cli/test/BUILD.bazel @@ -40,7 +40,7 @@ ts_library( jasmine_node_test( name = "extract_i18n", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], data = [ "//packages/core:npm_package", ], @@ -68,7 +68,7 @@ ts_library( jasmine_node_test( name = "downlevel_decorator_transform", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":downlevel_decorator_transform_lib", ], @@ -92,7 +92,7 @@ ts_library( jasmine_node_test( name = "perform_watch", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], data = [ "//packages/core:npm_package", ], @@ -119,7 +119,7 @@ ts_library( jasmine_node_test( name = "perform_compile", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], data = [ "//packages/core:npm_package", ], @@ -142,7 +142,7 @@ ts_library( jasmine_node_test( name = "typescript_support", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":typescript_support_lib", ], @@ -160,7 +160,7 @@ ts_library( jasmine_node_test( name = "version_helpers", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":version_helpers_lib", ], diff --git a/packages/compiler-cli/test/compliance/full/BUILD.bazel b/packages/compiler-cli/test/compliance/full/BUILD.bazel index 38c05e971cc..58c6f429ea2 100644 --- a/packages/compiler-cli/test/compliance/full/BUILD.bazel +++ b/packages/compiler-cli/test/compliance/full/BUILD.bazel @@ -12,7 +12,7 @@ ts_library( jasmine_node_test( name = "full", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], data = [ "//packages/compiler-cli/src/ngtsc/testing/fake_core:npm_package", "//packages/compiler-cli/test/compliance/test_cases", diff --git a/packages/compiler-cli/test/compliance/linked/BUILD.bazel b/packages/compiler-cli/test/compliance/linked/BUILD.bazel index 3a0904b5abf..2d37761ff14 100644 --- a/packages/compiler-cli/test/compliance/linked/BUILD.bazel +++ b/packages/compiler-cli/test/compliance/linked/BUILD.bazel @@ -17,7 +17,7 @@ ts_library( jasmine_node_test( name = "linked", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], data = [ "//packages/compiler-cli/src/ngtsc/testing/fake_core:npm_package", "//packages/compiler-cli/test/compliance/test_cases", diff --git a/packages/compiler-cli/test/extract_i18n_spec.ts b/packages/compiler-cli/test/extract_i18n_spec.ts index 23e7cd71bd4..4883fe1950f 100644 --- a/packages/compiler-cli/test/extract_i18n_spec.ts +++ b/packages/compiler-cli/test/extract_i18n_spec.ts @@ -10,6 +10,7 @@ import * as fs from 'fs'; import * as path from 'path'; import {mainXi18n} from '../src/extract_i18n'; + import {setup} from './test_support'; const EXPECTED_XMB = ` @@ -222,10 +223,10 @@ describe('extract_i18n command line', () => { "rootDir": ".", "baseUrl": ".", "declaration": true, - "target": "es5", + "target": "es2015", "module": "es2015", "moduleResolution": "node", - "lib": ["es6", "dom"], + "lib": ["es2015", "dom"], "typeRoots": ["node_modules/@types"] } }`); diff --git a/packages/compiler-cli/test/ngtsc/BUILD.bazel b/packages/compiler-cli/test/ngtsc/BUILD.bazel index 4144808bf5c..04a1bbe859d 100644 --- a/packages/compiler-cli/test/ngtsc/BUILD.bazel +++ b/packages/compiler-cli/test/ngtsc/BUILD.bazel @@ -24,7 +24,7 @@ ts_library( jasmine_node_test( name = "ngtsc", timeout = "long", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], data = [ "//packages/compiler-cli/src/ngtsc/testing/fake_common:npm_package", "//packages/compiler-cli/src/ngtsc/testing/fake_core:npm_package", diff --git a/packages/compiler-cli/test/ngtsc/env.ts b/packages/compiler-cli/test/ngtsc/env.ts index c7fbbcf0961..16c9e65981a 100644 --- a/packages/compiler-cli/test/ngtsc/env.ts +++ b/packages/compiler-cli/test/ngtsc/env.ts @@ -64,11 +64,11 @@ export class NgtscTestEnvironment { "baseUrl": ".", "allowJs": true, "declaration": true, - "target": "es5", + "target": "es2015", "newLine": "lf", "module": "es2015", "moduleResolution": "node", - "lib": ["es6", "dom"], + "lib": ["es2015", "dom"], "typeRoots": ["node_modules/@types"] }, "angularCompilerOptions": { diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel index b772d754822..6ffb9d8dfdd 100644 --- a/packages/compiler/test/BUILD.bazel +++ b/packages/compiler/test/BUILD.bazel @@ -54,7 +54,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ":test_node_only_lib", diff --git a/packages/compiler/test/expression_parser/BUILD.bazel b/packages/compiler/test/expression_parser/BUILD.bazel index fa834c2f3f5..8e3c82773ce 100644 --- a/packages/compiler/test/expression_parser/BUILD.bazel +++ b/packages/compiler/test/expression_parser/BUILD.bazel @@ -14,7 +14,7 @@ ts_library( jasmine_node_test( name = "expression_parser", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":expression_parser_lib", ], diff --git a/packages/compiler/test/ml_parser/BUILD.bazel b/packages/compiler/test/ml_parser/BUILD.bazel index 9df32dcf0b6..099a995c16f 100644 --- a/packages/compiler/test/ml_parser/BUILD.bazel +++ b/packages/compiler/test/ml_parser/BUILD.bazel @@ -13,7 +13,7 @@ ts_library( jasmine_node_test( name = "ml_parser", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":ml_parser_lib", ], diff --git a/packages/compiler/test/render3/BUILD.bazel b/packages/compiler/test/render3/BUILD.bazel index a41c153a35d..33e477a65eb 100644 --- a/packages/compiler/test/render3/BUILD.bazel +++ b/packages/compiler/test/render3/BUILD.bazel @@ -16,7 +16,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/compiler/test/selector/BUILD.bazel b/packages/compiler/test/selector/BUILD.bazel index af9b5c903c1..4bfeda303ba 100644 --- a/packages/compiler/test/selector/BUILD.bazel +++ b/packages/compiler/test/selector/BUILD.bazel @@ -13,7 +13,7 @@ ts_library( jasmine_node_test( name = "selector", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":selector_lib", ], diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel index 3446327df5e..f99c95c43bc 100644 --- a/packages/core/test/BUILD.bazel +++ b/packages/core/test/BUILD.bazel @@ -108,7 +108,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], data = [ ":downleveled_es5_fixture", ], diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel index d973f707fe4..b3abaa7ccad 100644 --- a/packages/core/test/acceptance/BUILD.bazel +++ b/packages/core/test/acceptance/BUILD.bazel @@ -37,7 +37,7 @@ ts_library( jasmine_node_test( name = "acceptance", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":acceptance_lib", "//packages/zone.js/lib:zone_d_ts", diff --git a/packages/core/test/compiler/BUILD.bazel b/packages/core/test/compiler/BUILD.bazel index 95f8ca8b39c..3c7e1b31542 100644 --- a/packages/core/test/compiler/BUILD.bazel +++ b/packages/core/test/compiler/BUILD.bazel @@ -16,7 +16,7 @@ ts_library( jasmine_node_test( name = "compiler", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":compiler_lib", ], diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel index 6e28a0f3741..b96c4c94cdc 100644 --- a/packages/core/test/render3/BUILD.bazel +++ b/packages/core/test/render3/BUILD.bazel @@ -2,10 +2,6 @@ load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_li package(default_visibility = ["//visibility:public"]) -ES2015_SPECS = [ - "providers_es2015_spec.ts", -] - ts_library( name = "render3_lib", testonly = True, @@ -18,7 +14,7 @@ ts_library( "is_shape_of.ts", "jit_spec.ts", "matchers.ts", - ] + ES2015_SPECS, + ], ), deps = [ ":matchers", @@ -41,20 +37,6 @@ ts_library( ], ) -ts_library( - name = "render3_es2015_test_lib", - testonly = True, - srcs = ES2015_SPECS, - devmode_target = "es2015", - tsconfig = "es2015-tsconfig.json", - deps = [ - ":matchers", - ":render3_lib", - "//packages:types", - "//packages/core", - ], -) - ts_library( name = "matchers", testonly = True, @@ -94,11 +76,10 @@ ts_library( jasmine_node_test( name = "render3", bootstrap = [ - ":domino_es5", - "//tools/testing:node_es5", + ":domino_es2015", + "//tools/testing:node_es2015", ], deps = [ - ":render3_es2015_test_lib", ":render3_node_lib", "//packages/zone.js/lib", ], @@ -107,7 +88,6 @@ jasmine_node_test( karma_web_test_suite( name = "render3_web", deps = [ - ":render3_es2015_test_lib", ":render3_lib", ], ) diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel index 6a919a757ed..e5cd86fc74c 100644 --- a/packages/core/test/render3/ivy/BUILD.bazel +++ b/packages/core/test/render3/ivy/BUILD.bazel @@ -17,8 +17,8 @@ ts_library( jasmine_node_test( name = "ivy", bootstrap = [ - "//packages/core/test/render3:domino_es5", - "//tools/testing:node_es5", + "//packages/core/test/render3:domino_es2015", + "//tools/testing:node_es2015", ], deps = [ ":ivy_lib", diff --git a/packages/core/test/render3/providers_es2015_spec.ts b/packages/core/test/render3/providers_es2015_spec.ts deleted file mode 100644 index 35098c38db5..00000000000 --- a/packages/core/test/render3/providers_es2015_spec.ts +++ /dev/null @@ -1,45 +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.io/license - */ - -import {forwardRef, InjectionToken, ɵɵdirectiveInject} from '@angular/core'; - -import {expectProvidersScenario} from './providers_helper'; - -describe('es2015 providers', () => { - abstract class Greeter { - abstract greet: string; - } - - const GREETER = new InjectionToken('greeter'); - - class GreeterClass implements Greeter { - greet = 'Class'; - hasBeenCleanedUp = false; - - ngOnDestroy() { - this.hasBeenCleanedUp = true; - } - } - - it('ClassProvider wrapped in forwardRef', () => { - let greeterInstance: GreeterClass|null = null; - - expectProvidersScenario({ - parent: { - providers: [{provide: GREETER, useClass: forwardRef(() => GreeterClass)}], - componentAssertion: () => { - greeterInstance = ɵɵdirectiveInject(GREETER) as GreeterClass; - expect(greeterInstance.greet).toEqual('Class'); - } - } - }); - - expect(greeterInstance).not.toBeNull(); - expect(greeterInstance!.hasBeenCleanedUp).toBe(true); - }); -}); diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel index ebfcbe37d22..90765ce2255 100644 --- a/packages/elements/test/BUILD.bazel +++ b/packages/elements/test/BUILD.bazel @@ -1,6 +1,5 @@ load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library") load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test") -load("//tools:utils.bzl", "transpile_js_to_es5") circular_dependency_test( name = "circular_deps_test", @@ -26,13 +25,6 @@ ts_library( ], ) -# This file is shipped as es2015 to npm. We have to transpile -# it to es5 in order to run the tests against older browsers. -transpile_js_to_es5( - name = "custom_elements_native_shim", - js_file = "@npm//:node_modules/@webcomponents/custom-elements/src/native-shim.js", -) - filegroup( name = "elements_test_bootstrap_scripts", testonly = True, @@ -41,9 +33,6 @@ filegroup( "@npm//:node_modules/core-js-bundle/index.js", # Required for browsers that do not natively support Custom Elements. "@npm//:node_modules/@webcomponents/custom-elements/custom-elements.min.js", - # Required for ES5 code to work with a native Custom Elements implementation. - # (See https://www.npmjs.com/package/@webcomponents/custom-elements#es5-vs-es2015.) - ":custom_elements_native_shim", "@npm//:node_modules/reflect-metadata/Reflect.js", "//packages/zone.js/bundles:zone.umd.js", "//packages/zone.js/bundles:zone-testing.umd.js", diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 2befe31a35f..43c62f68920 100644 --- a/packages/examples/core/BUILD.bazel +++ b/packages/examples/core/BUILD.bazel @@ -1,7 +1,7 @@ -package(default_visibility = ["//visibility:public"]) - load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "protractor_web_test_suite", "ts_devserver", "ts_library") +package(default_visibility = ["//visibility:public"]) + ng_module( name = "core_examples", srcs = glob( @@ -78,7 +78,7 @@ protractor_web_test_suite( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":core_tests_lib", ], diff --git a/packages/examples/core/testing/ts/BUILD.bazel b/packages/examples/core/testing/ts/BUILD.bazel index d845f648ea0..600d9939302 100644 --- a/packages/examples/core/testing/ts/BUILD.bazel +++ b/packages/examples/core/testing/ts/BUILD.bazel @@ -15,7 +15,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":fake_async_lib", ], diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel index 525cba5a080..b52c87b43ca 100644 --- a/packages/forms/test/BUILD.bazel +++ b/packages/forms/test/BUILD.bazel @@ -27,7 +27,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/localize/schematics/ng-add/BUILD.bazel b/packages/localize/schematics/ng-add/BUILD.bazel index 020ea85db65..17f2f409885 100644 --- a/packages/localize/schematics/ng-add/BUILD.bazel +++ b/packages/localize/schematics/ng-add/BUILD.bazel @@ -1,7 +1,7 @@ -package(default_visibility = ["//visibility:public"]) - load("//tools:defaults.bzl", "jasmine_node_test", "ts_config", "ts_library") +package(default_visibility = ["//visibility:public"]) + ts_config( name = "tsconfig", src = "tsconfig-build.json", @@ -42,7 +42,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/localize/src/localize/test/BUILD.bazel b/packages/localize/src/localize/test/BUILD.bazel index 4da7c93501a..6aa2ca88be0 100644 --- a/packages/localize/src/localize/test/BUILD.bazel +++ b/packages/localize/src/localize/test/BUILD.bazel @@ -14,7 +14,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/localize/src/utils/test/BUILD.bazel b/packages/localize/src/utils/test/BUILD.bazel index aa16ff7e837..1bb1a8a54fc 100644 --- a/packages/localize/src/utils/test/BUILD.bazel +++ b/packages/localize/src/utils/test/BUILD.bazel @@ -14,7 +14,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/localize/test/BUILD.bazel b/packages/localize/test/BUILD.bazel index 70622deefda..ce0dee17bec 100644 --- a/packages/localize/test/BUILD.bazel +++ b/packages/localize/test/BUILD.bazel @@ -23,7 +23,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/localize/tools/test/BUILD.bazel b/packages/localize/tools/test/BUILD.bazel index 940091cb3ff..c0a5a6648e8 100644 --- a/packages/localize/tools/test/BUILD.bazel +++ b/packages/localize/tools/test/BUILD.bazel @@ -27,7 +27,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", "@npm//glob", diff --git a/packages/localize/tools/test/extract/integration/BUILD.bazel b/packages/localize/tools/test/extract/integration/BUILD.bazel index 1464fa8e72b..511f2b1bda5 100644 --- a/packages/localize/tools/test/extract/integration/BUILD.bazel +++ b/packages/localize/tools/test/extract/integration/BUILD.bazel @@ -21,7 +21,7 @@ ts_library( jasmine_node_test( name = "integration", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], data = [ "//packages/localize/tools/test/extract/integration/test_files", "//packages/localize/tools/test/extract/integration/test_files:compile_es2015", diff --git a/packages/localize/tools/test/migrate/integration/BUILD.bazel b/packages/localize/tools/test/migrate/integration/BUILD.bazel index 52b652f7544..da8e9b5b183 100644 --- a/packages/localize/tools/test/migrate/integration/BUILD.bazel +++ b/packages/localize/tools/test/migrate/integration/BUILD.bazel @@ -28,7 +28,7 @@ copy_to_bin( jasmine_node_test( name = "integration", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], data = [ ":test_files", ], diff --git a/packages/localize/tools/test/translate/integration/BUILD.bazel b/packages/localize/tools/test/translate/integration/BUILD.bazel index c0ac0e20e27..64cc6c9fc3e 100644 --- a/packages/localize/tools/test/translate/integration/BUILD.bazel +++ b/packages/localize/tools/test/translate/integration/BUILD.bazel @@ -18,7 +18,7 @@ ts_library( jasmine_node_test( name = "integration", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], data = [ "//packages/localize/tools/test/translate/integration/locales", "//packages/localize/tools/test/translate/integration/test_files", diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel index c798c052e70..6e7ee7866c5 100644 --- a/packages/platform-browser-dynamic/test/BUILD.bazel +++ b/packages/platform-browser-dynamic/test/BUILD.bazel @@ -25,7 +25,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/platform-browser/animations/test/BUILD.bazel b/packages/platform-browser/animations/test/BUILD.bazel index f14e31e55a1..25e5ae35d90 100644 --- a/packages/platform-browser/animations/test/BUILD.bazel +++ b/packages/platform-browser/animations/test/BUILD.bazel @@ -31,7 +31,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel index 901e3f6c94f..09dd8f05d59 100644 --- a/packages/platform-browser/test/BUILD.bazel +++ b/packages/platform-browser/test/BUILD.bazel @@ -42,7 +42,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/platform-server/init/test/BUILD.bazel b/packages/platform-server/init/test/BUILD.bazel index aeee41bd844..b70f110872f 100644 --- a/packages/platform-server/init/test/BUILD.bazel +++ b/packages/platform-server/init/test/BUILD.bazel @@ -18,7 +18,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_no_angular_es5"], + bootstrap = ["//tools/testing:node_no_angular_es2015"], deps = [ ":test_lib", ], diff --git a/packages/platform-server/test/BUILD.bazel b/packages/platform-server/test/BUILD.bazel index 24b5d5b4d43..5a4b8b9b049 100644 --- a/packages/platform-server/test/BUILD.bazel +++ b/packages/platform-server/test/BUILD.bazel @@ -35,7 +35,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel index bbadc0ccba9..ae8e5bd9164 100644 --- a/packages/router/test/BUILD.bazel +++ b/packages/router/test/BUILD.bazel @@ -36,7 +36,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/router/test/aot_ngsummary_test/BUILD.bazel b/packages/router/test/aot_ngsummary_test/BUILD.bazel index f21ff919143..7355107a918 100644 --- a/packages/router/test/aot_ngsummary_test/BUILD.bazel +++ b/packages/router/test/aot_ngsummary_test/BUILD.bazel @@ -27,7 +27,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":aot_test_lib", ], diff --git a/packages/service-worker/cli/tsconfig.json b/packages/service-worker/cli/tsconfig.json index b226276bacf..697d364ab3f 100644 --- a/packages/service-worker/cli/tsconfig.json +++ b/packages/service-worker/cli/tsconfig.json @@ -3,7 +3,7 @@ "baseUrl": ".", "declaration": false, "strict": true, - "module": "es2015", + "module": "es2020", "moduleResolution": "node", "strictNullChecks": true, "strictPropertyInitialization": true, @@ -17,8 +17,8 @@ "@angular/service-worker/config": ["../../../dist/packages/service-worker/config"] }, "inlineSourceMap": true, - "lib": ["es2015"], - "target": "es5", + "lib": ["es2020"], + "target": "es2020", "typeRoots": [], "types": [ "node" diff --git a/packages/service-worker/config/test/BUILD.bazel b/packages/service-worker/config/test/BUILD.bazel index 6d0a35c3a84..c6376652673 100644 --- a/packages/service-worker/config/test/BUILD.bazel +++ b/packages/service-worker/config/test/BUILD.bazel @@ -21,7 +21,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", "//packages/service-worker/config", diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel index 16956f533a1..acbb9cb2aa1 100644 --- a/packages/service-worker/test/BUILD.bazel +++ b/packages/service-worker/test/BUILD.bazel @@ -25,7 +25,7 @@ ts_library( jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [ ":test_lib", ], diff --git a/packages/tsconfig-build.json b/packages/tsconfig-build.json index 8a6d7437985..46aff24e958 100644 --- a/packages/tsconfig-build.json +++ b/packages/tsconfig-build.json @@ -31,8 +31,6 @@ "importHelpers": true }, "bazelOptions": { - "suppressTsconfigOverrideWarnings": true, - // TODO(devversion): Switch devmode target to ES2020 or combine devmode with prodmode. - "devmodeTargetOverride": "es5" + "suppressTsconfigOverrideWarnings": true } } diff --git a/packages/tsconfig-test.json b/packages/tsconfig-test.json index 49d6b9523f2..9a1307f7668 100644 --- a/packages/tsconfig-test.json +++ b/packages/tsconfig-test.json @@ -11,7 +11,6 @@ }] }, "bazelOptions": { - "suppressTsconfigOverrideWarnings": true, - "devmodeTargetOverride": "es5" + "suppressTsconfigOverrideWarnings": true } } diff --git a/packages/tsconfig.json b/packages/tsconfig.json index 29bfd891c95..592850b9961 100644 --- a/packages/tsconfig.json +++ b/packages/tsconfig.json @@ -8,6 +8,7 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "module": "es2020", + "target": "es2020", "strict": true, "moduleResolution": "node", "esModuleInterop": true, @@ -43,7 +44,6 @@ ], "skipDefaultLibCheck": true, "skipLibCheck": true, - "target": "es2020", "types": [ "angular" ] @@ -68,4 +68,4 @@ "platform-server/integrationtest", "router/test/aot_ngsummary_test" ] -} \ No newline at end of file +} diff --git a/packages/zone.js/test/BUILD.bazel b/packages/zone.js/test/BUILD.bazel index a461668524e..e7345d07b35 100644 --- a/packages/zone.js/test/BUILD.bazel +++ b/packages/zone.js/test/BUILD.bazel @@ -182,7 +182,7 @@ ts_library( jasmine_node_test( name = "test_node", - bootstrap = [":node_entry_point_es5"], + bootstrap = [":node_entry_point_es2015"], deps = [ ":test_node_lib", ], @@ -190,7 +190,7 @@ jasmine_node_test( jasmine_node_test( name = "test_node_no_jasmine_clock", - bootstrap = [":node_entry_point_no_patch_clock_es5"], + bootstrap = [":node_entry_point_no_patch_clock_es2015"], deps = [ ":test_node_lib", ], @@ -198,7 +198,7 @@ jasmine_node_test( jasmine_node_test( name = "test_node_bluebird", - bootstrap = [":node_bluebird_entry_point_es5"], + bootstrap = [":node_bluebird_entry_point_es2015"], deps = [ ":bluebird_spec", ], @@ -206,12 +206,12 @@ jasmine_node_test( jasmine_node_test( name = "test_node_error_disable_policy", - bootstrap = [":node_error_disable_policy_entry_point_es5"], + bootstrap = [":node_error_disable_policy_entry_point_es2015"], ) jasmine_node_test( name = "test_node_error_lazy_policy", - bootstrap = [":node_error_lazy_policy_entry_point_es5"], + bootstrap = [":node_error_lazy_policy_entry_point_es2015"], ) ts_library( diff --git a/tools/defaults.bzl b/tools/defaults.bzl index bf1126c33ed..03caa9574bd 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -123,6 +123,7 @@ def ts_library(name, tsconfig = None, testonly = False, deps = [], module_name = # For prodmode, the target is set to `ES2020`. `@bazel/typecript` sets `ES2015` by # default. Note that this should be in sync with the `ng_module` tsconfig generation. # https://github.com/bazelbuild/rules_nodejs/blob/901df3868e3ceda177d3ed181205e8456a5592ea/third_party/github.com/bazelbuild/rules_typescript/internal/common/tsconfig.bzl#L195 + # https://github.com/bazelbuild/rules_nodejs/blob/9b36274dba34204625579463e3da054a9f42cb47/packages/typescript/internal/build_defs.bzl#L85. prodmode_target = "es2020", # `module_name` is used for AMD module names within emitted JavaScript files. module_name = module_name, @@ -132,14 +133,18 @@ def ts_library(name, tsconfig = None, testonly = False, deps = [], module_name = **kwargs ) - # Select the es5 .js output of the ts_library for use in downstream boostrap targets - # with `output_group = "es5_sources"`. This exposes an internal detail of ts_library - # that is not ideal. - # TODO(gregmagolan): clean this up by using tsc() in these cases rather than ts_library + # The `ts_library` targets by default only expose the type definitions as `DefaultInfo`. + # This is an auto-generated target that can be used to access the plain ES2015 devmode output. + # TODO(devversion): Should be renamed once we have devmode & prodmode combined. native.filegroup( - name = "%s_es5" % name, + # Note: When changing the suffix of this target, update the `jasmine_node_test` bootstrap + # logic which has special logic for resolving such targets. + name = "%s_es2015" % name, srcs = [":%s" % name], testonly = testonly, + # Note: Ironically this is named `es5_sources` but it refers to the devmode output. + # This is just an artifact of many iterations in `@bazel/typescript`. This is being + # solved together with us combining devmode & prodmode. output_group = "es5_sources", ) @@ -404,15 +409,15 @@ def jasmine_node_test(bootstrap = [], **kwargs): file. The label is automatically added to the deps of jasmine_node_test. - If the label ends in `_es5` which by convention selects the es5 outputs - of a ts_library rule, then corresponding ts_library target sans `_es5` + If the label ends in `_es2015` which by convention selects the es2015 outputs + of a ts_library rule, then corresponding ts_library target sans `_es2015` is also added to the deps of jasmine_node_test. For example with, jasmine_node_test( name = "test", - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], deps = [":test_lib"], ) @@ -438,12 +443,12 @@ def jasmine_node_test(bootstrap = [], **kwargs): for label in bootstrap: deps += [label] templated_args += ["--node_options=--require=$$(rlocation $(rootpath %s))" % label] - if label.endswith("_es5"): + if label.endswith("_es2015"): # If this label is a filegroup derived from a ts_library then automatically - # add the ts_library target (which is the label sans `_es5`) to deps so we pull + # add the ts_library target (which is the label sans `_es2015`) to deps so we pull # in all of its transitive deps. This removes the need for duplicate deps on the # target and makes the usage of this rule less verbose. - deps += [label[:-4]] + deps += [label[:-len("_es2015")]] _jasmine_node_test( deps = deps, diff --git a/tools/testing/BUILD.bazel b/tools/testing/BUILD.bazel index 1344c895ed5..62bb2952f04 100644 --- a/tools/testing/BUILD.bazel +++ b/tools/testing/BUILD.bazel @@ -57,6 +57,6 @@ jasmine_node_test( jasmine_node_test( name = "fail_bootstrap_test", srcs = ["fail.spec.js"], - bootstrap = ["//tools/testing:node_es5"], + bootstrap = ["//tools/testing:node_es2015"], expected_exit_code = 55, ) diff --git a/tools/utils.bzl b/tools/utils.bzl deleted file mode 100644 index 441710797e5..00000000000 --- a/tools/utils.bzl +++ /dev/null @@ -1,47 +0,0 @@ -"""Simple utility bazel macros for convenience usage.""" - -load("@npm//typescript:index.bzl", "tsc") - -def transpile_js_to_es5(name, js_file): - """Transpiles a provided javascript target to es5. - - For testing on IE, shims must be served in es5, this macro can be used to - transpile es2015 JS shims to es5 for usage in IE testing. - - Example usage: - - transpile_js_to_es5( - name = "my-file", - js_file = "@npm//some_package/shim_files/es6_shim_file.js", - ) - - filegroup( - name = "some_shims_for_tests", - testonly = True, - srcs = [ - ":my-file", - ... - ] - ) - """ - tsc( - name = name, - outs = [ - "%s.js" % name, - ], - args = [ - # Allow JS files to be used for transpiling - "--allowJs", - # Skip lib check as pure local javascript transpiling should be done - "--skipLibCheck", - # Transpile to ES5 - "--target ES5", - # Output the transpiled file to the location provided by the name - "--outFile $(execpath :%s.js)" % name, - # Transpile the provided js_file - "$(execpath %s)" % js_file, - ], - data = [ - js_file, - ], - )