Skip to content

Commit db1a6ae

Browse files
clydinalan-agius4
authored andcommitted
refactor(@angular/build): move generic Angular tools into separate source directory
The Angular compiler code that is not specific to esbuild has been moved into a separate `tools` subdirectory. This allows for potential reuse internal reuse outside of the Angular esbuild plugin.
1 parent 8b6ae4c commit db1a6ae

16 files changed

+22
-22
lines changed

packages/angular/build/src/private.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export { transformSupportedBrowsersToTargets } from './tools/esbuild/utils';
2626
export { SassWorkerImplementation } from './tools/sass/sass-service';
2727

2828
export { SourceFileCache } from './tools/esbuild/angular/source-file-cache';
29-
export { createJitResourceTransformer } from './tools/esbuild/angular/jit-resource-transformer';
29+
export { createJitResourceTransformer } from './tools/angular/transformers/jit-resource-transformer';
3030
export { JavaScriptTransformer } from './tools/esbuild/javascript-transformer';
3131
export { createCompilerPlugin } from './tools/esbuild/angular/compiler-plugin';
3232

packages/angular/build/src/tools/esbuild/angular/compilation/angular-compilation.ts renamed to packages/angular/build/src/tools/angular/compilation/angular-compilation.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import type ng from '@angular/compiler-cli';
1010
import type { PartialMessage } from 'esbuild';
1111
import type ts from 'typescript';
12-
import { loadEsmModule } from '../../../../utils/load-esm';
13-
import { profileAsync, profileSync } from '../../profiling';
12+
import { loadEsmModule } from '../../../utils/load-esm';
13+
import { convertTypeScriptDiagnostic } from '../../esbuild/angular/diagnostics';
14+
import { profileAsync, profileSync } from '../../esbuild/profiling';
1415
import type { AngularHostOptions } from '../angular-host';
15-
import { convertTypeScriptDiagnostic } from '../diagnostics';
1616

1717
export interface EmitFileResult {
1818
filename: string;

packages/angular/build/src/tools/esbuild/angular/compilation/aot-compilation.ts renamed to packages/angular/build/src/tools/angular/compilation/aot-compilation.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
import type ng from '@angular/compiler-cli';
1010
import assert from 'node:assert';
1111
import ts from 'typescript';
12-
import { profileAsync, profileSync } from '../../profiling';
12+
import { profileAsync, profileSync } from '../../esbuild/profiling';
1313
import {
1414
AngularHostOptions,
1515
createAngularCompilerHost,
1616
ensureSourceFileVersions,
1717
} from '../angular-host';
18-
import { createWorkerTransformer } from '../web-worker-transformer';
18+
import { replaceBootstrap } from '../transformers/jit-bootstrap-transformer';
19+
import { createWorkerTransformer } from '../transformers/web-worker-transformer';
1920
import { AngularCompilation, DiagnosticModes, EmitFileResult } from './angular-compilation';
20-
import { replaceBootstrap } from './jit-bootstrap-transformer';
2121

2222
class AngularCompilationState {
2323
constructor(

packages/angular/build/src/tools/esbuild/angular/compilation/factory.ts renamed to packages/angular/build/src/tools/angular/compilation/factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import { useParallelTs } from '../../../../utils/environment-options';
9+
import { useParallelTs } from '../../../utils/environment-options';
1010
import type { AngularCompilation } from './angular-compilation';
1111

1212
/**

packages/angular/build/src/tools/esbuild/angular/compilation/jit-compilation.ts renamed to packages/angular/build/src/tools/angular/compilation/jit-compilation.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import type ng from '@angular/compiler-cli';
1010
import assert from 'node:assert';
1111
import ts from 'typescript';
12-
import { profileSync } from '../../profiling';
12+
import { profileSync } from '../../esbuild/profiling';
1313
import { AngularHostOptions, createAngularCompilerHost } from '../angular-host';
14-
import { createJitResourceTransformer } from '../jit-resource-transformer';
15-
import { createWorkerTransformer } from '../web-worker-transformer';
14+
import { createJitResourceTransformer } from '../transformers/jit-resource-transformer';
15+
import { createWorkerTransformer } from '../transformers/web-worker-transformer';
1616
import { AngularCompilation, DiagnosticModes, EmitFileResult } from './angular-compilation';
1717

1818
class JitCompilationState {

packages/angular/build/src/tools/esbuild/angular/compilation/parallel-worker.ts renamed to packages/angular/build/src/tools/angular/compilation/parallel-worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type { PartialMessage } from 'esbuild';
1010
import assert from 'node:assert';
1111
import { randomUUID } from 'node:crypto';
1212
import { type MessagePort, receiveMessageOnPort } from 'node:worker_threads';
13-
import { SourceFileCache } from '../source-file-cache';
13+
import { SourceFileCache } from '../../esbuild/angular/source-file-cache';
1414
import type { AngularCompilation, DiagnosticModes } from './angular-compilation';
1515
import { AotCompilation } from './aot-compilation';
1616
import { JitCompilation } from './jit-compilation';

packages/angular/build/src/tools/esbuild/angular/jit-resource-transformer.ts renamed to packages/angular/build/src/tools/angular/transformers/jit-resource-transformer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import ts from 'typescript';
10-
import { generateJitFileUri, generateJitInlineUri } from './uri';
10+
import { generateJitFileUri, generateJitInlineUri } from '../uri';
1111

1212
/**
1313
* Creates a TypeScript Transformer to transform Angular Component resource references into

packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ import type {
1818
import assert from 'node:assert';
1919
import * as path from 'node:path';
2020
import { maxWorkers, useTypeChecking } from '../../../utils/environment-options';
21-
import { JavaScriptTransformer } from '../javascript-transformer';
22-
import { LoadResultCache, createCachedLoad } from '../load-result-cache';
23-
import { logCumulativeDurations, profileAsync, resetCumulativeDurations } from '../profiling';
24-
import { BundleStylesheetOptions } from '../stylesheets/bundle-options';
25-
import { AngularHostOptions } from './angular-host';
21+
import { AngularHostOptions } from '../../angular/angular-host';
2622
import {
2723
AngularCompilation,
2824
DiagnosticModes,
2925
NoopCompilation,
3026
createAngularCompilation,
31-
} from './compilation';
27+
} from '../../angular/compilation';
28+
import { JavaScriptTransformer } from '../javascript-transformer';
29+
import { LoadResultCache, createCachedLoad } from '../load-result-cache';
30+
import { logCumulativeDurations, profileAsync, resetCumulativeDurations } from '../profiling';
31+
import { BundleStylesheetOptions } from '../stylesheets/bundle-options';
3232
import { SharedTSCompilationState, getSharedCompilationState } from './compilation-state';
3333
import { ComponentStylesheetBundler } from './component-stylesheets';
3434
import { FileReferenceTracker } from './file-reference-tracker';

packages/angular/build/src/tools/esbuild/angular/jit-plugin-callbacks.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
import type { Metafile, OutputFile, PluginBuild } from 'esbuild';
1010
import { readFile } from 'node:fs/promises';
1111
import { dirname, join, relative } from 'node:path';
12-
import { LoadResultCache, createCachedLoad } from '../load-result-cache';
13-
import { ComponentStylesheetBundler } from './component-stylesheets';
1412
import {
1513
JIT_NAMESPACE_REGEXP,
1614
JIT_STYLE_NAMESPACE,
1715
JIT_TEMPLATE_NAMESPACE,
1816
parseJitUri,
19-
} from './uri';
17+
} from '../../angular/uri';
18+
import { LoadResultCache, createCachedLoad } from '../load-result-cache';
19+
import { ComponentStylesheetBundler } from './component-stylesheets';
2020

2121
/**
2222
* Loads/extracts the contents from a load callback Angular JIT entry.

0 commit comments

Comments
 (0)