@rstest/adapter-rsbuild 0.10.3 → 0.10.5

package/dist/index.d.ts

@@ -4,8 +4,7 @@ import { RsbuildConfig } from '@rsbuild/core';
 
 /**
  * Convert rsbuild config to rstest config
- */
-export declare function toRstestConfig({ configPath, environmentName, rsbuildConfig: rawRsbuildConfig, modifyRsbuildConfig, }: {
+ */ export declare function toRstestConfig({ configPath, environmentName, rsbuildConfig: rawRsbuildConfig, modifyRsbuildConfig }: {
     configPath?: string;
     environmentName?: string;
     rsbuildConfig: RsbuildConfig;
@@ -18,23 +17,19 @@ export declare interface WithRsbuildConfigOptions {
     /**
      * `cwd` passed to loadConfig of Rsbuild
      * @default process.cwd()
-     */
-    cwd?: string;
+     */ cwd?: string;
     /**
      * Path to rsbuild config file
      * @default './rsbuild.config.ts'
-     */
-    configPath?: string;
+     */ configPath?: string;
     /**
      * The environment name in `environments` field to use, will be merged with the common config.
      * Set to a string to use the environment config with matching name.
      * @default undefined
-     */
-    environmentName?: string;
+     */ environmentName?: string;
     /**
      * Modify rsbuild config before converting to rstest config
-     */
-    modifyRsbuildConfig?: (buildConfig: RsbuildConfig) => RsbuildConfig;
+     */ modifyRsbuildConfig?: (buildConfig: RsbuildConfig) => RsbuildConfig;
 }
 
 export { }

package/dist/index.js

@@ -1,11 +1,12 @@
 import { loadConfig, mergeRsbuildConfig } from "@rsbuild/core";
-import { dirname, isAbsolute, join, normalize } from "node:path";
-const getCacheDependency = ({ dependency, configPath, root })=>{
+import { dirname, isAbsolute, normalize, resolve } from "node:path";
+import "node:module";
+const resolveCacheDependency = ({ dependency, configPath, root })=>{
     if (isAbsolute(dependency)) return normalize(dependency);
-    if (configPath) return normalize(join(dirname(configPath), dependency));
-    return root ? normalize(join(root, dependency)) : dependency;
+    if (configPath) return normalize(resolve(dirname(configPath), dependency));
+    return root ? normalize(resolve(root, dependency)) : dependency;
 };
-const updateCacheConfig = ({ buildCache, configPath, root })=>{
+const resolveBuildCache = ({ buildCache, configPath, root })=>{
     if (void 0 === buildCache) return;
     if (false === buildCache) return false;
     if (true === buildCache) return configPath ? {
@@ -13,7 +14,7 @@ const updateCacheConfig = ({ buildCache, configPath, root })=>{
             normalize(configPath)
         ]
     } : true;
-    const buildDependencies = buildCache.buildDependencies?.map((dependency)=>getCacheDependency({
+    const buildDependencies = buildCache.buildDependencies?.map((dependency)=>resolveCacheDependency({
             dependency,
             configPath,
             root
@@ -28,6 +29,13 @@ const updateCacheConfig = ({ buildCache, configPath, root })=>{
         buildDependencies: nextBuildDependencies
     };
 };
+const isNodeTarget = (target)=>{
+    const targets = Array.isArray(target) ? target.filter(Boolean) : 'string' == typeof target ? [
+        target
+    ] : [];
+    return targets.some((t)=>'async-node' === t || t.startsWith('node'));
+};
+const resolveTestEnvironmentFromTarget = (target)=>isNodeTarget(target) ? 'node' : 'happy-dom';
 function toRstestConfig({ configPath, environmentName, rsbuildConfig: rawRsbuildConfig, modifyRsbuildConfig }) {
     const { environments, ...rawBuildConfig } = rawRsbuildConfig;
     const environmentConfig = environmentName ? environments?.[environmentName] : void 0;
@@ -69,7 +77,7 @@ function toRstestConfig({ configPath, environmentName, rsbuildConfig: rawRsbuild
             module
         },
         performance: {
-            buildCache: updateCacheConfig({
+            buildCache: resolveBuildCache({
                 buildCache,
                 configPath,
                 root: finalBuildConfig.root
@@ -80,7 +88,7 @@ function toRstestConfig({ configPath, environmentName, rsbuildConfig: rawRsbuild
             swc,
             bundlerChain
         },
-        testEnvironment: 'node' === target ? 'node' : 'happy-dom'
+        testEnvironment: resolveTestEnvironmentFromTarget(target)
     };
     return rstestConfig;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstest/adapter-rsbuild",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "description": "Rstest adapter for rsbuild configuration",
   "keywords": [
     "rstest",
@@ -13,7 +13,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/web-infra-dev/rstest",
+    "url": "git+https://github.com/web-infra-dev/rstest.git",
     "directory": "packages/adapter-rsbuild"
   },
   "license": "MIT",
@@ -30,14 +30,14 @@
     "dist"
   ],
   "devDependencies": {
-    "@rsbuild/core": "~2.0.8",
-    "@rslib/core": "0.21.5",
-    "@rstest/core": "0.10.3",
+    "@rsbuild/core": "~2.0.14",
+    "@rslib/core": "0.22.1",
+    "@rstest/core": "0.10.5",
     "@rstest/tsconfig": "0.0.1"
   },
   "peerDependencies": {
     "@rsbuild/core": "*",
-    "@rstest/core": "^0.10.3"
+    "@rstest/core": "^0.10.5"
   },
   "publishConfig": {
     "access": "public"