Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cssnano): disable normalizeUrl while enabling output.injectStyles #6669

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/tidy-waves-sip.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@modern-js/uni-builder': patch
---

fix(cssnano): cssnano `normalizeUrl` optimization breaks resolving of CSS files
fix(cssnano): cssnano `normalizeUrl` 优化导致 CSS 文件无法正确 resolving
4 changes: 1 addition & 3 deletions packages/cli/uni-builder/src/rspack/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ export async function parseConfig(
if (Boolean(rsbuildConfig.tools!.lightningcssLoader) === false) {
const { pluginPostcss } = await import('../shared/plugins/postcss');
rsbuildPlugins.push(
pluginPostcss({
autoprefixer: uniBuilderConfig.tools?.autoprefixer,
}),
pluginPostcss({ autoprefixer: uniBuilderConfig.tools?.autoprefixer }),
);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/cli/uni-builder/src/shared/parseCommonConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ const isUseCssSourceMap = (disableSourceMap: DisableSourceMapOption = {}) => {

export async function parseCommonConfig(
uniBuilderConfig: UniBuilderConfig,
options: CreateBuilderCommonOptions,
options?: CreateBuilderCommonOptions,
): Promise<{
rsbuildConfig: RsbuildConfig;
rsbuildPlugins: RsbuildPlugin[];
}> {
const { frameworkConfigPath } = options;
const frameworkConfigPath = options?.frameworkConfigPath;

const {
plugins: [...plugins] = [],
Expand Down
46 changes: 28 additions & 18 deletions packages/cli/uni-builder/src/shared/plugins/postcss.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
import { applyOptionsChain, isProd } from '@modern-js/utils';
import type { RsbuildPlugin } from '@rsbuild/core';
import type { Options } from 'cssnano';
import type { ToolsAutoprefixerConfig } from '../../types';
import { getCssSupport } from '../getCssSupport';

// enable autoprefixer and support compat legacy browsers
export const pluginPostcss = ({
autoprefixer,
}: {
export interface PluginPostcssOptions {
autoprefixer?: ToolsAutoprefixerConfig;
}): RsbuildPlugin => ({
}

// enable autoprefixer and support compat legacy browsers
export const pluginPostcss = (
options: PluginPostcssOptions = {},
): RsbuildPlugin => ({
name: 'uni-builder:postcss-plugins',

pre: ['uni-builder:environment-defaults-plugin'],

setup(api) {
const { autoprefixer } = options;
api.modifyEnvironmentConfig((config, { mergeEnvironmentConfig }) => {
if (config.output.target !== 'web') {
return config;
Expand All @@ -25,6 +29,24 @@ export const pluginPostcss = ({

const enableCssMinify = !enableExtractCSS && isProd;

const cssnanoOptions: Options = {
preset: [
'default',
{
// merge longhand will break safe-area-inset-top, so disable it
// https://github.com/cssnano/cssnano/issues/803
// https://github.com/cssnano/cssnano/issues/967
mergeLonghand: false,
/**
* normalizeUrl will transform relative url from `./assets/img.svg` to `assets/img.svg`.
* It may break the behavior of webpack resolver while using style-loader.
* So disable it while `output.injectStyles = true` or `output.disableCssExtract = true`.
*/
normalizeUrl: false,
},
],
};

const plugins = [
require('postcss-flexbugs-fixes'),
!cssSupport.customProperties && require('postcss-custom-properties'),
Expand All @@ -33,19 +55,7 @@ export const pluginPostcss = ({
!cssSupport.fontVariant && require('postcss-font-variant'),
!cssSupport.mediaMinmax && require('postcss-media-minmax'),
require('postcss-nesting'),
enableCssMinify
? require('cssnano')({
preset: [
'default',
{
// merge longhand will break safe-area-inset-top, so disable it
// https://github.com/cssnano/cssnano/issues/803
// https://github.com/cssnano/cssnano/issues/967
mergeLonghand: false,
},
],
})
: false,
enableCssMinify ? require('cssnano')(cssnanoOptions) : false,
// The last insert autoprefixer
require('autoprefixer')(
applyOptionsChain(
Expand Down
4 changes: 1 addition & 3 deletions packages/cli/uni-builder/src/webpack/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ export async function parseConfig(
);

rsbuildPlugins.push(
pluginPostcss({
autoprefixer: uniBuilderConfig.tools?.autoprefixer,
}),
pluginPostcss({ autoprefixer: uniBuilderConfig.tools?.autoprefixer }),
);

const hasEnvironmentBabelConfig = Object.values(
Expand Down
Loading
Loading