@nx/rspack 23.0.0-beta.2 → 23.0.0-beta.20

package/src/utils/version-utils.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInstalledRspackMajorVersion = getInstalledRspackMajorVersion;
+exports.getInstalledRspackVersionRuntime = getInstalledRspackVersionRuntime;
+exports.getRspackVersionsForInstalledMajor = getRspackVersionsForInstalledMajor;
+const internal_1 = require("@nx/devkit/internal");
+const semver_1 = require("semver");
+const versions_1 = require("./versions");
+const RSPACK_CORE_PACKAGE = '@rspack/core';
+/**
+ * Returns the declared @rspack/core major version from the workspace's
+ * package.json when it matches a supported major, or `undefined` otherwise
+ * (fresh install, dist tag, unknown major). Below-floor enforcement is
+ * handled at generator entry points via `assertSupportedRspackVersion`.
+ */
+function getInstalledRspackMajorVersion(tree) {
+    const declared = (0, internal_1.getDeclaredPackageVersion)(tree, RSPACK_CORE_PACKAGE);
+    if (!declared) {
+        return undefined;
+    }
+    const installedMajor = (0, semver_1.major)(declared);
+    return installedMajor in versions_1.backwardCompatibleRspackVersions
+        ? installedMajor
+        : undefined;
+}
+/**
+ * Returns the installed @rspack/core major version resolved at runtime from
+ * node_modules. For use in executors and runtime code where no Tree is
+ * available. Returns `null` when @rspack/core can't be resolved or the
+ * installed major isn't supported.
+ */
+function getInstalledRspackVersionRuntime() {
+    const version = (0, internal_1.getInstalledPackageVersion)(RSPACK_CORE_PACKAGE);
+    if (!version) {
+        return null;
+    }
+    const installedMajor = (0, semver_1.major)(version);
+    return installedMajor in versions_1.backwardCompatibleRspackVersions
+        ? installedMajor
+        : null;
+}
+/**
+ * Returns the version-map entry for the installed major, falling back to the
+ * latest supported map when no installed version is detected (fresh install)
+ * or the detected major is outside the supported window.
+ */
+function getRspackVersionsForInstalledMajor(tree) {
+    const installed = getInstalledRspackMajorVersion(tree);
+    if (installed === undefined) {
+        return versions_1.latestRspackVersions;
+    }
+    return versions_1.backwardCompatibleRspackVersions[installed];
+}

package/src/utils/versions.d.ts

@@ -1,9 +1,24 @@
 export declare const nxVersion: any;
-export declare const rspackCoreVersion = "1.6.8";
-export declare const rspackDevServerVersion = "^1.1.4";
-export declare const rspackPluginReactRefreshVersion = "^1.0.0";
+export declare const minSupportedRspackVersion = "1.0.0";
 export declare const lessLoaderVersion = "~11.1.3";
 export declare const sassLoaderVersion = "^16.0.7";
 export declare const sassEmbeddedVersion = "^1.97.2";
 export declare const reactRefreshVersion = "~0.14.0";
+export declare const supportedRspackMajorVersions: readonly [1];
+export type SupportedRspackMajorVersion = (typeof supportedRspackMajorVersions)[number];
+type RspackVersionMap = {
+    rspackCoreVersion: string;
+    rspackDevServerVersion: string;
+    rspackPluginReactRefreshVersion: string;
+};
+export declare const latestRspackVersions: RspackVersionMap;
+export declare const backwardCompatibleRspackVersions: Record<SupportedRspackMajorVersion, RspackVersionMap>;
+/**
+ * Kept for backward compatibility with code paths that don't yet branch on
+ * the detected installed major. Points at the latest supported major.
+ */
+export declare const rspackCoreVersion: string;
+export declare const rspackDevServerVersion: string;
+export declare const rspackPluginReactRefreshVersion: string;
+export {};
 //# sourceMappingURL=versions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAE/C,eAAO,MAAM,+BAA+B,WAAW,CAAC;AACxD,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAE7C,eAAO,MAAM,mBAAmB,YAAY,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,yBAAyB,UAAU,CAAC;AAEjD,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAK7C,eAAO,MAAM,4BAA4B,cAAe,CAAC;AACzD,MAAM,MAAM,2BAA2B,GACrC,CAAC,OAAO,4BAA4B,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhD,KAAK,gBAAgB,GAAG;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+BAA+B,EAAE,MAAM,CAAC;CACzC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,gBAIlC,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,MAAM,CACnD,2BAA2B,EAC3B,gBAAgB,CAGjB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAyC,CAAC;AACxE,eAAO,MAAM,sBAAsB,QACU,CAAC;AAC9C,eAAO,MAAM,+BAA+B,QACU,CAAC"}

package/src/utils/versions.js

@@ -1,11 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reactRefreshVersion = exports.sassEmbeddedVersion = exports.sassLoaderVersion = exports.lessLoaderVersion = exports.rspackPluginReactRefreshVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = exports.nxVersion = void 0;
+exports.rspackPluginReactRefreshVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = exports.backwardCompatibleRspackVersions = exports.latestRspackVersions = exports.supportedRspackMajorVersions = exports.reactRefreshVersion = exports.sassEmbeddedVersion = exports.sassLoaderVersion = exports.lessLoaderVersion = exports.minSupportedRspackVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.rspackCoreVersion = '1.6.8';
-exports.rspackDevServerVersion = '^1.1.4';
-exports.rspackPluginReactRefreshVersion = '^1.0.0';
+exports.minSupportedRspackVersion = '1.0.0';
 exports.lessLoaderVersion = '~11.1.3';
 exports.sassLoaderVersion = '^16.0.7';
 exports.sassEmbeddedVersion = '^1.97.2';
 exports.reactRefreshVersion = '~0.14.0';
+// Supported `@rspack/core` majors. Currently v1 only — v2 ships as pure
+// ESM, which @nx/rspack (CommonJS) cannot consume without a deeper
+// refactor; tracked separately.
+exports.supportedRspackMajorVersions = [1];
+exports.latestRspackVersions = {
+    rspackCoreVersion: '1.6.8',
+    rspackDevServerVersion: '^1.1.4',
+    rspackPluginReactRefreshVersion: '^1.0.0',
+};
+exports.backwardCompatibleRspackVersions = {
+    1: exports.latestRspackVersions,
+};
+/**
+ * Kept for backward compatibility with code paths that don't yet branch on
+ * the detected installed major. Points at the latest supported major.
+ */
+exports.rspackCoreVersion = exports.latestRspackVersions.rspackCoreVersion;
+exports.rspackDevServerVersion = exports.latestRspackVersions.rspackDevServerVersion;
+exports.rspackPluginReactRefreshVersion = exports.latestRspackVersions.rspackPluginReactRefreshVersion;

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

@@ -1,13 +1,7 @@
-import { Configuration } from '@rspack/core';
+import type { 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,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,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;
     };
 }

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

@@ -1,4 +1,4 @@
-import { Configuration } from '@rspack/core';
+import type { Configuration } from '@rspack/core';
 import { ExtraEntryPointClass } from './model';
 import { NxRspackExecutionContext } from './config';
 export interface WithWebOptions {

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

@@ -1 +1 @@
-{"version":3,"file":"with-web.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC9C,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,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;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;CAC9D;AAID,wBAAgB,OAAO,CAAC,aAAa,GAAE,cAAmB,IAEtD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CAsBjB"}
+{"version":3,"file":"with-web.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC9C,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,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;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;CAC9D;AAID,wBAAgB,OAAO,CAAC,aAAa,GAAE,cAAmB,IAEtD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CAsBjB"}