Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -314,7 +314,7 @@ function handleUpdate(
generatedFiles: Map<string, OutputFileRecord>,
server: ViteDevServer,
serverOptions: NormalizedDevServerOptions,
logger: logging.LoggerApi,
logger: BuilderContext['logger'],
): void {
const updatedFiles: string[] = [];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -456,7 +456,7 @@ export async function createJsonBuildManifest(
}

export async function logMessages(
logger: logging.LoggerApi,
logger: BuilderContext['logger'],
executionResult: ExecutionResult,
color?: boolean,
jsonLogs?: boolean,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -34,7 +33,7 @@ export async function generateWebpackConfig(
projectName: string,
options: NormalizedBrowserBuilderSchema,
webpackPartialGenerator: WebpackPartialGenerator,
logger: logging.LoggerApi,
logger: BuilderContext['logger'],
extraBuildOptions: Partial<NormalizedBrowserBuilderSchema>,
): Promise<Configuration> {
// Ensure Build Optimizer is only used with AOT.
Expand Down