@nx/rsbuild 22.0.0-beta.4 → 22.0.0-beta.5

package/config-utils.d.ts

@@ -1,5 +1,5 @@
 export { addBuildPlugin } from './src/utils/add-build-plugin';
-export { addCopyAssets, addHtmlTemplatePath, addExperimentalSwcPlugin, } from './src/utils/ast-utils';
+export { addCopyAssets, addHtmlTemplatePath, addExperimentalSwcPlugin, addSourceDefine, } from './src/utils/ast-utils';
 export * as versions from './src/utils/versions';
 export { getRsbuildE2EWebServerInfo } from './src/utils/e2e-web-server-info-utils';
 export { hasRsbuildPlugin } from './src/utils/has-rsbuild-plugin';

package/config-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-utils.d.ts","sourceRoot":"","sources":["../../../packages/rsbuild/config-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC"}
+{"version":3,"file":"config-utils.d.ts","sourceRoot":"","sources":["../../../packages/rsbuild/config-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,wBAAwB,EACxB,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC"}

package/config-utils.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasRsbuildPlugin = exports.getRsbuildE2EWebServerInfo = exports.versions = exports.addExperimentalSwcPlugin = exports.addHtmlTemplatePath = exports.addCopyAssets = exports.addBuildPlugin = void 0;
+exports.hasRsbuildPlugin = exports.getRsbuildE2EWebServerInfo = exports.versions = exports.addSourceDefine = exports.addExperimentalSwcPlugin = exports.addHtmlTemplatePath = exports.addCopyAssets = exports.addBuildPlugin = void 0;
 var add_build_plugin_1 = require("./src/utils/add-build-plugin");
 Object.defineProperty(exports, "addBuildPlugin", { enumerable: true, get: function () { return add_build_plugin_1.addBuildPlugin; } });
 var ast_utils_1 = require("./src/utils/ast-utils");
 Object.defineProperty(exports, "addCopyAssets", { enumerable: true, get: function () { return ast_utils_1.addCopyAssets; } });
 Object.defineProperty(exports, "addHtmlTemplatePath", { enumerable: true, get: function () { return ast_utils_1.addHtmlTemplatePath; } });
 Object.defineProperty(exports, "addExperimentalSwcPlugin", { enumerable: true, get: function () { return ast_utils_1.addExperimentalSwcPlugin; } });
+Object.defineProperty(exports, "addSourceDefine", { enumerable: true, get: function () { return ast_utils_1.addSourceDefine; } });
 exports.versions = require("./src/utils/versions");
 var e2e_web_server_info_utils_1 = require("./src/utils/e2e-web-server-info-utils");
 Object.defineProperty(exports, "getRsbuildE2EWebServerInfo", { enumerable: true, get: function () { return e2e_web_server_info_utils_1.getRsbuildE2EWebServerInfo; } });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/rsbuild",
   "description": "The Nx Plugin for Rsbuild contains an Nx plugin, executors and utilities that support building applications using Rsbuild.",
-  "version": "22.0.0-beta.4",
+  "version": "22.0.0-beta.5",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -30,14 +30,14 @@
   "executors": "./executors.json",
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "22.0.0-beta.4",
-    "@nx/js": "22.0.0-beta.4",
+    "@nx/devkit": "22.0.0-beta.5",
+    "@nx/js": "22.0.0-beta.5",
     "@rsbuild/core": "1.1.8",
     "minimatch": "9.0.3",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "devDependencies": {
-    "nx": "22.0.0-beta.4"
+    "nx": "22.0.0-beta.5"
   },
   "peerDependencies": {},
   "nx-migrations": {

package/src/utils/ast-utils.d.ts

@@ -2,4 +2,5 @@ import { type Tree } from '@nx/devkit';
 export declare function addHtmlTemplatePath(tree: Tree, configFilePath: string, templatePath: string): void;
 export declare function addCopyAssets(tree: Tree, configFilePath: string, from: string): void;
 export declare function addExperimentalSwcPlugin(tree: Tree, configFilePath: string, pluginName: string): void;
+export declare function addSourceDefine(tree: Tree, configFilePath: string, key: string, value: string): void;
 //# sourceMappingURL=ast-utils.d.ts.map

package/src/utils/ast-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/utils/ast-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAOvC,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,QAgDrB;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,MAAM,QAgDb;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,QAoGnB"}
+{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/utils/ast-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAOvC,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,QAgDrB;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,MAAM,QAgDb;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,QAoGnB;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,QAmDd"}

package/src/utils/ast-utils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addHtmlTemplatePath = addHtmlTemplatePath;
 exports.addCopyAssets = addCopyAssets;
 exports.addExperimentalSwcPlugin = addExperimentalSwcPlugin;
+exports.addSourceDefine = addSourceDefine;
 const indent_by_1 = require("./indent-by");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const DEFINE_CONFIG_SELECTOR = 'CallExpression:has(Identifier[name=defineConfig]) > ObjectLiteralExpression';
@@ -118,3 +119,31 @@ function addExperimentalSwcPlugin(tree, configFilePath, pluginName) {
     }
     tree.write(configFilePath, configContents);
 }
+function addSourceDefine(tree, configFilePath, key, value) {
+    const SOURCE_CONFIG_SELECTOR = 'CallExpression:has(Identifier[name=defineConfig]) ObjectLiteralExpression PropertyAssignment:has(Identifier[name=source]) > ObjectLiteralExpression';
+    const DEFINE_OBJECT_SELECTOR = 'CallExpression:has(Identifier[name=defineConfig]) ObjectLiteralExpression PropertyAssignment:has(Identifier[name=source]) ObjectLiteralExpression PropertyAssignment:has(Identifier[name=define]) > ObjectLiteralExpression';
+    let configContents = tree.read(configFilePath, 'utf-8');
+    const ast = tsquery_1.tsquery.ast(configContents);
+    const defineProperty = `'${key}': '${value}'`;
+    const sourceConfigNodes = (0, tsquery_1.tsquery)(ast, SOURCE_CONFIG_SELECTOR);
+    if (sourceConfigNodes.length === 0) {
+        const defineConfigNodes = (0, tsquery_1.tsquery)(ast, DEFINE_CONFIG_SELECTOR);
+        if (defineConfigNodes.length === 0) {
+            throw new Error(`Could not find 'defineConfig' in the config file at ${configFilePath}.`);
+        }
+        const defineConfigNode = defineConfigNodes[0];
+        configContents = `${configContents.slice(0, defineConfigNode.getStart() + 1)}\n${(0, indent_by_1.indentBy)(1)(`source: {\n${(0, indent_by_1.indentBy)(1)(`define: {\n${(0, indent_by_1.indentBy)(1)(defineProperty)},\n}`)},\n}`)},${configContents.slice(defineConfigNode.getStart() + 1)}`;
+    }
+    else {
+        const sourceConfigNode = sourceConfigNodes[0];
+        const defineObjectNodes = (0, tsquery_1.tsquery)(ast, DEFINE_OBJECT_SELECTOR);
+        if (defineObjectNodes.length === 0) {
+            configContents = `${configContents.slice(0, sourceConfigNode.getStart() + 1)}\n${(0, indent_by_1.indentBy)(2)(`define: {\n${(0, indent_by_1.indentBy)(1)(defineProperty)},\n},`)}\n\t\t${configContents.slice(sourceConfigNode.getStart() + 1)}`;
+        }
+        else {
+            const defineObjectNode = defineObjectNodes[0];
+            configContents = `${configContents.slice(0, defineObjectNode.getStart() + 1)}\n${(0, indent_by_1.indentBy)(3)(defineProperty)},\n\t\t\t${configContents.slice(defineObjectNode.getStart() + 1)}`;
+        }
+    }
+    tree.write(configFilePath, configContents);
+}