@rstest/adapter-rsbuild 0.2.5 → 0.10.0

package/README.md

@@ -18,7 +18,7 @@ import { withRsbuildConfig } from '@rstest/adapter-rsbuild';
 
 export default defineConfig({
   extends: withRsbuildConfig(),
-  // other rstest config options
+  // other Rstest config options
 });
 ```
 

package/dist/index.d.ts

@@ -5,7 +5,8 @@ import { RsbuildConfig } from '@rsbuild/core';
 /**
  * Convert rsbuild config to rstest config
  */
-export declare function toRstestConfig({ environmentName, rsbuildConfig: rawRsbuildConfig, modifyRsbuildConfig }: {
+export declare function toRstestConfig({ configPath, environmentName, rsbuildConfig: rawRsbuildConfig, modifyRsbuildConfig, }: {
+    configPath?: string;
     environmentName?: string;
     rsbuildConfig: RsbuildConfig;
     modifyRsbuildConfig?: (buildConfig: RsbuildConfig) => RsbuildConfig;

package/dist/index.js

@@ -1,15 +1,48 @@
 import { loadConfig, mergeRsbuildConfig } from "@rsbuild/core";
-function toRstestConfig({ environmentName, rsbuildConfig: rawRsbuildConfig, modifyRsbuildConfig }) {
+import { dirname, isAbsolute, join, normalize } from "node:path";
+const getCacheDependency = ({ dependency, configPath, root })=>{
+    if (isAbsolute(dependency)) return normalize(dependency);
+    if (configPath) return normalize(join(dirname(configPath), dependency));
+    return root ? normalize(join(root, dependency)) : dependency;
+};
+const updateCacheConfig = ({ buildCache, configPath, root })=>{
+    if (void 0 === buildCache) return;
+    if (false === buildCache) return false;
+    if (true === buildCache) return configPath ? {
+        buildDependencies: [
+            normalize(configPath)
+        ]
+    } : true;
+    const buildDependencies = buildCache.buildDependencies?.map((dependency)=>getCacheDependency({
+            dependency,
+            configPath,
+            root
+        }));
+    const nextBuildDependencies = configPath ? Array.from(new Set([
+        ...buildDependencies || [],
+        normalize(configPath)
+    ])) : buildDependencies;
+    return {
+        cacheDirectory: buildCache.cacheDirectory,
+        cacheDigest: buildCache.cacheDigest,
+        buildDependencies: nextBuildDependencies
+    };
+};
+function toRstestConfig({ configPath, environmentName, rsbuildConfig: rawRsbuildConfig, modifyRsbuildConfig }) {
     const { environments, ...rawBuildConfig } = rawRsbuildConfig;
     const environmentConfig = environmentName ? environments?.[environmentName] : void 0;
     const rsbuildConfig = environmentConfig ? mergeRsbuildConfig(rawBuildConfig, environmentConfig) : rawBuildConfig;
     const finalBuildConfig = modifyRsbuildConfig ? modifyRsbuildConfig(rsbuildConfig) : rsbuildConfig;
     const { rspack, swc, bundlerChain } = finalBuildConfig.tools || {};
-    const { cssModules, target, module } = finalBuildConfig.output || {};
+    const { buildCache } = finalBuildConfig.performance || {};
+    const { cssModules, emitAssets, target, module } = finalBuildConfig.output || {};
     const { assetsInclude, decorators, define, include, exclude, tsconfigPath, transformImport } = finalBuildConfig.source || {};
-    return {
+    const rstestConfig = {
         root: finalBuildConfig.root,
         name: environmentName,
+        forceRerunTriggers: configPath ? [
+            normalize(configPath)
+        ] : void 0,
         plugins: [
             ...finalBuildConfig.plugins || [],
             {
@@ -32,8 +65,16 @@ function toRstestConfig({ environmentName, rsbuildConfig: rawRsbuildConfig, modi
         resolve: finalBuildConfig.resolve,
         output: {
             cssModules,
+            emitAssets,
             module
         },
+        performance: {
+            buildCache: updateCacheConfig({
+                buildCache,
+                configPath,
+                root: finalBuildConfig.root
+            })
+        },
         tools: {
             rspack,
             swc,
@@ -41,6 +82,7 @@ function toRstestConfig({ environmentName, rsbuildConfig: rawRsbuildConfig, modi
         },
         testEnvironment: 'node' === target ? 'node' : 'happy-dom'
     };
+    return rstestConfig;
 }
 function withRsbuildConfig(options = {}) {
     return async ()=>{
@@ -53,6 +95,7 @@ function withRsbuildConfig(options = {}) {
         const rstestConfig = toRstestConfig({
             environmentName,
             rsbuildConfig,
+            configPath: filePath,
             modifyRsbuildConfig
         });
         return rstestConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstest/adapter-rsbuild",
-  "version": "0.2.5",
+  "version": "0.10.0",
   "description": "Rstest adapter for rsbuild configuration",
   "keywords": [
     "rstest",
@@ -30,14 +30,14 @@
     "dist"
   ],
   "devDependencies": {
-    "@rsbuild/core": "2.0.0-rc.0",
-    "@rslib/core": "0.20.2",
-    "@rstest/core": "0.9.6",
+    "@rsbuild/core": "^2.0.6",
+    "@rslib/core": "0.21.4",
+    "@rstest/core": "0.10.0",
     "@rstest/tsconfig": "0.0.1"
   },
   "peerDependencies": {
     "@rsbuild/core": "*",
-    "@rstest/core": ">=0.7.7"
+    "@rstest/core": "^0.10.0"
   },
   "publishConfig": {
     "access": "public"