Skip to content

Commit 9009175

Browse files
clydinangular-robot[bot]
authored andcommitted
refactor(@angular-devkit/build-angular): consolidate esbuild stylesheet files
The stylesheet related files for the esbuild-based browser application builder have now been moved into a `stylesheets` directory to better organize the code.
1 parent b973b0f commit 9009175

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
profileSync,
3030
resetCumulativeDurations,
3131
} from '../profiling';
32-
import { BundleStylesheetOptions, bundleComponentStylesheet } from '../stylesheets';
32+
import { BundleStylesheetOptions, bundleComponentStylesheet } from '../stylesheets/bundle-options';
3333
import { AngularCompilation, FileEmitter } from './angular-compilation';
3434
import { AngularHostOptions } from './angular-host';
3535
import { AotCompilation } from './aot-compilation';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type { OutputFile, PluginBuild } from 'esbuild';
1010
import { readFile } from 'node:fs/promises';
1111
import path from 'node:path';
1212
import { LoadResultCache } from '../load-result-cache';
13-
import { BundleStylesheetOptions, bundleComponentStylesheet } from '../stylesheets';
13+
import { BundleStylesheetOptions, bundleComponentStylesheet } from '../stylesheets/bundle-options';
1414
import {
1515
JIT_NAMESPACE_REGEXP,
1616
JIT_STYLE_NAMESPACE,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import { createGlobalScriptsBundleOptions } from './global-scripts';
2929
import { extractLicenses } from './license-extractor';
3030
import { LoadResultCache } from './load-result-cache';
3131
import { BrowserEsbuildOptions, NormalizedBrowserOptions, normalizeOptions } from './options';
32-
import { shutdownSassWorkerPool } from './sass-plugin';
3332
import { Schema as BrowserBuilderOptions } from './schema';
3433
import { createSourcemapIngorelistPlugin } from './sourcemap-ignorelist-plugin';
35-
import { createStylesheetBundleOptions } from './stylesheets';
34+
import { createStylesheetBundleOptions } from './stylesheets/bundle-options';
35+
import { shutdownSassWorkerPool } from './stylesheets/sass-plugin';
3636
import type { ChangedFiles } from './watcher';
3737

3838
interface RebuildState {

packages/angular_devkit/build_angular/src/builders/browser-esbuild/stylesheets.ts renamed to packages/angular_devkit/build_angular/src/builders/browser-esbuild/stylesheets/bundle-options.ts

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

99
import type { BuildOptions, OutputFile } from 'esbuild';
1010
import path from 'node:path';
11+
import { BundlerContext } from '../esbuild';
12+
import { LoadResultCache } from '../load-result-cache';
1113
import { createCssPlugin } from './css-plugin';
1214
import { createCssResourcePlugin } from './css-resource-plugin';
13-
import { BundlerContext } from './esbuild';
1415
import { createLessPlugin } from './less-plugin';
15-
import { LoadResultCache } from './load-result-cache';
1616
import { createSassPlugin } from './sass-plugin';
1717

1818
/**

packages/angular_devkit/build_angular/src/builders/browser-esbuild/sass-plugin.ts renamed to packages/angular_devkit/build_angular/src/builders/browser-esbuild/stylesheets/sass-plugin.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import type { CompileResult, Exception, Syntax } from 'sass';
1515
import type {
1616
FileImporterWithRequestContextOptions,
1717
SassWorkerImplementation,
18-
} from '../../sass/sass-service';
19-
import type { LoadResultCache } from './load-result-cache';
18+
} from '../../../sass/sass-service';
19+
import type { LoadResultCache } from '../load-result-cache';
2020

2121
export interface SassPluginOptions {
2222
sourcemap: boolean;
@@ -113,7 +113,7 @@ async function compileString(
113113
): Promise<OnLoadResult> {
114114
// Lazily load Sass when a Sass file is found
115115
if (sassWorkerPool === undefined) {
116-
const sassService = await import('../../sass/sass-service');
116+
const sassService = await import('../../../sass/sass-service');
117117
sassWorkerPool = new sassService.SassWorkerImplementation(true);
118118
}
119119

0 commit comments

Comments
 (0)