@nx/rspack 23.0.0-beta.1 → 23.0.0-beta.10

package/src/plugins/utils/apply-react-config.js

@@ -1,47 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyReactConfig = applyReactConfig;
-const devkit_1 = require("@nx/devkit");
-// TODO(v23): Remove SVGR support
-function applyReactConfig(options, config = {}) {
+function applyReactConfig(options = {}, config = {}) {
     if (global.NX_GRAPH_CREATION)
         return;
     addHotReload(config);
-    if (options.svgr !== false || typeof options.svgr === 'object') {
-        // Log deprecation warning when SVGR is used
-        if (options.svgr === true || typeof options.svgr === 'object') {
-            devkit_1.logger.warn('SVGR support is deprecated and will be removed in Nx 23. Please consider using alternative SVG handling methods.');
-        }
-        removeSvgLoaderIfPresent(config);
-        const defaultSvgrOptions = {
-            svgo: false,
-            titleProp: true,
-            ref: true,
-        };
-        const svgrOptions = typeof options.svgr === 'object' ? options.svgr : defaultSvgrOptions;
-        config.module.rules.push({
-            test: /\.svg$/i,
-            type: 'asset',
-            resourceQuery: /url/, // *.svg?url
-        }, {
-            test: /\.svg$/i,
-            issuer: /\.[jt]sx?$/,
-            resourceQuery: { not: [/url/] }, // exclude react component if not *.svg?url
-            use: [{ loader: '@svgr/webpack', options: svgrOptions }],
-        });
-    }
     // enable rspack node api
     config.node = {
         __dirname: true,
         __filename: true,
     };
 }
-function removeSvgLoaderIfPresent(config) {
-    const svgLoaderIdx = config.module.rules.findIndex((rule) => typeof rule === 'object' && rule.test?.toString().includes('svg'));
-    if (svgLoaderIdx === -1)
-        return;
-    config.module.rules.splice(svgLoaderIdx, 1);
-}
 function addHotReload(config) {
     const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
     const isDev = process.env.NODE_ENV === 'development' || config.mode === 'development';

package/src/plugins/utils/apply-web-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply-web-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/apply-web-config.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAQlB,uBAAuB,EACxB,MAAM,cAAc,CAAC;AAUtB,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAG9D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,kCAAkC,EAC3C,MAAM,GAAE,OAAO,CAAC,uBAAuB,GAAG,aAAa,CAAM,EAC7D,EACE,kBAAkB,GACnB,GAAE;IAID,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACzB,GACL,IAAI,CAqXN"}
+{"version":3,"file":"apply-web-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/apply-web-config.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAQlB,uBAAuB,EACxB,MAAM,cAAc,CAAC;AAUtB,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAG9D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,kCAAkC,EAC3C,MAAM,GAAE,OAAO,CAAC,uBAAuB,GAAG,aAAa,CAAM,EAC7D,EACE,kBAAkB,GACnB,GAAE;IAID,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACzB,GACL,IAAI,CA2WN"}

package/src/plugins/utils/apply-web-config.js

@@ -124,7 +124,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             use: [
                 ...(0, stylesheet_loaders_1.getCommonLoadersForCssModules)(options, includePaths),
                 {
-                    loader: require.resolve('less-loader'),
+                    loader: (0, path_1.join)(__dirname, 'loaders/deprecated-less-loader.js'),
                     options: {
                         lessOptions: {
                             paths: includePaths,
@@ -169,7 +169,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             use: [
                 ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalCss)(options, includePaths),
                 {
-                    loader: require.resolve('less-loader'),
+                    loader: (0, path_1.join)(__dirname, 'loaders/deprecated-less-loader.js'),
                     options: {
                         sourceMap: !!options.sourceMap,
                         lessOptions: {
@@ -216,7 +216,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             use: [
                 ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalStyle)(options, includePaths),
                 {
-                    loader: require.resolve('less-loader'),
+                    loader: (0, path_1.join)(__dirname, 'loaders/deprecated-less-loader.js'),
                     options: {
                         sourceMap: !!options.sourceMap,
                         lessOptions: {
@@ -306,19 +306,9 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
         ...(config.module ?? {}),
         rules: [
             ...(config.module.rules ?? []),
-            // Images: Inline small images, and emit a separate file otherwise.
+            // Images: Inline small images, and emit a separate file otherwise (including SVGs).
             {
-                test: /\.(avif|bmp|gif|ico|jpe?g|png|webp)$/,
-                type: 'asset',
-                parser: {
-                    dataUrlCondition: {
-                        maxSize: 10_000, // 10 kB
-                    },
-                },
-            },
-            // SVG: same as image but we need to separate it so it can be swapped for SVGR in the React plugin.
-            {
-                test: /\.svg$/,
+                test: /\.(avif|bmp|gif|ico|jpe?g|png|svg|webp)$/,
                 type: 'asset',
                 parser: {
                     dataUrlCondition: {

package/src/plugins/utils/loaders/deprecated-less-loader.js

@@ -0,0 +1,19 @@
+const lessLoader = require('less-loader');
+
+module.exports = function (...args) {
+  if (!process.env.__NX_LESS_DEPRECATION_WARNED) {
+    process.env.__NX_LESS_DEPRECATION_WARNED = '1';
+    console.warn(
+      '\n⚠️  Less support in Nx is deprecated and will be removed in a future version.\n' +
+        '   Please migrate to CSS or SCSS.\n' +
+        '   Existing .less imports continue to compile, but Nx generators no longer\n' +
+        '   accept --style=less. To add new Less files, install less-loader manually\n' +
+        '   and generate with --style=css, then rename the file to .less.\n'
+    );
+  }
+  return lessLoader.apply(this, args);
+};
+
+if (lessLoader.raw) {
+  module.exports.raw = lessLoader.raw;
+}

package/src/plugins/utils/models.d.ts

@@ -1,15 +1,6 @@
 import type { DevTool, Mode } from '@rspack/core';
 import type { ProjectGraph } from '@nx/devkit';
 import type { AssetGlob } from '@nx/js/src/utils/assets/assets';
-/**
- * @deprecated SVGR support is deprecated and will be removed in Nx 23.
- * TODO(v23): Remove SVGR support
- */
-export interface SvgrOptions {
-    svgo?: boolean;
-    titleProp?: boolean;
-    ref?: boolean;
-}
 export interface AssetGlobPattern {
     glob: string;
     input: string;

package/src/plugins/utils/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAEhE;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,iBAAiB,CAAC;AAE1D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC/C;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC;IACnC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAC1B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACjD;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,mBAAmB,CAAC;IAC7C;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC/C;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IAC9C;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAC9B;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,wBAAwB,CAAC,EAAE;QACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnC,CAAC;IACF;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC9C;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAClC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,kBAAkB,CAAC,EACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,OAAO,GACP,CAAC,CACC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACxB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7D;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,kCACf,SAAQ,wBAAwB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;CAC9B"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAEhE,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,iBAAiB,CAAC;AAE1D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC/C;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC;IACnC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAC1B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACjD;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,mBAAmB,CAAC;IAC7C;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC/C;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IAC9C;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAC9B;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,wBAAwB,CAAC,EAAE;QACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnC,CAAC;IACF;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC9C;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAClC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,kBAAkB,CAAC,EACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,OAAO,GACP,CAAC,CACC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACxB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7D;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,kCACf,SAAQ,wBAAwB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;CAC9B"}

package/src/utils/deprecation.d.ts

@@ -0,0 +1,6 @@
+export declare const RSPACK_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/rspack:rspack` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
+export declare const RSPACK_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/rspack:dev-server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
+export declare function warnRspackExecutorDeprecation(): void;
+export declare function warnRspackDevServerExecutorDeprecation(): void;
+export declare function warnRspackExecutorGenerating(): void;
+//# sourceMappingURL=deprecation.d.ts.map

package/src/utils/deprecation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/deprecation.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mCAAmC,mQACkN,CAAC;AAEnQ,eAAO,MAAM,8CAA8C,uQAC2M,CAAC;AAEvQ,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD;AAED,wBAAgB,sCAAsC,IAAI,IAAI,CAE7D;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAInD"}

package/src/utils/deprecation.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RSPACK_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = exports.RSPACK_EXECUTOR_DEPRECATION_MESSAGE = void 0;
+exports.warnRspackExecutorDeprecation = warnRspackExecutorDeprecation;
+exports.warnRspackDevServerExecutorDeprecation = warnRspackDevServerExecutorDeprecation;
+exports.warnRspackExecutorGenerating = warnRspackExecutorGenerating;
+const devkit_1 = require("@nx/devkit");
+// TODO(v24): Remove the @nx/rspack:rspack and @nx/rspack:dev-server
+// executors. The inferred plugin (@nx/rspack/plugin) and the
+// convert-to-inferred generator stay supported.
+exports.RSPACK_EXECUTOR_DEPRECATION_MESSAGE = 'The `@nx/rspack:rspack` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.';
+exports.RSPACK_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = 'The `@nx/rspack:dev-server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.';
+function warnRspackExecutorDeprecation() {
+    devkit_1.logger.warn(exports.RSPACK_EXECUTOR_DEPRECATION_MESSAGE);
+}
+function warnRspackDevServerExecutorDeprecation() {
+    devkit_1.logger.warn(exports.RSPACK_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE);
+}
+function warnRspackExecutorGenerating() {
+    devkit_1.logger.warn('Generating targets that use the deprecated `@nx/rspack:rspack` and `@nx/rspack:dev-server` executors. These executors will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` next to migrate these targets to the `@nx/rspack/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
+}

package/src/utils/e2e-web-server-info-utils.d.ts

@@ -1,3 +1,3 @@
 import { type Tree } from '@nx/devkit';
-export declare function getRspackE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number): Promise<import("@nx/devkit/src/generators/e2e-web-server-info-utils").E2EWebServerDetails>;
+export declare function getRspackE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number): Promise<import("@nx/devkit/internal").E2EWebServerDetails>;
 //# sourceMappingURL=e2e-web-server-info-utils.d.ts.map

package/src/utils/e2e-web-server-info-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8FA8BzB"}
+{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8DA8BzB"}

package/src/utils/e2e-web-server-info-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRspackE2EWebServerInfo = getRspackE2EWebServerInfo;
 const devkit_1 = require("@nx/devkit");
-const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function getRspackE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = e2ePortOverride ?? 4200;
@@ -10,7 +10,7 @@ async function getRspackE2EWebServerInfo(tree, projectName, configFilePath, isPl
         nxJson.targetDefaults?.['serve'].options?.port) {
         e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
     }
-    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+    return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/rspack/plugin',
         serveTargetName: 'serveTargetName',
         serveStaticTargetName: 'previewTargetName',

package/src/utils/resolve-user-defined-rspack-config.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveUserDefinedRspackConfig = resolveUserDefinedRspackConfig;
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function resolveUserDefinedRspackConfig(path, tsConfig, 
 /** Skip require cache and return latest content */
 reload = false) {
-    return await (0, config_utils_1.loadConfigFile)(path);
+    return await (0, internal_1.loadConfigFile)(path);
 }

package/src/utils/versions.d.ts

@@ -3,7 +3,7 @@ export declare const rspackCoreVersion = "1.6.8";
 export declare const rspackDevServerVersion = "^1.1.4";
 export declare const rspackPluginReactRefreshVersion = "^1.0.0";
 export declare const lessLoaderVersion = "~11.1.3";
-export declare const sassLoaderVersion = "^16.0.4";
-export declare const sassEmbeddedVersion = "^1.83.4";
+export declare const sassLoaderVersion = "^16.0.7";
+export declare const sassEmbeddedVersion = "^1.97.2";
 export declare const reactRefreshVersion = "~0.14.0";
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.js

@@ -6,6 +6,6 @@ exports.rspackCoreVersion = '1.6.8';
 exports.rspackDevServerVersion = '^1.1.4';
 exports.rspackPluginReactRefreshVersion = '^1.0.0';
 exports.lessLoaderVersion = '~11.1.3';
-exports.sassLoaderVersion = '^16.0.4';
-exports.sassEmbeddedVersion = '^1.83.4';
+exports.sassLoaderVersion = '^16.0.7';
+exports.sassEmbeddedVersion = '^1.97.2';
 exports.reactRefreshVersion = '~0.14.0';

package/src/utils/with-react.d.ts

@@ -1,13 +1,7 @@
 import { Configuration } from '@rspack/core';
 import { NxRspackExecutionContext } from './config';
 import { WithWebOptions } from './with-web';
-import { SvgrOptions } from '../plugins/utils/models';
 export interface WithReactOptions extends WithWebOptions {
-    /**
-     * @deprecated SVGR support is deprecated and will be removed in Nx 23.
-     * TODO(v23): Remove SVGR support
-     */
-    svgr?: boolean | SvgrOptions;
 }
 export declare function withReact(opts?: WithReactOptions): (config: Configuration, { options, context }: NxRspackExecutionContext) => Configuration;
 //# sourceMappingURL=with-react.d.ts.map

package/src/utils/with-react.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-react.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAW,cAAc,EAAE,MAAM,YAAY,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAC9B;AAED,wBAAgB,SAAS,CAAC,IAAI,GAAE,gBAAqB,IAEjD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CASjB"}
+{"version":3,"file":"with-react.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAW,cAAc,EAAE,MAAM,YAAY,CAAC;AAGrD,MAAM,WAAW,gBAAiB,SAAQ,cAAc;CAAG;AAE3D,wBAAgB,SAAS,CAAC,IAAI,GAAE,gBAAqB,IAEjD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CASjB"}

package/src/utils/with-react.js

@@ -9,7 +9,7 @@ function withReact(opts = {}) {
             options,
             context,
         });
-        (0, apply_react_config_1.applyReactConfig)(opts, config);
+        (0, apply_react_config_1.applyReactConfig)({}, config);
         return config;
     };
 }