Skip to content

Commit 0c3de8d

Browse files
bennypowersbennypowers
committed
fix: resolve conflict markers in test files and remove unused imports
- Fix 48 test files with merge conflict markers from rebase - Remove unused path imports in test files flagged by eslint - Regenerate package-lock.json Assisted-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent c830d78 commit 0c3de8d

49 files changed

Lines changed: 33 additions & 2662 deletions

File tree

Some content is hidden

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

‎package-lock.json‎

Lines changed: 28 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/dev-server-core/test/helpers.ts‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,10 @@ import {
55
fetchText,
66
expectIncludes,
77
virtualFilesPlugin,
8-
<<<<<<< HEAD
9-
} from '../src/test-helpers.js';
10-
<<<<<<< HEAD
11-
import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.ts';
12-
||||||| parent of aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
13-
import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.js';
14-
=======
15-
import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.js';
16-
||||||| parent of c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
17-
} from '../src/test-helpers.ts';
18-
import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.ts';
19-
=======
20-
<<<<<<< HEAD
21-
} from '../src/test-helpers.ts';
22-
import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.ts';
23-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
24-
} from '../src/test-helpers.js';
25-
import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.js';
26-
=======
278
} from '../src/test-helpers.ts';
289
import type { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.ts';
2910

3011
const __dirname = import.meta.dirname;
31-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
32-
>>>>>>> c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
33-
>>>>>>> aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
3412

3513
export function createTestServer(config: Partial<DevServerCoreConfig> = {}) {
3614
return originalCreateTestServer({

‎packages/dev-server-core/test/middleware/historyApiFallbackMiddleware.test.ts‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,10 @@ import { describe, it, beforeEach, afterEach } from 'node:test';
22
import assert from 'node:assert/strict';
33
import path from 'path';
44

5-
<<<<<<< HEAD
6-
import { createTestServer } from '../helpers.ts';
7-
import { DevServer } from '../../src/server/DevServer.ts';
8-
||||||| parent of aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
9-
import { createTestServer } from '../helpers.js';
10-
import { DevServer } from '../../src/server/DevServer.js';
11-
=======
12-
<<<<<<< HEAD
13-
import { createTestServer } from '../helpers.js';
14-
import { DevServer } from '../../src/server/DevServer.js';
15-
||||||| parent of c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
16-
import { createTestServer } from '../helpers.ts';
17-
import { DevServer } from '../../src/server/DevServer.ts';
18-
=======
19-
<<<<<<< HEAD
20-
import { createTestServer } from '../helpers.ts';
21-
import { DevServer } from '../../src/server/DevServer.ts';
22-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
23-
import { createTestServer } from '../helpers.js';
24-
import { DevServer } from '../../src/server/DevServer.js';
25-
=======
265
import { createTestServer } from '../helpers.ts';
276
import { DevServer } from '../../src/server/DevServer.ts';
287

298
const __dirname = import.meta.dirname;
30-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
31-
>>>>>>> c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
32-
>>>>>>> aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
339

3410
describe('history api fallback middleware', () => {
3511
describe('index in root', () => {

‎packages/dev-server-core/test/middleware/serveFilesMiddleware.test.ts‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,9 @@ import { describe, it } from 'node:test';
22
import assert from 'node:assert/strict';
33
import path from 'path';
44

5-
<<<<<<< HEAD
6-
import { createTestServer } from '../helpers.ts';
7-
||||||| parent of aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
8-
import { createTestServer } from '../helpers.js';
9-
=======
10-
<<<<<<< HEAD
11-
import { createTestServer } from '../helpers.js';
12-
||||||| parent of c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
13-
import { createTestServer } from '../helpers.ts';
14-
=======
15-
<<<<<<< HEAD
16-
import { createTestServer } from '../helpers.ts';
17-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
18-
import { createTestServer } from '../helpers.js';
19-
=======
205
import { createTestServer } from '../helpers.ts';
216

227
const __dirname = import.meta.dirname;
23-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
24-
>>>>>>> c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
25-
>>>>>>> aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
268

279
describe('serveFilesMiddleware', () => {
2810
it('can serve files outside of the root directory', async () => {

‎packages/dev-server-core/test/plugins/mimeTypesPlugin.test.ts‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,9 @@
11
import { describe, it } from 'node:test';
22
import assert from 'node:assert/strict';
3-
import path from 'path';
43

5-
<<<<<<< HEAD
6-
import { createTestServer } from '../helpers.ts';
7-
||||||| parent of aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
8-
import { createTestServer } from '../helpers.js';
9-
=======
10-
<<<<<<< HEAD
11-
import { createTestServer } from '../helpers.js';
12-
||||||| parent of c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
13-
import { createTestServer } from '../helpers.ts';
14-
=======
15-
<<<<<<< HEAD
16-
import { createTestServer } from '../helpers.ts';
17-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
18-
import { createTestServer } from '../helpers.js';
19-
=======
204
import { createTestServer } from '../helpers.ts';
215

226
const __dirname = import.meta.dirname;
23-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
24-
>>>>>>> c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
25-
>>>>>>> aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
267

278
describe('mimeTypesPLugin', () => {
289
it('can configure mime types for files', async () => {

‎packages/dev-server-core/test/plugins/parseDynamicImport.test.ts‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,6 @@
1-
<<<<<<< HEAD
2-
import { expect } from 'chai';
3-
<<<<<<< HEAD
4-
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.js';
5-
||||||| parent of c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
6-
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.ts';
7-
=======
8-
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.ts';
9-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
10-
import { expect } from 'chai';
11-
<<<<<<< HEAD
12-
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.ts';
13-
||||||| parent of aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
14-
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.js';
15-
=======
16-
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.js';
17-
=======
181
import { describe, it } from 'node:test';
192
import assert from 'node:assert/strict';
203
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.ts';
21-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
22-
>>>>>>> c37bb778 (chore: migrate tests from mocha/chai to node:test + node:assert)
23-
>>>>>>> aecfa949 (chore: migrate tests from mocha/chai to node:test + node:assert)
244

255
describe('parseDynamicImport', () => {
266
function testParseDynamicImport(specifier: string) {

0 commit comments

Comments
 (0)