Merge branch 'main' of https://github.com/web-infra-dev/rstest into load-wasm

Author: 9aoy

.github/workflows/release.yml

@@ -129,3 +129,8 @@ jobs:
         env:
           VSCE_PAT: ${{ secrets.VSCE_PAT }}
         run: pnpm --filter ./packages/vscode exec vsce publish --target ${{ matrix.vsce-target }}
+
+      - name: Publish OVSX Extension
+        env:
+          OVSX_PAT: ${{ secrets.OVSX_PAT }}
+        run: pnpm --filter ./packages/vscode exec ovsx publish --target ${{ matrix.vsce-target }}

e2e/package.json

@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@rsbuild/core": "1.6.0-beta.1",
-    "@rslib/core": "0.17.0",
+    "@rslib/core": "0.17.1",
     "@rstest/core": "workspace:*",
     "@rstest/tsconfig": "workspace:*",
     "@types/jest-image-snapshot": "^6.4.0",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstest/core",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "The Rsbuild-based test tool.",
   "bugs": {
     "url": "https://github.com/web-infra-dev/rstest/issues"
@@ -66,7 +66,7 @@
     "@babel/code-frame": "^7.27.1",
     "@jridgewell/trace-mapping": "0.3.31",
     "@microsoft/api-extractor": "^7.53.3",
-    "@rslib/core": "0.17.0",
+    "@rslib/core": "0.17.1",
     "@rstest/tsconfig": "workspace:*",
     "@sinonjs/fake-timers": "^14.0.0",
     "@types/babel__code-frame": "^7.0.6",

packages/core/rslib.config.ts

@@ -97,9 +97,6 @@ export default defineConfig({
             }),
             isBuildWatch ? null : licensePlugin(),
           ].filter(Boolean),
-          optimization: {
-            splitChunks: false,
-          },
         },
       },
     },

packages/core/src/core/rsbuild.ts

@@ -76,7 +76,7 @@ export const prepareRsbuild = async (
 
   const rsbuildInstance = await createRsbuild({
     callerName: 'rstest',
-    rsbuildConfig: {
+    config: {
       root: context.rootPath,
       server: {
         printUrls: false,

packages/core/src/index.ts

@@ -3,6 +3,7 @@ import type {
   CoverageOptions,
   CoverageProvider,
   NormalizedCoverageOptions,
+  ProjectConfig,
   RstestConfig,
 } from './types';
 
@@ -31,7 +32,7 @@ export type RstestConfigExport =
 
 /**
  * This function helps you to autocomplete configuration types.
- * It accepts a Rsbuild config object, or a function that returns a config.
+ * It accepts a Rstest config object, or a function that returns a config.
  */
 export function defineConfig(config: RstestConfig): RstestConfig;
 export function defineConfig(config: RstestConfigSyncFn): RstestConfigSyncFn;
@@ -41,6 +42,28 @@ export function defineConfig(config: RstestConfigExport) {
   return config;
 }
 
+type ProjectConfigAsyncFn = () => Promise<ProjectConfig>;
+
+type ProjectConfigSyncFn = () => ProjectConfig;
+
+type RstestProjectConfigExport =
+  | ProjectConfig
+  | ProjectConfigSyncFn
+  | ProjectConfigAsyncFn;
+
+/**
+ * This function helps you to autocomplete configuration types.
+ * It accepts a Rstest project config object, or a function that returns a config.
+ */
+export function defineProject(config: ProjectConfig): ProjectConfig;
+export function defineProject(config: ProjectConfigSyncFn): ProjectConfigSyncFn;
+export function defineProject(
+  config: ProjectConfigAsyncFn,
+): ProjectConfigAsyncFn;
+export function defineProject(config: RstestProjectConfigExport) {
+  return config;
+}
+
 export type {
   ProjectConfig,
   Reporter,

packages/core/src/types/config.ts

@@ -22,7 +22,14 @@ export type RstestPoolOptions = {
 
 export type ProjectConfig = Omit<
   RstestConfig,
-  'projects' | 'reporters' | 'pool' | 'isolate' | 'coverage'
+  | 'projects'
+  | 'reporters'
+  | 'pool'
+  | 'isolate'
+  | 'coverage'
+  | 'resolveSnapshotPath'
+  | 'onConsoleLog'
+  | 'hideSkippedTests'
 >;
 
 type SnapshotFormat = Omit<

packages/core/src/utils/testFiles.ts

@@ -158,9 +158,10 @@ export const getSetupFiles = (
         const relativePath = pathe.relative(rootPath, setupFilePath);
         return [formatTestEntryName(relativePath), setupFilePath];
       } catch (err) {
+        const resolvedPath = tryResolve(setupFile, rootPath);
         // support use package name as setupFiles value
-        if (tryResolve(setupFile, rootPath)) {
-          return [formatTestEntryName(setupFile), setupFile];
+        if (resolvedPath) {
+          return [formatTestEntryName(setupFile), resolvedPath];
         }
         throw err;
       }

packages/coverage-istanbul/package.json

@@ -32,7 +32,7 @@
   "devDependencies": {
     "@rstest/tsconfig": "workspace:*",
     "@rstest/core": "workspace:*",
-    "@rslib/core": "0.17.0",
+    "@rslib/core": "0.17.1",
     "@types/node": "^22.16.5",
     "typescript": "^5.9.3",
     "@types/istanbul-lib-instrument": "^1.7.8",

packages/vscode/package.json

@@ -4,7 +4,7 @@
   "displayName": "Rstest",
   "publisher": "rstack",
   "description": "VS Code extension for Rstest",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "private": true,
   "license": "MIT",
   "repository": {
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "@rsbuild/core": "1.6.0-beta.1",
-    "@rslib/core": "0.17.0",
+    "@rslib/core": "0.17.1",
     "@rstest/core": "workspace:*",
     "@swc/core": "^1.13.5",
     "@types/glob": "^7.2.0",
@@ -80,6 +80,7 @@
     "get-port": "^7.1.0",
     "glob": "^7.2.3",
     "mocha": "^11.7.4",
+    "ovsx": "^0.10.6",
     "typescript": "^5.9.3",
     "ws": "^8.18.3"
   }