Skip to content

Commit e7ebbcd

Browse files
committed
refactor(@angular/build): relocate non-esbuild utilities out of tools/esbuild
Relocate several utilities from `src/tools/esbuild` to more appropriate locations, as they are not specific to esbuild: - `watcher.ts`: moved to `src/utils/watcher.ts`. - `profiling.ts`: moved to `src/utils/profiling.ts`. - `cache.ts`, `sqlite-cache-store.ts`, `lmdb-cache-store.ts`: moved to `src/utils/cache/`. - `javascript-transformer.ts`, `javascript-transformer-worker.ts`: moved to `src/tools/javascript-transformer/`. - `i18n-inliner.ts`, `i18n-inliner-worker.ts`, `i18n-translation-*`: moved to `src/tools/i18n/`, with locale data helpers in `src/tools/i18n/locale-data.ts`. - `index-html-generator.ts`: moved to `src/builders/application/index-html-generator.ts`. (cherry picked from commit eb1edeb)
1 parent ee30413 commit e7ebbcd

44 files changed

Lines changed: 247 additions & 177 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

packages/angular/build/src/builders/application/build-action.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import {
1818
shutdownSassWorkerPool,
1919
} from '../../tools/esbuild/stylesheets/sass-language';
2020
import { logMessages, withNoProgress, withSpinner } from '../../tools/esbuild/utils';
21-
import { ChangedFiles } from '../../tools/esbuild/watcher';
2221
import { initializeHash } from '../../utils/hash';
2322
import { NormalizedCachedOptions } from '../../utils/normalize-cache';
23+
import { ChangedFiles } from '../../utils/watcher';
2424
import { NormalizedApplicationBuildOptions, NormalizedOutputOptions } from './options';
2525
import {
2626
ComponentUpdateResult,
@@ -88,7 +88,7 @@ export async function* runEsBuildBuildAction(
8888
}
8989
}
9090

91-
let watcher: import('../../tools/esbuild/watcher').BuildWatcher | undefined;
91+
let watcher: import('../../utils/watcher').BuildWatcher | undefined;
9292
let watchLoopStarted = false;
9393
try {
9494
// Setup watcher if watch mode enabled
@@ -98,7 +98,7 @@ export async function* runEsBuildBuildAction(
9898
}
9999

100100
// Setup a watcher
101-
const { setupWatcher } = await import('../../tools/esbuild/watcher');
101+
const { setupWatcher } = await import('../../utils/watcher');
102102
watcher = await setupWatcher({
103103
workspaceRoot,
104104
projectRoot,

packages/angular/build/src/builders/application/execute-build.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { BuildOutputFileType } from '../../tools/esbuild/bundler-files';
2020
import { checkCommonJSModules } from '../../tools/esbuild/commonjs-checker';
2121
import { LOCALE_DATA_BASE_MODULE } from '../../tools/esbuild/i18n-locale-plugin';
2222
import { extractLicenses } from '../../tools/esbuild/license-extractor';
23-
import { profileAsync } from '../../tools/esbuild/profiling';
2423
import { transformSupportedBrowsersToTargets } from '../../tools/esbuild/target';
2524
import {
2625
calculateEstimatedTransferSizes,
@@ -29,6 +28,7 @@ import {
2928
} from '../../tools/esbuild/utils';
3029
import { BudgetCalculatorResult, checkBudgets } from '../../utils/bundle-calculator';
3130
import { optimizeChunksThreshold } from '../../utils/environment-options';
31+
import { profileAsync } from '../../utils/profiling';
3232
import { resolveAssets } from '../../utils/resolve-assets';
3333
import {
3434
SERVER_APP_ENGINE_MANIFEST_FILENAME,

packages/angular/build/src/builders/application/execute-post-bundle.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,15 @@ import {
1818
type InitialFileRecord,
1919
createOutputFile,
2020
} from '../../tools/esbuild/bundler-files';
21-
import { generateIndexHtml } from '../../tools/esbuild/index-html-generator';
2221
import { maxWorkers } from '../../utils/environment-options';
2322
import {
2423
SERVER_APP_MANIFEST_FILENAME,
2524
generateAngularServerAppManifest,
2625
} from '../../utils/server-rendering/manifest';
27-
import {
28-
RouteRenderMode,
29-
WritableSerializableRouteTreeNode,
30-
} from '../../utils/server-rendering/models';
26+
import { WritableSerializableRouteTreeNode } from '../../utils/server-rendering/models';
3127
import { prerenderPages } from '../../utils/server-rendering/prerender';
3228
import { augmentAppWithServiceWorkerEsbuild } from '../../utils/service-worker';
29+
import { generateIndexHtml } from './index-html-generator';
3330
import { injectDebugIds } from './inject-debug-ids';
3431
import { INDEX_HTML_CSR, INDEX_HTML_SERVER, NormalizedApplicationBuildOptions } from './options';
3532
import { OutputMode } from './schema';

packages/angular/build/src/builders/application/i18n.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
PrerenderedRoutesRecord,
1717
} from '../../tools/esbuild/bundler-execution-result';
1818
import { BuildOutputFileType, InitialFileRecord } from '../../tools/esbuild/bundler-files';
19-
import { I18nInliner } from '../../tools/esbuild/i18n-inliner';
19+
import { I18nInliner } from '../../tools/i18n';
2020
import { maxInlinerWorkers } from '../../utils/environment-options';
2121
import { loadTranslations } from '../../utils/i18n-options';
2222
import { createTranslationLoader } from '../../utils/load-translations';

packages/angular/build/src/tools/esbuild/index-html-generator.ts renamed to packages/angular/build/src/builders/application/index-html-generator.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
import assert from 'node:assert';
1010
import { createHash } from 'node:crypto';
1111
import path from 'node:path';
12-
import { NormalizedApplicationBuildOptions } from '../../builders/application/options';
12+
import {
13+
BuildOutputFile,
14+
BuildOutputFileType,
15+
InitialFileRecord,
16+
} from '../../tools/esbuild/bundler-files';
1317
import { IndexHtmlGenerator } from '../../utils/index-file/index-html-generator';
14-
import { BuildOutputFile, BuildOutputFileType, InitialFileRecord } from './bundler-files';
18+
import { NormalizedApplicationBuildOptions } from './options';
1519

1620
/**
1721
* The maximum number of module preload link elements that should be added for

packages/angular/build/src/builders/dev-server/internal.ts

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

99
export { type BuildOutputFile, BuildOutputFileType } from '../../tools/esbuild/bundler-files';
1010
export { createRxjsEsmResolutionPlugin } from '../../tools/esbuild/rxjs-esm-resolution-plugin';
11-
export { JavaScriptTransformer } from '../../tools/esbuild/javascript-transformer';
11+
export { JavaScriptTransformer } from '../../tools/javascript-transformer';
1212
export { getFeatureSupport, isZonelessApp } from '../../tools/esbuild/utils';
1313
export { type IndexHtmlTransform } from '../../utils/index-file/index-html-generator';
1414
export { purgeStaleBuildCache } from '../../utils/purge-cache';

packages/angular/build/src/private.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ export { transformSupportedBrowsersToTargets } from './tools/esbuild/target';
3939
export { SassCompiler } from './tools/sass/sass-service';
4040

4141
export { SourceFileCache } from './tools/esbuild/angular/source-file-cache';
42-
export { Cache } from './tools/esbuild/cache';
42+
export { Cache } from './utils/cache';
4343
export { createJitResourceTransformer } from './tools/angular/transformers/jit-resource-transformer';
44-
export { JavaScriptTransformer } from './tools/esbuild/javascript-transformer';
44+
export { JavaScriptTransformer } from './tools/javascript-transformer';
4545

4646
export function createCompilerPlugin(
4747
pluginOptions: CompilerPluginOptions & {

packages/angular/build/src/tools/angular/compilation/aot-compilation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import assert from 'node:assert';
1111
import { relative } from 'node:path';
1212
import ts from 'typescript';
1313
import { useTypeChecking } from '../../../utils/environment-options';
14-
import { profileAsync, profileSync } from '../../esbuild/profiling';
14+
import { profileAsync, profileSync } from '../../../utils/profiling';
1515
import {
1616
AngularHostOptions,
1717
createAngularCompilerHost,

packages/angular/build/src/tools/angular/compilation/jit-compilation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import type * as ng from '@angular/compiler-cli';
1010
import assert from 'node:assert';
1111
import ts from 'typescript';
12-
import { profileSync } from '../../esbuild/profiling';
12+
import { profileSync } from '../../../utils/profiling';
1313
import { AngularHostOptions, createAngularCompilerHost } from '../angular-host';
1414
import { createJitResourceTransformer } from '../transformers/jit-resource-transformer';
1515
import { lazyRoutesTransformer } from '../transformers/lazy-routes-transformer';

packages/angular/build/src/tools/angular/compilation/parallel-compilation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import type { PartialMessage } from 'esbuild';
1010
import { createRequire } from 'node:module';
1111
import { MessageChannel } from 'node:worker_threads';
12+
import { mergeCumulativeDurations } from '../../../utils/profiling';
1213
import { WorkerPool } from '../../../utils/worker-pool';
13-
import { mergeCumulativeDurations } from '../../esbuild/profiling';
1414
import type { AngularHostOptions } from '../angular-host';
1515
import {
1616
AngularCompilation,

0 commit comments

Comments
 (0)