From 6c803c97316b4a9d1280e138afc0f56c8e72fe9a Mon Sep 17 00:00:00 2001 From: arvinxx Date: Fri, 21 Apr 2023 15:10:09 +0800 Subject: [PATCH] =?UTF-8?q?:wrench:=20chore:=20=E5=8D=87=E7=BA=A7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 26 +------------------ jest.config.base.js | 13 ---------- jest.config.js | 9 ------- package.json | 13 +++++----- packages/bar/jest.config.js | 13 ---------- .../tests/__snapshots__/index.test.tsx.snap | 2 +- packages/bar/vitest.config.ts | 2 +- packages/foo/jest.config.js | 13 ---------- .../tests/__snapshots__/index.test.tsx.snap | 2 +- packages/foo/vitest.config.ts | 3 +++ vitest.config.ts | 4 +++ 11 files changed, 18 insertions(+), 82 deletions(-) delete mode 100644 jest.config.base.js delete mode 100644 jest.config.js delete mode 100644 packages/bar/jest.config.js delete mode 100644 packages/foo/jest.config.js create mode 100644 packages/foo/vitest.config.ts diff --git a/.eslintrc.js b/.eslintrc.js index 5717c18..2109370 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,25 +1 @@ -module.exports = { - extends: [require.resolve('@umijs/fabric/dist/eslint')], - globals: { - page: true, - }, - rules: { - 'import/no-extraneous-dependencies': 0, - 'import/default': 0, - 'import/no-named-default': 0, - 'import/no-unresolved': 0, - 'import/no-named-as-default-member': 0, - 'import/named': 0, - 'no-param-reassign': 0, - 'consistent-return': 0, - 'no-useless-return': 0, - 'no-restricted-globals': 0, - 'no-continue': 0, - 'no-shadow': 'warn', - 'no-console': 0, - 'no-underscore-dangle': 0, - '@typescript-eslint/consistent-type-definitions': 0, - '@typescript-eslint/no-shadow': 0, - }, - ignorePatterns: ['*.js'], -}; +module.exports = require('@umijs/lint/dist/config/eslint'); diff --git a/jest.config.base.js b/jest.config.base.js deleted file mode 100644 index b85491a..0000000 --- a/jest.config.base.js +++ /dev/null @@ -1,13 +0,0 @@ -const { - default: umiConfig, -} = require('@umijs/test/lib/createDefaultConfig/createDefaultConfig'); - -const defaultConfig = umiConfig(process.cwd(), {}); - -module.exports = { - ...defaultConfig, - moduleNameMapper: { - '@arvinxu/foo': '/packages/foo/src', - '@arvinxu/bar': '/packages/bar/src', - }, -}; diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index 0ad15f6..0000000 --- a/jest.config.js +++ /dev/null @@ -1,9 +0,0 @@ -const baseConfig = require('./jest.config.base'); - -module.exports = { - ...baseConfig, - projects: ['/packages/*/jest.config.js'], - moduleDirectories: ['node_modules'], - collectCoverageFrom: ['/packages/*/src'], - coverageDirectory: '/coverage', -}; diff --git a/package.json b/package.json index 485665f..bb3dab4 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,9 @@ "docs:dev": "dumi dev", "docs:build": "dumi build", "--------- ": "", - "test": "lerna run test", - "test:update": "lerna run test:update", - "test:coverage": "jest --coverage", + "test": "vitest", + "test:update": "vitest -u", + "test:coverage": "vitest run --coverage", "--------- ": "", "check": "npm run check:lint && npm run check:circular && npm run check:types", "check:lint": "npm run lint-eslint", @@ -58,25 +58,26 @@ "@testing-library/react-hooks": "^3.2.1", "@types/classnames": "^2.2.7", "@types/fs-extra": "^9.0.1", - "@types/jest": "^26.0.0", + "@umijs/lint": "^4", "@types/jsdom": "^16.2.3", "@types/node": "^14.14.10", "@types/react": "^18", "@types/react-dom": "^18", "@types/uuid": "^8.3.0", + "@vitest/coverage-c8": "latest", "commitlint": "^17", "commitlint-config-gitmoji": "^2", "conventional-changelog-gitmoji-config": "^1.4.0", "concurrently": "^7", "cross-env": "^7", - "dumi": "^2.1.21", + "dumi": "^2", + "jsdom": "^21", "dumi-theme-antd-style": "latest", "dumi-assets-types": "^1", "dpdm": "^3", "eslint": "^8", "father": "^4", "husky": "^8", - "jsdom": "^21", "lint-staged": "^13", "onchange": "^7", "prettier": "^2", diff --git a/packages/bar/jest.config.js b/packages/bar/jest.config.js deleted file mode 100644 index 60ff1b8..0000000 --- a/packages/bar/jest.config.js +++ /dev/null @@ -1,13 +0,0 @@ -const base = require('../../jest.config.base'); - -const packageName = '@arvinxu/bar'; - -const root = '/packages/bar'; - -module.exports = { - ...base, - rootDir: '../..', - roots: [root], - name: packageName, - displayName: packageName, -}; diff --git a/packages/bar/tests/__snapshots__/index.test.tsx.snap b/packages/bar/tests/__snapshots__/index.test.tsx.snap index c36f0d2..7ed814b 100644 --- a/packages/bar/tests/__snapshots__/index.test.tsx.snap +++ b/packages/bar/tests/__snapshots__/index.test.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`Bar 1`] = `
diff --git a/packages/bar/vitest.config.ts b/packages/bar/vitest.config.ts index 997df18..9eee1ba 100644 --- a/packages/bar/vitest.config.ts +++ b/packages/bar/vitest.config.ts @@ -1,3 +1,3 @@ -import config from '../../vitest.config.base'; +import config from '../../vitest.config'; export default config; diff --git a/packages/foo/jest.config.js b/packages/foo/jest.config.js deleted file mode 100644 index 44c07c4..0000000 --- a/packages/foo/jest.config.js +++ /dev/null @@ -1,13 +0,0 @@ -const base = require('../../jest.config.base'); - -const packageName = '@arvinxu/foo'; - -const root = '/packages/foo'; - -module.exports = { - ...base, - rootDir: '../..', - roots: [root], - name: packageName, - displayName: packageName, -}; diff --git a/packages/foo/tests/__snapshots__/index.test.tsx.snap b/packages/foo/tests/__snapshots__/index.test.tsx.snap index 70755e3..a53b1f4 100644 --- a/packages/foo/tests/__snapshots__/index.test.tsx.snap +++ b/packages/foo/tests/__snapshots__/index.test.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`Foo 1`] = `
diff --git a/packages/foo/vitest.config.ts b/packages/foo/vitest.config.ts new file mode 100644 index 0000000..9eee1ba --- /dev/null +++ b/packages/foo/vitest.config.ts @@ -0,0 +1,3 @@ +import config from '../../vitest.config'; + +export default config; diff --git a/vitest.config.ts b/vitest.config.ts index eb2d0e2..3115137 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -13,5 +13,9 @@ export default defineConfig({ '@arvinxu/foo': join(__dirname, '/packages/foo/src'), '@arvinxu/bar': join(__dirname, '/packages/bar/src'), }, + coverage: { + provider: 'c8', + reporter: ['text', 'json', 'lcov', 'text-summary'], + }, }, });