Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 26127bd

Browse files
fix(@angular/build): resolve PostCSS plugins relative to config file
Previously, PostCSS plugins were resolved from the location of `@angular/build`. This caused issues when the PostCSS configuration file was located in a subdirectory and used plugins not hoisted to the root `node_modules`, as plugins would not be found. This change updates the PostCSS configuration loading to resolve plugins relative to the directory containing the PostCSS configuration file. This ensures that plugins are correctly located regardless of the configuration files location.
1 parent 982d6c5 commit 26127bd

File tree

4 files changed

+25
-14
lines changed

4 files changed

+25
-14
lines changed

‎packages/angular/build/src/tools/esbuild/stylesheets/bundle-options.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export interface BundleStylesheetOptions {
3131
externalDependencies?: string[];
3232
target: string[];
3333
tailwindConfiguration?: { file: string; package: string };
34-
postcssConfiguration?: PostcssConfiguration;
34+
postcssConfiguration?: {config: PostcssConfiguration;configPath: string};
3535
publicPath?: string;
3636
cacheOptions: NormalizedCachedOptions;
3737
}

‎packages/angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
import type { OnLoadResult, Plugin, PluginBuild } from 'esbuild';
1010
import assert from 'node:assert';
1111
import { readFile } from 'node:fs/promises';
12-
import { extname } from 'node:path';
12+
import { createRequire } from 'node:module';
13+
import { dirname, extname } from 'node:path';
1314
import type { Options } from 'sass';
1415
import { glob } from 'tinyglobby';
1516
import { assertIsError } from '../../../utils/error';
@@ -69,7 +70,7 @@ export interface StylesheetPluginOptions {
6970
* initialized and used for every stylesheet. This overrides the tailwind integration
7071
* and any tailwind usage must be manually configured in the custom postcss usage.
7172
*/
72-
postcssConfiguration?: PostcssConfiguration;
73+
postcssConfiguration?: {config: PostcssConfiguration;configPath: string};
7374

7475
/**
7576
* Optional Options for configuring Sass behavior.
@@ -215,14 +216,18 @@ export class StylesheetPluginFactory {
215216

216217
const { options } = this;
217218
if (options.postcssConfiguration) {
218-
const postCssInstanceKey = JSON.stringify(options.postcssConfiguration);
219+
const { config, configPath } = options.postcssConfiguration;
220+
const postCssInstanceKey = JSON.stringify(config);
219221
let postcssProcessor = postcssProcessors.get(postCssInstanceKey)?.deref();
220222

221223
if (!postcssProcessor) {
222224
postcss ??= (await import('postcss')).default;
223225
postcssProcessor = postcss();
224-
for (const [pluginName, pluginOptions] of options.postcssConfiguration.plugins) {
225-
const { default: plugin } = await import(pluginName);
226+
227+
const postCssPluginRequire = createRequire(dirname(configPath) + '/');
228+
229+
for (const [pluginName, pluginOptions] of config.plugins) {
230+
const plugin = postCssPluginRequire(pluginName);
226231
if (typeof plugin !== 'function' || plugin.postcss !== true) {
227232
throw new Error(`Attempted to load invalid Postcss plugin: "${pluginName}"`);
228233
}

‎packages/angular/build/src/utils/postcss-configuration.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,13 @@ async function readPostcssConfiguration(
7171
return config;
7272
}
7373

74-
export async function loadPostcssConfiguration(
75-
searchDirectories: SearchDirectory[],
76-
): Promise<PostcssConfiguration | undefined> {
74+
export async function loadPostcssConfiguration(searchDirectories: SearchDirectory[]): Promise<
75+
| {
76+
configPath: string;
77+
config: PostcssConfiguration;
78+
}
79+
| undefined
80+
> {
7781
const configPath = findFile(searchDirectories, postcssConfigurationFiles);
7882
if (!configPath) {
7983
return undefined;
@@ -101,7 +105,7 @@ export async function loadPostcssConfiguration(
101105
}
102106
}
103107

104-
return config;
108+
return {config, configPath };
105109
}
106110

107111
// Normalize plugin object map form
@@ -119,5 +123,5 @@ export async function loadPostcssConfiguration(
119123
config.plugins.push([name, options]);
120124
}
121125

122-
return config;
126+
return {config, configPath };
123127
}

‎packages/angular_devkit/build_angular/src/tools/webpack/configs/styles.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
loadPostcssConfiguration,
1414
} from '@angular/build/private';
1515
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
16+
import { createRequire } from 'node:module';
1617
import * as path from 'node:path';
1718
import { fileURLToPath, pathToFileURL } from 'node:url';
1819
import type { FileImporter } from 'sass';
@@ -83,9 +84,10 @@ export async function getStylesConfig(wco: WebpackConfigOptions): Promise<Config
8384
const postcssConfig = await loadPostcssConfiguration(searchDirectories);
8485

8586
if (postcssConfig) {
86-
for (const [pluginName, pluginOptions] of postcssConfig.plugins) {
87-
const resolvedPlugin = require.resolve(pluginName, { paths: [root] });
88-
const { default: plugin } = await import(resolvedPlugin);
87+
const postCssPluginRequire = createRequire(path.dirname(postcssConfig.configPath) + '/');
88+
89+
for (const [pluginName, pluginOptions] of postcssConfig.config.plugins) {
90+
const plugin = postCssPluginRequire(pluginName);
8991
if (typeof plugin !== 'function' || plugin.postcss !== true) {
9092
throw new Error(`Attempted to load invalid Postcss plugin: "${pluginName}"`);
9193
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /