diff --git a/packages/angular_devkit/build_angular/src/builders/application/build-action.ts b/packages/angular_devkit/build_angular/src/builders/application/build-action.ts index 1eee42968206..4b6d15d955cc 100644 --- a/packages/angular_devkit/build_angular/src/builders/application/build-action.ts +++ b/packages/angular_devkit/build_angular/src/builders/application/build-action.ts @@ -6,8 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import { BuilderOutput } from '@angular-devkit/architect'; -import type { logging } from '@angular-devkit/core'; +import { BuilderContext, BuilderOutput } from '@angular-devkit/architect'; import { existsSync } from 'node:fs'; import path from 'node:path'; import { BuildOutputFile } from '../../tools/esbuild/bundler-context'; @@ -44,7 +43,7 @@ export async function* runEsBuildBuildAction( workspaceRoot: string; projectRoot: string; outputOptions: NormalizedOutputOptions; - logger: logging.LoggerApi; + logger: BuilderContext['logger']; cacheOptions: NormalizedCachedOptions; writeToFileSystem: boolean; writeToFileSystemFilter: ((file: BuildOutputFile) => boolean) | undefined; diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/vite-server.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/vite-server.ts index 98c760b02598..d9c535127c99 100644 --- a/packages/angular_devkit/build_angular/src/builders/dev-server/vite-server.ts +++ b/packages/angular_devkit/build_angular/src/builders/dev-server/vite-server.ts @@ -7,7 +7,7 @@ */ import type { BuilderContext } from '@angular-devkit/architect'; -import type { json, logging } from '@angular-devkit/core'; +import type { json } from '@angular-devkit/core'; import type { Plugin } from 'esbuild'; import assert from 'node:assert'; import { readFile } from 'node:fs/promises'; @@ -314,7 +314,7 @@ function handleUpdate( generatedFiles: Map, server: ViteDevServer, serverOptions: NormalizedDevServerOptions, - logger: logging.LoggerApi, + logger: BuilderContext['logger'], ): void { const updatedFiles: string[] = []; diff --git a/packages/angular_devkit/build_angular/src/tools/esbuild/utils.ts b/packages/angular_devkit/build_angular/src/tools/esbuild/utils.ts index 41c4c42fdb20..8c8da676839e 100644 --- a/packages/angular_devkit/build_angular/src/tools/esbuild/utils.ts +++ b/packages/angular_devkit/build_angular/src/tools/esbuild/utils.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import { logging } from '@angular-devkit/core'; +import { BuilderContext } from '@angular-devkit/architect'; import { BuildOptions, Metafile, OutputFile, formatMessages } from 'esbuild'; import { createHash } from 'node:crypto'; import { constants as fsConstants } from 'node:fs'; @@ -456,7 +456,7 @@ export async function createJsonBuildManifest( } export async function logMessages( - logger: logging.LoggerApi, + logger: BuilderContext['logger'], executionResult: ExecutionResult, color?: boolean, jsonLogs?: boolean, diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts b/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts index b020b791a715..270b923486df 100644 --- a/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts +++ b/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts @@ -6,12 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import { BaseException } from '@angular-devkit/core'; import { statSync } from 'fs'; import * as path from 'path'; import { AssetPattern, AssetPatternClass } from '../builders/browser/schema'; -export class MissingAssetSourceRootException extends BaseException { +export class MissingAssetSourceRootException extends Error { constructor(path: string) { super(`The ${path} asset path must start with the project source root.`); } diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts b/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts index 377dafdabad4..7ae647091153 100644 --- a/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts +++ b/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts @@ -6,12 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import { BaseException } from '@angular-devkit/core'; import { existsSync } from 'fs'; import * as path from 'path'; import { FileReplacement } from '../builders/browser/schema'; -export class MissingFileReplacementException extends BaseException { +export class MissingFileReplacementException extends Error { constructor(path: string) { super(`The ${path} path in file replacements does not exist.`); } diff --git a/packages/angular_devkit/build_angular/src/utils/supported-browsers.ts b/packages/angular_devkit/build_angular/src/utils/supported-browsers.ts index 0dbe083ca14a..acc1466bd33a 100644 --- a/packages/angular_devkit/build_angular/src/utils/supported-browsers.ts +++ b/packages/angular_devkit/build_angular/src/utils/supported-browsers.ts @@ -6,10 +6,12 @@ * found in the LICENSE file at https://angular.io/license */ -import { logging } from '@angular-devkit/core'; import browserslist from 'browserslist'; -export function getSupportedBrowsers(projectRoot: string, logger: logging.LoggerApi): string[] { +export function getSupportedBrowsers( + projectRoot: string, + logger: { warn(message: string): void }, +): string[] { browserslist.defaults = [ 'last 2 Chrome versions', 'last 1 Firefox version', diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts index a727f845005b..709c2f4c0646 100644 --- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts +++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts @@ -7,7 +7,6 @@ */ import { BuilderContext } from '@angular-devkit/architect'; -import { logging } from '@angular-devkit/core'; import * as path from 'path'; import { Configuration, javascript } from 'webpack'; import { merge as webpackMerge } from 'webpack-merge'; @@ -34,7 +33,7 @@ export async function generateWebpackConfig( projectName: string, options: NormalizedBrowserBuilderSchema, webpackPartialGenerator: WebpackPartialGenerator, - logger: logging.LoggerApi, + logger: BuilderContext['logger'], extraBuildOptions: Partial, ): Promise { // Ensure Build Optimizer is only used with AOT.