Skip to content

Migrate many more packages to npm_package #29348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 14, 2025
Merged

Migrate many more packages to npm_package #29348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0cb680
build: migrate `@angular-devkit/architect-cli` to `npm_package`
devversion Jan 14, 2025
57c18de
build: migrate `@angular-devkit/core` to `npm_package`
devversion Jan 14, 2025
8a852d7
build: migrate `@angular-devkit/build-webpack` to `npm_package`
devversion Jan 14, 2025
7b8f69f
build: migrate `@angular-devkit/build-angular` to `npm_package`
devversion Jan 14, 2025
de99ab7
build: migrate `@angular-devkit/schematics` to `npm_package`
devversion Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions packages/angular_devkit/architect_cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
load("//tools:defaults.bzl", "pkg_npm")
load("//tools:interop.bzl", "ts_project")
load("//tools:defaults2.bzl", "npm_package", "ts_project")

# Copyright Google Inc. All Rights Reserved.
#
Expand Down Expand Up @@ -34,16 +33,16 @@ genrule(
cmd = "cp $(execpath //:LICENSE) $@",
)

pkg_npm(
name = "npm_package",
npm_package(
name = "pkg",
pkg_deps = [
"//packages/angular_devkit/architect:package.json",
"//packages/angular_devkit/core:package.json",
],
tags = ["release-package"],
deps = [
":README.md",
":architect_cli",
":architect_cli_rjs",
":license",
],
)
38 changes: 21 additions & 17 deletions packages/angular_devkit/build_angular/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
load("//tools:defaults.bzl", "pkg_npm")
load("//tools:interop.bzl", "ts_project")
load("//tools:defaults2.bzl", "npm_package", "ts_project")
load("//tools:ts_json_schema.bzl", "ts_json_schema")

licenses(["notice"])
Expand Down Expand Up @@ -78,6 +77,18 @@ ts_json_schema(
src = "src/builders/web-test-runner/schema.json",
)

RUNTIME_ASSETS = glob(
include = [
"src/**/schema.json",
"src/**/*.js",
"src/**/*.mjs",
"src/**/*.html",
],
) + [
"builders.json",
"package.json",
]

ts_project(
name = "build_angular",
srcs = glob(
Expand Down Expand Up @@ -108,17 +119,7 @@ ts_project(
"//packages/angular_devkit/build_angular:src/builders/ssr-dev-server/schema.ts",
"//packages/angular_devkit/build_angular:src/builders/web-test-runner/schema.ts",
],
data = glob(
include = [
"src/**/schema.json",
"src/**/*.js",
"src/**/*.mjs",
"src/**/*.html",
],
) + [
"builders.json",
"package.json",
],
data = RUNTIME_ASSETS,
module_name = "@angular-devkit/build-angular",
deps = [
"//:root_modules/@ampproject/remapping",
Expand Down Expand Up @@ -239,19 +240,22 @@ genrule(
cmd = "cp $(execpath //:LICENSE) $@",
)

pkg_npm(
name = "npm_package",
npm_package(
name = "pkg",
pkg_deps = [
"//packages/angular/build:package.json",
"//packages/angular_devkit/architect:package.json",
"//packages/angular_devkit/build_webpack:package.json",
"//packages/angular_devkit/core:package.json",
"//packages/ngtools/webpack:package.json",
],
stamp_files = [
"src/utils/normalize-cache.js",
],
tags = ["release-package"],
deps = [
deps = RUNTIME_ASSETS + [
":README.md",
":build_angular",
":build_angular_rjs",
":license",
],
)
Expand Down
26 changes: 13 additions & 13 deletions packages/angular_devkit/build_webpack/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
load("//tools:defaults.bzl", "pkg_npm")
load("//tools:interop.bzl", "ts_project")
load("//tools:defaults2.bzl", "npm_package", "ts_project")
load("//tools:ts_json_schema.bzl", "ts_json_schema")

licenses(["notice"])
Expand All @@ -23,6 +22,13 @@ ts_json_schema(
src = "src/builders/webpack-dev-server/schema.json",
)

RUNTIME_ASSETS = [
"builders.json",
"package.json",
"src/builders/webpack-dev-server/schema.json",
"src/builders/webpack/schema.json",
]

ts_project(
name = "build_webpack",
srcs = glob(
Expand All @@ -36,12 +42,7 @@ ts_project(
"//packages/angular_devkit/build_webpack:src/builders/webpack-dev-server/schema.ts",
"//packages/angular_devkit/build_webpack:src/builders/webpack/schema.ts",
],
data = [
"builders.json",
"package.json",
"src/builders/webpack-dev-server/schema.json",
"src/builders/webpack/schema.json",
],
data = RUNTIME_ASSETS,
module_name = "@angular-devkit/build-webpack",
deps = [
"//:root_modules/@types/node",
Expand Down Expand Up @@ -99,16 +100,15 @@ genrule(
cmd = "cp $(execpath //:LICENSE) $@",
)

pkg_npm(
name = "npm_package",
npm_package(
name = "pkg",
pkg_deps = [
"//packages/angular_devkit/architect:package.json",
],
tags = ["release-package"],
deps = [
deps = RUNTIME_ASSETS + [
":README.md",
":build_webpack",
":builders.json",
":build_webpack_rjs",
":license",
],
)
Expand Down
33 changes: 16 additions & 17 deletions packages/angular_devkit/core/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
load("//tools:defaults.bzl", "pkg_npm")
load("//tools:interop.bzl", "ts_project")
load("//tools:defaults2.bzl", "npm_package", "ts_project")

# Copyright Google Inc. All Rights Reserved.
#
Expand All @@ -11,7 +10,14 @@ package(default_visibility = ["//visibility:public"])

licenses(["notice"])

# @angular-devkit/core
RUNTIME_ASSETS = glob(
include = ["**/*.json"],
# NB: we need to exclude the nested node_modules that is laid out by yarn workspaces
exclude = [
"node_modules/**",
"src/workspace/json/test/**",
],
)

ts_project(
name = "core",
Expand All @@ -21,14 +27,7 @@ ts_project(
"src/**/*_spec.ts",
],
) + ["index.ts"],
data = glob(
include = ["**/*.json"],
# NB: we need to exclude the nested node_modules that is laid out by yarn workspaces
exclude = [
"node_modules/**",
"src/workspace/json/test/**",
],
),
data = RUNTIME_ASSETS,
module_name = "@angular-devkit/core",
deps = [
"//:root_modules/@types/node",
Expand Down Expand Up @@ -73,15 +72,15 @@ genrule(
cmd = "cp $(execpath //:LICENSE) $@",
)

pkg_npm(
name = "npm_package",
npm_package(
name = "pkg",
tags = ["release-package"],
deps = [
deps = RUNTIME_ASSETS + [
":README.md",
":core",
":core_rjs",
":license",
"//packages/angular_devkit/core/node",
"//packages/angular_devkit/core/node/testing",
"//packages/angular_devkit/core/node:node_rjs",
"//packages/angular_devkit/core/node/testing:testing_rjs",
],
)

Expand Down
13 changes: 6 additions & 7 deletions packages/angular_devkit/schematics/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
load("//tools:defaults.bzl", "pkg_npm")
load("//tools:interop.bzl", "ts_project")
load("//tools:defaults2.bzl", "npm_package", "ts_project")

# Copyright Google Inc. All Rights Reserved.
#
Expand Down Expand Up @@ -61,8 +60,8 @@ genrule(
cmd = "cp $(execpath //:LICENSE) $@",
)

pkg_npm(
name = "npm_package",
npm_package(
name = "pkg",
pkg_deps = [
"//packages/angular_devkit/core:package.json",
],
Expand All @@ -71,11 +70,11 @@ pkg_npm(
":README.md",
":collection-schema.json",
":license",
":schematics",
"//packages/angular_devkit/schematics/tasks",
":schematics_rjs",
"//packages/angular_devkit/schematics/tasks:package.json",
"//packages/angular_devkit/schematics/testing",
"//packages/angular_devkit/schematics/tasks:tasks_rjs",
"//packages/angular_devkit/schematics/testing:package.json",
"//packages/angular_devkit/schematics/testing:testing_rjs",
"//packages/angular_devkit/schematics/tools:package.json",
],
)
Expand Down
Loading