Skip to content

Commit fd9d012

Browse files
authored
test(e2e): migrate test cases to ES modules (#6531)
1 parent 970c255 commit fd9d012

File tree

160 files changed

+669
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+669
-529
lines changed

e2e/assets/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@e2e/assets",
3-
"description": "Common static assets used in E2E test cases.",
3+
"version": "1.0.0",
44
"private": true,
5-
"version": "1.0.0"
5+
"description": "Common static assets used in E2E test cases.",
6+
"type": "module"
67
}

e2e/cases/assets/addtional-assets/index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test('should support configuring additional assets matched by path', async ({
3636
const rsbuild = await build({
3737
config: {
3838
source: {
39-
assetsInclude: path.resolve(__dirname, 'src/assets'),
39+
assetsInclude: path.resolve(import.meta.dirname, 'src/assets'),
4040
},
4141
},
4242
});

e2e/cases/assets/addtional-assets/rsbuild.config.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { join } from 'node:path';
22
import { defineConfig } from '@rsbuild/core';
3-
import { outputFileSync } from 'fs-extra';
3+
import fse from 'fs-extra';
44

5-
outputFileSync(
6-
join(__dirname, 'src/assets/test-temp-small.json5'),
5+
fse.outputFileSync(
6+
join(import.meta.dirname, 'src/assets/test-temp-small.json5'),
77
JSON.stringify({ a: 1 }),
88
);
9-
outputFileSync(
10-
join(__dirname, 'src/assets/test-temp-large.json5'),
9+
fse.outputFileSync(
10+
join(import.meta.dirname, 'src/assets/test-temp-large.json5'),
1111
JSON.stringify({ a: '1'.repeat(10000) }),
1212
);
1313

e2e/cases/assets/import-json-raw-query/index.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ rspackTest(
88
await buildPreview();
99

1010
expect(await page.evaluate('window.a')).toBe(
11-
readFileSync(join(__dirname, './src/a.json'), 'utf-8'),
11+
readFileSync(join(import.meta.dirname, './src/a.json'), 'utf-8'),
1212
);
1313
expect(await page.evaluate('window.b')).toBe(
14-
readFileSync(join(__dirname, './src/b.json'), 'utf-8'),
14+
readFileSync(join(import.meta.dirname, './src/b.json'), 'utf-8'),
1515
);
1616
},
1717
);

e2e/cases/assets/raw-query/index.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test('should return raw asset content with `?raw` in dev', async ({
1212

1313
expect(await page.evaluate('window.rawSvg')).toEqual(
1414
await promises.readFile(
15-
join(__dirname, '../../../assets/circle.svg'),
15+
join(import.meta.dirname, '../../../assets/circle.svg'),
1616
'utf-8',
1717
),
1818
);
@@ -26,7 +26,7 @@ test('should return raw asset content with `?raw` in build', async ({
2626

2727
expect(await page.evaluate('window.rawSvg')).toEqual(
2828
await promises.readFile(
29-
join(__dirname, '../../../assets/circle.svg'),
29+
join(import.meta.dirname, '../../../assets/circle.svg'),
3030
'utf-8',
3131
),
3232
);
@@ -44,7 +44,7 @@ test('should return raw SVG content with `?raw` when using pluginSvgr', async ({
4444

4545
expect(await page.evaluate('window.rawSvg')).toEqual(
4646
await promises.readFile(
47-
join(__dirname, '../../../assets/circle.svg'),
47+
join(import.meta.dirname, '../../../assets/circle.svg'),
4848
'utf-8',
4949
),
5050
);
@@ -54,15 +54,15 @@ test('should return raw JS content with `?raw`', async ({ page, dev }) => {
5454
await dev();
5555

5656
expect(await page.evaluate('window.rawJs')).toEqual(
57-
await promises.readFile(join(__dirname, 'src/foo.js'), 'utf-8'),
57+
await promises.readFile(join(import.meta.dirname, 'src/foo.js'), 'utf-8'),
5858
);
5959
});
6060

6161
test('should return raw TS content with `?raw`', async ({ page, dev }) => {
6262
await dev();
6363

6464
const tsContent = await promises.readFile(
65-
join(__dirname, 'src/bar.ts'),
65+
join(import.meta.dirname, 'src/bar.ts'),
6666
'utf-8',
6767
);
6868
expect(await page.evaluate('window.rawTs1')).toEqual(tsContent);
@@ -82,7 +82,7 @@ test('should return raw TSX content with `?raw` when using pluginReact', async (
8282
});
8383

8484
expect(await page.evaluate('window.rawTsx')).toEqual(
85-
await promises.readFile(join(__dirname, 'src/baz.tsx'), 'utf-8'),
85+
await promises.readFile(join(import.meta.dirname, 'src/baz.tsx'), 'utf-8'),
8686
);
8787
});
8888

e2e/cases/browser-logs/custom-source-map/index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ rspackTest(
2727
rspackTest(
2828
'should parse source map correctly if source path is relative to source map path',
2929
async ({ dev }) => {
30-
const sourceMapPath = join(__dirname, 'dist/static/js');
30+
const sourceMapPath = join(import.meta.dirname, 'dist/static/js');
3131
const rsbuild = await dev({
3232
config: {
3333
tools: {
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"private": true,
32
"name": "@e2e/browserslist-config-mock",
43
"version": "1.0.0",
4+
"private": true,
5+
"type": "module",
56
"main": "index.json"
67
}

e2e/cases/browserslist/extends-browserslist/index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { expect, getFileContent, test } from '@e2e/helper';
22

33
test('should extend browserslist and downgrade syntax', async ({ build }) => {
44
const originalCwd = process.cwd();
5-
process.chdir(__dirname);
5+
process.chdir(import.meta.dirname);
66

77
const rsbuild = await build();
88
const files = rsbuild.getDistFiles();
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
2-
"private": true,
32
"name": "@e2e/extends-browserslist",
43
"version": "1.0.0",
5-
"dependencies": {
6-
"@e2e/browserslist-config-mock": "workspace:*"
7-
},
4+
"private": true,
5+
"type": "module",
86
"browserslist": [
97
"extends @e2e/browserslist-config-mock"
10-
]
8+
],
9+
"dependencies": {
10+
"@e2e/browserslist-config-mock": "workspace:*"
11+
}
1112
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"private": true,
3+
"type": "module",
34
"browserslist": "Chrome >= 40, Edge >= 79"
45
}

0 commit comments

Comments
 (0)