refactor(custom-esbuild): complete migration to @angular/build - Remove @angular-devkit/build-angular dependency completely - Update all references and tests to use @angular/build - Update schema generation to use @angular/build schemas - Update builder context patching to map to @angular/build:application

Author: just-jeb

packages/custom-esbuild/e2e/custom-esbuild-schema.spec.ts

@@ -10,16 +10,17 @@ describe('Custom ESBuild schema tests', () => {
     customEsbuildDevServerSchema = require('../dist/dev-server/schema.json');
   });
 
-  it('should fit the schema of the `@angular-devkit/build-angular:application`', () => {
+  it('should fit the schema of the `@angular/build:application`', () => {
     const path = resolvePackagePath('@angular/build', 'src/builders/application/schema.json');
     const originalApplicationSchema = require(path);
     customEsbuildApplicationSchema.properties['plugins'] = undefined;
     customEsbuildApplicationSchema.properties['indexHtmlTransformer'] = undefined;
     expect(originalApplicationSchema.properties).toEqual(customEsbuildApplicationSchema.properties);
   });
 
-  it('should fit the schema of the `@angular-devkit/build-angular:dev-server`', () => {
-    const originalDevServerSchema = require('@angular-devkit/build-angular/src/builders/dev-server/schema.json');
+  it('should fit the schema of the `@angular/build:dev-server`', () => {
+    const path = resolvePackagePath('@angular/build', 'src/builders/dev-server/schema.json');
+    const originalDevServerSchema = require(path);
     customEsbuildDevServerSchema.properties['middlewares'] = undefined;
     expect(originalDevServerSchema.properties).toEqual(customEsbuildDevServerSchema.properties);
   });

packages/custom-esbuild/package.json

@@ -49,7 +49,6 @@
     "@angular/compiler-cli": "^20.0.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^20.0.0",
     "esbuild": "0.25.1",
     "jest": "29.7.0",
     "rimraf": "^5.0.0",

packages/custom-esbuild/src/dev-server/patch-builder-context.ts

@@ -1,8 +1,8 @@
 import { BuilderContext, Target } from '@angular-devkit/architect';
 
 const executorToBuilderMap = new Map<string, string>([
-  ['@angular-builders/custom-esbuild', '@angular-devkit/build-angular:application'],
-  ['@angular-builders/custom-esbuild:application', '@angular-devkit/build-angular:application'],
+  ['@angular-builders/custom-esbuild', '@angular/build:application'],
+  ['@angular-builders/custom-esbuild:application', '@angular/build:application'],
 ]);
 
 function cleanBuildTargetOptions(options: any) {
@@ -15,9 +15,9 @@ export function patchBuilderContext(context: BuilderContext, buildTarget: Target
   const originalGetBuilderNameForTarget = context.getBuilderNameForTarget;
 
   // We have to patch `getBuilderNameForTarget` because Angular CLI checks
-  // whether the runnable target is `@angular-devkit/build-angular:application`
+  // whether the runnable target is `@angular/build:application`
   // and then defines the server to run. If the `builderName` (returned by
-  // `context.getBuilderNameForTarget`) is not an `@angular-devkit/build-angular:application`,
+  // `context.getBuilderNameForTarget`) is not an `@angular/build:application`,
   // then it will use the Webpack server for the `dev-server target`. By patching
   // the return value, Angular will use the Vite server for the `dev-server` target.
   context.getBuilderNameForTarget = async target => {

packages/custom-esbuild/src/schemes.ts

@@ -7,7 +7,8 @@ module.exports = [
     newSchemaPath: `${__dirname}/../dist/application/schema.json`,
   },
   {
-    originalSchemaPath: '@angular-devkit/build-angular/src/builders/dev-server/schema.json',
+    originalSchemaPackage: '@angular/build',
+    originalSchemaPath: 'src/builders/dev-server/schema.json',
     schemaExtensionPaths: [`${__dirname}/dev-server/schema.ext.json`],
     newSchemaPath: `${__dirname}/../dist/dev-server/schema.json`,
   },

yarn.lock

@@ -48,7 +48,6 @@ __metadata:
   dependencies:
     "@angular-builders/common": "workspace:*"
     "@angular-devkit/architect": ">=0.2000.0 < 0.2100.0"
-    "@angular-devkit/build-angular": ^20.0.0
     "@angular-devkit/core": ^20.0.0
     "@angular/build": ^20.0.0
     esbuild: 0.25.1