From 88952fb030724c86f938b27ffdf06d7d7a7e2bb8 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Sat, 9 Dec 2023 06:58:08 +0100 Subject: [PATCH] build: prefer `/e2e` subpath export --- build.config.ts | 2 +- e2e.d.ts | 1 + examples/app-jest/test/browser.e2e.spec.ts | 2 +- examples/app-jest/test/dev.e2e.spec.ts | 2 +- examples/app-jest/test/server.e2e.spec.ts | 4 ++-- examples/app-vitest/test/browser.e2e.ts | 2 +- examples/app-vitest/test/dev.e2e.test.ts | 2 +- examples/app-vitest/test/server.e2e.spec.ts | 2 +- examples/module/test/basic.test.ts | 2 +- package.json | 5 +++-- src/{index.ts => e2e.ts} | 0 src/runtime/global-setup.ts | 2 +- 12 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 e2e.d.ts rename src/{index.ts => e2e.ts} (100%) diff --git a/build.config.ts b/build.config.ts index 5fe39aebf..73e15ac4f 100644 --- a/build.config.ts +++ b/build.config.ts @@ -5,7 +5,7 @@ const isStub = process.argv.includes('--stub') export default defineBuildConfig({ declaration: true, entries: [ - 'src/index', + 'src/e2e', 'src/experimental', 'src/config', 'src/module.ts', diff --git a/e2e.d.ts b/e2e.d.ts new file mode 100644 index 000000000..9247c2a8c --- /dev/null +++ b/e2e.d.ts @@ -0,0 +1 @@ +export * from './dist/index' diff --git a/examples/app-jest/test/browser.e2e.spec.ts b/examples/app-jest/test/browser.e2e.spec.ts index 43138a718..702b9dda4 100644 --- a/examples/app-jest/test/browser.e2e.spec.ts +++ b/examples/app-jest/test/browser.e2e.spec.ts @@ -1,5 +1,5 @@ import { fileURLToPath } from 'node:url' -import { createPage, setup } from '@nuxt/test-utils' +import { createPage, setup } from '@nuxt/test-utils/e2e' await setup({ rootDir: fileURLToPath(new URL('../', import.meta.url)), diff --git a/examples/app-jest/test/dev.e2e.spec.ts b/examples/app-jest/test/dev.e2e.spec.ts index 65ed6b92d..b2d9c28fa 100644 --- a/examples/app-jest/test/dev.e2e.spec.ts +++ b/examples/app-jest/test/dev.e2e.spec.ts @@ -1,5 +1,5 @@ import { fileURLToPath } from 'node:url' -import { $fetch, setup } from '@nuxt/test-utils' +import { $fetch, setup } from '@nuxt/test-utils/e2e' await setup({ rootDir: fileURLToPath(new URL('../', import.meta.url)), diff --git a/examples/app-jest/test/server.e2e.spec.ts b/examples/app-jest/test/server.e2e.spec.ts index 1744908ec..73400738c 100644 --- a/examples/app-jest/test/server.e2e.spec.ts +++ b/examples/app-jest/test/server.e2e.spec.ts @@ -1,5 +1,5 @@ import { fileURLToPath } from 'node:url' -import { $fetch, setup } from '@nuxt/test-utils' +import { $fetch, setup } from '@nuxt/test-utils/e2e' await setup({ rootDir: fileURLToPath(new URL('../', import.meta.url)), @@ -11,4 +11,4 @@ describe("app",()=>{ const html = await $fetch('/') expect(html.slice(0, 15)).toMatchInlineSnapshot(`""`) }) -}) \ No newline at end of file +}) diff --git a/examples/app-vitest/test/browser.e2e.ts b/examples/app-vitest/test/browser.e2e.ts index 8517f270d..0526ddfd5 100644 --- a/examples/app-vitest/test/browser.e2e.ts +++ b/examples/app-vitest/test/browser.e2e.ts @@ -1,5 +1,5 @@ import { fileURLToPath } from 'node:url' -import { createPage, setup } from '@nuxt/test-utils' +import { createPage, setup } from '@nuxt/test-utils/e2e' import { describe, expect, it } from 'vitest' await setup({ diff --git a/examples/app-vitest/test/dev.e2e.test.ts b/examples/app-vitest/test/dev.e2e.test.ts index 67e3d302b..9df78ec6d 100644 --- a/examples/app-vitest/test/dev.e2e.test.ts +++ b/examples/app-vitest/test/dev.e2e.test.ts @@ -1,5 +1,5 @@ import { fileURLToPath } from 'node:url' -import { $fetch, setup } from '@nuxt/test-utils' +import { $fetch, setup } from '@nuxt/test-utils/e2e' import { describe, expect, it } from 'vitest' await setup({ diff --git a/examples/app-vitest/test/server.e2e.spec.ts b/examples/app-vitest/test/server.e2e.spec.ts index 55936925f..f6d8bfe30 100644 --- a/examples/app-vitest/test/server.e2e.spec.ts +++ b/examples/app-vitest/test/server.e2e.spec.ts @@ -1,5 +1,5 @@ import { fileURLToPath } from 'node:url' -import { $fetch, setup } from '@nuxt/test-utils' +import { $fetch, setup } from '@nuxt/test-utils/e2e' import { describe, expect, it } from 'vitest' await setup({ diff --git a/examples/module/test/basic.test.ts b/examples/module/test/basic.test.ts index 16115dc1c..2e3df6728 100644 --- a/examples/module/test/basic.test.ts +++ b/examples/module/test/basic.test.ts @@ -1,6 +1,6 @@ import { fileURLToPath } from 'node:url' import { describe, expect, it } from 'vitest' -import { $fetch, setup } from '@nuxt/test-utils' +import { $fetch, setup } from '@nuxt/test-utils/e2e' describe('ssr', async () => { await setup({ diff --git a/package.json b/package.json index c093bd8e4..9819da9a2 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,11 @@ "description": "Test utilities for Nuxt", "license": "MIT", "type": "module", - "types": "./dist/index.d.ts", + "types": "./dist/e2e.d.ts", "exports": { - ".": "./dist/index.mjs", + ".": "./dist/e2e.mjs", "./config": "./dist/config.mjs", + "./e2e": "./dist/e2e.mjs", "./experimental": "./dist/experimental.mjs", "./module": "./dist/module.mjs", "./runtime": "./dist/runtime-utils/index.mjs", diff --git a/src/index.ts b/src/e2e.ts similarity index 100% rename from src/index.ts rename to src/e2e.ts diff --git a/src/runtime/global-setup.ts b/src/runtime/global-setup.ts index 5528dab5e..386ac740c 100644 --- a/src/runtime/global-setup.ts +++ b/src/runtime/global-setup.ts @@ -1,5 +1,5 @@ import * as _kit from '@nuxt/kit' -import { createTest, exposeContextToEnv } from '@nuxt/test-utils' +import { createTest, exposeContextToEnv } from '@nuxt/test-utils/e2e' // @ts-expect-error type cast // eslint-disable-next-line