Skip to content

Commit d835a44

Browse files
josephperrottalxhub
authored andcommitted
build: migrate upgrade to use ng_project instead of ng_module (angular#61320)
Use ng_project instead of ng_module in @angular/upgrade PR Close angular#61320
1 parent 5af8afe commit d835a44

7 files changed

Lines changed: 28 additions & 16 deletions

File tree

packages/upgrade/BUILD.bazel

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
1+
load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package")
2+
load("//tools:defaults2.bzl", "ng_project")
23

34
package(default_visibility = ["//visibility:public"])
45

5-
ng_module(
6+
ng_project(
67
name = "upgrade",
78
srcs = glob(
89
[
910
"*.ts",
1011
"src/dynamic/src/*.ts",
1112
],
1213
),
13-
deps = [
14+
interop_deps = [
1415
"//packages/core",
1516
"//packages/platform-browser-dynamic",
16-
"//packages/upgrade/src/common",
1717
"//packages/zone.js/lib:zone_d_ts",
1818
],
19+
deps = [
20+
"//packages/upgrade/src/common:common_rjs",
21+
],
1922
)
2023

2124
ng_package(

packages/upgrade/src/dynamic/src/upgrade_adapter.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ import {
5656

5757
import {UpgradeNg1ComponentAdapterBuilder} from './upgrade_ng1_adapter';
5858

59+
// Needed for the global `Zone` ambient types to be available.
60+
import type {} from 'zone.js';
61+
5962
let upgradeCount: number = 0;
6063

6164
/**

packages/upgrade/src/dynamic/test/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ ts_project(
1212
"//packages/core/testing",
1313
"//packages/platform-browser",
1414
"//packages/platform-browser-dynamic",
15-
"//packages/upgrade",
1615
],
1716
deps = [
17+
"//packages/upgrade:upgrade_rjs",
1818
"//packages/upgrade/src/common:common_rjs",
1919
"//packages/upgrade/src/common/test/helpers:helpers_rjs",
2020
],

packages/upgrade/static/BUILD.bazel

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
1+
load("//tools:defaults.bzl", "generate_api_docs")
2+
load("//tools:defaults2.bzl", "ng_project")
23

34
package(default_visibility = ["//visibility:public"])
45

56
exports_files(["package.json"])
67

7-
ng_module(
8+
ng_project(
89
name = "static",
910
srcs = glob(
1011
[
1112
"*.ts",
1213
"src/*.ts",
1314
],
1415
),
15-
deps = [
16+
interop_deps = [
1617
"//packages/core",
1718
"//packages/platform-browser",
18-
"//packages/upgrade",
19+
],
20+
deps = [
21+
"//packages/upgrade:upgrade_rjs",
1922
],
2023
)
2124

packages/upgrade/static/test/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ ts_project(
1414
"//packages/platform-browser-dynamic",
1515
"//packages/platform-browser/testing",
1616
"//packages/private/testing",
17-
"//packages/upgrade/static:static",
1817
],
1918
deps = [
2019
"//packages/upgrade/src/common:common_rjs",
2120
"//packages/upgrade/src/common/test/helpers:helpers_rjs",
21+
"//packages/upgrade/static:static_rjs",
2222
],
2323
)
2424

packages/upgrade/static/testing/BUILD.bazel

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
1+
load("//tools:defaults.bzl", "generate_api_docs")
2+
load("//tools:defaults2.bzl", "ng_project")
23

34
package(default_visibility = ["//visibility:public"])
45

56
exports_files(["package.json"])
67

7-
ng_module(
8+
ng_project(
89
name = "testing",
910
srcs = glob(
1011
[
1112
"*.ts",
1213
"src/*.ts",
1314
],
1415
),
15-
deps = [
16+
interop_deps = [
1617
"//packages/core/testing",
17-
"//packages/upgrade/static",
18+
],
19+
deps = [
20+
"//packages/upgrade/static:static_rjs",
1821
],
1922
)
2023

packages/upgrade/static/testing/test/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ ts_project(
1313
"//packages/core",
1414
"//packages/core/testing",
1515
"//packages/upgrade/src/common",
16-
"//packages/upgrade/static",
17-
"//packages/upgrade/static/testing",
1816
],
1917
deps = [
2018
"//packages/upgrade/src/common/test/helpers:helpers_rjs",
19+
"//packages/upgrade/static:static_rjs",
20+
"//packages/upgrade/static/testing:testing_rjs",
2121
],
2222
)
2323

0 commit comments

Comments
 (0)