Skip to content

Commit 4b0004c

Browse files
test(e2e-Utils): export built package from e2eUtils (#5336)
* add build step and update exports * address flaky test * export types * ci: apply automated fixes * use vite for building * ci: apply automated fixes * code rabbit issues --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
1 parent f11c4c6 commit 4b0004c

File tree

4 files changed

+224
-23
lines changed

4 files changed

+224
-23
lines changed

e2e/e2e-utils/package.json

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,38 @@
33
"private": true,
44
"scripts": {
55
"clean": "rimraf ./dist && rimraf ./coverage",
6+
"build": "vite build",
67
"test:eslint": "eslint ./src",
78
"test:unit": "exit 0; vitest --typecheck"
89
},
910
"type": "module",
11+
"types": "dist/types/index.d.ts",
12+
"main": "dist/cjs/index.cjs",
13+
"module": "dist/esm/index.js",
1014
"exports": {
1115
".": {
12-
"import": "./src/index.ts",
13-
"default": "./src/index.ts"
16+
"import": {
17+
"types": "./dist/types/index.d.ts",
18+
"default": "./dist/esm/index.js"
19+
},
20+
"require": {
21+
"types": "./dist/types/index.d.ts",
22+
"default": "./dist/cjs/index.cjs"
23+
}
1424
},
1525
"./package.json": "./package.json"
1626
},
27+
"sideEffects": false,
28+
"files": [
29+
"dist",
30+
"src"
31+
],
32+
"engines": {
33+
"node": ">=12"
34+
},
1735
"dependencies": {},
1836
"devDependencies": {
19-
"get-port-please": "^3.2.0"
37+
"get-port-please": "^3.2.0",
38+
"vite-plugin-dts": "^4.5.4"
2039
}
2140
}

e2e/e2e-utils/vite.config.ts

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
1-
import { defineConfig, mergeConfig } from 'vitest/config'
2-
import { tanstackViteConfig } from '@tanstack/config/vite'
3-
import packageJson from './package.json'
1+
import path from 'node:path'
2+
import { fileURLToPath } from 'node:url'
3+
import { defineConfig } from 'vite'
4+
import dts from 'vite-plugin-dts'
45

5-
const config = defineConfig({
6-
test: {
7-
name: packageJson.name,
8-
dir: './tests',
9-
watch: false,
10-
typecheck: { enabled: true },
6+
const __dirname = fileURLToPath(new URL('.', import.meta.url))
7+
8+
export default defineConfig({
9+
build: {
10+
ssr: true,
11+
emptyOutDir: true,
12+
rollupOptions: {
13+
input: 'src/index.ts',
14+
output: [
15+
{
16+
format: 'esm',
17+
dir: './dist/esm',
18+
entryFileNames: '[name].js',
19+
preserveModules: true,
20+
preserveModulesRoot: path.resolve(__dirname, 'src'),
21+
},
22+
{
23+
format: 'cjs',
24+
dir: './dist/cjs',
25+
entryFileNames: '[name].cjs',
26+
preserveModules: true,
27+
preserveModulesRoot: path.resolve(__dirname, 'src'),
28+
},
29+
],
30+
},
1131
},
32+
plugins: [
33+
dts({
34+
copyDtsFiles: true,
35+
entryRoot: './src',
36+
outDir: './dist/types',
37+
}),
38+
],
1239
})
13-
14-
export default mergeConfig(
15-
config,
16-
tanstackViteConfig({
17-
entry: './src/index.ts',
18-
srcDir: './src',
19-
}),
20-
)

e2e/react-router/basic-file-based/tests/redirect.spec.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ test.describe('redirects', () => {
6464
const url = `http://localhost:${PORT}/posts`
6565

6666
await page.waitForURL(url)
67+
if (reloadDocument) {
68+
await page.waitForLoadState('domcontentloaded')
69+
}
6770
expect(page.url()).toBe(url)
6871
await expect(page.getByTestId('PostsIndexComponent')).toBeInViewport()
6972
expect(fullPageLoad).toBe(reloadDocument)

0 commit comments

Comments
 (0)