Skip to content

Commit

Permalink
build: migrate @angular/build to ts_project
Browse files Browse the repository at this point in the history 
This commit migrates `@angular/build` to `ts_project`.
  • Loading branch information
@devversion @josephperrott
devversion authored and josephperrott committed Dec 26, 2024
1 parent afd1e72 commit 60c2ff5
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 94 deletions.
170 changes: 82 additions & 88 deletions packages/angular/build/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,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", "ts_library")
load("//tools:defaults.bzl", "pkg_npm")
load("//tools:interop.bzl", "ts_project")
load("//tools:ts_json_schema.bzl", "ts_json_schema")

licenses(["notice"])
Expand All @@ -22,9 +23,8 @@ ts_json_schema(
src = "src/builders/extract-i18n/schema.json",
)

ts_library(
ts_project(
name = "build",
package_name = "@angular/build",
srcs = glob(
include = [
"src/**/*.ts",
Expand All @@ -34,9 +34,9 @@ ts_library(
"src/**/*_spec.ts",
"src/**/tests/**/*.ts",
"src/testing/**/*.ts",
"src/private.ts",
],
) + [
"index.ts",
"//packages/angular/build:src/builders/application/schema.ts",
"//packages/angular/build:src/builders/dev-server/schema.ts",
"//packages/angular/build:src/builders/extract-i18n/schema.ts",
Expand All @@ -52,81 +52,75 @@ ts_library(
"builders.json",
"package.json",
],
module_name = "@angular/build",
module_root = "src/index.d.ts",
deps = [
interop_deps = [
"//packages/angular/ssr",
"//packages/angular/ssr/node",
"//packages/angular_devkit/architect",
"@npm//@ampproject/remapping",
"@npm//@angular/common",
"@npm//@angular/compiler",
"@npm//@angular/compiler-cli",
"@npm//@angular/core",
"@npm//@angular/localize",
"@npm//@angular/platform-server",
"@npm//@angular/service-worker",
"@npm//@babel/core",
"@npm//@babel/helper-annotate-as-pure",
"@npm//@babel/helper-split-export-declaration",
"@npm//@babel/plugin-syntax-import-attributes",
"@npm//@inquirer/confirm",
"@npm//@types/babel__core",
"@npm//@types/less",
"@npm//@types/node",
"@npm//@types/picomatch",
"@npm//@types/semver",
"@npm//@types/watchpack",
"@npm//@vitejs/plugin-basic-ssl",
"@npm//beasties",
"@npm//browserslist",
"@npm//esbuild",
"@npm//esbuild-wasm",
"@npm//fast-glob",
"@npm//https-proxy-agent",
"@npm//listr2",
"@npm//lmdb",
"@npm//magic-string",
"@npm//mrmime",
"@npm//parse5-html-rewriting-stream",
"@npm//picomatch",
"@npm//piscina",
"@npm//postcss",
"@npm//rollup",
"@npm//sass",
"@npm//semver",
"@npm//tslib",
"@npm//typescript",
"@npm//vite",
"@npm//watchpack",
],
)

ts_library(
name = "private",
srcs = ["src/private.ts"],
module_name = "@angular/build/private",
module_root = "src/private.d.ts",
module_name = "@angular/build",
deps = [
"//packages/angular/build",
"//:root_modules/@ampproject/remapping",
"//:root_modules/@angular/common",
"//:root_modules/@angular/compiler",
"//:root_modules/@angular/compiler-cli",
"//:root_modules/@angular/core",
"//:root_modules/@angular/localize",
"//:root_modules/@angular/platform-server",
"//:root_modules/@angular/service-worker",
"//:root_modules/@babel/core",
"//:root_modules/@babel/helper-annotate-as-pure",
"//:root_modules/@babel/helper-split-export-declaration",
"//:root_modules/@babel/plugin-syntax-import-attributes",
"//:root_modules/@inquirer/confirm",
"//:root_modules/@types/babel__core",
"//:root_modules/@types/less",
"//:root_modules/@types/node",
"//:root_modules/@types/picomatch",
"//:root_modules/@types/semver",
"//:root_modules/@types/watchpack",
"//:root_modules/@vitejs/plugin-basic-ssl",
"//:root_modules/beasties",
"//:root_modules/browserslist",
"//:root_modules/esbuild",
"//:root_modules/esbuild-wasm",
"//:root_modules/fast-glob",
"//:root_modules/https-proxy-agent",
"//:root_modules/jsonc-parser",
"//:root_modules/listr2",
"//:root_modules/lmdb",
"//:root_modules/magic-string",
"//:root_modules/mrmime",
"//:root_modules/parse5-html-rewriting-stream",
"//:root_modules/picomatch",
"//:root_modules/piscina",
"//:root_modules/postcss",
"//:root_modules/rollup",
"//:root_modules/sass",
"//:root_modules/semver",
"//:root_modules/tslib",
"//:root_modules/typescript",
"//:root_modules/vite",
"//:root_modules/watchpack",
],
)

ts_library(
ts_project(
name = "unit_test_lib",
testonly = True,
srcs = glob(
include = ["src/**/*_spec.ts"],
exclude = ["src/builders/**/tests/**"],
),
deps = [
":build",
":private",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
"@npm//@angular/compiler-cli",
"@npm//@babel/core",
"@npm//prettier",
":build_rjs",
"//:root_modules/@angular/compiler-cli",
"//:root_modules/@babel/core",
"//:root_modules/@types/jasmine",
"//:root_modules/prettier",
"//:root_modules/typescript",
"//packages/angular/build/private:private_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
],
)

Expand All @@ -135,38 +129,38 @@ jasmine_node_test(
deps = [":unit_test_lib"],
)

ts_library(
ts_project(
name = "integration_test_lib",
testonly = True,
srcs = glob(include = ["src/builders/**/tests/**/*.ts"]),
deps = [
":build",
":private",
"//modules/testing/builder",
"//packages/angular_devkit/architect",
"//packages/angular_devkit/architect/node",
"//packages/angular_devkit/architect/testing",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
":build_rjs",
"//packages/angular/build/private:private_rjs",
"//modules/testing/builder:builder_rjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",

# dev server only test deps
"@npm//@types/http-proxy",
"@npm//http-proxy",
"@npm//puppeteer",
"//:root_modules/@types/http-proxy",
"//:root_modules/http-proxy",
"//:root_modules/puppeteer",

# Base dependencies for the application in hello-world-app.
"@npm//@angular/common",
"@npm//@angular/compiler",
"@npm//@angular/compiler-cli",
"@npm//@angular/core",
"@npm//@angular/platform-browser",
"@npm//@angular/platform-browser-dynamic",
"@npm//@angular/router",
"@npm//rxjs",
"@npm//tslib",
"@npm//typescript",
"@npm//zone.js",
"@npm//buffer",
"//:root_modules/@angular/common",
"//:root_modules/@angular/compiler",
"//:root_modules/@angular/compiler-cli",
"//:root_modules/@angular/core",
"//:root_modules/@angular/platform-browser",
"//:root_modules/@angular/platform-browser-dynamic",
"//:root_modules/@angular/router",
"//:root_modules/rxjs",
"//:root_modules/tslib",
"//:root_modules/typescript",
"//:root_modules/zone.js",
"//:root_modules/buffer",
],
)

Expand Down
9 changes: 9 additions & 0 deletions packages/angular/build/index.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* @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.dev/license
*/

export * from './src/index';
12 changes: 12 additions & 0 deletions packages/angular/build/private/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
load("//tools:interop.bzl", "ts_project")

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

ts_project(
name = "private",
srcs = ["index.ts"],
module_name = "@angular/build/private",
deps = [
"//packages/angular/build:build_rjs",
],
)
9 changes: 9 additions & 0 deletions packages/angular/build/private/index.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* @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.dev/license
*/

export * from '../src/private';
12 changes: 6 additions & 6 deletions packages/angular_devkit/build_angular/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ ts_project(
"package.json",
],
interop_deps = [
"//packages/angular/build",
"//packages/angular/build:private",
"//packages/angular/ssr",
"//packages/angular_devkit/build_webpack",
"//packages/angular_devkit/core",
Expand Down Expand Up @@ -201,6 +199,8 @@ ts_project(
"//:root_modules/webpack-dev-server",
"//:root_modules/webpack-merge",
"//:root_modules/webpack-subresource-integrity",
"//packages/angular/build:build_rjs",
"//packages/angular/build/private:private_rjs",
"//packages/angular_devkit/architect",
],
)
Expand Down Expand Up @@ -287,14 +287,14 @@ ts_project(
data = glob(["test/**/*"]),
interop_deps = [
"//modules/testing/builder",
"//packages/angular/build",
"//packages/angular/build:private",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
],
deps = [
":build_angular_rjs",
"//:root_modules/@types/jasmine",
"//packages/angular/build:build_rjs",
"//packages/angular/build/private:private_rjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
Expand Down Expand Up @@ -386,13 +386,13 @@ LARGE_SPECS = {
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
"//modules/testing/builder",
"//packages/angular/build",
"//packages/angular/build:private",
] + LARGE_SPECS[spec].get("extra_interop_deps", []),
deps = [
# Dependencies needed to compile and run the specs themselves.
":build_angular_rjs",
":build_angular_test_utils_rjs",
"//packages/angular/build:build_rjs",
"//packages/angular/build/private:private_rjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@angular-devkit/build-angular": ["./packages/angular_devkit/build_angular"],
"@angular-devkit/*": ["./packages/angular_devkit/*/src"],
"@angular/ssr": ["./packages/angular/ssr"],
"@angular/ssr/node": ["./packages/angular/ssr/node"],
"@angular/*": ["./packages/angular/*/src"],
"@angular/build/private": ["./packages/angular/build/src/private"],
"@ngtools/webpack": ["./packages/ngtools/webpack/index"],
Expand Down

0 comments on commit 60c2ff5

Please sign in to comment.