From 8c79258e1e9d680964ea83f0b999c48a8a128f0c Mon Sep 17 00:00:00 2001 From: 9aoy <9aoyuao@gmail.com> Date: Thu, 27 Nov 2025 21:18:35 +0800 Subject: [PATCH 1/7] test: migrate some jest tests to rstest --- .../__snapshots__/globalVars.test.ts.snap | 46 -- .../tests/__snapshots__/tsLoader.test.ts.snap | 419 ------------------ packages/cli/plugin-ssg/jest.config.js | 7 - packages/cli/plugin-ssg/rstest.config.ts | 5 + .../generator/generator-common/jest.config.js | 7 - .../generator-common/rstest.config.ts | 5 + .../generator/generator-utils/jest.config.js | 11 - .../generator-utils/rstest.config.ts | 5 + packages/generator/new-action/jest.config.js | 7 - .../generator/new-action/rstest.config.ts | 5 + .../jest.config.js | 7 - .../rstest.config.ts | 5 + .../tests/import.test.js | 2 +- .../tests/index.test.js | 20 +- packages/server/bff-runtime/jest.config.js | 7 - packages/server/bff-runtime/rstest.config.ts | 5 + .../server/bff-runtime/tests/tsconfig.json | 3 +- packages/server/core/jest.config.js | 9 - packages/server/core/rstest.config.ts | 5 + .../utils/__snapshots__/error.test.ts.snap | 6 +- .../toolkit/compiler/babel/jest.config.js | 7 - .../toolkit/compiler/babel/rstest.config.ts | 5 + .../compiler/babel/tests/tsconfig.json | 2 +- packages/toolkit/i18n-utils/jest.config.js | 7 - packages/toolkit/i18n-utils/rstest.config.ts | 5 + .../toolkit/i18n-utils/tests/tsconfig.json | 3 +- packages/toolkit/plugin/jest.config.js | 7 - packages/toolkit/plugin/rstest.config.ts | 5 + tests/jest-ut.config.js | 52 +-- 29 files changed, 76 insertions(+), 603 deletions(-) delete mode 100644 packages/cli/builder/tests/__snapshots__/globalVars.test.ts.snap delete mode 100644 packages/cli/builder/tests/__snapshots__/tsLoader.test.ts.snap delete mode 100644 packages/cli/plugin-ssg/jest.config.js create mode 100644 packages/cli/plugin-ssg/rstest.config.ts delete mode 100644 packages/generator/generator-common/jest.config.js create mode 100644 packages/generator/generator-common/rstest.config.ts delete mode 100644 packages/generator/generator-utils/jest.config.js create mode 100644 packages/generator/generator-utils/rstest.config.ts delete mode 100644 packages/generator/new-action/jest.config.js create mode 100644 packages/generator/new-action/rstest.config.ts delete mode 100644 packages/server/babel-plugin-module-resolver/jest.config.js create mode 100644 packages/server/babel-plugin-module-resolver/rstest.config.ts delete mode 100644 packages/server/bff-runtime/jest.config.js create mode 100644 packages/server/bff-runtime/rstest.config.ts delete mode 100644 packages/server/core/jest.config.js create mode 100644 packages/server/core/rstest.config.ts delete mode 100644 packages/toolkit/compiler/babel/jest.config.js create mode 100644 packages/toolkit/compiler/babel/rstest.config.ts delete mode 100644 packages/toolkit/i18n-utils/jest.config.js create mode 100644 packages/toolkit/i18n-utils/rstest.config.ts delete mode 100644 packages/toolkit/plugin/jest.config.js create mode 100644 packages/toolkit/plugin/rstest.config.ts diff --git a/packages/cli/builder/tests/__snapshots__/globalVars.test.ts.snap b/packages/cli/builder/tests/__snapshots__/globalVars.test.ts.snap deleted file mode 100644 index 2595575eb921..000000000000 --- a/packages/cli/builder/tests/__snapshots__/globalVars.test.ts.snap +++ /dev/null @@ -1,46 +0,0 @@ -// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html - -exports[`plugin-global-vars > 'globalVars function' 1`] = ` -[ - DefinePlugin { - "definitions": { - "import.meta.env.ASSET_PREFIX": """", - "import.meta.env.BASE_URL": "\\"/\\"", - "import.meta.env.DEV": false, - "import.meta.env.MODE": ""none"", - "import.meta.env.PROD": false, - "process.env.ASSET_PREFIX": """", - "process.env.BASE_URL": "\\"/\\"", - }, - }, - DefinePlugin { - "definitions": { - "ENV": ""test"", - "TARGET": ""web"", - }, - }, -] -`; - -exports[`plugin-global-vars > 'globalVars' 1`] = ` -[ - DefinePlugin { - "definitions": { - "import.meta.env.ASSET_PREFIX": """", - "import.meta.env.BASE_URL": "\\"/\\"", - "import.meta.env.DEV": false, - "import.meta.env.MODE": ""none"", - "import.meta.env.PROD": false, - "process.env.ASSET_PREFIX": """", - "process.env.BASE_URL": "\\"/\\"", - }, - }, - DefinePlugin { - "definitions": { - "import.meta.bar": "{"a":"bar","b":false,"c":{"d":42}}", - "process.env.foo": ""foo"", - "window.baz": "[null,"baz"]", - }, - }, -] -`; diff --git a/packages/cli/builder/tests/__snapshots__/tsLoader.test.ts.snap b/packages/cli/builder/tests/__snapshots__/tsLoader.test.ts.snap deleted file mode 100644 index a8f4d4b717a2..000000000000 --- a/packages/cli/builder/tests/__snapshots__/tsLoader.test.ts.snap +++ /dev/null @@ -1,419 +0,0 @@ -// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html - -exports[`plugin-ts-loader > should insert babel plugin correctly in some edge case 1`] = ` -[ - { - "resolve": { - "fullySpecified": false, - }, - "test": /\\\\\\.m\\?js/, - }, - { - "dependency": { - "not": "url", - }, - "include": [ - { - "and": [ - "", - { - "not": /\\[\\\\\\\\/\\]node_modules\\[\\\\\\\\/\\]/, - }, - ], - }, - /\\\\\\.\\(\\?:ts\\|tsx\\|jsx\\|mts\\|cts\\)\\$/, - ], - "resourceQuery": { - "not": /\\^\\\\\\?raw\\$/, - }, - "test": /\\\\\\.\\(\\?:js\\|mjs\\|cjs\\|jsx\\)\\$/, - "type": "javascript/auto", - "use": [ - { - "loader": "/node_modules//babel-loader/lib/index.js", - "options": { - "babelrc": false, - "compact": true, - "configFile": false, - "plugins": [ - [ - "babel-plugin-xxx", - ], - [ - "babel-plugin-import", - { - "libraryDirectory": "es", - "libraryName": "xxx-components", - "style": true, - }, - ], - ], - "presets": [ - [ - "/node_modules//@babel/preset-env/lib/index.js", - { - "bugfixes": true, - "corejs": { - "proposals": true, - "version": "3.40", - }, - "exclude": [ - "transform-typeof-symbol", - ], - "include": [ - "@babel/plugin-transform-class-properties", - ], - "modules": false, - "targets": [ - "> 0.01%", - "not dead", - "not op_mini all", - ], - "useBuiltIns": "entry", - }, - ], - [ - "/node_modules//@babel/preset-typescript/lib/index.js", - { - "allExtensions": true, - "allowDeclareFields": true, - "allowNamespaces": true, - "isTSX": true, - "optimizeConstEnums": true, - }, - ], - [ - "/node_modules//@babel/preset-react/lib/index.js", - { - "development": false, - "runtime": "automatic", - "useBuiltIns": true, - "useSpread": false, - }, - ], - ], - }, - }, - ], - }, - { - "resourceQuery": /\\^\\\\\\?raw\\$/, - "test": /\\\\\\.\\(\\?:js\\|jsx\\|mjs\\|cjs\\|ts\\|tsx\\|mts\\|cts\\)\\$/, - "type": "asset/source", - }, -] -`; - -exports[`plugin-ts-loader > should insert babel plugin correctly in some edge case 2`] = ` -[ - { - "resourceQuery": /\\^\\\\\\?raw\\$/, - "test": /\\\\\\.\\(\\?:js\\|jsx\\|mjs\\|cjs\\|ts\\|tsx\\|mts\\|cts\\)\\$/, - "type": "asset/source", - }, - { - "include": [ - { - "and": [ - "", - { - "not": /\\[\\\\\\\\/\\]node_modules\\[\\\\\\\\/\\]/, - }, - ], - }, - /\\\\\\.\\(\\?:ts\\|tsx\\|jsx\\|mts\\|cts\\)\\$/, - ], - "test": /\\\\\\.\\(\\?:ts\\|mts\\|cts\\|tsx\\)\\$/, - "use": [ - { - "loader": "/node_modules//babel-loader/lib/index.js", - "options": { - "plugins": [ - [ - "babel-plugin-xxx", - ], - [ - "babel-plugin-import", - { - "libraryDirectory": "es", - "libraryName": "xxx-components", - "style": true, - }, - ], - ], - "presets": [ - [ - "/node_modules//@babel/preset-env/lib/index.js", - { - "bugfixes": true, - "corejs": { - "proposals": true, - "version": "3.40", - }, - "exclude": [ - "transform-typeof-symbol", - ], - "modules": false, - "targets": [ - "> 0.01%", - "not dead", - "not op_mini all", - ], - "useBuiltIns": "entry", - }, - ], - [ - "/node_modules//@babel/preset-typescript/lib/index.js", - { - "allExtensions": true, - "allowDeclareFields": true, - "allowNamespaces": true, - "isTSX": true, - "optimizeConstEnums": true, - }, - ], - [ - "/node_modules//@babel/preset-react/lib/index.js", - { - "development": false, - "runtime": "automatic", - "useBuiltIns": true, - "useSpread": false, - }, - ], - ], - }, - }, - { - "loader": "/node_modules//ts-loader/index.js", - "options": { - "allowTsInNodeModules": true, - "compilerOptions": { - "module": "esnext", - "target": "esnext", - }, - "transpileOnly": true, - }, - }, - ], - }, -] -`; - -exports[`plugin-ts-loader > should set include/exclude 1`] = ` -[ - { - "resourceQuery": /\\^\\\\\\?raw\\$/, - "test": /\\\\\\.\\(\\?:js\\|jsx\\|mjs\\|cjs\\|ts\\|tsx\\|mts\\|cts\\)\\$/, - "type": "asset/source", - }, - { - "exclude": [ - "src/**/*.js", - ], - "include": [ - { - "and": [ - "", - { - "not": /\\[\\\\\\\\/\\]node_modules\\[\\\\\\\\/\\]/, - }, - ], - }, - /\\\\\\.\\(\\?:ts\\|tsx\\|jsx\\|mts\\|cts\\)\\$/, - "src/**/*.ts", - ], - "test": /\\\\\\.\\(\\?:ts\\|mts\\|cts\\|tsx\\)\\$/, - "use": [ - { - "loader": "/node_modules//babel-loader/lib/index.js", - "options": { - "plugins": [ - "/node_modules//@babel/plugin-proposal-export-default-from/lib/index.js", - "/node_modules//@babel/plugin-proposal-partial-application/lib/index.js", - [ - "/node_modules//@babel/plugin-proposal-pipeline-operator/lib/index.js", - { - "proposal": "minimal", - }, - ], - [ - "/node_modules//@babel/plugin-transform-runtime/lib/index.js", - { - "useESModules": true, - "version": "7.26.10", - }, - ], - "/packages/cli/babel-preset/src/pluginLockCorejsVersion.js", - [ - "/node_modules//react-refresh/babel.js", - { - "skipEnvCheck": true, - }, - ], - ], - "presets": [ - [ - "/node_modules//@babel/preset-env/lib/index.js", - { - "bugfixes": true, - "corejs": { - "proposals": true, - "version": "3.40", - }, - "exclude": [ - "transform-typeof-symbol", - ], - "modules": "commonjs", - "targets": [ - "> 0.01%", - "not dead", - "not op_mini all", - ], - "useBuiltIns": "entry", - }, - ], - [ - "/node_modules//@babel/preset-typescript/lib/index.js", - { - "allExtensions": true, - "allowDeclareFields": true, - "allowNamespaces": true, - "isTSX": true, - "optimizeConstEnums": true, - }, - ], - [ - "/node_modules//@babel/preset-react/lib/index.js", - { - "development": true, - "runtime": "automatic", - "useBuiltIns": true, - "useSpread": false, - }, - ], - ], - }, - }, - { - "loader": "/node_modules//ts-loader/index.js", - "options": { - "allowTsInNodeModules": true, - "compilerOptions": { - "module": "esnext", - "target": "esnext", - }, - "transpileOnly": true, - }, - }, - ], - }, -] -`; - -exports[`plugin-ts-loader > should set ts-loader 1`] = ` -[ - { - "resourceQuery": /\\^\\\\\\?raw\\$/, - "test": /\\\\\\.\\(\\?:js\\|jsx\\|mjs\\|cjs\\|ts\\|tsx\\|mts\\|cts\\)\\$/, - "type": "asset/source", - }, - { - "include": [ - { - "and": [ - "", - { - "not": /\\[\\\\\\\\/\\]node_modules\\[\\\\\\\\/\\]/, - }, - ], - }, - /\\\\\\.\\(\\?:ts\\|tsx\\|jsx\\|mts\\|cts\\)\\$/, - ], - "test": /\\\\\\.\\(\\?:ts\\|mts\\|cts\\|tsx\\)\\$/, - "use": [ - { - "loader": "/node_modules//babel-loader/lib/index.js", - "options": { - "plugins": [ - "/node_modules//@babel/plugin-proposal-export-default-from/lib/index.js", - "/node_modules//@babel/plugin-proposal-partial-application/lib/index.js", - [ - "/node_modules//@babel/plugin-proposal-pipeline-operator/lib/index.js", - { - "proposal": "minimal", - }, - ], - [ - "/node_modules//@babel/plugin-transform-runtime/lib/index.js", - { - "useESModules": true, - "version": "7.26.10", - }, - ], - "/packages/cli/babel-preset/src/pluginLockCorejsVersion.js", - [ - "/node_modules//react-refresh/babel.js", - { - "skipEnvCheck": true, - }, - ], - ], - "presets": [ - [ - "/node_modules//@babel/preset-env/lib/index.js", - { - "bugfixes": true, - "corejs": { - "proposals": true, - "version": "3.40", - }, - "exclude": [ - "transform-typeof-symbol", - ], - "modules": "commonjs", - "targets": [ - "> 0.01%", - "not dead", - "not op_mini all", - ], - "useBuiltIns": "entry", - }, - ], - [ - "/node_modules//@babel/preset-typescript/lib/index.js", - { - "allExtensions": true, - "allowDeclareFields": true, - "allowNamespaces": true, - "isTSX": true, - "optimizeConstEnums": true, - }, - ], - [ - "/node_modules//@babel/preset-react/lib/index.js", - { - "development": true, - "runtime": "automatic", - "useBuiltIns": true, - "useSpread": false, - }, - ], - ], - }, - }, - { - "loader": "/node_modules//ts-loader/index.js", - "options": { - "allowTsInNodeModules": true, - "compilerOptions": { - "module": "esnext", - "target": "esnext", - }, - "transpileOnly": true, - }, - }, - ], - }, -] -`; diff --git a/packages/cli/plugin-ssg/jest.config.js b/packages/cli/plugin-ssg/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/cli/plugin-ssg/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/cli/plugin-ssg/rstest.config.ts b/packages/cli/plugin-ssg/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/cli/plugin-ssg/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/packages/generator/generator-common/jest.config.js b/packages/generator/generator-common/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/generator-common/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/generator-common/rstest.config.ts b/packages/generator/generator-common/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/generator/generator-common/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/packages/generator/generator-utils/jest.config.js b/packages/generator/generator-utils/jest.config.js deleted file mode 100644 index c1618ef2fb9c..000000000000 --- a/packages/generator/generator-utils/jest.config.js +++ /dev/null @@ -1,11 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, - modulePathIgnorePatterns: [ - // TODO: 很容易超时导致失败，暂时先绕过 - 'tests/index.test.ts', - ], -}; diff --git a/packages/generator/generator-utils/rstest.config.ts b/packages/generator/generator-utils/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/generator/generator-utils/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/packages/generator/new-action/jest.config.js b/packages/generator/new-action/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/new-action/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/new-action/rstest.config.ts b/packages/generator/new-action/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/generator/new-action/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/packages/server/babel-plugin-module-resolver/jest.config.js b/packages/server/babel-plugin-module-resolver/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/server/babel-plugin-module-resolver/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/server/babel-plugin-module-resolver/rstest.config.ts b/packages/server/babel-plugin-module-resolver/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/server/babel-plugin-module-resolver/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/packages/server/babel-plugin-module-resolver/tests/import.test.js b/packages/server/babel-plugin-module-resolver/tests/import.test.js index b897b3566fef..213bd74bf987 100644 --- a/packages/server/babel-plugin-module-resolver/tests/import.test.js +++ b/packages/server/babel-plugin-module-resolver/tests/import.test.js @@ -137,7 +137,7 @@ describe('import and export statement', () => { ); }); - describe('should ignore the call if a non-import statement is used', () => { + it('should ignore the call if a non-import statement is used', () => { const code = stripIndent` function test() { return "components/Sidebar/Footer"; diff --git a/packages/server/babel-plugin-module-resolver/tests/index.test.js b/packages/server/babel-plugin-module-resolver/tests/index.test.js index 92b135da4e59..4bfbff9cdcae 100644 --- a/packages/server/babel-plugin-module-resolver/tests/index.test.js +++ b/packages/server/babel-plugin-module-resolver/tests/index.test.js @@ -526,7 +526,7 @@ describe('module-resolver', () => { }); describe('with a function', () => { - const mockSubstitute = jest.fn(); + const mockSubstitute = rs.fn(); const regExpSubsituteOpts = { babelrc: false, cwd, @@ -618,12 +618,12 @@ describe('module-resolver', () => { }); describe('missing packages warning', () => { - const mockWarn = jest.fn(); - jest.mock('../src/log', () => ({ + const mockWarn = rs.fn(); + rs.doMock('../src/log', () => ({ warn: mockWarn, })); - jest.resetModules(); - const pluginWithMock = jest.requireActual('../src').default; + rs.resetModules(); + const pluginWithMock = rs.requireActual('../src').default; const fileName = path.resolve('unknown'); const missingAliasTransformerOpts = { @@ -1009,8 +1009,8 @@ describe('module-resolver', () => { }); describe('missing babelrc in path (uses cwd)', () => { - jest.resetModules(); - const pluginWithMock = jest.requireActual('../src').default; + rs.resetModules(); + const pluginWithMock = rs.requireActual('../src').default; const missingBabelConfigTransformerOpts = { babelrc: false, @@ -1120,13 +1120,13 @@ describe('module-resolver', () => { }); describe('missing package.json in path (uses cwd)', () => { - jest.mock('pkg-up', () => ({ + rs.mock('pkg-up', () => ({ sync: function pkgUpSync() { return null; }, })); - jest.resetModules(); - const pluginWithMock = jest.requireActual('../src').default; + rs.resetModules(); + const pluginWithMock = rs.requireActual('../src').default; const missingPkgJsonConfigTransformerOpts = { babelrc: false, diff --git a/packages/server/bff-runtime/jest.config.js b/packages/server/bff-runtime/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/server/bff-runtime/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/server/bff-runtime/rstest.config.ts b/packages/server/bff-runtime/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/server/bff-runtime/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/packages/server/bff-runtime/tests/tsconfig.json b/packages/server/bff-runtime/tests/tsconfig.json index 1ef6f52a7778..04e9b4e644f0 100644 --- a/packages/server/bff-runtime/tests/tsconfig.json +++ b/packages/server/bff-runtime/tests/tsconfig.json @@ -5,6 +5,7 @@ "jsx": "preserve", "baseUrl": "./", "isolatedModules": true, - "paths": {} + "paths": {}, + "types": ["@rstest/core/globals"] } } diff --git a/packages/server/core/jest.config.js b/packages/server/core/jest.config.js deleted file mode 100644 index 09f064c98383..000000000000 --- a/packages/server/core/jest.config.js +++ /dev/null @@ -1,9 +0,0 @@ -const path = require('path'); -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, - testEnvironment: 'node', -}; diff --git a/packages/server/core/rstest.config.ts b/packages/server/core/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/server/core/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/packages/server/core/tests/utils/__snapshots__/error.test.ts.snap b/packages/server/core/tests/utils/__snapshots__/error.test.ts.snap index 77d59c424880..af32e8c1d9bb 100644 --- a/packages/server/core/tests/utils/__snapshots__/error.test.ts.snap +++ b/packages/server/core/tests/utils/__snapshots__/error.test.ts.snap @@ -1,6 +1,6 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Rstest Snapshot v1 -exports[`test utils.error should get 404 error html 1`] = ` +exports[`test utils.error > should get 404 error html 1`] = ` " @@ -33,7 +33,7 @@ exports[`test utils.error should get 404 error html 1`] = ` " `; -exports[`test utils.error should get 500 error html 1`] = ` +exports[`test utils.error > should get 500 error html 1`] = ` " diff --git a/packages/toolkit/compiler/babel/jest.config.js b/packages/toolkit/compiler/babel/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/toolkit/compiler/babel/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/toolkit/compiler/babel/rstest.config.ts b/packages/toolkit/compiler/babel/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/toolkit/compiler/babel/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/packages/toolkit/compiler/babel/tests/tsconfig.json b/packages/toolkit/compiler/babel/tests/tsconfig.json index d168acca56f9..3a0a9edf6be0 100644 --- a/packages/toolkit/compiler/babel/tests/tsconfig.json +++ b/packages/toolkit/compiler/babel/tests/tsconfig.json @@ -8,6 +8,6 @@ "emitDeclarationOnly": true, "isolatedModules": true, "paths": {}, - "types": ["node", "jest"] + "types": ["node", "@rstest/core/globals"] } } diff --git a/packages/toolkit/i18n-utils/jest.config.js b/packages/toolkit/i18n-utils/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/toolkit/i18n-utils/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/toolkit/i18n-utils/rstest.config.ts b/packages/toolkit/i18n-utils/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/toolkit/i18n-utils/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/packages/toolkit/i18n-utils/tests/tsconfig.json b/packages/toolkit/i18n-utils/tests/tsconfig.json index 1ef6f52a7778..04e9b4e644f0 100644 --- a/packages/toolkit/i18n-utils/tests/tsconfig.json +++ b/packages/toolkit/i18n-utils/tests/tsconfig.json @@ -5,6 +5,7 @@ "jsx": "preserve", "baseUrl": "./", "isolatedModules": true, - "paths": {} + "paths": {}, + "types": ["@rstest/core/globals"] } } diff --git a/packages/toolkit/plugin/jest.config.js b/packages/toolkit/plugin/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/toolkit/plugin/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/toolkit/plugin/rstest.config.ts b/packages/toolkit/plugin/rstest.config.ts new file mode 100644 index 000000000000..04738ee6a816 --- /dev/null +++ b/packages/toolkit/plugin/rstest.config.ts @@ -0,0 +1,5 @@ +import { defineConfig } from '@rstest/core'; + +export default defineConfig({ + globals: true, +}); diff --git a/tests/jest-ut.config.js b/tests/jest-ut.config.js index ae9a80c535d2..194312149320 100644 --- a/tests/jest-ut.config.js +++ b/tests/jest-ut.config.js @@ -58,6 +58,10 @@ module.exports = { '/packages/(server|solutions)/', '/packages/generator/', '/packages/runtime/plugin-runtime/', + '/packages/cli/plugin-ssg/', + '/packages/toolkit/plugin/', + '/packages/toolkit/compiler/babel/', + '/packages/toolkit/i18n-utils/', ], rootDir: path.join(__dirname, '../'), testEnvironment: '/tests/jest.env.js', @@ -102,6 +106,9 @@ module.exports = { '/packages/builder/', '/packages/toolkit/e2e/', '/packages/generator/', + '/packages/server/babel-plugin-module-resolver/', + '/packages/server/core/', + '/packages/server/bff-runtime/', ], rootDir: path.join(__dirname, '../'), testEnvironment: 'node', @@ -113,50 +120,5 @@ module.exports = { '/packages/runtime/plugin-runtime/', ], }, - { - setupFiles: [], - transform: { - '\\.[jt]sx?$': [ - require.resolve('@swc/jest'), - { - jsc: { - parser: { - syntax: 'typescript', - decorators: true, - }, - transform: { - react: { - runtime: 'automatic', - }, - }, - }, - }, - ], - }, - moduleNameMapper: { - '^@modern-js/generator-common$': - '/packages/generator/generator-common/src', - '^@modern-js/generator-utils$': - '/packages/generator/generator-utils/src', - '^@modern-js/i18n-utils$': '/packages/toolkit/i18n-utils/src', - }, - globals: {}, - transformIgnorePatterns: [], - modulePathIgnorePatterns: [ - '/packages/cli/builder/', - '/packages/toolkit/e2e/', - '/packages/solutions/module-tools/compiled/', - '/packages/toolkit/utils/compiled/', - '/.nx-cache', - '/.nx', - ], - testPathIgnorePatterns: [], - rootDir: path.join(__dirname, '../'), - testEnvironment: 'node', - testMatch: [ - '/packages/generator/**/src/**/*.test.[jt]s?(x)', - '/packages/generator/**/tests/**/*.test.[jt]s?(x)', - ], - }, ], }; From 2ab0adb627c2b1db4fe4d61fccf33f51fbb1acb0 Mon Sep 17 00:00:00 2001 From: 9aoy <9aoyuao@gmail.com> Date: Fri, 28 Nov 2025 11:29:01 +0800 Subject: [PATCH 2/7] fix: resolve source --- packages/cli/babel-preset/rstest.config.ts | 1 + packages/cli/builder/rstest.config.ts | 1 + packages/cli/plugin-ssg/package.json | 2 +- packages/cli/plugin-ssg/rstest.config.ts | 6 ++++-- packages/server/core/package.json | 2 +- packages/server/core/rstest.config.ts | 6 ++++-- packages/toolkit/compiler/babel/package.json | 2 +- .../toolkit/compiler/babel/rstest.config.ts | 6 ++++-- pnpm-lock.yaml | 18 ++++++------------ scripts/rstest-config/package.json | 2 -- scripts/rstest-config/src/index.ts | 15 +++++++-------- 11 files changed, 30 insertions(+), 31 deletions(-) diff --git a/packages/cli/babel-preset/rstest.config.ts b/packages/cli/babel-preset/rstest.config.ts index 223758da4966..0946072af5c0 100644 --- a/packages/cli/babel-preset/rstest.config.ts +++ b/packages/cli/babel-preset/rstest.config.ts @@ -3,4 +3,5 @@ import { withTestPreset } from '@scripts/rstest-config'; export default withTestPreset({ root: __dirname, testEnvironment: 'node', + setupFiles: ['@scripts/rstest-config/setup.ts'], }); diff --git a/packages/cli/builder/rstest.config.ts b/packages/cli/builder/rstest.config.ts index 223758da4966..0946072af5c0 100644 --- a/packages/cli/builder/rstest.config.ts +++ b/packages/cli/builder/rstest.config.ts @@ -3,4 +3,5 @@ import { withTestPreset } from '@scripts/rstest-config'; export default withTestPreset({ root: __dirname, testEnvironment: 'node', + setupFiles: ['@scripts/rstest-config/setup.ts'], }); diff --git a/packages/cli/plugin-ssg/package.json b/packages/cli/plugin-ssg/package.json index fc8ab624d6dd..48e8ba041679 100644 --- a/packages/cli/plugin-ssg/package.json +++ b/packages/cli/plugin-ssg/package.json @@ -84,7 +84,7 @@ "devDependencies": { "@modern-js/app-tools": "workspace:*", "@modern-js/types": "workspace:*", - "@scripts/jest-config": "workspace:*", + "@scripts/rstest-config": "workspace:*", "@rslib/core": "0.18.0", "@modern-js/rslib": "workspace:*", "@types/jest": "^29.5.14", diff --git a/packages/cli/plugin-ssg/rstest.config.ts b/packages/cli/plugin-ssg/rstest.config.ts index 04738ee6a816..660a9ce57f40 100644 --- a/packages/cli/plugin-ssg/rstest.config.ts +++ b/packages/cli/plugin-ssg/rstest.config.ts @@ -1,5 +1,7 @@ -import { defineConfig } from '@rstest/core'; +import { withTestPreset } from '@scripts/rstest-config'; -export default defineConfig({ +export default withTestPreset({ + root: __dirname, + testEnvironment: 'node', globals: true, }); diff --git a/packages/server/core/package.json b/packages/server/core/package.json index 930c489b0f80..8b00c20964f5 100644 --- a/packages/server/core/package.json +++ b/packages/server/core/package.json @@ -75,7 +75,7 @@ }, "devDependencies": { "@modern-js/types": "workspace:*", - "@scripts/jest-config": "workspace:*", + "@scripts/rstest-config": "workspace:*", "@rslib/core": "0.18.0", "@types/cloneable-readable": "^2.0.3", "@types/jest": "^29.5.14", diff --git a/packages/server/core/rstest.config.ts b/packages/server/core/rstest.config.ts index 04738ee6a816..660a9ce57f40 100644 --- a/packages/server/core/rstest.config.ts +++ b/packages/server/core/rstest.config.ts @@ -1,5 +1,7 @@ -import { defineConfig } from '@rstest/core'; +import { withTestPreset } from '@scripts/rstest-config'; -export default defineConfig({ +export default withTestPreset({ + root: __dirname, + testEnvironment: 'node', globals: true, }); diff --git a/packages/toolkit/compiler/babel/package.json b/packages/toolkit/compiler/babel/package.json index 19cdb0073eb5..c066aa93dab7 100644 --- a/packages/toolkit/compiler/babel/package.json +++ b/packages/toolkit/compiler/babel/package.json @@ -53,7 +53,7 @@ "devDependencies": { "@babel/plugin-transform-classes": "^7.28.4", "@babel/preset-typescript": "^7.28.5", - "@scripts/jest-config": "workspace:*", + "@scripts/rstest-config": "workspace:*", "@rslib/core": "0.18.0", "@modern-js/rslib": "workspace:*", "@types/babel__core": "^7.20.5", diff --git a/packages/toolkit/compiler/babel/rstest.config.ts b/packages/toolkit/compiler/babel/rstest.config.ts index 04738ee6a816..660a9ce57f40 100644 --- a/packages/toolkit/compiler/babel/rstest.config.ts +++ b/packages/toolkit/compiler/babel/rstest.config.ts @@ -1,5 +1,7 @@ -import { defineConfig } from '@rstest/core'; +import { withTestPreset } from '@scripts/rstest-config'; -export default defineConfig({ +export default withTestPreset({ + root: __dirname, + testEnvironment: 'node', globals: true, }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd2a52b06c9f..ff4804887887 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -489,9 +489,9 @@ importers: '@rslib/core': specifier: 0.18.0 version: 0.18.0(typescript@5.6.3) - '@scripts/jest-config': + '@scripts/rstest-config': specifier: workspace:* - version: link:../../../scripts/jest-config + version: link:../../../scripts/rstest-config '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -1619,9 +1619,9 @@ importers: '@rslib/core': specifier: 0.18.0 version: 0.18.0(typescript@5.6.3) - '@scripts/jest-config': + '@scripts/rstest-config': specifier: workspace:* - version: link:../../../scripts/jest-config + version: link:../../../scripts/rstest-config '@types/cloneable-readable': specifier: ^2.0.3 version: 2.0.3 @@ -2140,9 +2140,9 @@ importers: '@rslib/core': specifier: 0.18.0 version: 0.18.0(typescript@5.6.3) - '@scripts/jest-config': + '@scripts/rstest-config': specifier: workspace:* - version: link:../../../../scripts/jest-config + version: link:../../../../scripts/rstest-config '@types/babel__core': specifier: ^7.20.5 version: 7.20.5 @@ -2869,15 +2869,9 @@ importers: '@modern-js/tsconfig': specifier: workspace:* version: link:../../packages/tsconfig - '@types/lodash': - specifier: ^4.17.21 - version: 4.17.21 '@types/node': specifier: ^20 version: 20.8.8 - lodash: - specifier: ^4.17.21 - version: 4.17.21 path-serializer: specifier: 0.5.1 version: 0.5.1 diff --git a/scripts/rstest-config/package.json b/scripts/rstest-config/package.json index 84b1ffe51d66..63def2e87a8f 100644 --- a/scripts/rstest-config/package.json +++ b/scripts/rstest-config/package.json @@ -7,9 +7,7 @@ "dependencies": { "@modern-js/tsconfig": "workspace:*", "path-serializer": "0.5.1", - "@types/lodash": "^4.17.21", "@types/node": "^20", - "lodash": "^4.17.21", "typescript": "^5" } } diff --git a/scripts/rstest-config/src/index.ts b/scripts/rstest-config/src/index.ts index 52b82f3905e1..4bbe313814cb 100644 --- a/scripts/rstest-config/src/index.ts +++ b/scripts/rstest-config/src/index.ts @@ -1,25 +1,24 @@ -import { join } from 'path'; -import { type RstestConfig, defineConfig } from '@rstest/core'; +import { + type RstestConfig, + defineConfig, + mergeRstestConfig, +} from '@rstest/core'; import _ from 'lodash'; export const testPreset = defineConfig({ coverage: { enabled: false, }, - testEnvironment: 'happy-dom', testTimeout: 30000, include: ['src/**/*.test.[jt]s?(x)', 'tests/**/*.test.[jt]s?(x)'], restoreMocks: true, - setupFiles: [join(__dirname, '../setup.ts')], resolve: { + // Make sure to resolve modern.js packages to their source code in tests because modern.js packages are build slowly in CI. conditionNames: ['jsnext:source', 'require', 'node', 'default'], }, }); export const withTestPreset = (config: RstestConfig) => { - const mergedConfig = _.merge({}, testPreset, config); - if (config.setupFiles) { - mergedConfig.setupFiles = [...testPreset.setupFiles!, ...config.setupFiles]; - } + const mergedConfig = mergeRstestConfig(testPreset, config); return defineConfig(mergedConfig); }; From 1ab8ca4663fd683c5f82c6c87a0d430710f60588 Mon Sep 17 00:00:00 2001 From: 9aoy <9aoyuao@gmail.com> Date: Fri, 28 Nov 2025 11:47:13 +0800 Subject: [PATCH 3/7] fix: resolve source --- .vscode/settings.json | 2 +- benchmark/bundle-diff/package.json | 1 - packages/cli/plugin-data-loader/package.json | 7 +-- .../cli/plugin-data-loader/rstest.config.ts | 18 ++++++ .../plugin-data-loader/tests/request.test.ts | 3 - .../plugin-data-loader/tests/server.test.ts | 5 +- .../plugin-data-loader/tests/tsconfig.json | 2 +- packages/cli/plugin-ssg/package.json | 4 +- .../generator/generator-common/package.json | 6 +- .../generator-common/rstest.config.ts | 6 +- .../generator-common/tests/tsconfig.json | 3 +- packages/generator/new-action/package.json | 6 +- .../generator/new-action/rstest.config.ts | 6 +- .../generator/new-action/tests/tsconfig.json | 2 +- packages/toolkit/compiler/babel/package.json | 4 +- packages/toolkit/compiler/babel/tsconfig.json | 2 +- packages/toolkit/i18n-utils/package.json | 6 +- packages/toolkit/i18n-utils/rstest.config.ts | 6 +- pnpm-lock.yaml | 58 +++---------------- tests/jest-ut.config.js | 1 + 20 files changed, 56 insertions(+), 92 deletions(-) create mode 100644 packages/cli/plugin-data-loader/rstest.config.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index d7f4be179f4a..9fe0356d2bb8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -42,7 +42,7 @@ "**/node_modules": false }, "[typescript]": { - "editor.defaultFormatter": "biomejs.biome", + "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.codeActionsOnSave": { "quickfix.biome": "explicit", "source.organizeImports": "never", diff --git a/benchmark/bundle-diff/package.json b/benchmark/bundle-diff/package.json index 0e75a68c11b0..a6d8e5f48e43 100644 --- a/benchmark/bundle-diff/package.json +++ b/benchmark/bundle-diff/package.json @@ -23,7 +23,6 @@ "@modern-js/app-tools": "workspace:*", "@modern-js/tsconfig": "workspace:*", "@rsdoctor/rspack-plugin": "^1.3.11", - "@types/jest": "^29.5.14", "@types/node": "^20", "@types/react": "^19.1.8", "@types/react-dom": "^19.1.6", diff --git a/packages/cli/plugin-data-loader/package.json b/packages/cli/plugin-data-loader/package.json index c9086b58da3b..da9803872bb6 100644 --- a/packages/cli/plugin-data-loader/package.json +++ b/packages/cli/plugin-data-loader/package.json @@ -50,7 +50,7 @@ "new": "modern-lib new", "build": "rslib build", "dev": "rslib build --watch", - "test": "jest --passWithNoTests" + "test": "rstest --passWithNoTests" }, "dependencies": { "@babel/core": "^7.28.5", @@ -62,20 +62,17 @@ "devDependencies": { "@modern-js/server-core": "workspace:*", "@modern-js/types": "workspace:*", - "@scripts/jest-config": "workspace:*", + "@scripts/rstest-config": "workspace:*", "@rslib/core": "0.18.0", "@modern-js/rslib": "workspace:*", "@types/babel__core": "^7.20.5", - "@types/jest": "^29.5.14", "@types/node": "^20", "@types/supertest": "^2.0.16", "isomorphic-fetch": "^3.0.0", - "jest": "^29.7.0", "memfs": "^3.5.3", "react": "^19.2.0", "react-dom": "^19.2.0", "supertest": "^6.3.4", - "ts-jest": "^29.4.5", "typescript": "^5", "@rsbuild/core": "1.6.9" }, diff --git a/packages/cli/plugin-data-loader/rstest.config.ts b/packages/cli/plugin-data-loader/rstest.config.ts new file mode 100644 index 000000000000..bbd2b1d77647 --- /dev/null +++ b/packages/cli/plugin-data-loader/rstest.config.ts @@ -0,0 +1,18 @@ +import { withTestPreset } from '@scripts/rstest-config'; + +export default withTestPreset({ + root: __dirname, + testEnvironment: 'node', + globals: true, + tools: { + swc: { + jsc: { + transform: { + react: { + runtime: 'automatic', + }, + }, + }, + }, + }, +}); diff --git a/packages/cli/plugin-data-loader/tests/request.test.ts b/packages/cli/plugin-data-loader/tests/request.test.ts index 8d2642e7dd4a..14a9430adca7 100644 --- a/packages/cli/plugin-data-loader/tests/request.test.ts +++ b/packages/cli/plugin-data-loader/tests/request.test.ts @@ -1,6 +1,3 @@ -/** - * @jest-environment node - */ import { getRequestUrl } from '../src/cli/createRequest'; import { DIRECT_PARAM, LOADER_ID_PARAM } from '../src/common/constants'; diff --git a/packages/cli/plugin-data-loader/tests/server.test.ts b/packages/cli/plugin-data-loader/tests/server.test.ts index 2923ba8ab748..9550f3ed3bcb 100644 --- a/packages/cli/plugin-data-loader/tests/server.test.ts +++ b/packages/cli/plugin-data-loader/tests/server.test.ts @@ -1,6 +1,3 @@ -/** - * @jest-environment node - */ import type { IncomingMessage, ServerResponse } from 'http'; import path from 'path'; import qs from 'querystring'; @@ -16,7 +13,7 @@ describe('handleRequest', () => { './fixtures', 'server', 'bundles', - 'three-server-loaders', + 'three-server-loaders/index.js', ); const createContext = ( req: IncomingMessage, diff --git a/packages/cli/plugin-data-loader/tests/tsconfig.json b/packages/cli/plugin-data-loader/tests/tsconfig.json index 9267c0682b10..b6491c2df241 100644 --- a/packages/cli/plugin-data-loader/tests/tsconfig.json +++ b/packages/cli/plugin-data-loader/tests/tsconfig.json @@ -9,6 +9,6 @@ "esModuleInterop": true, "isolatedModules": true, "paths": {}, - "types": ["node", "jest"] + "types": ["node", "@rstest/core/globals"] } } diff --git a/packages/cli/plugin-ssg/package.json b/packages/cli/plugin-ssg/package.json index 48e8ba041679..fce9cf0aab57 100644 --- a/packages/cli/plugin-ssg/package.json +++ b/packages/cli/plugin-ssg/package.json @@ -64,7 +64,7 @@ "new": "modern-lib new", "build": "rslib build", "dev": "rslib build --watch", - "test": "jest --passWithNoTests" + "test": "rstest --passWithNoTests" }, "dependencies": { "@modern-js/prod-server": "workspace:*", @@ -87,9 +87,7 @@ "@scripts/rstest-config": "workspace:*", "@rslib/core": "0.18.0", "@modern-js/rslib": "workspace:*", - "@types/jest": "^29.5.14", "@types/node": "^20", - "jest": "^29.7.0", "react": "^19.2.0", "react-dom": "^19.2.0", "react-router-dom": "^7.6.0", diff --git a/packages/generator/generator-common/package.json b/packages/generator/generator-common/package.json index d52998315f58..ce9bc047acbb 100644 --- a/packages/generator/generator-common/package.json +++ b/packages/generator/generator-common/package.json @@ -34,7 +34,7 @@ "prepublishOnly": "only-allow-pnpm", "new": "modern-lib new", "build": "modern-lib build", - "test": "jest --passWithNoTests" + "test": "rstest --passWithNoTests" }, "dependencies": { "@modern-js/codesmith-formily": "2.6.8", @@ -46,10 +46,8 @@ "@modern-js/codesmith-api-app": "2.6.8", "@modern-js/codesmith-utils": "2.6.8", "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", + "@scripts/rstest-config": "workspace:*", "@types/node": "^20", - "jest": "^29.7.0", "typescript": "^5" }, "sideEffects": false, diff --git a/packages/generator/generator-common/rstest.config.ts b/packages/generator/generator-common/rstest.config.ts index 04738ee6a816..660a9ce57f40 100644 --- a/packages/generator/generator-common/rstest.config.ts +++ b/packages/generator/generator-common/rstest.config.ts @@ -1,5 +1,7 @@ -import { defineConfig } from '@rstest/core'; +import { withTestPreset } from '@scripts/rstest-config'; -export default defineConfig({ +export default withTestPreset({ + root: __dirname, + testEnvironment: 'node', globals: true, }); diff --git a/packages/generator/generator-common/tests/tsconfig.json b/packages/generator/generator-common/tests/tsconfig.json index 6000706335a3..1ab35f524ad3 100644 --- a/packages/generator/generator-common/tests/tsconfig.json +++ b/packages/generator/generator-common/tests/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "baseUrl": "../" + "baseUrl": "../", + "types": ["@rstest/core/globals"] }, "include": ["**/*"] } diff --git a/packages/generator/new-action/package.json b/packages/generator/new-action/package.json index ca5d4f115325..26d92474fa7e 100644 --- a/packages/generator/new-action/package.json +++ b/packages/generator/new-action/package.json @@ -36,7 +36,7 @@ "prepublishOnly": "only-allow-pnpm", "new": "modern-lib new", "build": "modern-lib build", - "test": "jest --passWithNoTests" + "test": "rstest --passWithNoTests" }, "dependencies": { "@modern-js/codesmith": "2.6.8", @@ -50,10 +50,8 @@ }, "devDependencies": { "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", + "@scripts/rstest-config": "workspace:*", "@types/node": "^20", - "jest": "^29.7.0", "ts-node": "^10.9.2", "typescript": "^5" }, diff --git a/packages/generator/new-action/rstest.config.ts b/packages/generator/new-action/rstest.config.ts index 04738ee6a816..660a9ce57f40 100644 --- a/packages/generator/new-action/rstest.config.ts +++ b/packages/generator/new-action/rstest.config.ts @@ -1,5 +1,7 @@ -import { defineConfig } from '@rstest/core'; +import { withTestPreset } from '@scripts/rstest-config'; -export default defineConfig({ +export default withTestPreset({ + root: __dirname, + testEnvironment: 'node', globals: true, }); diff --git a/packages/generator/new-action/tests/tsconfig.json b/packages/generator/new-action/tests/tsconfig.json index d168acca56f9..3a0a9edf6be0 100644 --- a/packages/generator/new-action/tests/tsconfig.json +++ b/packages/generator/new-action/tests/tsconfig.json @@ -8,6 +8,6 @@ "emitDeclarationOnly": true, "isolatedModules": true, "paths": {}, - "types": ["node", "jest"] + "types": ["node", "@rstest/core/globals"] } } diff --git a/packages/toolkit/compiler/babel/package.json b/packages/toolkit/compiler/babel/package.json index c066aa93dab7..c688eac63d0c 100644 --- a/packages/toolkit/compiler/babel/package.json +++ b/packages/toolkit/compiler/babel/package.json @@ -43,7 +43,7 @@ "new": "modern-lib new", "dev": "rslib build --watch", "build": "rslib build", - "test": "jest --passWithNoTests" + "test": "rstest --passWithNoTests" }, "dependencies": { "@babel/core": "^7.28.5", @@ -58,9 +58,7 @@ "@modern-js/rslib": "workspace:*", "@types/babel__core": "^7.20.5", "@types/glob": "7.2.0", - "@types/jest": "^29.5.14", "@types/node": "^20", - "jest": "^29.7.0", "typescript": "^5" }, "sideEffects": false, diff --git a/packages/toolkit/compiler/babel/tsconfig.json b/packages/toolkit/compiler/babel/tsconfig.json index b58a53675a61..5f34804b6bf4 100644 --- a/packages/toolkit/compiler/babel/tsconfig.json +++ b/packages/toolkit/compiler/babel/tsconfig.json @@ -8,7 +8,7 @@ "emitDeclarationOnly": true, "isolatedModules": true, "paths": {}, - "types": ["node", "jest"] + "types": ["node"] }, "include": ["src"] } diff --git a/packages/toolkit/i18n-utils/package.json b/packages/toolkit/i18n-utils/package.json index 05c3cb50a94a..d98aa8a9186a 100644 --- a/packages/toolkit/i18n-utils/package.json +++ b/packages/toolkit/i18n-utils/package.json @@ -55,7 +55,7 @@ "new": "modern-lib new", "dev": "rslib build --watch", "build": "rslib build", - "test": "jest --passWithNoTests" + "test": "rstest --passWithNoTests" }, "dependencies": { "@modern-js/utils": "workspace:*", @@ -65,10 +65,8 @@ "@rslib/core": "0.18.0", "@modern-js/rslib": "workspace:*", "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", + "@scripts/rstest-config": "workspace:*", "@types/node": "^20", - "jest": "^29.7.0", "typescript": "^5" }, "sideEffects": false, diff --git a/packages/toolkit/i18n-utils/rstest.config.ts b/packages/toolkit/i18n-utils/rstest.config.ts index 04738ee6a816..660a9ce57f40 100644 --- a/packages/toolkit/i18n-utils/rstest.config.ts +++ b/packages/toolkit/i18n-utils/rstest.config.ts @@ -1,5 +1,7 @@ -import { defineConfig } from '@rstest/core'; +import { withTestPreset } from '@scripts/rstest-config'; -export default defineConfig({ +export default withTestPreset({ + root: __dirname, + testEnvironment: 'node', globals: true, }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ff4804887887..1b8f14aca707 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -86,9 +86,6 @@ importers: '@rsdoctor/rspack-plugin': specifier: ^1.3.11 version: 1.3.11(@rsbuild/core@1.6.9)(@rspack/core@1.6.5(@swc/helpers@0.5.17))(bufferutil@4.0.8)(utf-8-validate@5.0.10)(webpack@5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5)) - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 '@types/node': specifier: ^20 version: 20.8.8 @@ -419,15 +416,12 @@ importers: '@rslib/core': specifier: 0.18.0 version: 0.18.0(typescript@5.6.3) - '@scripts/jest-config': + '@scripts/rstest-config': specifier: workspace:* - version: link:../../../scripts/jest-config + version: link:../../../scripts/rstest-config '@types/babel__core': specifier: ^7.20.5 version: 7.20.5 - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 '@types/node': specifier: ^20 version: 20.8.8 @@ -437,9 +431,6 @@ importers: isomorphic-fetch: specifier: ^3.0.0 version: 3.0.0(encoding@0.1.13) - jest: - specifier: ^29.7.0 - version: 29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) memfs: specifier: ^3.5.3 version: 3.5.3 @@ -452,9 +443,6 @@ importers: supertest: specifier: ^6.3.4 version: 6.3.4 - ts-jest: - specifier: ^29.4.5 - version: 29.4.5(@babel/core@7.28.5)(@jest/transform@29.7.0)(@jest/types@30.2.0)(babel-jest@29.7.0(@babel/core@7.28.5))(esbuild@0.25.5)(jest-util@29.7.0)(jest@29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)))(typescript@5.6.3) typescript: specifier: ^5 version: 5.6.3 @@ -492,15 +480,9 @@ importers: '@scripts/rstest-config': specifier: workspace:* version: link:../../../scripts/rstest-config - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 '@types/node': specifier: ^20 version: 20.8.8 - jest: - specifier: ^29.7.0 - version: 29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) react: specifier: ^19.2.0 version: 19.2.0 @@ -627,18 +609,12 @@ importers: '@scripts/build': specifier: workspace:* version: link:../../../scripts/build - '@scripts/jest-config': + '@scripts/rstest-config': specifier: workspace:* - version: link:../../../scripts/jest-config - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 + version: link:../../../scripts/rstest-config '@types/node': specifier: ^20 version: 20.8.8 - jest: - specifier: ^29.7.0 - version: 29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) typescript: specifier: ^5 version: 5.6.3 @@ -1061,18 +1037,12 @@ importers: '@scripts/build': specifier: workspace:* version: link:../../../scripts/build - '@scripts/jest-config': + '@scripts/rstest-config': specifier: workspace:* - version: link:../../../scripts/jest-config - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 + version: link:../../../scripts/rstest-config '@types/node': specifier: ^20 version: 20.8.8 - jest: - specifier: ^29.7.0 - version: 29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) ts-node: specifier: ^10.9.2 version: 10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3) @@ -2149,15 +2119,9 @@ importers: '@types/glob': specifier: 7.2.0 version: 7.2.0 - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 '@types/node': specifier: ^20 version: 20.8.8 - jest: - specifier: ^29.7.0 - version: 29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) typescript: specifier: ^5 version: 5.6.3 @@ -2219,18 +2183,12 @@ importers: '@scripts/build': specifier: workspace:* version: link:../../../scripts/build - '@scripts/jest-config': + '@scripts/rstest-config': specifier: workspace:* - version: link:../../../scripts/jest-config - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 + version: link:../../../scripts/rstest-config '@types/node': specifier: ^20 version: 20.8.8 - jest: - specifier: ^29.7.0 - version: 29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) typescript: specifier: ^5 version: 5.6.3 diff --git a/tests/jest-ut.config.js b/tests/jest-ut.config.js index 194312149320..832262b7a4f2 100644 --- a/tests/jest-ut.config.js +++ b/tests/jest-ut.config.js @@ -43,6 +43,7 @@ module.exports = { transformIgnorePatterns: ['/node_modules/.pnpm/(?!(@babel))'], modulePathIgnorePatterns: [ '/packages/cli/builder/', + '/packages/cli/plugin-data-loader/', '/packages/cli/babel-preset/', '/packages/toolkit/e2e/', '/packages/solutions/module-tools/compiled/', From d3fbe27eb608acef803ac44346e10f1181934f5f Mon Sep 17 00:00:00 2001 From: 9aoy <9aoyuao@gmail.com> Date: Fri, 28 Nov 2025 14:35:06 +0800 Subject: [PATCH 4/7] fix: use modern:source instead of jsnext:source --- packages/generator/generator-common/package.json | 1 + packages/toolkit/i18n-utils/package.json | 1 + packages/toolkit/plugin/package.json | 2 ++ packages/toolkit/runtime-utils/package.json | 1 + packages/toolkit/utils/package.json | 1 + scripts/rstest-config/src/index.ts | 3 +-- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/generator/generator-common/package.json b/packages/generator/generator-common/package.json index ce9bc047acbb..df15a6783bf4 100644 --- a/packages/generator/generator-common/package.json +++ b/packages/generator/generator-common/package.json @@ -23,6 +23,7 @@ "exports": { ".": { "node": { + "modern:source": "./src/index.ts", "jsnext:source": "./src/index.ts", "import": "./dist/esm-node/index.js", "require": "./dist/cjs/index.js" diff --git a/packages/toolkit/i18n-utils/package.json b/packages/toolkit/i18n-utils/package.json index d98aa8a9186a..0f487c3cc485 100644 --- a/packages/toolkit/i18n-utils/package.json +++ b/packages/toolkit/i18n-utils/package.json @@ -33,6 +33,7 @@ "exports": { ".": { "node": { + "modern:source": "./src/index.ts", "jsnext:source": "./src/index.ts", "import": "./dist/esm-node/index.mjs", "require": "./dist/cjs/index.js" diff --git a/packages/toolkit/plugin/package.json b/packages/toolkit/plugin/package.json index fae50367b8f9..084030259bb4 100644 --- a/packages/toolkit/plugin/package.json +++ b/packages/toolkit/plugin/package.json @@ -24,6 +24,7 @@ ".": { "types": "./dist/types/index.d.ts", "node": { + "modern:source": "./src/index.ts", "jsnext:source": "./src/index.ts", "import": "./dist/esm/index.mjs", "require": "./dist/cjs/index.js" @@ -51,6 +52,7 @@ }, "./server": { "types": "./dist/types/server/index.d.ts", + "modern:source": "./src/server/index.ts", "jsnext:source": "./src/server/index.ts", "node": { "require": "./dist/cjs/server/index.js", diff --git a/packages/toolkit/runtime-utils/package.json b/packages/toolkit/runtime-utils/package.json index 0c1372ff95a1..4f590593fc94 100644 --- a/packages/toolkit/runtime-utils/package.json +++ b/packages/toolkit/runtime-utils/package.json @@ -71,6 +71,7 @@ }, "./storer": { "types": "./dist/types/node/storer/index.d.ts", + "modern:source": "./src/node/storer/index.ts", "jsnext:source": "./src/node/storer/index.ts", "require": "./dist/cjs/node/storer/index.js", "default": "./dist/esm/node/storer/index.mjs" diff --git a/packages/toolkit/utils/package.json b/packages/toolkit/utils/package.json index 102af187e51e..de830e63984e 100644 --- a/packages/toolkit/utils/package.json +++ b/packages/toolkit/utils/package.json @@ -23,6 +23,7 @@ "_comment": "Provide ESM and CJS exports, ESM is used by runtime package, for treeshaking", "exports": { ".": { + "modern:source": "./src/index.ts", "jsnext:source": "./src/index.ts", "types": "./dist/types/index.d.ts", "node": { diff --git a/scripts/rstest-config/src/index.ts b/scripts/rstest-config/src/index.ts index 4bbe313814cb..4ee6a4b5db8f 100644 --- a/scripts/rstest-config/src/index.ts +++ b/scripts/rstest-config/src/index.ts @@ -3,7 +3,6 @@ import { defineConfig, mergeRstestConfig, } from '@rstest/core'; -import _ from 'lodash'; export const testPreset = defineConfig({ coverage: { enabled: false, @@ -13,7 +12,7 @@ export const testPreset = defineConfig({ restoreMocks: true, resolve: { // Make sure to resolve modern.js packages to their source code in tests because modern.js packages are build slowly in CI. - conditionNames: ['jsnext:source', 'require', 'node', 'default'], + conditionNames: ['modern:source', 'require', 'node', 'default'], }, }); From bbf2e9ab4250aee1468aad1d78378cf7fa297280 Mon Sep 17 00:00:00 2001 From: 9aoy <9aoyuao@gmail.com> Date: Fri, 28 Nov 2025 14:42:13 +0800 Subject: [PATCH 5/7] fix: update --- packages/generator/generator-utils/package.json | 1 + packages/server/core/package.json | 1 + packages/toolkit/runtime-utils/package.json | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/packages/generator/generator-utils/package.json b/packages/generator/generator-utils/package.json index 5f7c9faf6a12..664a5ffddf8a 100644 --- a/packages/generator/generator-utils/package.json +++ b/packages/generator/generator-utils/package.json @@ -22,6 +22,7 @@ "exports": { ".": { "node": { + "modern:source": "./src/index.ts", "jsnext:source": "./src/index.ts", "import": "./dist/esm/index.js", "require": "./dist/cjs/index.js" diff --git a/packages/server/core/package.json b/packages/server/core/package.json index 8b00c20964f5..ac86ddd4970d 100644 --- a/packages/server/core/package.json +++ b/packages/server/core/package.json @@ -28,6 +28,7 @@ }, "./node": { "types": "./dist/types/adapters/node/index.d.ts", + "modern:source": "./src/adapters/node/index.ts", "jsnext:source": "./src/adapters/node/index.ts", "default": "./dist/cjs/adapters/node/index.js" }, diff --git a/packages/toolkit/runtime-utils/package.json b/packages/toolkit/runtime-utils/package.json index 4f590593fc94..a58b7c18ef3c 100644 --- a/packages/toolkit/runtime-utils/package.json +++ b/packages/toolkit/runtime-utils/package.json @@ -20,24 +20,28 @@ "exports": { "./router": { "types": "./dist/types/router.d.ts", + "modern:source": "./src/router.ts", "jsnext:source": "./src/router.ts", "require": "./dist/cjs/router.js", "default": "./dist/esm/router.mjs" }, "./router/rsc": { "types": "./dist/types/rsc.d.ts", + "modern:source": "./src/rsc.ts", "jsnext:source": "./src/rsc.ts", "require": "./dist/cjs/rsc.js", "default": "./dist/esm/rsc.mjs" }, "./browser": { "types": "./dist/types/browser/index.d.ts", + "modern:source": "./src/browser/index.ts", "jsnext:source": "./src/browser/index.ts", "require": "./dist/cjs/browser/index.js", "default": "./dist/esm/browser/index.mjs" }, "./node": { "types": "./dist/types/node/index.d.ts", + "modern:source": "./src/node/index.ts", "jsnext:source": "./src/node/index.ts", "node": { "require": "./dist/cjs/node/index.js", @@ -47,24 +51,28 @@ }, "./server": { "types": "./dist/types/server/index.d.ts", + "modern:source": "./src/server/index.ts", "jsnext:source": "./src/server/index.ts", "require": "./dist/cjs/server/index.js", "default": "./dist/esm/server/index.mjs" }, "./time": { "types": "./dist/types/time.d.ts", + "modern:source": "./src/time.ts", "jsnext:source": "./src/time.ts", "require": "./dist/cjs/time.js", "default": "./dist/esm/time.mjs" }, "./universal/request": { "types": "./dist/universal/request.d.ts", + "modern:source": "./src/universal/request.ts", "jsnext:source": "./src/universal/request.ts", "require": "./dist/cjs/universal/request.js", "default": "./dist/esm/universal/request.mjs" }, "./parsed": { "types": "./dist/types/parsed.d.ts", + "modern:source": "./src/parsed.ts", "jsnext:source": "./src/parsed.ts", "require": "./dist/cjs/parsed.js", "default": "./dist/esm/parsed.mjs" @@ -77,6 +85,7 @@ "default": "./dist/esm/node/storer/index.mjs" }, "./fileReader": { + "modern:source": "./src/node/fileReader.ts", "jsnext:source": "./src/node/fileReader.ts", "types": "./dist/types/node/fileReader.d.ts", "require": "./dist/cjs/node/fileReader.js", @@ -84,18 +93,21 @@ }, "./url": { "types": "./dist/types/url.d.ts", + "modern:source": "./src/url.ts", "jsnext:source": "./src/url.ts", "require": "./dist/cjs/url.js", "default": "./dist/esm/url.mjs" }, "./merge": { "types": "./dist/types/merge.d.ts", + "modern:source": "./src/merge.ts", "jsnext:source": "./src/merge.ts", "require": "./dist/cjs/merge.js", "default": "./dist/esm/merge.mjs" }, "./cache": { "types": "./dist/types/universal/cache.d.ts", + "modern:source": "./src/universal/cache.ts", "jsnext:source": "./src/universal/cache.ts", "require": "./dist/cjs/universal/cache.js", "default": "./dist/esm/universal/cache.mjs" From 36291a37b750407e8dd5335e235a99f9226e845d Mon Sep 17 00:00:00 2001 From: 9aoy <9aoyuao@gmail.com> Date: Fri, 28 Nov 2025 14:50:04 +0800 Subject: [PATCH 6/7] fix: @modern-js/utils --- packages/toolkit/utils/package.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/toolkit/utils/package.json b/packages/toolkit/utils/package.json index de830e63984e..7a576db891ef 100644 --- a/packages/toolkit/utils/package.json +++ b/packages/toolkit/utils/package.json @@ -34,34 +34,41 @@ "default": "./dist/cjs/index.js" }, "./logger": { + "modern:source": "./src/cli/logger.ts", "jsnext:source": "./src/cli/logger.ts", "default": "./dist/cjs/cli/logger.js" }, "./chain-id": { + "modern:source": "./src/cli/constants/chainId.ts", "jsnext:source": "./src/cli/constants/chainId.ts", "default": "./dist/cjs/cli/constants/chainId.js" }, "./require": { + "modern:source": "./src/cli/require.ts", "jsnext:source": "./src/cli/require.ts", "import": "./dist/esm/cli/require.js", "default": "./dist/cjs/cli/require.js" }, "./env": { + "modern:source": "./src/cli/is/env.ts", "jsnext:source": "./src/cli/is/env.ts", "import": "./dist/esm/cli/is/env.js", "default": "./dist/cjs/cli/is/env.js" }, "./universal": { + "modern:source": "./src/universal/index.ts", "jsnext:source": "./src/universal/index.ts", "import": "./dist/esm/universal/index.mjs", "default": "./dist/cjs/universal/index.js" }, "./universal/constants": { + "modern:source": "./src/universal/constants.ts", "jsnext:source": "./src/universal/constants.ts", "import": "./dist/esm/universal/constants.mjs", "default": "./dist/cjs/universal/constants.js" }, "./universal/plugin-dag-sort": { + "modern:source": "./src/universal/pluginDagSort.ts", "jsnext:source": "./src/universal/pluginDagSort.ts", "import": "./dist/esm/universal/pluginDagSort.mjs", "default": "./dist/cjs/universal/pluginDagSort.js" From 99d5a62d6b73a7a4059db8477bb01aabf1136dce Mon Sep 17 00:00:00 2001 From: 9aoy <9aoyuao@gmail.com> Date: Fri, 28 Nov 2025 15:25:34 +0800 Subject: [PATCH 7/7] fix: update script --- .vscode/settings.json | 2 +- packages/generator/generator-utils/package.json | 4 +--- packages/generator/generator-utils/rstest.config.ts | 5 +++-- pnpm-lock.yaml | 10 ++-------- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9fe0356d2bb8..d7f4be179f4a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -42,7 +42,7 @@ "**/node_modules": false }, "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.defaultFormatter": "biomejs.biome", "editor.codeActionsOnSave": { "quickfix.biome": "explicit", "source.organizeImports": "never", diff --git a/packages/generator/generator-utils/package.json b/packages/generator/generator-utils/package.json index 664a5ffddf8a..3cb682c856e3 100644 --- a/packages/generator/generator-utils/package.json +++ b/packages/generator/generator-utils/package.json @@ -48,12 +48,10 @@ "devDependencies": { "@modern-js/codesmith": "2.6.8", "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", + "@scripts/rstest-config": "workspace:*", "@types/glob": "7.2.0", - "@types/jest": "^29.5.14", "@types/js-yaml": "4.0.9", "@types/node": "^20", - "jest": "^29.7.0", "typescript": "^5" }, "sideEffects": false, diff --git a/packages/generator/generator-utils/rstest.config.ts b/packages/generator/generator-utils/rstest.config.ts index 04738ee6a816..f018b0d21c8f 100644 --- a/packages/generator/generator-utils/rstest.config.ts +++ b/packages/generator/generator-utils/rstest.config.ts @@ -1,5 +1,6 @@ -import { defineConfig } from '@rstest/core'; +import { withTestPreset } from '@scripts/rstest-config'; -export default defineConfig({ +export default withTestPreset({ + root: __dirname, globals: true, }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1b8f14aca707..fcdf5c4d389a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -649,24 +649,18 @@ importers: '@scripts/build': specifier: workspace:* version: link:../../../scripts/build - '@scripts/jest-config': + '@scripts/rstest-config': specifier: workspace:* - version: link:../../../scripts/jest-config + version: link:../../../scripts/rstest-config '@types/glob': specifier: 7.2.0 version: 7.2.0 - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 '@types/js-yaml': specifier: 4.0.9 version: 4.0.9 '@types/node': specifier: ^20 version: 20.8.8 - jest: - specifier: ^29.7.0 - version: 29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) typescript: specifier: ^5 version: 5.6.3