@varlet/cli 2.14.2 → 2.15.0-alpha.1692990022445

package/README.md

@@ -170,8 +170,13 @@ varlet-cli test
 ```shell
 # playground-ignore
 varlet-cli test -w
-or
-varlet-cli test -wa
+```
+
+#### Execute unit tests and report coverage
+
+```shell
+# playground-ignore
+varlet-cli test -cov
 ```
 
 #### Lint the code

package/README.zh-CN.md

@@ -170,8 +170,13 @@ varlet-cli test
 ```shell
 # playground-ignore
 varlet-cli test -w
-or
-varlet-cli test -wa
+```
+
+#### 执行所有的单元测试并报告覆盖率
+
+```shell
+# playground-ignore
+varlet-cli test -cov
 ```
 
 #### 检查代码

package/lib/node/bin.js

@@ -87,15 +87,14 @@ program
     return create(options);
 });
 program
-    .command('jest')
-    .description('Run Jest in work directory')
+    .command('test')
+    .description('Run test in work directory')
     .option('-w, --watch', 'Watch files for changes and rerun tests related to changed files')
-    .option('-wa, --watchAll', 'Watch files for changes and rerun all tests when something changes')
     .option('-c, --component <componentName>', 'Test a specific component')
-    .option('-cc --clearCache', 'Clear test cache')
-    .action(async (option) => {
-    const { jest } = await import('./commands/jest.js');
-    return jest(option);
+    .option('-cov, --coverage', 'Generate the coverage')
+    .action(async (options) => {
+    const { test } = await import('./commands/test.js');
+    return test(options);
 });
 program
     .command('gen')
@@ -104,40 +103,40 @@ program
     .option('-s, --sfc', 'Generate files in sfc format')
     .option('-t, --tsx', 'Generate files in tsx format')
     .option('-l, --locale', 'Generator internationalized files')
-    .action(async (option) => {
+    .action(async (options) => {
     const { gen } = await import('./commands/gen.js');
-    return gen(option);
+    return gen(options);
 });
 program
     .command('changelog')
     .option('-rc --releaseCount <releaseCount>', 'Release count')
     .option('-f --file <file>', 'Changelog filename')
     .description('Generate changelog')
-    .action(async (option) => {
+    .action(async (options) => {
     const { changelog } = await import('./commands/changelog.js');
-    return changelog(option);
+    return changelog(options);
 });
 program
     .command('release')
     .option('-r --remote <remote>', 'Remote name')
     .description('Release all packages and generate changelogs')
-    .action(async (option) => {
+    .action(async (options) => {
     const { release } = await import('./commands/release.js');
-    return release(option);
+    return release(options);
 });
 program
     .command('commit-lint <gitParams>')
     .description('Lint commit message')
-    .action(async (option) => {
+    .action(async (options) => {
     const { commitLint } = await import('./commands/commitLint.js');
-    return commitLint(option);
+    return commitLint(options);
 });
 program
     .command('checklist <gitParams>')
     .description('Display a checklist for confirmation')
-    .action(async (option) => {
+    .action(async (options) => {
     const { checklist } = await import('./commands/checklist.js');
-    return checklist(option);
+    return checklist(options);
 });
 program.on('command:*', async ([cmd]) => {
     const { default: logger } = await import('./shared/logger.js');

package/lib/node/commands/test.d.ts

@@ -0,0 +1,7 @@
+interface TestCommandOptions {
+    watch?: boolean;
+    component?: string;
+    coverage?: boolean;
+}
+export declare function test({ component, watch, coverage }: TestCommandOptions): Promise<void>;
+export {};

package/lib/node/commands/test.js

@@ -0,0 +1,16 @@
+import execa from 'execa';
+import { VITEST_CONFIG } from '../shared/constant.js';
+export async function test({ component, watch, coverage }) {
+    process.env.NODE_ENV = 'test';
+    const args = ['--config', VITEST_CONFIG];
+    if (!watch) {
+        args.unshift('run');
+    }
+    if (coverage) {
+        args.push('--coverage');
+    }
+    if (component) {
+        args.push('--dir', `src/${component.trim()}`);
+    }
+    await execa('vitest', args, { stdin: 'inherit', stdout: 'inherit', stderr: 'inherit' });
+}

package/lib/node/config/vitest.config.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("vite").UserConfig;
+export default _default;

package/lib/node/config/vitest.config.js

@@ -0,0 +1,22 @@
+import vue from '@vitejs/plugin-vue';
+import jsx from '@vitejs/plugin-vue-jsx';
+import { defineConfig } from 'vitest/config';
+import { VITE_RESOLVE_EXTENSIONS } from '../shared/constant.js';
+import { cpus } from 'os';
+const cpuNum = Math.max(cpus().length - 1, 1);
+export default defineConfig({
+    resolve: {
+        extensions: VITE_RESOLVE_EXTENSIONS,
+    },
+    plugins: [vue(), jsx()],
+    test: {
+        environment: 'jsdom',
+        coverage: {
+            provider: 'istanbul',
+            exclude: ['**/example/**', '**/__tests__/**'],
+        },
+        globals: true,
+        experimentalVmThreads: true,
+        experimentalVmWorkerMemoryLimit: Math.min((1 / cpuNum) * 2, 0.2),
+    },
+});

package/lib/node/index.d.ts

@@ -5,7 +5,7 @@ export * from './commands/build.js';
 export * from './commands/compile.js';
 export * from './commands/commitLint.js';
 export * from './commands/gen.js';
-export * from './commands/jest.js';
+export * from './commands/test.js';
 export * from './commands/create.js';
 export * from './commands/lint.js';
 export * from './commands/changelog.js';

package/lib/node/index.js

@@ -5,7 +5,7 @@ export * from './commands/build.js';
 export * from './commands/compile.js';
 export * from './commands/commitLint.js';
 export * from './commands/gen.js';
-export * from './commands/jest.js';
+export * from './commands/test.js';
 export * from './commands/create.js';
 export * from './commands/lint.js';
 export * from './commands/changelog.js';

package/lib/node/shared/constant.d.ts

@@ -1,6 +1,7 @@
 export declare const dirname: string;
 export declare const CWD: string;
 export declare const VARLET_CONFIG: string;
+export declare const VITEST_CONFIG: string;
 export declare const SRC_DIR: string;
 export declare const ES_DIR: string;
 export declare const LIB_DIR: string;
@@ -48,4 +49,3 @@ export declare const ICONS_PNG_DIR: string;
 export declare const ICONS_FONTS_DIR: string;
 export declare const ICONS_SVG_DIR: string;
 export declare const EXTENSION_ENTRY: string;
-export declare const JEST_CONFIG: string;

package/lib/node/shared/constant.js

@@ -3,6 +3,7 @@ import { getDirname } from './fsUtils.js';
 export const dirname = getDirname(import.meta.url);
 export const CWD = process.cwd();
 export const VARLET_CONFIG = resolve(CWD, 'varlet.config.mjs');
+export const VITEST_CONFIG = resolve(dirname, '../config/vitest.config.js');
 export const SRC_DIR = resolve(CWD, 'src');
 export const ES_DIR = resolve(CWD, 'es');
 export const LIB_DIR = resolve(CWD, 'lib');
@@ -54,5 +55,3 @@ export const ICONS_FONTS_DIR = resolve(ICONS_DIST_DIR, 'fonts');
 export const ICONS_SVG_DIR = resolve(CWD, 'svg');
 // extension
 export const EXTENSION_ENTRY = resolve(CWD, 'src/extension.ts');
-// jest
-export const JEST_CONFIG = resolve(dirname, '../../../cjs/jest.config.cjs');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.14.2",
+  "version": "2.15.0-alpha.1692990022445",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -45,8 +45,7 @@
     "@vue/babel-plugin-jsx": "1.1.4",
     "@vue/compiler-sfc": "3.3.4",
     "@vue/runtime-core": "3.3.4",
-    "@vue/vue3-jest": "^29.2.3",
-    "babel-jest": "^29.5.0",
+    "vitest": "0.34.3",
     "chokidar": "^3.5.2",
     "commander": "^8.3.0",
     "conventional-changelog": "^3.1.25",
@@ -56,8 +55,6 @@
     "glob": "^7.2.0",
     "hash-sum": "^2.0.0",
     "inquirer": "^9.1.4",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
     "less": "^3.12.2",
     "lodash-es": "^4.17.21",
     "markdown-it": "^12.2.3",
@@ -70,8 +67,8 @@
     "vite": "4.3.5",
     "vue": "3.3.4",
     "webfont": "^9.0.0",
-    "@varlet/vite-plugins": "2.14.2",
-    "@varlet/shared": "2.14.2"
+    "@varlet/shared": "2.15.0-alpha.1692990022445",
+    "@varlet/vite-plugins": "2.15.0-alpha.1692990022445"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -86,19 +83,22 @@
     "@types/semver": "^7.3.9",
     "@types/sharp": "0.31.1",
     "rimraf": "^5.0.1",
-    "@varlet/icons": "2.14.2",
-    "@varlet/touch-emulator": "2.14.2"
+    "@varlet/touch-emulator": "2.15.0-alpha.1692990022445",
+    "@varlet/icons": "2.15.0-alpha.1692990022445"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.3.4",
-    "@vue/test-utils": "2.3.2",
+    "@vue/test-utils": "2.4.1",
+    "@vitest/coverage-istanbul": "0.34.3",
+    "vitest": "0.34.3",
+    "jsdom": "22.1.0",
     "clipboard": "^2.0.6",
     "live-server": "^1.2.1",
     "lodash-es": "^4.17.21",
     "vue": "3.3.4",
     "vue-router": "4.2.0",
-    "@varlet/icons": "2.14.2",
-    "@varlet/touch-emulator": "2.14.2"
+    "@varlet/icons": "2.15.0-alpha.1692990022445",
+    "@varlet/touch-emulator": "2.15.0-alpha.1692990022445"
   },
   "scripts": {
     "dev": "tsc --watch",

package/template/generators/base/README.md

@@ -48,8 +48,12 @@ pnpm test
 
 ```shell
 pnpm test:watch 
-or
-pnpm test:watchAll 
+```
+
+#### Run unit test and report coverage
+
+```shell
+pnpm test:coverage 
 ```
 
 #### Mount Git Hooks

package/template/generators/base/package.json

@@ -28,9 +28,9 @@
     "lint": "varlet-cli lint",
     "changelog": "varlet-cli changelog",
     "release": "pnpm compile && varlet-cli release",
-    "test": "varlet-cli jest",
-    "test:watch": "varlet-cli jest -w",
-    "test:watchAll": "varlet-cli jest -wa",
+    "test": "varlet-cli test",
+    "test:watch": "varlet-cli test -w",
+    "test:coverage": "varlet-cli test -cov",
     "create": "varlet-cli create"
   },
   "peerDependencies": {
@@ -42,8 +42,11 @@
     "@varlet/icons": "workspace:*",
     "@varlet/touch-emulator": "workspace:*",
     "@varlet/shared": "workspace:*",
-    "@vue/test-utils": "2.3.2",
+    "@vue/test-utils": "2.4.1",
     "@vue/runtime-core": "3.3.4",
+    "@vitest/coverage-istanbul": "0.34.3",
+    "jsdom": "22.1.0",
+    "vitest": "0.34.3",
     "clipboard": "^2.0.6",
     "eslint": "^8.43.0",
     "lint-staged": "^10.5.0",

package/cjs/jest.config.cjs

@@ -1,38 +0,0 @@
-const { resolve } = require('path')
-const { pathExistsSync } = require('fs-extra')
-
-const JEST_MEDIA_MOCK = resolve(__dirname, 'jest.media.mock.cjs')
-const JEST_STYLE_MOCK = resolve(__dirname, 'jest.style.mock.cjs')
-
-function getRootConfig() {
-  const file = resolve(process.cwd(), 'jest.config.js')
-
-  if (pathExistsSync(file)) {
-    delete require.cache[require.resolve(file)]
-    return require(file)
-  }
-
-  return {}
-}
-
-module.exports = {
-  testEnvironment: 'jsdom',
-  coverageProvider: 'v8',
-  testEnvironmentOptions: {
-    customExportConditions: ['node', 'node-addons'],
-  },
-  moduleNameMapper: {
-    '^@config$': '<rootDir>/.varlet/site.config.json',
-    '\\.(css|less)$': JEST_STYLE_MOCK,
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': JEST_MEDIA_MOCK,
-  },
-  transform: {
-    '\\.(vue)$': '@vue/vue3-jest',
-    '\\.(js|jsx|ts|tsx)$': 'babel-jest',
-  },
-  collectCoverage: true,
-  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx,vue}', `!**/example/**`, `!**/docs/**`, `!**/__tests__/**`],
-  moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'vue'],
-  transformIgnorePatterns: [],
-  ...getRootConfig(),
-}

package/cjs/jest.media.mock.cjs

@@ -1 +0,0 @@
-module.exports = {}

package/cjs/jest.style.mock.cjs

@@ -1 +0,0 @@
-module.exports = {}

package/lib/node/commands/jest.d.ts

@@ -1,7 +0,0 @@
-export interface JestCommandOptions {
-    watch?: boolean;
-    watchAll?: boolean;
-    component?: string;
-    clearCache?: boolean;
-}
-export declare function jest(cmd: JestCommandOptions): Promise<void>;

package/lib/node/commands/jest.js

@@ -1,27 +0,0 @@
-import logger from '../shared/logger.js';
-import jestModule from 'jest';
-import { CWD, JEST_CONFIG } from '../shared/constant.js';
-import { buildSiteEntry } from '../compiler/compileSiteEntry.js';
-const { runCLI } = jestModule;
-export async function jest(cmd) {
-    process.env.NODE_ENV = 'test';
-    const config = {
-        rootDir: CWD,
-        watch: cmd.watch,
-        watchAll: cmd.watchAll,
-        clearCache: cmd.clearCache,
-        config: JEST_CONFIG,
-        testRegex: cmd.component && `${cmd.component}/__tests__/.*.spec.[jt]s?$`,
-    };
-    await buildSiteEntry(false);
-    try {
-        const response = await runCLI(config, [CWD]);
-        if (!response.results.success && !cmd.watch) {
-            process.exit(1);
-        }
-    }
-    catch (e) {
-        logger.error(e.toString());
-        process.exit(1);
-    }
-}