Skip to content

Commit f19d625

Browse files
bennypowersbennypowers
committed
fix: re-apply test files and preset fix dropped during rebase
Files were dropped when git rebase --skip was used to resolve conflicts between PR2's test migration and PR3/PR4's changes. Re-applied from fix/node24. Assisted-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 9d8ff0d commit f19d625

46 files changed

Lines changed: 154 additions & 515 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: 9 additions & 96 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 & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,10 @@ import {
55
fetchText,
66
expectIncludes,
77
virtualFilesPlugin,
8-
<<<<<<< HEAD
9-
} from '../src/test-helpers.ts';
10-
import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.ts';
11-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
12-
} from '../src/test-helpers.js';
13-
import { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.js';
14-
=======
158
} from '../src/test-helpers.ts';
169
import type { DevServerCoreConfig } from '../src/server/DevServerCoreConfig.ts';
1710

1811
const __dirname = import.meta.dirname;
19-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
2012

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

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +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 61bf92a0 (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-
=======
125
import { createTestServer } from '../helpers.ts';
136
import { DevServer } from '../../src/server/DevServer.ts';
147

158
const __dirname = import.meta.dirname;
16-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
179

1810
describe('history api fallback middleware', () => {
1911
describe('index in root', () => {

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +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 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
8-
import { createTestServer } from '../helpers.js';
9-
=======
105
import { createTestServer } from '../helpers.ts';
116

127
const __dirname = import.meta.dirname;
13-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
148

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

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +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 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
8-
import { createTestServer } from '../helpers.js';
9-
=======
105
import { createTestServer } from '../helpers.ts';
116

127
const __dirname = import.meta.dirname;
13-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
148

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

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
<<<<<<< HEAD
2-
import { expect } from 'chai';
3-
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.ts';
4-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
5-
import { expect } from 'chai';
6-
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.js';
7-
=======
81
import { describe, it } from 'node:test';
92
import assert from 'node:assert/strict';
103
import { parseDynamicImport } from '../../src/plugins/parseDynamicImport.ts';
11-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
124

135
describe('parseDynamicImport', () => {
146
function testParseDynamicImport(specifier: string) {

‎packages/dev-server-esbuild/test/banner-footer.test.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,9 @@ import path from 'path';
44
import { createTestServer } from '@web/dev-server-core/test-helpers';
55
import { expectIncludes } from '@web/dev-server-core/test-helpers';
66

7-
<<<<<<< HEAD
8-
import { esbuildPlugin } from '../src/index.ts';
9-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
10-
import { esbuildPlugin } from '../src/index.js';
11-
=======
127
import { esbuildPlugin } from '../src/index.ts';
138

149
const __dirname = import.meta.dirname;
15-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
1610

1711
describe('esbuildPlugin banner/footers', function () {
1812
it('prepends custom banner', async () => {

‎packages/dev-server-esbuild/test/browser-targets.test.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
<<<<<<< HEAD
2-
import { expect } from 'chai';
3-
import { browsers } from '@mdn/browser-compat-data';
4-
import { isLatestModernBrowser, getLatestStableMajor } from '../src/browser-targets.ts';
5-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
6-
import { expect } from 'chai';
7-
import { browsers } from '@mdn/browser-compat-data';
8-
import { isLatestModernBrowser, getLatestStableMajor } from '../src/browser-targets.js';
9-
=======
101
import assert from 'node:assert/strict';
112
import { describe, it } from 'node:test';
123
import browserCompatData from '@mdn/browser-compat-data';
134
const { browsers } = browserCompatData;
145
import { isLatestModernBrowser, getLatestStableMajor } from '../src/browser-targets.ts';
15-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
166

177
describe('isLatestModernBrowser', () => {
188
it('returns true for latest Chrome', async () => {

‎packages/dev-server-esbuild/test/json.test.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,9 @@ import { describe, it } from 'node:test';
33
import path from 'path';
44
import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers';
55

6-
<<<<<<< HEAD
7-
import { esbuildPlugin } from '../src/index.ts';
8-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
9-
import { esbuildPlugin } from '../src/index.js';
10-
=======
116
import { esbuildPlugin } from '../src/index.ts';
127

138
const __dirname = import.meta.dirname;
14-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
159

1610
describe('esbuildPlugin JSON', function () {
1711
it('transforms .json files', async () => {

‎packages/dev-server-esbuild/test/jsx.test.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,9 @@ import { describe, it } from 'node:test';
33
import path from 'path';
44
import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers';
55

6-
<<<<<<< HEAD
7-
import { esbuildPlugin } from '../src/index.ts';
8-
||||||| parent of 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
9-
import { esbuildPlugin } from '../src/index.js';
10-
=======
116
import { esbuildPlugin } from '../src/index.ts';
127

138
const __dirname = import.meta.dirname;
14-
>>>>>>> 61bf92a0 (chore: migrate tests from mocha/chai to node:test + node:assert)
159

1610
describe('esbuildPlugin JSX', function () {
1711
it('transforms .jsx files', async () => {

0 commit comments

Comments
 (0)