@rstest/adapter-rspack 0.2.0 → 0.10.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023-present ByteDance, Inc. and its affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.d.ts

@@ -29,9 +29,11 @@ export interface WithRspackConfigOptions {
      */
     modifyRspackConfig?: (config: RspackOptions) => RspackOptions;
 }
-export declare function toRstestConfig({ rspackConfig, configName, modifyRspackConfig, }: {
+export declare function toRstestConfig({ rspackConfig, configName, configPath, cwd, modifyRspackConfig, }: {
     rspackConfig: RspackOptions;
     configName?: RspackConfigName;
+    configPath?: string;
+    cwd?: string;
     modifyRspackConfig?: (config: RspackOptions) => RspackOptions;
 }): ExtendConfig;
 export declare function withRspackConfig(options?: WithRspackConfigOptions): ExtendConfigFn;

package/dist/index.js

@@ -28,6 +28,39 @@ const normalizeTargets = (target)=>{
 };
 const isNodeTarget = (targets)=>targets.some((target)=>'async-node' === target || target.startsWith('node'));
 const isHtmlRspackPlugin = (plugin)=>plugin && plugin.constructor ? 'HtmlRspackPlugin' === plugin.constructor.name : false;
+const isPersistentCacheConfig = (cache)=>'object' == typeof cache && cache?.type === 'persistent';
+const getCachePath = ({ cachePath, root })=>{
+    if (node_path.isAbsolute(cachePath)) return node_path.normalize(cachePath);
+    return root ? node_path.normalize(node_path.resolve(root, cachePath)) : cachePath;
+};
+const getCacheRoot = (rspackConfig, cwd)=>{
+    const { context } = rspackConfig;
+    if (!context) return cwd;
+    return node_path.isAbsolute(context) ? context : node_path.resolve(cwd ?? process.cwd(), context);
+};
+const updateCacheConfig = ({ cache, configPath, root })=>{
+    if (void 0 === cache) return;
+    if (false === cache || 'object' == typeof cache && cache?.type === 'memory') return false;
+    if (!isPersistentCacheConfig(cache)) return;
+    const buildDependencies = cache.buildDependencies?.map((dependency)=>getCachePath({
+            cachePath: dependency,
+            root
+        }));
+    const nextBuildDependencies = configPath ? Array.from(new Set([
+        ...buildDependencies || [],
+        node_path.normalize(configPath)
+    ])) : buildDependencies;
+    return {
+        cacheDirectory: cache.storage?.directory ? getCachePath({
+            cachePath: cache.storage.directory,
+            root
+        }) : void 0,
+        cacheDigest: cache.version ? [
+            cache.version
+        ] : void 0,
+        buildDependencies: nextBuildDependencies
+    };
+};
 const buildRspackToolConfig = (rspackConfig)=>{
     const { lazyCompilation: _lazy, ...restConfig } = rspackConfig;
     return (config)=>{
@@ -80,7 +113,7 @@ const buildRspackToolConfig = (rspackConfig)=>{
             ...config.externalsPresets || {},
             ...restConfig.externalsPresets
         };
-        if (void 0 !== restConfig.cache) nextConfig.cache = restConfig.cache;
+        if (void 0 !== restConfig.cache && !isPersistentCacheConfig(restConfig.cache)) nextConfig.cache = restConfig.cache;
         return nextConfig;
     };
 };
@@ -108,9 +141,12 @@ const loadRspackConfig = async (options)=>{
         env: options.env,
         nodeEnv: options.nodeEnv
     });
-    return config;
+    return {
+        config: config,
+        configFile
+    };
 };
-function toRstestConfig({ rspackConfig, configName, modifyRspackConfig }) {
+function toRstestConfig({ rspackConfig, configName, configPath, cwd, modifyRspackConfig }) {
     const finalConfig = modifyRspackConfig ? modifyRspackConfig(rspackConfig) : rspackConfig;
     const targets = normalizeTargets(finalConfig.target);
     const testEnvironment = isNodeTarget(targets) ? 'node' : 'happy-dom';
@@ -119,6 +155,11 @@ function toRstestConfig({ rspackConfig, configName, modifyRspackConfig }) {
     const output = void 0 !== outputModule ? {
         module: outputModule
     } : void 0;
+    const buildCache = updateCacheConfig({
+        cache: finalConfig.cache,
+        configPath,
+        root: getCacheRoot(finalConfig, cwd)
+    });
     const tsConfig = finalConfig.resolve?.tsConfig;
     const tsconfigPath = 'string' == typeof tsConfig ? tsConfig : tsConfig?.configFile;
     const source = tsconfigPath ? {
@@ -135,6 +176,12 @@ function toRstestConfig({ rspackConfig, configName, modifyRspackConfig }) {
         ...resolve ? {
             resolve
         } : {},
+        forceRerunTriggers: configPath ? [
+            node_path.normalize(configPath)
+        ] : void 0,
+        performance: {
+            buildCache
+        },
         plugins: [
             {
                 name: 'remove-rsbuild-css',
@@ -154,12 +201,16 @@ function toRstestConfig({ rspackConfig, configName, modifyRspackConfig }) {
 }
 function withRspackConfig(options = {}) {
     return async ()=>{
-        const config = await loadRspackConfig(options);
-        if (!config) return {};
+        const loaded = await loadRspackConfig(options);
+        if (!loaded) return {};
+        const { config, configFile } = loaded;
         const selectedConfig = selectRspackConfig(config, options.configName);
+        const cwd = options.cwd ?? process.cwd();
         return toRstestConfig({
             rspackConfig: selectedConfig,
             configName: options.configName,
+            configPath: configFile,
+            cwd,
             modifyRspackConfig: options.modifyRspackConfig
         });
     };

package/package.json

@@ -1,53 +1,53 @@
 {
   "name": "@rstest/adapter-rspack",
-  "version": "0.2.0",
+  "version": "0.10.0",
   "description": "Rstest adapter for rspack configuration",
+  "keywords": [
+    "rstest",
+    "rspack",
+    "adapter",
+    "configuration"
+  ],
+  "bugs": {
+    "url": "https://github.com/web-infra-dev/rstest/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/rstest",
+    "directory": "packages/adapter-rspack"
+  },
+  "license": "MIT",
   "type": "module",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
     }
   },
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "rslib build",
-    "dev": "rslib build --watch",
-    "test": "rstest",
-    "typecheck": "tsc --noEmit"
+  "devDependencies": {
+    "@rslib/core": "0.21.4",
+    "@rspack/cli": "2.0.3",
+    "@rspack/core": "2.0.3",
+    "@rstest/core": "0.10.0",
+    "@rstest/tsconfig": "0.0.1"
   },
-  "keywords": [
-    "rstest",
-    "rspack",
-    "adapter",
-    "configuration"
-  ],
-  "license": "MIT",
   "peerDependencies": {
     "@rspack/cli": ">=2.0.0-0",
     "@rspack/core": ">=2.0.0-0",
-    "@rstest/core": ">=0.7.7"
-  },
-  "devDependencies": {
-    "@rspack/cli": "2.0.0-beta.6",
-    "@rspack/core": "2.0.0-beta.6",
-    "@rslib/core": "0.20.0",
-    "@rstest/core": "workspace:*",
-    "@rstest/tsconfig": "workspace:*"
+    "@rstest/core": "^0.10.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "bugs": {
-    "url": "https://github.com/web-infra-dev/rstest/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/web-infra-dev/rstest",
-    "directory": "packages/adapter-rspack"
+  "scripts": {
+    "build": "rslib build",
+    "dev": "rslib build --watch",
+    "test": "rstest",
+    "typecheck": "pnpm -w exec tsc --noEmit -p packages/adapter-rspack/tsconfig.json"
   }
-}
+}