33load ("@rules_pkg//:pkg.bzl" , "pkg_tar" )
44load ("@build_bazel_rules_nodejs//:index.bzl" , _pkg_npm = "pkg_npm" )
55load ("@io_bazel_rules_sass//:defs.bzl" , _npm_sass_library = "npm_sass_library" , _sass_binary = "sass_binary" , _sass_library = "sass_library" )
6- load ("@npm//@angular/bazel:index.bzl" , _ng_module = "ng_module" , _ng_package = "ng_package" )
6+ load ("@npm//@angular/bazel:index.bzl" , _ng_package = "ng_package" )
77load ("@npm//@angular/build-tooling/bazel/integration:index.bzl" , _integration_test = "integration_test" )
88load ("@npm//@angular/build-tooling/bazel/karma:index.bzl" , _karma_web_test_suite = "karma_web_test_suite" )
99load ("@npm//@angular/build-tooling/bazel/esbuild:index.bzl" , _esbuild = "esbuild" , _esbuild_config = "esbuild_config" )
@@ -12,16 +12,11 @@ load("@npm//@angular/build-tooling/bazel/http-server:index.bzl", _http_server =
1212load ("@npm//@angular/build-tooling/bazel:extract_js_module_output.bzl" , "extract_js_module_output" )
1313load ("@npm//@bazel/jasmine:index.bzl" , _jasmine_node_test = "jasmine_node_test" )
1414load ("@npm//@bazel/protractor:index.bzl" , _protractor_web_test_suite = "protractor_web_test_suite" )
15- load ("@npm//tsec:index.bzl" , _tsec_test = "tsec_test" )
1615load ("//:packages.bzl" , "NO_STAMP_NPM_PACKAGE_SUBSTITUTIONS" , "NPM_PACKAGE_SUBSTITUTIONS" )
1716load ("//:pkg-externals.bzl" , "PKG_EXTERNALS" )
1817load ("//tools/markdown-to-html:index.bzl" , _markdown_to_html = "markdown_to_html" )
1918load ("//tools/extract-tokens:index.bzl" , _extract_tokens = "extract_tokens" )
2019load ("//tools/angular:index.bzl" , "LINKER_PROCESSED_FW_PACKAGES" )
21- load ("//tools/bazel:module_name.bzl" , "compute_module_name" )
22-
23- _DEFAULT_TSCONFIG_BUILD = "//src:bazel-tsconfig-build.json"
24- _DEFAULT_TSCONFIG_TEST = "//src:tsconfig-test"
2520
2621npmPackageSubstitutions = select ({
2722 "//tools:stamp" : NPM_PACKAGE_SUBSTITUTIONS ,
@@ -36,23 +31,6 @@ esbuild = _esbuild
3631esbuild_config = _esbuild_config
3732http_server = _http_server
3833
39- def _make_tsec_test (target ):
40- package_name = native .package_name ()
41- if not package_name .startswith ("src/components-examples" ) and \
42- not package_name .endswith ("/testing" ) and \
43- not package_name .endswith ("/schematics" ):
44- _tsec_test (
45- name = target + "_tsec_test" ,
46- target = target ,
47- tsconfig = "//src:tsec_config" ,
48- )
49-
50- def _getDefaultTsConfig (testonly ):
51- if testonly :
52- return _DEFAULT_TSCONFIG_TEST
53- else :
54- return _DEFAULT_TSCONFIG_BUILD
55-
5634def sass_binary (sourcemap = False , include_paths = [], ** kwargs ):
5735 _sass_binary (
5836 sourcemap = sourcemap ,
@@ -67,47 +45,6 @@ def sass_library(**kwargs):
6745def npm_sass_library (** kwargs ):
6846 _npm_sass_library (** kwargs )
6947
70- def ng_module (
71- deps = [],
72- srcs = [],
73- tsconfig = None ,
74- testonly = False ,
75- ** kwargs ):
76- if not tsconfig :
77- tsconfig = _getDefaultTsConfig (testonly )
78-
79- # Compute an AMD module name for the target.
80- module_name = compute_module_name (testonly )
81-
82- local_deps = [
83- # Add tslib because we use import helpers for all public packages.
84- "@npm//tslib" ,
85- ]
86-
87- # Append given deps only if they're not in the default set of deps
88- for d in deps :
89- if d not in local_deps :
90- local_deps = local_deps + [d ]
91-
92- _ng_module (
93- srcs = srcs ,
94- # `module_name` is used for AMD module names within emitted JavaScript files.
95- module_name = module_name ,
96- # We use the module name as package name, so that the target can be resolved within
97- # NodeJS executions, by activating the Bazel NodeJS linker.
98- # See: https://github.com/bazelbuild/rules_nodejs/pull/2799.
99- package_name = module_name ,
100- strict_templates = True ,
101- deps = local_deps ,
102- tsconfig = tsconfig ,
103- testonly = testonly ,
104- ** kwargs
105- )
106-
107- # TODO(devversion): Partner with ISE team to support `rules_js` here.
108- if False and module_name and not testonly :
109- _make_tsec_test (kwargs ["name" ])
110-
11148def ng_package (name , srcs = [], deps = [], externals = PKG_EXTERNALS , readme_md = None , visibility = None , ** kwargs ):
11249 # If no readme file has been specified explicitly, use the default readme for
11350 # release packages from "src/README.md".
@@ -295,7 +232,7 @@ def ng_web_test_suite(deps = [], static_css = [], exclude_init_script = False, *
295232 ]
296233
297234 # Workaround for https://github.com/bazelbuild/rules_typescript/issues/301
298- # Since some of our tests depend on CSS files which are not part of the `ng_module ` rule,
235+ # Since some of our tests depend on CSS files which are not part of the `ng_project ` rule,
299236 # we need to somehow load static CSS files within Karma (e.g. overlay prebuilt). Those styles
300237 # are required for successful test runs. Since the `karma_web_test_suite` rule currently only
301238 # allows JS files to be included and served within Karma, we need to create a JS file that
0 commit comments