diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c19c65d53..31a7310e2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: run: pnpm install - name: Run test cases - run: npm test + run: pnpm run test:coverage - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 diff --git a/package.json b/package.json index bbe0f3e5a..518031b59 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "test": "pnpm --dir ./packages/vant test", "test:watch": "pnpm --dir ./packages/vant test:watch", "test:update": "pnpm --dir ./packages/vant test:update", + "test:coverage": "pnpm --dir ./packages/vant test:coverage", "build": "pnpm --dir ./packages/vant build", "build:site": "pnpm --dir ./packages/vant build:site" }, diff --git a/packages/vant-cli/changelog.md b/packages/vant-cli/changelog.md index 14b58def3..cfa06f31a 100644 --- a/packages/vant-cli/changelog.md +++ b/packages/vant-cli/changelog.md @@ -2,6 +2,7 @@ ## Unreleased +- 移除 vant-cli test 命令 - 移除 vant-cli release 命令 - 移除 vant-cli changelog 命令 - 升级 commander v11 diff --git a/packages/vant-cli/cjs/jest.config.cjs b/packages/vant-cli/cjs/jest.config.cjs deleted file mode 100644 index 8dd1f6a0b..000000000 --- a/packages/vant-cli/cjs/jest.config.cjs +++ /dev/null @@ -1,51 +0,0 @@ -const { join } = require('path'); -const { existsSync } = require('fs'); -const { ROOT } = require('./shared.cjs'); - -const JEST_SETUP_FILE = join(__dirname, 'jest.setup.cjs'); -const JEST_FILE_MOCK_FILE = join(__dirname, 'jest.file-mock.cjs'); -const JEST_STYLE_MOCK_FILE = join(__dirname, 'jest.style-mock.cjs'); - -const DEFAULT_CONFIG = { - testEnvironment: 'jsdom', - moduleNameMapper: { - '\\.(css|less|scss)$': JEST_STYLE_MOCK_FILE, - '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': - JEST_FILE_MOCK_FILE, - }, - setupFilesAfterEnv: [JEST_SETUP_FILE], - moduleFileExtensions: ['js', 'jsx', 'vue', 'ts', 'tsx'], - transform: { - '\\.(js|jsx|ts|tsx|vue)$': - '/node_modules/@vant/cli/cjs/jest.transformer.cjs', - }, - transformIgnorePatterns: ['/node_modules/(?!(@vant/cli))/'], - snapshotSerializers: ['jest-serializer-html'], - collectCoverage: true, - collectCoverageFrom: [ - 'src/**/*.{js,jsx,ts,tsx,vue}', - '!**/demo/**', - '!**/test/**', - ], - coverageReporters: ['html', 'lcov', 'text-summary'], - coverageDirectory: './test/coverage', - testEnvironmentOptions: { - // https://stackoverflow.com/questions/72428323/jest-referenceerror-vue-is-not-defined - customExportConditions: ['node', 'node-addons'], - }, -}; - -function readRootConfig() { - const ROOT_CONFIG_PATH = join(ROOT, 'jest.config.js'); - - if (existsSync(ROOT_CONFIG_PATH)) { - return require(ROOT_CONFIG_PATH); - } - - return {}; -} - -module.exports = { - ...DEFAULT_CONFIG, - ...readRootConfig(), -}; diff --git a/packages/vant-cli/cjs/jest.file-mock.cjs b/packages/vant-cli/cjs/jest.file-mock.cjs deleted file mode 100644 index 86059f362..000000000 --- a/packages/vant-cli/cjs/jest.file-mock.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = 'test-file-stub'; diff --git a/packages/vant-cli/cjs/jest.setup.cjs b/packages/vant-cli/cjs/jest.setup.cjs deleted file mode 100644 index de31992f8..000000000 --- a/packages/vant-cli/cjs/jest.setup.cjs +++ /dev/null @@ -1 +0,0 @@ -require('jest-canvas-mock'); diff --git a/packages/vant-cli/cjs/jest.style-mock.js b/packages/vant-cli/cjs/jest.style-mock.js deleted file mode 100644 index f053ebf79..000000000 --- a/packages/vant-cli/cjs/jest.style-mock.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = {}; diff --git a/packages/vant-cli/cjs/jest.transformer.cjs b/packages/vant-cli/cjs/jest.transformer.cjs deleted file mode 100644 index 3aaed7441..000000000 --- a/packages/vant-cli/cjs/jest.transformer.cjs +++ /dev/null @@ -1,94 +0,0 @@ -const sfc = require('vue/compiler-sfc'); -const babel = require('@babel/core'); -const esbuild = require('esbuild'); -const nodePath = require('path'); - -const isJsxFile = (path) => /\.(j|t)sx$/.test(path); -const isTsxFile = (path) => /\.tsx$/.test(path); -const isVueFile = (path) => /\.vue$/.test(path); - -const transformJsx = (code, path) => { - const babelResult = babel.transformSync(code, { - filename: path, - babelrc: false, - presets: isTsxFile(path) ? ['@babel/preset-typescript'] : [], - plugins: [['@vue/babel-plugin-jsx']], - }); - return babelResult?.code || ''; -}; - -const transformSFC = (code, path) => { - const parsedPath = nodePath.parse(path); - const { descriptor, errors } = sfc.parse(code, { - filename: parsedPath.base, - sourceRoot: parsedPath.dir, - }); - - if (errors.length) { - errors.forEach((error) => console.error(error)); - return ''; - } - - const output = []; - let bindingMetadata = {}; - - if (descriptor.script) { - const content = descriptor.script.content.replace( - 'export default', - 'const script =', - ); - output.push(content); - } else if (descriptor.scriptSetup) { - const result = sfc.compileScript(descriptor, { - id: 'mock', - }); - - const content = result.content.replace('export default', 'const script ='); - output.push(content); - - if (result.bindings) { - bindingMetadata = result.bindings; - } - } else { - output.push(`const script = {};`); - } - - if (descriptor.template) { - const render = sfc.compileTemplate({ - id: 'mock', - source: descriptor.template.content, - filename: path, - compilerOptions: { - bindingMetadata, - }, - }).code; - output.push(render); - output.push('script.render = render;'); - } - - output.push('export default script;'); - - return output.join('\n'); -}; - -const transformScript = (code) => - esbuild.transformSync(code, { - target: 'es2016', - format: 'cjs', - loader: 'ts', - }).code; - -module.exports = { - canInstrument: true, - process(code, path) { - if (isVueFile(path)) { - code = transformSFC(code, path); - } - if (isJsxFile(path)) { - code = transformJsx(code, path); - } - return { - code: transformScript(code), - }; - }, -}; diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index 9399cb0c2..cbc10b9e3 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -38,7 +38,6 @@ "author": "chenjiahan", "license": "MIT", "devDependencies": { - "@jest/types": "^29.1.2", "@types/fs-extra": "^11.0.1", "@types/less": "^3.0.3", "@types/lodash": "^4.14.191", @@ -49,7 +48,6 @@ "dependencies": { "@babel/core": "^7.18.13", "@babel/preset-typescript": "^7.18.6", - "@types/jest": "^29.5.1", "@vant/eslint-config": "^4.0.0", "@vant/touch-emulator": "^1.4.0", "@vitejs/plugin-vue": "^4.0.0", @@ -66,10 +64,6 @@ "hash-sum": "^2.0.0", "highlight.js": "^11.6.0", "husky": "^8.0.1", - "jest": "^29.5.0", - "jest-canvas-mock": "^2.4.0", - "jest-environment-jsdom": "^29.1.2", - "jest-serializer-html": "^7.1.0", "less": "^4.1.3", "lodash": "^4.17.21", "markdown-it": "^13.0.1", diff --git a/packages/vant-cli/src/cli.ts b/packages/vant-cli/src/cli.ts index 5c0ea100d..9fa3ee307 100644 --- a/packages/vant-cli/src/cli.ts +++ b/packages/vant-cli/src/cli.ts @@ -22,39 +22,6 @@ program return lint(); }); -program - .command('test') - .description('Run unit tests through jest') - .option( - '--watch', - 'Watch files for changes and rerun tests related to changed files', - ) - .option( - '--clearCache', - 'Clears the configured Jest cache directory and then exits', - ) - .option( - '--changedSince ', - 'Runs tests related to the changes since the provided branch or commit hash', - ) - .option( - '--logHeapUsage', - 'Logs the heap usage after every test. Useful to debug memory leaks', - ) - .option( - '--runInBand', - 'Run all tests serially in the current process, rather than creating a worker pool of child processes that run tests', - ) - .option( - '--updateSnapshot', - 'Re-record every snapshot that fails during this test run', - ) - .option('--debug', 'Print debugging info about your Jest config') - .action(async (options) => { - const { test } = await import('./commands/jest.js'); - return test(options); - }); - program .command('clean') .description('Clean all dist files') diff --git a/packages/vant-cli/src/commands/jest.ts b/packages/vant-cli/src/commands/jest.ts deleted file mode 100644 index 1ba81287b..000000000 --- a/packages/vant-cli/src/commands/jest.ts +++ /dev/null @@ -1,47 +0,0 @@ -import jest from 'jest'; -import { setNodeEnv } from '../common/index.js'; -import { genPackageEntry } from '../compiler/gen-package-entry.js'; -import { - ROOT, - JEST_CONFIG_FILE, - PACKAGE_ENTRY_FILE, -} from '../common/constant.js'; -import type { Config } from '@jest/types'; - -export function test(command: Config.Argv) { - setNodeEnv('test'); - - genPackageEntry({ - outputPath: PACKAGE_ENTRY_FILE, - }); - - const config = { - rootDir: ROOT, - watch: command.watch, - debug: command.debug, - config: JEST_CONFIG_FILE, - runInBand: command.runInBand, - clearCache: command.clearCache, - changedSince: command.changedSince, - logHeapUsage: command.logHeapUsage, - updateSnapshot: command.updateSnapshot, - // make jest tests faster - // see: https://ivantanev.com/make-jest-faster/ - maxWorkers: '50%', - } as Config.Argv; - - jest - .runCLI(config, [ROOT]) - .then((response) => { - if (!response.results.success && !command.watch) { - process.exit(1); - } - }) - .catch((err) => { - console.log(err); - - if (!command.watch) { - process.exit(1); - } - }); -} diff --git a/packages/vant-cli/src/common/constant.ts b/packages/vant-cli/src/common/constant.ts index 9a4f0e8ab..34a031986 100644 --- a/packages/vant-cli/src/common/constant.ts +++ b/packages/vant-cli/src/common/constant.ts @@ -40,7 +40,6 @@ export const STYLE_DEPS_JSON_FILE = join(DIST_DIR, 'style-deps.json'); // Config files export const POSTCSS_CONFIG_FILE = join(CJS_DIR, 'postcss.config.cjs'); -export const JEST_CONFIG_FILE = join(CJS_DIR, 'jest.config.cjs'); export const SCRIPT_EXTS = [ '.js', diff --git a/packages/vant-use/test/utils.spec.ts b/packages/vant-use/test/utils.spec.ts index 9c1b9b085..6eb98a021 100644 --- a/packages/vant-use/test/utils.spec.ts +++ b/packages/vant-use/test/utils.spec.ts @@ -1,7 +1,7 @@ import { raf, cancelRaf } from '../src/utils'; test('raf', async () => { - const spy = jest.fn(); + const spy = vi.fn(); raf(spy); expect(spy).toHaveBeenCalledTimes(1); diff --git a/packages/vant/.eslintrc b/packages/vant/.eslintrc index 28d474c80..fad617631 100644 --- a/packages/vant/.eslintrc +++ b/packages/vant/.eslintrc @@ -4,6 +4,9 @@ "rules": { "prefer-object-spread": "off" }, + "globals": { + "vi": true + }, "overrides": [ { "files": ["src/**/*"], diff --git a/packages/vant/jest.config.js b/packages/vant/jest.config.js deleted file mode 100644 index 5dbfb0cff..000000000 --- a/packages/vant/jest.config.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - testPathIgnorePatterns: ['/node_modules/'], - collectCoverageFrom: [ - 'src/**/*.{js,jsx,ts,tsx,vue}', - '!src/lazyload/vue-lazyload/**', - '!**/demo/**', - '!**/test/**', - '!**/lang/**', - ], -}; diff --git a/packages/vant/package.json b/packages/vant/package.json index 474a5e679..1806c4538 100644 --- a/packages/vant/package.json +++ b/packages/vant/package.json @@ -15,14 +15,15 @@ "scripts": { "dev": "vant-cli dev", "lint": "vant-cli lint", - "test": "vant-cli test", + "test": "vitest run", "build": "vant-cli build", "build:site": "vant-cli build-site", "release": "cp ../../README.md ./ && vant-cli release --gitTag && rm ./README.md", "release:site": "pnpm build:site && npx gh-pages -d site-dist --add", - "test:update": "vant-cli test --updateSnapshot", - "test:watch": "vant-cli test --watch", - "test:coverage": "open test/coverage/index.html" + "test:update": "vitest run -u", + "test:watch": "vitest", + "test:coverage": "vitest run --coverage", + "open:coverage": "open test/coverage/index.html" }, "publishConfig": { "registry": "https://registry.npmjs.org/" @@ -53,15 +54,22 @@ "vue": "^3.0.0" }, "devDependencies": { - "@types/jest": "^29.5.1", "@types/node": "^18.16.3", "@vant/area-data": "workspace:*", "@vant/cli": "workspace:*", "@vant/eslint-config": "workspace:*", "@vant/icons": "workspace:*", + "@vitejs/plugin-vue": "^4.0.0", + "@vitejs/plugin-vue-jsx": "^3.0.0", + "@vitest/coverage-v8": "0.34.2", "@vue/runtime-core": "^3.3.4", "@vue/test-utils": "^2.3.2", + "diffable-html": "^5.0.0", + "jsdom": "^22.1.0", "typescript": "^5.0.4", + "vite": "^4.4.2", + "vitest": "^0.34.2", + "vitest-canvas-mock": "^0.3.2", "vue": "^3.3.4", "vue-router": "^4.1.6" }, diff --git a/packages/vant/src/action-bar-button/test/__snapshots__/index.spec.ts.snap b/packages/vant/src/action-bar-button/test/__snapshots__/index.spec.ts.snap index 0c8cbf3f8..a670d5596 100644 --- a/packages/vant/src/action-bar-button/test/__snapshots__/index.spec.ts.snap +++ b/packages/vant/src/action-bar-button/test/__snapshots__/index.spec.ts.snap @@ -1,8 +1,9 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`should render default slot correctly 1`] = ` - - - - - - - `; exports[`should render cancel slot correctly 1`] = ` - `; exports[`should render default slot correctly 1`] = ` -
- -