From 652f1604ac01d85dd026d6bababcc82afc5794b9 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Fri, 7 Oct 2022 19:43:48 +0800 Subject: [PATCH] fix!: use type module (revert #1411) (#1465) Co-authored-by: Vladimir Sheremet --- packages/vitest/index.cjs | 0 packages/vitest/index.d.cts | 1 + packages/vitest/package.json | 23 +++++++++++++++-------- packages/vitest/rollup.config.js | 7 +++---- packages/vitest/src/node/cli-wrapper.ts | 2 +- packages/vitest/src/node/pool.ts | 4 ++-- packages/vitest/src/runtime/mocker.ts | 2 +- packages/vitest/src/runtime/worker.ts | 2 +- packages/vitest/vitest.mjs | 2 +- test/fails/test/runner.test.ts | 2 +- 10 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 packages/vitest/index.cjs create mode 100644 packages/vitest/index.d.cts diff --git a/packages/vitest/index.cjs b/packages/vitest/index.cjs new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/packages/vitest/index.d.cts b/packages/vitest/index.d.cts new file mode 100644 index 000000000000..09e9c9b2a265 --- /dev/null +++ b/packages/vitest/index.d.cts @@ -0,0 +1 @@ +export * from './dist/index.js' diff --git a/packages/vitest/package.json b/packages/vitest/package.json index f75263f5a0f6..2ab09484e475 100644 --- a/packages/vitest/package.json +++ b/packages/vitest/package.json @@ -1,5 +1,6 @@ { "name": "vitest", + "type": "module", "version": "0.23.4", "description": "A blazing fast unit test framework powered by Vite", "author": "Anthony Fu ", @@ -22,8 +23,14 @@ ], "exports": { ".": { - "types": "./dist/index.d.ts", - "import": "./dist/index.mjs" + "require": { + "types": "./index.d.cts", + "default": "./index.cjs" + }, + "import": { + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + } }, "./*": "./*", "./globals": { @@ -34,24 +41,24 @@ }, "./node": { "types": "./dist/node.d.ts", - "import": "./dist/node.mjs" + "import": "./dist/node.js" }, "./environments": { "types": "./dist/environments.d.ts", - "import": "./dist/environments.mjs" + "import": "./dist/environments.js" }, "./browser": { "types": "./dist/browser.d.ts", - "import": "./dist/browser.mjs" + "import": "./dist/browser.js" }, "./config": { "types": "./config.d.ts", "require": "./dist/config.cjs", - "import": "./dist/config.mjs" + "import": "./dist/config.js" } }, - "main": "./dist/index.mjs", - "module": "./dist/index.mjs", + "main": "./dist/index.js", + "module": "./dist/index.js", "types": "./dist/index.d.ts", "bin": { "vitest": "./vitest.mjs" diff --git a/packages/vitest/rollup.config.js b/packages/vitest/rollup.config.js index 1dcb7b49eab5..79c7b8c75ae8 100644 --- a/packages/vitest/rollup.config.js +++ b/packages/vitest/rollup.config.js @@ -69,7 +69,6 @@ export default ({ watch }) => defineConfig([ output: { dir: 'dist', format: 'esm', - entryFileNames: '[name].mjs', chunkFileNames: (chunkInfo) => { const id = chunkInfo.facadeModuleId || Object.keys(chunkInfo.modules).find(i => !i.includes('node_modules') && i.includes('src/')) if (id) { @@ -79,9 +78,9 @@ export default ({ watch }) => defineConfig([ .filter(i => !['src', 'index', 'dist', 'node_modules'].some(j => i.includes(j)) && i.match(/^[\w_-]+$/))), ) if (parts.length) - return `chunk-${parts.slice(-2).join('-')}.[hash].mjs` + return `chunk-${parts.slice(-2).join('-')}.[hash].js` } - return 'vendor-[name].[hash].mjs' + return 'vendor-[name].[hash].js' }, }, external, @@ -99,7 +98,7 @@ export default ({ watch }) => defineConfig([ format: 'cjs', }, { - file: 'dist/config.mjs', + file: 'dist/config.js', format: 'esm', }, ], diff --git a/packages/vitest/src/node/cli-wrapper.ts b/packages/vitest/src/node/cli-wrapper.ts index 79fa210a3d17..f218f51689cd 100644 --- a/packages/vitest/src/node/cli-wrapper.ts +++ b/packages/vitest/src/node/cli-wrapper.ts @@ -7,7 +7,7 @@ import c from 'picocolors' import { execa } from 'execa' import { EXIT_CODE_RESTART } from '../constants' -const ENTRY = new URL('./cli.mjs', import.meta.url) +const ENTRY = new URL('./cli.js', import.meta.url) /** Arguments passed to Node before the script */ const NODE_ARGS = [ diff --git a/packages/vitest/src/node/pool.ts b/packages/vitest/src/node/pool.ts index fe90544eeec5..fc4bc5e232dc 100644 --- a/packages/vitest/src/node/pool.ts +++ b/packages/vitest/src/node/pool.ts @@ -18,8 +18,8 @@ export interface WorkerPool { close: () => Promise } -const workerPath = _url.pathToFileURL(resolve(distDir, './worker.mjs')).href -const loaderPath = _url.pathToFileURL(resolve(distDir, './loader.mjs')).href +const workerPath = _url.pathToFileURL(resolve(distDir, './worker.js')).href +const loaderPath = _url.pathToFileURL(resolve(distDir, './loader.js')).href const suppressLoaderWarningsPath = resolve(rootDir, './suppress-warnings.cjs') diff --git a/packages/vitest/src/runtime/mocker.ts b/packages/vitest/src/runtime/mocker.ts index 4ace943b8dc3..c8414e7c6f9d 100644 --- a/packages/vitest/src/runtime/mocker.ts +++ b/packages/vitest/src/runtime/mocker.ts @@ -341,7 +341,7 @@ export class VitestMocker { private async ensureSpy() { if (VitestMocker.spyModule) return - VitestMocker.spyModule = await this.request(`/@fs/${slash(resolve(distDir, 'spy.mjs'))}`) as typeof import('../integrations/spy') + VitestMocker.spyModule = await this.request(`/@fs/${slash(resolve(distDir, 'spy.js'))}`) as typeof import('../integrations/spy') } public async requestWithMock(dep: string) { diff --git a/packages/vitest/src/runtime/worker.ts b/packages/vitest/src/runtime/worker.ts index bf9c25bf1fe4..69f7dd6bf7b5 100644 --- a/packages/vitest/src/runtime/worker.ts +++ b/packages/vitest/src/runtime/worker.ts @@ -39,7 +39,7 @@ async function startViteNode(ctx: WorkerContext) { const { run } = (await executeInViteNode({ files: [ - resolve(distDir, 'entry.mjs'), + resolve(distDir, 'entry.js'), ], fetchModule(id) { return rpc().fetch(id) diff --git a/packages/vitest/vitest.mjs b/packages/vitest/vitest.mjs index 81939defef1c..b4de875a07e6 100755 --- a/packages/vitest/vitest.mjs +++ b/packages/vitest/vitest.mjs @@ -1,2 +1,2 @@ #!/usr/bin/env node -import './dist/cli-wrapper.mjs' +import './dist/cli-wrapper.js' diff --git a/test/fails/test/runner.test.ts b/test/fails/test/runner.test.ts index a39ddef056ce..20e732c3c744 100644 --- a/test/fails/test/runner.test.ts +++ b/test/fails/test/runner.test.ts @@ -34,6 +34,6 @@ describe('should fails', async () => { ?.trim() .replace(root, '') expect(msg).toMatchSnapshot(file) - }, 10000) + }, 30_000) } })