diff --git a/packages/rspack/src/plugins/utils/apply-web-config.ts b/packages/rspack/src/plugins/utils/apply-web-config.ts index e5ecece139..01c96bde15 100644 --- a/packages/rspack/src/plugins/utils/apply-web-config.ts +++ b/packages/rspack/src/plugins/utils/apply-web-config.ts @@ -143,9 +143,9 @@ export function applyWebConfig( loader: require.resolve('sass-loader'), options: { implementation: - options.sassImplementation === 'sass-embedded' - ? require.resolve('sass-embedded') - : require.resolve('sass'), + options.sassImplementation === 'sass' + ? require.resolve('sass') + : require.resolve('sass-embedded'), api: 'modern-compiler', sassOptions: { fiber: false, @@ -209,9 +209,9 @@ export function applyWebConfig( options: { api: 'modern-compiler', implementation: - options.sassImplementation === 'sass-embedded' - ? require.resolve('sass-embedded') - : require.resolve('sass'), + options.sassImplementation === 'sass' + ? require.resolve('sass') + : require.resolve('sass-embedded'), sourceMap: !!options.sourceMap, sassOptions: { fiber: false, @@ -279,9 +279,9 @@ export function applyWebConfig( options: { api: 'modern-compiler', implementation: - options.sassImplementation === 'sass-embedded' - ? require.resolve('sass-embedded') - : require.resolve('sass'), + options.sassImplementation === 'sass' + ? require.resolve('sass') + : require.resolve('sass-embedded'), sourceMap: !!options.sourceMap, sassOptions: { fiber: false, diff --git a/packages/rspack/src/plugins/utils/models.ts b/packages/rspack/src/plugins/utils/models.ts index 1d7317c049..b7f9959360 100644 --- a/packages/rspack/src/plugins/utils/models.ts +++ b/packages/rspack/src/plugins/utils/models.ts @@ -161,10 +161,10 @@ export interface NxAppRspackPluginOptions { * Add an additional chunk for the rspack runtime. Defaults to `true` when `target === 'web'`. */ runtimeChunk?: boolean; - // TODO(v21): Make Sass Embedded the default in version 21. // TODO(v22): Remove in version 22. /** * The implementation of the SASS compiler to use. Can be either `sass` or `sass-embedded`. Defaults to `sass-embedded`. + * @deprecated Sass option will be removed in Nx 22. This option will also be removed in Nx 22 as it is no longer needed. */ sassImplementation?: 'sass' | 'sass-embedded'; /** diff --git a/packages/rspack/src/plugins/utils/plugins/normalize-options.ts b/packages/rspack/src/plugins/utils/plugins/normalize-options.ts index fa0ac5a6da..94b5f43446 100644 --- a/packages/rspack/src/plugins/utils/plugins/normalize-options.ts +++ b/packages/rspack/src/plugins/utils/plugins/normalize-options.ts @@ -121,7 +121,8 @@ export function normalizeOptions( root: workspaceRoot, runtimeChunk: combinedPluginAndMaybeExecutorOptions.runtimeChunk ?? true, sassImplementation: - combinedPluginAndMaybeExecutorOptions.sassImplementation ?? 'sass', + combinedPluginAndMaybeExecutorOptions.sassImplementation ?? + 'sass-embedded', scripts: combinedPluginAndMaybeExecutorOptions.scripts ?? [], sourceMap: combinedPluginAndMaybeExecutorOptions.sourceMap ?? !isProd, sourceRoot, diff --git a/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-web-config.ts b/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-web-config.ts index a4d3c785cd..cdbb6e0c14 100644 --- a/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-web-config.ts +++ b/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-web-config.ts @@ -145,9 +145,9 @@ export function applyWebConfig( options: { api: 'modern-compiler', implementation: - options.sassImplementation === 'sass-embedded' - ? require.resolve('sass-embedded') - : require.resolve('sass'), + options.sassImplementation === 'sass' + ? require.resolve('sass') + : require.resolve('sass-embedded'), sassOptions: { fiber: false, precision: 8, @@ -210,9 +210,9 @@ export function applyWebConfig( options: { api: 'modern-compiler', implementation: - options.sassImplementation === 'sass-embedded' - ? require.resolve('sass-embedded') - : require.resolve('sass'), + options.sassImplementation === 'sass' + ? require.resolve('sass') + : require.resolve('sass-embedded'), sourceMap: !!options.sourceMap, sassOptions: { fiber: false, @@ -280,9 +280,9 @@ export function applyWebConfig( options: { api: 'modern-compiler', implementation: - options.sassImplementation === 'sass-embedded' - ? require.resolve('sass-embedded') - : require.resolve('sass'), + options.sassImplementation === 'sass' + ? require.resolve('sass') + : require.resolve('sass-embedded'), sourceMap: !!options.sourceMap, sassOptions: { fiber: false, diff --git a/packages/webpack/src/plugins/nx-webpack-plugin/lib/normalize-options.ts b/packages/webpack/src/plugins/nx-webpack-plugin/lib/normalize-options.ts index 7ab5e2c753..abd22d24cb 100644 --- a/packages/webpack/src/plugins/nx-webpack-plugin/lib/normalize-options.ts +++ b/packages/webpack/src/plugins/nx-webpack-plugin/lib/normalize-options.ts @@ -133,7 +133,8 @@ export function normalizeOptions( targetName, vendorChunk: combinedPluginAndMaybeExecutorOptions.vendorChunk ?? !isProd, sassImplementation: - combinedPluginAndMaybeExecutorOptions.sassImplementation ?? 'sass', + combinedPluginAndMaybeExecutorOptions.sassImplementation ?? + 'sass-embedded', }; } diff --git a/packages/webpack/src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options.ts b/packages/webpack/src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options.ts index a5d8147a5a..2bd7106f26 100644 --- a/packages/webpack/src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options.ts +++ b/packages/webpack/src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options.ts @@ -221,10 +221,10 @@ export interface NxAppWebpackPluginOptions { * Use tsconfig-paths-webpack-plugin to resolve modules using paths in the tsconfig file. */ useTsconfigPaths?: boolean; - // TODO(v21): Make Sass Embedded the default in version 21. // TODO(v22): Remove in version 22. /** * The implementation of the SASS compiler to use. Can be either `sass` or `sass-embedded`. Defaults to `sass-embedded`. + * @deprecated Sass option will be removed in Nx 22. This option will also be removed in Nx 22 as it is no longer needed. */ sassImplementation?: 'sass' | 'sass-embedded'; /**