@nx/rsbuild 22.7.0-beta.1 → 22.7.0-beta.11

package/config-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasRsbuildPlugin = exports.getRsbuildE2EWebServerInfo = exports.versions = exports.addSourceDefine = exports.addExperimentalSwcPlugin = exports.addHtmlTemplatePath = exports.addCopyAssets = exports.addBuildPlugin = void 0;
+const tslib_1 = require("tslib");
 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");
@@ -8,7 +9,7 @@ Object.defineProperty(exports, "addCopyAssets", { enumerable: true, get: functio
 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");
+exports.versions = tslib_1.__importStar(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; } });
 var has_rsbuild_plugin_1 = require("./src/utils/has-rsbuild-plugin");

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.7.0-beta.1",
+  "version": "22.7.0-beta.11",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -30,14 +30,14 @@
   "executors": "./executors.json",
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "22.7.0-beta.1",
-    "@nx/js": "22.7.0-beta.1",
+    "@nx/devkit": "22.7.0-beta.11",
+    "@nx/js": "22.7.0-beta.11",
     "@rsbuild/core": "1.1.8",
     "minimatch": "10.2.4",
     "@phenomnomnominal/tsquery": "~6.1.4"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.1"
+    "nx": "22.7.0-beta.11"
   },
   "peerDependencies": {},
   "nx-migrations": {
@@ -63,6 +63,5 @@
       "types": "./config-utils.d.ts",
       "default": "./config-utils.js"
     }
-  },
-  "types": "./src/index.d.ts"
+  }
 }

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,aAAa,EAMd,MAAM,YAAY,CAAC;AAepB,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAiBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CA4B7D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/rsbuild/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,aAAa,EAMd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAiBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAgC7D,CAAC"}

package/src/plugins/plugin.js

@@ -13,7 +13,6 @@ const path_1 = require("path");
 const minimatch_1 = require("minimatch");
 const core_1 = require("@rsbuild/core");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -28,15 +27,16 @@ exports.createNodesV2 = [
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `rsbuild-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
         const isUsingTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isUsingTsSolutionSetup), configFilePaths, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isUsingTsSolutionSetup, pmc), configFilePaths, options, context);
         }
         finally {
             writeTargetsCache(cachePath, targetsCache);
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, targetsCache, isUsingTsSolutionSetup) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isUsingTsSolutionSetup, pmc) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
@@ -47,7 +47,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     const tsConfigFiles = siblingFiles.filter((p) => (0, minimatch_1.minimatch)(p, 'tsconfig*{.json,.*.json}')) ?? [];
     const normalizedOptions = normalizeOptions(options);
     const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, { ...normalizedOptions, isUsingTsSolutionSetup }, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    targetsCache[hash] ??= await createRsbuildTargets(configFilePath, projectRoot, normalizedOptions, tsConfigFiles, isUsingTsSolutionSetup, context);
+    targetsCache[hash] ??= await createRsbuildTargets(configFilePath, projectRoot, normalizedOptions, tsConfigFiles, isUsingTsSolutionSetup, context, pmc);
     const { targets, metadata } = targetsCache[hash];
     return {
         projects: {
@@ -59,7 +59,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function createRsbuildTargets(configFilePath, projectRoot, options, tsConfigFiles, isUsingTsSolutionSetup, context) {
+async function createRsbuildTargets(configFilePath, projectRoot, options, tsConfigFiles, isUsingTsSolutionSetup, context, pmc) {
     const absoluteConfigFilePath = (0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath);
     const rsbuildConfig = await (0, core_1.loadConfig)({
         path: absoluteConfigFilePath,

package/project.json

@@ -1,52 +0,0 @@
-{
-    "name": "rsbuild",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/rsbuild",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/rsbuild/README.md"],
-            "command": "node ./scripts/copy-readme.js rsbuild"
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/rsbuild",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/rsbuild",
-                        "glob": "**/files/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/rsbuild",
-                        "glob": "**/*.json",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/rsbuild",
-                        "glob": "**/*.js",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/rsbuild",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
-        }
-    }
-}