Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-18 03:23:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: migrate build_angular to ts_project

Browse Source 
This commit updates `build_angular` to the `rules_js` ts_project rule.

Notably a few real type issues surfaced but previously didn't surface
due to some unknown resolution issues that resulted in `never` types;
where every possible value was assignable; so this change improves type
safety and a TODO was left for the "brittle code fragment".
This commit is contained in:
Paul Gschwendtner 2024-12-19 14:06:19 +00:00 committed by Charles
parent cdf5d86688
commit b6268f7a30
9 changed files with 108 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx
View File

@ -2,7 +2,7 @@
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml"). # Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
# This file should be checked into version control along with the pnpm-lock.yaml file. # This file should be checked into version control along with the pnpm-lock.yaml file.
.npmrc=-2023857461 .npmrc=-2023857461
package.json=-617490503 package.json=-851944395
pnpm-lock.yaml=633266779 pnpm-lock.yaml=-958480774
pnpm-workspace.yaml=1711114604 pnpm-workspace.yaml=1711114604
yarn.lock=-291473705 yarn.lock=481913197

1
package.json
View File

@ -84,6 +84,7 @@
"@rollup/plugin-node-resolve": "^13.0.5", "@rollup/plugin-node-resolve": "^13.0.5",
"@stylistic/eslint-plugin": "^2.8.0", "@stylistic/eslint-plugin": "^2.8.0",
"@types/babel__core": "7.20.5", "@types/babel__core": "7.20.5",
"@types/babel__generator": "^7.6.8",
"@types/browser-sync": "^2.27.0", "@types/browser-sync": "^2.27.0",
"@types/express": "^4.16.0", "@types/express": "^4.16.0",
"@types/http-proxy": "^1.17.4", "@types/http-proxy": "^1.17.4",

137
packages/angular_devkit/build_angular/BUILD.bazel
View File

@ -5,7 +5,7 @@
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") 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("@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:interop.bzl", "ts_project")
load("//tools:ts_json_schema.bzl", "ts_json_schema") load("//tools:ts_json_schema.bzl", "ts_json_schema")
@ -93,6 +93,7 @@ ts_project(
"src/testing/**/*.ts", "src/testing/**/*.ts",
], ],
) + [ ) + [
"index.ts",
"//packages/angular_devkit/build_angular:src/builders/app-shell/schema.ts", "//packages/angular_devkit/build_angular:src/builders/app-shell/schema.ts",
"//packages/angular_devkit/build_angular:src/builders/browser-esbuild/schema.ts", "//packages/angular_devkit/build_angular:src/builders/browser-esbuild/schema.ts",
"//packages/angular_devkit/build_angular:src/builders/browser/schema.ts", "//packages/angular_devkit/build_angular:src/builders/browser/schema.ts",
@ -147,6 +148,7 @@ ts_project(
"//:root_modules/@babel/runtime", "//:root_modules/@babel/runtime",
"//:root_modules/@discoveryjs/json-ext", "//:root_modules/@discoveryjs/json-ext",
"//:root_modules/@types/babel__core", "//:root_modules/@types/babel__core",
"//:root_modules/@types/babel__generator",
"//:root_modules/@types/browser-sync", "//:root_modules/@types/browser-sync",
"//:root_modules/@types/karma", "//:root_modules/@types/karma",
"//:root_modules/@types/less", "//:root_modules/@types/less",
@ -203,7 +205,7 @@ ts_project(
], ],
) )
ts_library( ts_project(
name = "build_angular_test_lib", name = "build_angular_test_lib",
testonly = True, testonly = True,
srcs = glob( srcs = glob(
@ -215,15 +217,17 @@ ts_library(
], ],
), ),
data = glob(["test/**/*"]), data = glob(["test/**/*"]),
deps = [ interop_deps = [
":build_angular",
":build_angular_test_utils",
"//packages/angular_devkit/architect/testing",
"//packages/angular_devkit/core", "//packages/angular_devkit/core",
"@npm//fast-glob", ],
"@npm//prettier", deps = [
"@npm//typescript", ":build_angular_rjs",
"@npm//webpack", ":build_angular_test_utils_rjs",
"//:root_modules/fast-glob",
"//:root_modules/prettier",
"//:root_modules/typescript",
"//:root_modules/webpack",
"//packages/angular_devkit/architect/testing:testing_rjs",
], ],
) )
@ -268,7 +272,7 @@ api_golden_test_npm_package(
# Large build_angular specs # Large build_angular specs
ts_library( ts_project(
name = "build_angular_test_utils", name = "build_angular_test_utils",
testonly = True, testonly = True,
srcs = glob( srcs = glob(
@ -281,17 +285,19 @@ ts_library(
], ],
), ),
data = glob(["test/**/*"]), data = glob(["test/**/*"]),
tsconfig = "//:tsconfig-test.json", interop_deps = [
deps = [
":build_angular",
"//modules/testing/builder", "//modules/testing/builder",
"//packages/angular/build", "//packages/angular/build",
"//packages/angular/build:private", "//packages/angular/build:private",
"//packages/angular_devkit/architect",
"//packages/angular_devkit/architect/node",
"//packages/angular_devkit/architect/testing",
"//packages/angular_devkit/core", "//packages/angular_devkit/core",
"//packages/angular_devkit/core/node", "//packages/angular_devkit/core/node",
],
deps = [
":build_angular_rjs",
"//:root_modules/@types/jasmine",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
"@npm//rxjs", "@npm//rxjs",
], ],
) )
@ -302,12 +308,14 @@ LARGE_SPECS = {
"shards": 10, "shards": 10,
"size": "large", "size": "large",
"flaky": True, "flaky": True,
"extra_deps": [ "extra_interop_deps": [
"//packages/angular_devkit/build_webpack", "//packages/angular_devkit/build_webpack",
"@npm//@types/http-proxy", ],
"@npm//http-proxy", "extra_deps": [
"@npm//puppeteer", "//:root_modules/@types/http-proxy",
"@npm//undici", "//:root_modules/http-proxy",
"//:root_modules/puppeteer",
"//:root_modules/undici",
], ],
}, },
"extract-i18n": {}, "extract-i18n": {},
@ -316,21 +324,21 @@ LARGE_SPECS = {
"size": "large", "size": "large",
"flaky": True, "flaky": True,
"extra_deps": [ "extra_deps": [
"@npm//karma", "//:root_modules/karma",
"@npm//karma-chrome-launcher", "//:root_modules/karma-chrome-launcher",
"@npm//karma-coverage", "//:root_modules/karma-coverage",
"@npm//karma-jasmine", "//:root_modules/karma-jasmine",
"@npm//karma-jasmine-html-reporter", "//:root_modules/karma-jasmine-html-reporter",
"@npm//puppeteer", "//:root_modules/puppeteer",
"@npm//webpack", "//:root_modules/webpack",
], ],
}, },
"protractor": { "protractor": {
"extra_deps": [ "extra_deps": [
"@npm//jasmine-spec-reporter", "//:root_modules/jasmine-spec-reporter",
"@npm//protractor", "//:root_modules/protractor",
"@npm//puppeteer", "//:root_modules/puppeteer",
"@npm//ts-node", "//:root_modules/ts-node",
], ],
# NB: does not run on rbe because webdriver manager uses an absolute path to chromedriver # NB: does not run on rbe because webdriver manager uses an absolute path to chromedriver
"tags": ["no-remote-exec"], "tags": ["no-remote-exec"],
@ -340,7 +348,7 @@ LARGE_SPECS = {
"server": { "server": {
"size": "large", "size": "large",
"extra_deps": [ "extra_deps": [
"@npm//@angular/animations", "//:root_modules/@angular/animations",
], ],
}, },
"ng-packagr": {}, "ng-packagr": {},
@ -349,55 +357,60 @@ LARGE_SPECS = {
"size": "large", "size": "large",
"flaky": True, "flaky": True,
"extra_deps": [ "extra_deps": [
"@npm//@angular/animations", "//:root_modules/@angular/animations",
"@npm//@angular/material", "//:root_modules/@angular/material",
], ],
}, },
"prerender": {}, "prerender": {},
"browser-esbuild": {}, "browser-esbuild": {},
"ssr-dev-server": { "ssr-dev-server": {
"extra_deps": [ "extra_interop_deps": [
"@npm//@types/browser-sync",
"@npm//browser-sync",
"@npm//express",
"@npm//undici",
"//packages/angular/ssr/node", "//packages/angular/ssr/node",
], ],
"extra_deps": [
"//:root_modules/@types/browser-sync",
"//:root_modules/browser-sync",
"//:root_modules/express",
"//:root_modules/undici",
],
}, },
} }
[ [
ts_library( ts_project(
name = "build_angular_" + spec + "_test_lib", name = "build_angular_" + spec + "_test_lib",
testonly = True, testonly = True,
srcs = glob(["src/builders/" + spec + "/**/*_spec.ts"]), srcs = glob(["src/builders/" + spec + "/**/*_spec.ts"]),
tsconfig = "//:tsconfig-test.json", interop_deps = [
deps = [
# Dependencies needed to compile and run the specs themselves. # Dependencies needed to compile and run the specs themselves.
":build_angular", "//packages/angular_devkit/core",
":build_angular_test_utils", "//packages/angular_devkit/core/node",
"//modules/testing/builder", "//modules/testing/builder",
"//packages/angular/build", "//packages/angular/build",
"//packages/angular/build:private", "//packages/angular/build:private",
"//packages/angular_devkit/architect", ] + LARGE_SPECS[spec].get("extra_interop_deps", []),
"//packages/angular_devkit/architect/node", deps = [
"//packages/angular_devkit/architect/testing", # Dependencies needed to compile and run the specs themselves.
"//packages/angular_devkit/core", ":build_angular_rjs",
"//packages/angular_devkit/core/node", ":build_angular_test_utils_rjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
# Base dependencies for the application in hello-world-app. # Base dependencies for the application in hello-world-app.
# Some tests also require extra dependencies. # Some tests also require extra dependencies.
"@npm//@angular/common", "//:root_modules/@angular/common",
"@npm//@angular/compiler", "//:root_modules/@angular/compiler",
"@npm//@angular/compiler-cli", "//:root_modules/@angular/compiler-cli",
"@npm//@angular/core", "//:root_modules/@angular/core",
"@npm//@angular/platform-browser", "//:root_modules/@angular/platform-browser",
"@npm//@angular/platform-browser-dynamic", "//:root_modules/@angular/platform-browser-dynamic",
"@npm//@angular/router", "//:root_modules/@angular/router",
"@npm//rxjs", "//:root_modules/rxjs",
"@npm//tslib", "//:root_modules/tslib",
"@npm//typescript", "//:root_modules/typescript",
"@npm//zone.js", "//:root_modules/zone.js",
"//:root_modules/@types/jasmine",
] + LARGE_SPECS[spec].get("extra_deps", []), ] + LARGE_SPECS[spec].get("extra_deps", []),
) )
for spec in LARGE_SPECS for spec in LARGE_SPECS

9
packages/angular_devkit/build_angular/index.ts Normal file
View File

@ -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';

10
packages/angular_devkit/build_angular/src/tools/webpack/plugins/postcss-cli-resources.ts
View File

@ -115,10 +115,16 @@ export default function (options?: PostcssCliResourcesOptions): Plugin {
return; return;
} }
let outputPath = interpolateName({ resourcePath: result }, filename(result), { let outputPath = interpolateName(
// TODO: Revisit. Previously due to lack of type safety, this object
// was fine, but in practice it doesn't match the type of the loader context.
{ resourcePath: result } as Parameters<typeof interpolateName>[0],
filename(result),
{
content, content,
context: loader.context || loader.rootContext, context: loader.context || loader.rootContext,
}).replace(/\\|\//g, '-'); },
).replace(/\\|\//g, '-');
if (resourcesOutputPath) { if (resourcesOutputPath) {
outputPath = path.posix.join(resourcesOutputPath, outputPath); outputPath = path.posix.join(resourcesOutputPath, outputPath);

4
packages/angular_devkit/build_angular/src/tools/webpack/plugins/scripts-webpack-plugin.ts
View File

@ -194,7 +194,9 @@ export class ScriptsWebpackPlugin {
const asset = compilation.getAsset(assetName); const asset = compilation.getAsset(assetName);
if (asset) { if (asset) {
const interpolatedFilename = interpolateName( const interpolatedFilename = interpolateName(
{ resourcePath: 'scripts.js' }, // TODO: Revisit. Previously due to lack of type safety, this object
// was fine, but in practice it doesn't match the type of the loader context.
{ resourcePath: 'scripts.js' } as Parameters<typeof interpolateName>[0],
assetName, assetName,
{ content: asset.source.source() }, { content: asset.source.source() },
); );

6
pnpm-lock.yaml generated
View File

@ -142,6 +142,9 @@ importers:
'@types/babel__core': '@types/babel__core':
specifier: 7.20.5 specifier: 7.20.5
version: 7.20.5 version: 7.20.5
'@types/babel__generator':
specifier: ^7.6.8
version: 7.6.8
'@types/browser-sync': '@types/browser-sync':
specifier: ^2.27.0 specifier: ^2.27.0
version: 2.29.0 version: 2.29.0
@ -2063,7 +2066,6 @@ packages:
/@bazel/typescript@5.8.1(typescript@5.7.2): /@bazel/typescript@5.8.1(typescript@5.7.2):
resolution: {integrity: sha512-NAJ8WQHZL1WE1YmRoCrq/1hhG15Mvy/viWh6TkvFnBeEhNUiQUsA5GYyhU1ztnBIYW03nATO3vwhAEfO7Q0U5g==} resolution: {integrity: sha512-NAJ8WQHZL1WE1YmRoCrq/1hhG15Mvy/viWh6TkvFnBeEhNUiQUsA5GYyhU1ztnBIYW03nATO3vwhAEfO7Q0U5g==}
deprecated: No longer maintained, https://github.com/aspect-build/rules_ts is the recommended replacement
hasBin: true hasBin: true
peerDependencies: peerDependencies:
typescript: 5.7.2 typescript: 5.7.2
@ -11864,7 +11866,7 @@ packages:
/puppeteer@18.2.1: /puppeteer@18.2.1:
resolution: {integrity: sha512-7+UhmYa7wxPh2oMRwA++k8UGVDxh3YdWFB52r9C3tM81T6BU7cuusUSxImz0GEYSOYUKk/YzIhkQ6+vc0gHbxQ==} resolution: {integrity: sha512-7+UhmYa7wxPh2oMRwA++k8UGVDxh3YdWFB52r9C3tM81T6BU7cuusUSxImz0GEYSOYUKk/YzIhkQ6+vc0gHbxQ==}
engines: {node: '>=14.1.0'} engines: {node: '>=14.1.0'}
deprecated: < 22.8.2 is no longer supported deprecated: < 19.4.0 is no longer supported
dependencies: dependencies:
https-proxy-agent: 5.0.1(supports-color@9.4.0) https-proxy-agent: 5.0.1(supports-color@9.4.0)
progress: 2.0.3 progress: 2.0.3

1
tsconfig.json
View File

@ -26,6 +26,7 @@
"@angular-devkit/schematics/testing": ["./packages/angular_devkit/schematics/testing/index"], "@angular-devkit/schematics/testing": ["./packages/angular_devkit/schematics/testing/index"],
"@angular-devkit/architect/*": ["./packages/angular_devkit/architect/*/index"], "@angular-devkit/architect/*": ["./packages/angular_devkit/architect/*/index"],
"@angular-devkit/build-webpack": ["./packages/angular_devkit/build_webpack"], "@angular-devkit/build-webpack": ["./packages/angular_devkit/build_webpack"],
"@angular-devkit/build-angular": ["./packages/angular_devkit/build_angular"],
"@angular-devkit/*": ["./packages/angular_devkit/*/src"], "@angular-devkit/*": ["./packages/angular_devkit/*/src"],
"@angular/ssr": ["./packages/angular/ssr"], "@angular/ssr": ["./packages/angular/ssr"],
"@angular/*": ["./packages/angular/*/src"], "@angular/*": ["./packages/angular/*/src"],

3
yarn.lock
View File

@ -351,6 +351,7 @@ __metadata:
"@rollup/plugin-node-resolve": "npm:^13.0.5" "@rollup/plugin-node-resolve": "npm:^13.0.5"
"@stylistic/eslint-plugin": "npm:^2.8.0" "@stylistic/eslint-plugin": "npm:^2.8.0"
"@types/babel__core": "npm:7.20.5" "@types/babel__core": "npm:7.20.5"
"@types/babel__generator": "npm:^7.6.8"
"@types/browser-sync": "npm:^2.27.0" "@types/browser-sync": "npm:^2.27.0"
"@types/express": "npm:^4.16.0" "@types/express": "npm:^4.16.0"
"@types/http-proxy": "npm:^1.17.4" "@types/http-proxy": "npm:^1.17.4"
@ -4180,7 +4181,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/babel__generator@npm:*": "@types/babel__generator@npm:*, @types/babel__generator@npm:^7.6.8":
version: 7.6.8 version: 7.6.8
resolution: "@types/babel__generator@npm:7.6.8" resolution: "@types/babel__generator@npm:7.6.8"
dependencies: dependencies: