Skip to content

Commit 4111682

Browse files
clydinangular-robot[bot]
authored andcommitted
refactor(@angular-devkit/build-angular): move esbuild compiler plugin in angular directory
Minor directory restructure to better organize the Angular compiler plugin code files. The remainder of the Angular specific files for the Angular esbuild compiler plugin are now within the `angular` subdirectory of the esbuild-based browser application builder.
1 parent df49c35 commit 4111682

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular-compilation.ts renamed to packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/aot-compilation.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
import type ng from '@angular/compiler-cli';
1010
import assert from 'node:assert';
1111
import ts from 'typescript';
12-
import { loadEsmModule } from '../../utils/load-esm';
12+
import { loadEsmModule } from '../../../utils/load-esm';
13+
import { profileAsync, profileSync } from '../profiling';
1314
import {
1415
AngularHostOptions,
1516
createAngularCompilerHost,
1617
ensureSourceFileVersions,
1718
} from './angular-host';
18-
import { profileAsync, profileSync } from './profiling';
1919

2020
// Temporary deep import for transformer support
2121
// TODO: Move these to a private exports location or move the implementation into this package.
@@ -42,7 +42,7 @@ export interface EmitFileResult {
4242
}
4343
export type FileEmitter = (file: string) => Promise<EmitFileResult | undefined>;
4444

45-
export class AngularCompilation {
45+
export class AotCompilation {
4646
static #angularCompilerCliModule?: typeof ng;
4747

4848
#state?: AngularCompilationState;
@@ -64,7 +64,7 @@ export class AngularCompilation {
6464
configurationDiagnostics?: ts.Diagnostic[],
6565
): Promise<{ affectedFiles: ReadonlySet<ts.SourceFile> }> {
6666
// Dynamically load the Angular compiler CLI package
67-
const { NgtscProgram, OptimizeFor } = await AngularCompilation.loadCompilerCli();
67+
const { NgtscProgram, OptimizeFor } = await AotCompilation.loadCompilerCli();
6868

6969
// Create Angular compiler host
7070
const host = createAngularCompilerHost(compilerOptions, hostOptions);

packages/angular_devkit/build_angular/src/builders/browser-esbuild/compiler-plugin.ts renamed to packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/compiler-plugin.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ import { platform } from 'node:os';
2020
import * as path from 'node:path';
2121
import { pathToFileURL } from 'node:url';
2222
import ts from 'typescript';
23-
import { maxWorkers } from '../../utils/environment-options';
24-
import { JitCompilation } from './angular/jit-compilation';
25-
import { setupJitPluginCallbacks } from './angular/jit-plugin-callbacks';
26-
import { AngularCompilation, FileEmitter } from './angular-compilation';
27-
import { AngularHostOptions } from './angular-host';
28-
import { JavaScriptTransformer } from './javascript-transformer';
23+
import { maxWorkers } from '../../../utils/environment-options';
24+
import { JavaScriptTransformer } from '../javascript-transformer';
2925
import {
3026
logCumulativeDurations,
3127
profileAsync,
3228
profileSync,
3329
resetCumulativeDurations,
34-
} from './profiling';
35-
import { BundleStylesheetOptions, bundleComponentStylesheet } from './stylesheets';
30+
} from '../profiling';
31+
import { BundleStylesheetOptions, bundleComponentStylesheet } from '../stylesheets';
32+
import { AngularHostOptions } from './angular-host';
33+
import { AotCompilation, FileEmitter } from './aot-compilation';
34+
import { JitCompilation } from './jit-compilation';
35+
import { setupJitPluginCallbacks } from './jit-plugin-callbacks';
3636

3737
/**
3838
* Converts TypeScript Diagnostic related information into an esbuild compatible note object.
@@ -166,7 +166,7 @@ export function createCompilerPlugin(
166166
const javascriptTransformer = new JavaScriptTransformer(pluginOptions, maxWorkers);
167167

168168
const { GLOBAL_DEFS_FOR_TERSER_WITH_AOT, readConfiguration } =
169-
await AngularCompilation.loadCompilerCli();
169+
await AotCompilation.loadCompilerCli();
170170

171171
// Setup defines based on the values provided by the Angular compiler-cli
172172
build.initialOptions.define ??= {};
@@ -239,7 +239,7 @@ export function createCompilerPlugin(
239239

240240
let stylesheetMetafiles: Metafile[];
241241

242-
let compilation: AngularCompilation | undefined;
242+
let compilation: AotCompilation | undefined;
243243

244244
build.onStart(async () => {
245245
const result: OnStartResult = {
@@ -291,7 +291,7 @@ export function createCompilerPlugin(
291291
if (pluginOptions.jit) {
292292
compilation ??= new JitCompilation();
293293
} else {
294-
compilation ??= new AngularCompilation();
294+
compilation ??= new AotCompilation();
295295
}
296296

297297
// Initialize the Angular compilation for the current build.

packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/jit-compilation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
import assert from 'node:assert';
1010
import ts from 'typescript';
11-
import { AngularCompilation } from '../angular-compilation';
12-
import { AngularHostOptions, createAngularCompilerHost } from '../angular-host';
1311
import { profileSync } from '../profiling';
12+
import { AngularCompilation } from './angular-compilation';
13+
import { AngularHostOptions, createAngularCompilerHost } from './angular-host';
1414
import { createJitResourceTransformer } from './jit-resource-transformer';
1515

1616
class JitCompilationState {

packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import { augmentAppWithServiceWorkerEsbuild } from '../../utils/service-worker';
2121
import { Spinner } from '../../utils/spinner';
2222
import { getSupportedBrowsers } from '../../utils/supported-browsers';
2323
import { BundleStats, generateBuildStatsTable } from '../../webpack/utils/stats';
24+
import { SourceFileCache, createCompilerPlugin } from './angular/compiler-plugin';
2425
import { checkCommonJSModules } from './commonjs-checker';
25-
import { SourceFileCache, createCompilerPlugin } from './compiler-plugin';
2626
import { BundlerContext, logMessages } from './esbuild';
2727
import { logExperimentalWarnings } from './experimental-warnings';
2828
import { createGlobalScriptsBundleOptions } from './global-scripts';

0 commit comments

Comments
 (0)