build: rules_nodejs 0.26.0 & use @npm instead of @ngdeps now that downstream angular build uses angular bundles (#28871)
PR Close #28871
This commit is contained in:

committed by
Andrew Kushnir

parent
cd83a43462
commit
ea09430039
@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
|
||||
|
||||
load("//packages/bazel:index.bzl", "protractor_web_test_suite")
|
||||
load("//tools:defaults.bzl", "ng_module", "ts_library")
|
||||
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
|
||||
load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
|
||||
|
||||
ng_module(
|
||||
name = "common_examples",
|
||||
@ -18,7 +18,7 @@ ng_module(
|
||||
"//packages/platform-browser",
|
||||
"//packages/platform-browser-dynamic",
|
||||
"//packages/router",
|
||||
"@ngdeps//rxjs",
|
||||
"@npm//rxjs",
|
||||
],
|
||||
)
|
||||
|
||||
@ -30,8 +30,8 @@ ts_library(
|
||||
deps = [
|
||||
"//packages/examples/test-utils",
|
||||
"//packages/private/testing",
|
||||
"@ngdeps//@types/jasminewd2",
|
||||
"@ngdeps//protractor",
|
||||
"@npm//@types/jasminewd2",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
||||
@ -41,14 +41,14 @@ ts_devserver(
|
||||
index_html = "//packages/examples:index.html",
|
||||
port = 4200,
|
||||
scripts = [
|
||||
"@ngdeps//node_modules/tslib:tslib.js",
|
||||
"@npm//node_modules/tslib:tslib.js",
|
||||
"//tools/rxjs:rxjs_umd_modules",
|
||||
],
|
||||
static_files = [
|
||||
"@ngdeps//node_modules/zone.js:dist/zone.js",
|
||||
"@npm//node_modules/zone.js:dist/zone.js",
|
||||
# This is needed because the "ngComponentOutlet" test uses the JIT compiler
|
||||
# and needs to be able to read metadata at runtime.
|
||||
"@ngdeps//node_modules/reflect-metadata:Reflect.js",
|
||||
"@npm//node_modules/reflect-metadata:Reflect.js",
|
||||
],
|
||||
deps = [":common_examples"],
|
||||
)
|
||||
@ -60,7 +60,7 @@ protractor_web_test_suite(
|
||||
server = ":devserver",
|
||||
deps = [
|
||||
":common_tests_lib",
|
||||
"@ngdeps//protractor",
|
||||
"@ngdeps//selenium-webdriver",
|
||||
"@npm//protractor",
|
||||
"@npm//selenium-webdriver",
|
||||
],
|
||||
)
|
||||
|
@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
|
||||
|
||||
load("//packages/bazel:index.bzl", "protractor_web_test_suite")
|
||||
load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ts_library")
|
||||
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
|
||||
load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
|
||||
|
||||
ng_module(
|
||||
name = "core_examples",
|
||||
@ -22,7 +22,7 @@ ng_module(
|
||||
"//packages/platform-browser-dynamic",
|
||||
"//packages/platform-browser/animations",
|
||||
"//packages/router",
|
||||
"@ngdeps//rxjs",
|
||||
"@npm//rxjs",
|
||||
],
|
||||
)
|
||||
|
||||
@ -46,8 +46,8 @@ ts_library(
|
||||
tsconfig = "//packages/examples:tsconfig-e2e.json",
|
||||
deps = [
|
||||
"//packages/examples/test-utils",
|
||||
"@ngdeps//@types/jasminewd2",
|
||||
"@ngdeps//protractor",
|
||||
"@npm//@types/jasminewd2",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
||||
@ -57,12 +57,12 @@ ts_devserver(
|
||||
index_html = "//packages/examples:index.html",
|
||||
port = 4200,
|
||||
scripts = [
|
||||
"@ngdeps//node_modules/tslib:tslib.js",
|
||||
"@npm//node_modules/tslib:tslib.js",
|
||||
"//tools/rxjs:rxjs_umd_modules",
|
||||
],
|
||||
static_files = [
|
||||
"@ngdeps//node_modules/zone.js:dist/zone.js",
|
||||
"@ngdeps//node_modules/zone.js:dist/task-tracking.js",
|
||||
"@npm//node_modules/zone.js:dist/zone.js",
|
||||
"@npm//node_modules/zone.js:dist/task-tracking.js",
|
||||
],
|
||||
deps = [":core_examples"],
|
||||
)
|
||||
@ -74,8 +74,8 @@ protractor_web_test_suite(
|
||||
server = ":devserver",
|
||||
deps = [
|
||||
":core_e2e_tests_lib",
|
||||
"@ngdeps//protractor",
|
||||
"@ngdeps//selenium-webdriver",
|
||||
"@npm//protractor",
|
||||
"@npm//selenium-webdriver",
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -8,8 +8,8 @@ ts_library(
|
||||
],
|
||||
deps = [
|
||||
"//packages/core/testing",
|
||||
"@ngdeps//@types/jasmine",
|
||||
"@ngdeps//@types/node",
|
||||
"@npm//@types/jasmine",
|
||||
"@npm//@types/node",
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
|
||||
|
||||
load("//packages/bazel:index.bzl", "protractor_web_test_suite")
|
||||
load("//tools:defaults.bzl", "ng_module", "ts_library")
|
||||
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
|
||||
load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
|
||||
|
||||
ng_module(
|
||||
name = "forms_examples",
|
||||
@ -18,7 +18,7 @@ ng_module(
|
||||
"//packages/platform-browser",
|
||||
"//packages/platform-browser-dynamic",
|
||||
"//packages/router",
|
||||
"@ngdeps//rxjs",
|
||||
"@npm//rxjs",
|
||||
],
|
||||
)
|
||||
|
||||
@ -30,8 +30,8 @@ ts_library(
|
||||
deps = [
|
||||
"//packages/examples/test-utils",
|
||||
"//packages/private/testing",
|
||||
"@ngdeps//@types/jasminewd2",
|
||||
"@ngdeps//protractor",
|
||||
"@npm//@types/jasminewd2",
|
||||
"@npm//protractor",
|
||||
],
|
||||
)
|
||||
|
||||
@ -41,11 +41,11 @@ ts_devserver(
|
||||
index_html = "//packages/examples:index.html",
|
||||
port = 4200,
|
||||
scripts = [
|
||||
"@ngdeps//node_modules/tslib:tslib.js",
|
||||
"@npm//node_modules/tslib:tslib.js",
|
||||
"//tools/rxjs:rxjs_umd_modules",
|
||||
],
|
||||
static_files = [
|
||||
"@ngdeps//node_modules/zone.js:dist/zone.js",
|
||||
"@npm//node_modules/zone.js:dist/zone.js",
|
||||
],
|
||||
deps = [":forms_examples"],
|
||||
)
|
||||
@ -57,7 +57,7 @@ protractor_web_test_suite(
|
||||
server = ":devserver",
|
||||
deps = [
|
||||
":forms_e2e_tests_lib",
|
||||
"@ngdeps//protractor",
|
||||
"@ngdeps//selenium-webdriver",
|
||||
"@npm//protractor",
|
||||
"@npm//selenium-webdriver",
|
||||
],
|
||||
)
|
||||
|
@ -6,6 +6,6 @@ ts_library(
|
||||
name = "test-utils",
|
||||
srcs = ["index.ts"],
|
||||
deps = [
|
||||
"@ngdeps//@types/selenium-webdriver",
|
||||
"@npm//@types/selenium-webdriver",
|
||||
],
|
||||
)
|
||||
|
@ -7,7 +7,7 @@ ts_library(
|
||||
srcs = glob(["**/*.ts"]),
|
||||
tsconfig = "//packages:tsconfig-test",
|
||||
deps = [
|
||||
"@ngdeps//@types/jasmine",
|
||||
"@ngdeps//@types/node",
|
||||
"@npm//@types/jasmine",
|
||||
"@npm//@types/node",
|
||||
],
|
||||
)
|
||||
|
@ -1,6 +1,6 @@
|
||||
load("//packages/bazel:index.bzl", "protractor_web_test_suite")
|
||||
load("//tools:defaults.bzl", "ng_module", "ts_library")
|
||||
load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
|
||||
load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
|
||||
|
||||
"""
|
||||
Macro that can be used to create the Bazel targets for an "upgrade" example. Since the
|
||||
@ -16,7 +16,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
|
||||
# TODO: FW-1004 Type checking is currently not complete.
|
||||
type_check = False,
|
||||
deps = [
|
||||
"@ngdeps//@types/angular",
|
||||
"@npm//@types/angular",
|
||||
"//packages/core",
|
||||
"//packages/platform-browser",
|
||||
"//packages/platform-browser-dynamic",
|
||||
@ -30,8 +30,8 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
|
||||
srcs = e2e_srcs,
|
||||
testonly = True,
|
||||
deps = [
|
||||
"@ngdeps//@types/jasminewd2",
|
||||
"@ngdeps//protractor",
|
||||
"@npm//@types/jasminewd2",
|
||||
"@npm//protractor",
|
||||
"//packages/examples/test-utils",
|
||||
"//packages/private/testing",
|
||||
],
|
||||
@ -43,13 +43,13 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
|
||||
port = 4200,
|
||||
entry_module = entry_module,
|
||||
static_files = [
|
||||
"@ngdeps//node_modules/zone.js:dist/zone.js",
|
||||
"@ngdeps//node_modules/angular:angular.js",
|
||||
"@ngdeps//node_modules/reflect-metadata:Reflect.js",
|
||||
"@npm//node_modules/zone.js:dist/zone.js",
|
||||
"@npm//node_modules/angular:angular.js",
|
||||
"@npm//node_modules/reflect-metadata:Reflect.js",
|
||||
],
|
||||
index_html = "//packages/examples:index.html",
|
||||
scripts = [
|
||||
"@ngdeps//node_modules/tslib:tslib.js",
|
||||
"@npm//node_modules/tslib:tslib.js",
|
||||
"//tools/rxjs:rxjs_umd_modules",
|
||||
],
|
||||
deps = [":%s_sources" % name],
|
||||
@ -63,7 +63,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
|
||||
server = ":devserver",
|
||||
deps = [
|
||||
":%s_e2e_lib" % name,
|
||||
"@ngdeps//protractor",
|
||||
"@ngdeps//selenium-webdriver",
|
||||
"@npm//protractor",
|
||||
"@npm//selenium-webdriver",
|
||||
],
|
||||
)
|
||||
|
Reference in New Issue
Block a user