vitest 0.0.14 → 0.0.15

package/README.md

@@ -6,10 +6,11 @@ A blazing fast test runner powered by Vite.
 
 ## Features
 
-- [Vite](https://vitejs.dev/)'s config, transformers, resolvers, and plugins. Powered by [vite-node](https://github.com/antfu/vite-node)
+- [Vite](https://vitejs.dev/)'s config, transformers, resolvers, and plugins.
 - [Jest Snapshot](https://jestjs.io/docs/snapshot-testing)
 - [Chai](https://www.chaijs.com/) for assertions
 - [Sinon](https://sinonjs.org/) for mocking
+- [JSDOM](https://github.com/jsdom/jsdom) for DOM mocking
 - Async suite / test, top level await
 - ESM friendly
 - Out-of-box TypeScript support
@@ -20,11 +21,12 @@ import { it, describe, expect, assert } from 'vitest'
 
 describe('suite name', () => {
   it('foo', () => {
-    assert.equal(Math.sqrt(4), 2)
+    expect(1 + 1).toEqual(2)
+    expect(true).to.be.true
   })
 
   it('bar', () => {
-    expect(1 + 1).eq(2)
+    assert.equal(Math.sqrt(4), 2)
   })
 
   it('snapshot', () => {

package/bin/vitest.mjs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 'use strict'
 
-import '../dist/cli.js'
+import '../dist/entry.js'

package/dist/cli.js

@@ -1,36 +1,29 @@
-import { fileURLToPath } from 'url';
-import { resolve, dirname } from 'path';
+var _a;
 import minimist from 'minimist';
-import { findUp } from 'find-up';
-import { run } from './node.js';
-process.env.VITEST = 'true';
+import c from 'picocolors';
+import { run } from './run';
+const { log } = console;
 const argv = minimist(process.argv.slice(2), {
     alias: {
-        c: 'config',
+        u: 'update',
+        w: 'watch',
     },
     string: ['root', 'config'],
-    boolean: ['dev'],
-});
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const root = resolve(argv.root || process.cwd());
-const configPath = argv.config ? resolve(root, argv.config) : await findUp(['vitest.config.ts', 'vitest.config.js', 'vitest.config.mjs', 'vite.config.ts', 'vite.config.js', 'vite.config.mjs'], { cwd: root });
-await run({
-    root,
-    files: [
-        resolve(__dirname, argv.dev ? '../src/cli-entry.ts' : './cli-entry.js'),
-    ],
-    config: configPath,
-    defaultConfig: {
-        optimizeDeps: {
-            exclude: [
-                'vitest',
-            ],
-        },
-    },
-    shouldExternalize(id) {
-        if (id.includes('/node_modules/vitest/'))
-            return false;
-        else
-            return id.includes('/node_modules/');
+    boolean: ['update', 'dev', 'global', 'watch', 'jsdom'],
+    unknown(name) {
+        if (name[0] === '-') {
+            console.error(c.red(`Unknown argument: ${name}`));
+            help();
+            process.exit(1);
+        }
+        return true;
     },
 });
+// @ts-expect-error
+const server = (_a = process === null || process === void 0 ? void 0 : process.__vite_node__) === null || _a === void 0 ? void 0 : _a.server;
+const viteConfig = (server === null || server === void 0 ? void 0 : server.config) || {};
+const testOptions = viteConfig.test || {};
+await run(Object.assign(Object.assign(Object.assign({}, argv), testOptions), { server, updateSnapshot: argv.update, rootDir: argv.root || process.cwd(), nameFilters: argv._ }));
+function help() {
+    log('Help: finish help');
+}

package/dist/entry.js

@@ -0,0 +1,38 @@
+import { fileURLToPath } from 'url';
+import { resolve, dirname } from 'path';
+import minimist from 'minimist';
+import { findUp } from 'find-up';
+import { run } from './node.js';
+process.env.VITEST = 'true';
+const argv = minimist(process.argv.slice(2), {
+    alias: {
+        c: 'config',
+    },
+    string: ['root', 'config'],
+    boolean: ['dev'],
+});
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const root = resolve(argv.root || process.cwd());
+const configPath = argv.config
+    ? resolve(root, argv.config)
+    : await findUp(['vitest.config.ts', 'vitest.config.js', 'vitest.config.mjs', 'vite.config.ts', 'vite.config.js', 'vite.config.mjs'], { cwd: root });
+await run({
+    root,
+    files: [
+        resolve(__dirname, argv.dev ? '../src/cli.ts' : './cli.js'),
+    ],
+    config: configPath,
+    defaultConfig: {
+        optimizeDeps: {
+            exclude: [
+                'vitest',
+            ],
+        },
+    },
+    shouldExternalize(id) {
+        if (id.includes('/node_modules/vitest/'))
+            return false;
+        else
+            return id.includes('/node_modules/');
+    },
+});

package/dist/index.d.ts

@@ -1,8 +1,6 @@
-import sinon from 'sinon';
 export * from './types';
 export * from './suite';
 export * from './config';
-export * from './chai';
+export * from './integrations/chai';
+export * from './integrations/sinon';
 export { beforeAll, afterAll, beforeEach, afterEach, beforeFile, afterFile, beforeSuite, afterSuite } from './hooks';
-export { sinon };
-export declare const mock: sinon.SinonMockStatic, spy: sinon.SinonSpyStatic, stub: sinon.SinonStubStatic;

package/dist/index.js

@@ -1,8 +1,6 @@
-import sinon from 'sinon';
 export * from './types';
 export * from './suite';
 export * from './config';
-export * from './chai';
+export * from './integrations/chai';
+export * from './integrations/sinon';
 export { beforeAll, afterAll, beforeEach, afterEach, beforeFile, afterFile, beforeSuite, afterSuite } from './hooks';
-export { sinon };
-export const { mock, spy, stub } = sinon;

package/dist/integrations/chai/index.d.ts

@@ -0,0 +1,3 @@
+import chai from 'chai';
+export { assert, should, expect } from 'chai';
+export { chai };

package/dist/integrations/chai/index.js

@@ -0,0 +1,3 @@
+import chai from 'chai';
+export { assert, should, expect } from 'chai';
+export { chai };

package/dist/{chai.d.ts → integrations/chai/jest-expect.d.ts}

@@ -1,11 +1,8 @@
-import { Config } from 'vitest';
-export declare function setupChai(config: Config): Promise<void>;
-export { assert, should, expect } from 'chai';
+import { ChaiPlugin } from './types';
+export declare function JestChaiExpect(): ChaiPlugin;
 declare global {
     namespace Chai {
         interface Assertion {
-            toMatchSnapshot(message?: string): Assertion;
-            matchSnapshot(message?: string): Assertion;
             toEqual(expected: any): void;
             toStrictEqual(expected: any): void;
             toBe(expected: any): void;

package/dist/{chai.js → integrations/chai/jest-expect.js}

@@ -1,15 +1,7 @@
-import chai from 'chai';
-import SinonChai from 'sinon-chai';
-import { SnapshotPlugin } from './snapshot';
-export async function setupChai(config) {
-    chai.use(SinonChai);
-    chai.use(await SnapshotPlugin({
-        rootDir: config.rootDir || process.cwd(),
-        update: config.updateSnapshot,
-    }));
-    // Jest Compact
-    // TODO: add more https://jestjs.io/docs/expect
-    chai.use((chai, utils) => {
+// Jest Expect Compact
+// TODO: add more https://jestjs.io/docs/expect
+export function JestChaiExpect() {
+    return (chai, utils) => {
         const proto = chai.Assertion.prototype;
         utils.addMethod(proto, 'toEqual', function (expected) {
             return this.eql(expected);
@@ -43,6 +35,5 @@ export async function setupChai(config) {
         utils.addMethod(proto, 'toBeDefined', function () {
             return this.not.be.undefined;
         });
-    });
+    };
 }
-export { assert, should, expect } from 'chai';

package/dist/integrations/chai/setup.d.ts

@@ -0,0 +1,2 @@
+import { Config } from 'vitest';
+export declare function setupChai(config: Config): Promise<void>;

package/dist/integrations/chai/setup.js

@@ -0,0 +1,12 @@
+import chai from 'chai';
+import SinonChai from 'sinon-chai';
+import { JestChaiExpect } from './jest-expect';
+import { SnapshotPlugin } from './snapshot';
+export async function setupChai(config) {
+    chai.use(SinonChai);
+    chai.use(JestChaiExpect());
+    chai.use(await SnapshotPlugin({
+        rootDir: config.rootDir || process.cwd(),
+        update: config.updateSnapshot,
+    }));
+}

package/dist/integrations/chai/snapshot/index.d.ts

@@ -0,0 +1,17 @@
+import { ChaiPlugin } from '../types';
+export interface SnapshotOptions {
+    rootDir: string;
+    update?: boolean;
+}
+export declare function SnapshotPlugin(options: SnapshotOptions): Promise<ChaiPlugin>;
+declare global {
+    namespace Chai {
+        interface Assertion {
+            toMatchSnapshot(message?: string): Assertion;
+            matchSnapshot(message?: string): Assertion;
+        }
+        interface ExpectStatic {
+            addSnapshotSerializer: import('pretty-format').Plugin;
+        }
+    }
+}

package/dist/{snapshot → integrations/chai/snapshot}/index.js

@@ -1,5 +1,5 @@
 import Snap from 'jest-snapshot';
-import { afterAll, beforeEach } from '../hooks';
+import { afterAll, beforeEach } from '../../../hooks';
 import { SnapshotManager } from './manager';
 const { addSerializer } = Snap;
 let _manager;

package/dist/integrations/chai/types.d.ts

@@ -0,0 +1,3 @@
+import { use as chaiUse } from 'chai';
+export declare type FirstFunctionArgument<T> = T extends (arg: infer A) => unknown ? A : never;
+export declare type ChaiPlugin = FirstFunctionArgument<typeof chaiUse>;

package/dist/integrations/chai/types.js

@@ -0,0 +1 @@
+export {};

package/dist/integrations/jsdom.d.ts

@@ -0,0 +1,5 @@
+import { JSDOM } from 'jsdom';
+export declare function setupJSDOM(global: any): {
+    dom: JSDOM;
+    restore(): void;
+};

package/dist/integrations/jsdom.js

@@ -0,0 +1,20 @@
+import { JSDOM } from 'jsdom';
+export function setupJSDOM(global) {
+    const dom = new JSDOM('<!DOCTYPE html>', {
+        pretendToBeVisual: true,
+        runScripts: 'dangerously',
+        // TODO: options
+        url: 'http://localhost:3000',
+    });
+    const keys = Object.getOwnPropertyNames(dom.window)
+        .filter(k => !k.startsWith('_'))
+        .filter(k => !(k in global));
+    for (const key of keys)
+        global[key] = dom.window[key];
+    return {
+        dom,
+        restore() {
+            keys.forEach(key => delete global[key]);
+        },
+    };
+}

package/dist/integrations/sinon.d.ts

@@ -0,0 +1,3 @@
+import sinon from 'sinon';
+export { sinon };
+export declare const mock: sinon.SinonMockStatic, spy: sinon.SinonSpyStatic, stub: sinon.SinonStubStatic;

package/dist/integrations/sinon.js

@@ -0,0 +1,3 @@
+import sinon from 'sinon';
+export { sinon };
+export const { mock, spy, stub } = sinon;

package/dist/run.js

@@ -1,5 +1,5 @@
 import fg from 'fast-glob';
-import { setupChai } from './chai';
+import { setupChai } from './integrations/chai/setup';
 import { clearContext, defaultSuite } from './suite';
 import { context } from './context';
 import { afterEachHook, afterFileHook, afterAllHook, afterSuiteHook, beforeEachHook, beforeFileHook, beforeAllHook, beforeSuiteHook } from './hooks';
@@ -111,6 +111,8 @@ export async function run(config) {
     await ((_b = reporter.onStart) === null || _b === void 0 ? void 0 : _b.call(reporter, config));
     if (config.global)
         (await import('./global')).registerApiGlobally();
+    if (config.jsdom)
+        (await import('./integrations/jsdom')).setupJSDOM(globalThis);
     const files = await collectFiles(paths);
     const ctx = {
         files,

package/dist/types.d.ts

@@ -8,7 +8,13 @@ export interface UserOptions {
      *
      * @default false
      */
-    global?: string;
+    global?: boolean;
+    /**
+     * Use `js-dom` to mock browser APIs
+     *
+     * @default false
+     */
+    jsdom?: boolean;
 }
 export interface Config extends UserOptions {
     rootDir?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitest",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "",
   "keywords": [],
   "homepage": "https://github.com/antfu/vitest#readme",
@@ -33,6 +33,16 @@
     "bin",
     "*.d.ts"
   ],
+  "scripts": {
+    "prepare": "esmo scripts/generate-types.ts",
+    "build": "rimraf dist && tsc -p src/tsconfig.json",
+    "lint": "eslint \"{src,test}/**/*.ts\"",
+    "prepublishOnly": "nr build",
+    "release": "bumpp --commit --push --tag && pnpm publish",
+    "test": "node bin/vitest.mjs --dev",
+    "test:update": "nr test -u",
+    "watch": "tsc -p src/tsconfig.json --watch"
+  },
   "dependencies": {
     "@jest/test-result": "^27.4.2",
     "@types/chai": "^4.2.22",
@@ -42,6 +52,7 @@
     "find-up": "^6.2.0",
     "jest-snapshot": "^27.4.2",
     "jest-util": "^27.4.2",
+    "jsdom": "^19.0.0",
     "minimist": "^1.2.5",
     "ora": "^6.0.1",
     "picocolors": "^1.0.0",
@@ -51,6 +62,7 @@
   "devDependencies": {
     "@antfu/eslint-config": "^0.11.1",
     "@antfu/ni": "^0.11.0",
+    "@types/jsdom": "^16.2.13",
     "@types/minimist": "^1.2.2",
     "@types/node": "^16.11.11",
     "@types/sinon": "^10.0.6",
@@ -60,13 +72,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.5.2",
     "vite": "^2.6.14"
-  },
-  "scripts": {
-    "build": "rimraf dist && tsc -p src/tsconfig.json",
-    "lint": "eslint \"{src,test}/**/*.ts\"",
-    "release": "bumpp --commit --push --tag && pnpm publish",
-    "test": "node bin/vitest.mjs --dev",
-    "test:update": "nr test -u",
-    "watch": "tsc -p src/tsconfig.json --watch"
   }
-}
+}

package/dist/cli-entry.js

@@ -1,28 +0,0 @@
-var _a;
-import minimist from 'minimist';
-import c from 'picocolors';
-import { run } from './run';
-const { log } = console;
-const argv = minimist(process.argv.slice(2), {
-    alias: {
-        u: 'update',
-    },
-    string: ['root', 'config'],
-    boolean: ['update', 'dev', 'global'],
-    unknown(name) {
-        if (name[0] === '-') {
-            console.error(c.red(`Unknown argument: ${name}`));
-            help();
-            process.exit(1);
-        }
-        return true;
-    },
-});
-// @ts-expect-error
-const server = (_a = process === null || process === void 0 ? void 0 : process.__vite_node__) === null || _a === void 0 ? void 0 : _a.server;
-const viteConfig = (server === null || server === void 0 ? void 0 : server.config) || {};
-const testOptions = viteConfig.test || {};
-await run(Object.assign(Object.assign({}, testOptions), { server, global: argv.global, updateSnapshot: argv.update, rootDir: argv.root || process.cwd(), nameFilters: argv._ }));
-function help() {
-    log('Help: finish help');
-}

package/dist/snapshot/index.d.ts

@@ -1,9 +0,0 @@
-import { use as chaiUse } from 'chai';
-declare type FirstFunctionArgument<T> = T extends (arg: infer A) => unknown ? A : never;
-declare type ChaiPlugin = FirstFunctionArgument<typeof chaiUse>;
-export interface SnapshotOptions {
-    rootDir: string;
-    update?: boolean;
-}
-export declare function SnapshotPlugin(options: SnapshotOptions): Promise<ChaiPlugin>;
-export {};