Skip to content

Commit 2b0bf3d

Browse files
bennypowersbennypowers
committed
fix: rewrite .js to .ts imports in test files
Test files import from source using .js extensions which don't resolve on Node 24 with module:nodenext. Apply the same .js -> .ts import rewrite to test files as was done for source files. Assisted-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 999119d commit 2b0bf3d

36 files changed

Lines changed: 41 additions & 267 deletions

File tree

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import assert from 'node:assert/strict';
22
import { describe, it } from 'node:test';
33
import path from 'path';
4-
<<<<<<< HEAD
5-
import { createTestServer } from '@web/dev-server-core/test-helpers.js';
6-
import { expectIncludes } from '@web/dev-server-core/test-helpers.js';
7-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
8-
import { createTestServer } from '@web/dev-server-core/test-helpers.ts';
9-
import { expectIncludes } from '@web/dev-server-core/test-helpers.ts';
10-
=======
114
import { createTestServer } from '@web/dev-server-core/test-helpers';
125
import { expectIncludes } from '@web/dev-server-core/test-helpers';
13-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
146

157
import { esbuildPlugin } from '../src/index.ts';
168

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import assert from 'node:assert/strict';
22
import { describe, it } from 'node:test';
3-
import browserCompatData from '@mdn/browser-compat-data';
3+
import browserCompatData from '@mdn/browser-compat-data.ts';
44
const { browsers } = browserCompatData;
55
import { isLatestModernBrowser, getLatestStableMajor } from '../src/browser-targets.ts';
66

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import assert from 'node:assert/strict';
22
import { describe, it } from 'node:test';
33
import path from 'path';
4-
<<<<<<< HEAD
5-
import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers.js';
6-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
7-
import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers.ts';
8-
=======
94
import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers';
10-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
115

126
import { esbuildPlugin } from '../src/index.ts';
137

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import assert from 'node:assert/strict';
22
import { describe, it } from 'node:test';
33
import path from 'path';
4-
<<<<<<< HEAD
5-
import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers.js';
6-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
7-
import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers.ts';
8-
=======
94
import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers';
10-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
115

126
import { esbuildPlugin } from '../src/index.ts';
137

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import assert from 'node:assert/strict';
22
import { describe, it } from 'node:test';
33
import path from 'path';
4-
<<<<<<< HEAD
5-
import { createTestServer, expectIncludes } from '@web/dev-server-core/test-helpers.js';
6-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
7-
import { createTestServer, expectIncludes } from '@web/dev-server-core/test-helpers.ts';
8-
=======
94
import { createTestServer, expectIncludes } from '@web/dev-server-core/test-helpers';
10-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
115

126
import { esbuildPlugin } from '../src/index.ts';
137

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,10 @@
11
import assert from 'node:assert/strict';
22
import { describe, it } from 'node:test';
33
import path from 'path';
4-
<<<<<<< HEAD
5-
import { createTestServer } from '@web/dev-server-core/test-helpers.js';
6-
import { expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-helpers.js';
7-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
8-
import { createTestServer } from '@web/dev-server-core/test-helpers.ts';
9-
import { expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-helpers.ts';
10-
=======
114
import { createTestServer } from '@web/dev-server-core/test-helpers';
125
import { expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-helpers';
13-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
146
import type { Plugin as RollupPlugin } from 'rollup';
15-
<<<<<<< HEAD
16-
import { fromRollup } from '@web/dev-server-rollup.js';
17-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
18-
import { fromRollup } from '@web/dev-server-rollup.ts';
19-
=======
207
import { fromRollup } from '@web/dev-server-rollup';
21-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
228

239
import { esbuildPlugin } from '../src/index.ts';
2410

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import assert from 'node:assert/strict';
22
import { describe, it } from 'node:test';
33
import path from 'path';
4-
<<<<<<< HEAD
5-
import { createTestServer } from '@web/dev-server-core/test-helpers.js';
6-
import { expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-helpers.js';
7-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
8-
import { createTestServer } from '@web/dev-server-core/test-helpers.ts';
9-
import { expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-helpers.ts';
10-
=======
114
import { createTestServer } from '@web/dev-server-core/test-helpers';
125
import { expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-helpers';
13-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
146

157
import { esbuildPlugin } from '../src/index.ts';
168

‎packages/dev-server-hmr/test/browser.test.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import { describe, it, before, after } from 'node:test';
22
import assert from 'node:assert/strict';
33
import { stubMethod } from 'hanbi';
4-
<<<<<<< HEAD
5-
import { createTestServer, expectIncludes } from '@web/dev-server-core/test-helpers.js';
6-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
7-
import { createTestServer, expectIncludes } from '@web/dev-server-core/test-helpers.ts';
8-
=======
94
import { createTestServer, expectIncludes } from '@web/dev-server-core/test-helpers';
10-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
115
import type { Browser, HTTPResponse, Page } from 'puppeteer';
126
import { launch as launchPuppeteer } from 'puppeteer';
137
import { posix as pathUtil } from 'path';

‎packages/dev-server-import-maps/test/injection.test.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import { it } from 'node:test';
2-
<<<<<<< HEAD
3-
import { createTestServer, expectNotIncludes } from '@web/dev-server-core/test-helpers.js';
4-
import { fetchText, expectIncludes, virtualFilesPlugin } from '@web/dev-server-core/test-helpers.js';
5-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
6-
import { createTestServer, expectNotIncludes } from '@web/dev-server-core/test-helpers.ts';
7-
import { fetchText, expectIncludes, virtualFilesPlugin } from '@web/dev-server-core/test-helpers.ts';
8-
=======
92
import { createTestServer, expectNotIncludes } from '@web/dev-server-core/test-helpers';
103
import { fetchText, expectIncludes, virtualFilesPlugin } from '@web/dev-server-core/test-helpers';
11-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
124

13-
import { importMapsPlugin } from '../src/importMapsPlugin.js';
5+
import { importMapsPlugin } from '../src/importMapsPlugin.ts';
146

157
it('can inject an import map into any page', async () => {
168
const { server, host } = await createTestServer({

‎packages/dev-server-import-maps/test/resolving.test.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
import { describe, it } from 'node:test';
22
import assert from 'node:assert/strict';
3-
<<<<<<< HEAD
4-
import { fetchText, expectIncludes, virtualFilesPlugin } from '@web/dev-server-core/test-helpers.js';
5-
import { createTestServer } from '@web/dev-server-core/test-helpers.js';
6-
||||||| parent of 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
7-
import { fetchText, expectIncludes, virtualFilesPlugin } from '@web/dev-server-core/test-helpers.ts';
8-
import { createTestServer } from '@web/dev-server-core/test-helpers.ts';
9-
=======
103
import { fetchText, expectIncludes, virtualFilesPlugin } from '@web/dev-server-core/test-helpers';
114
import { createTestServer } from '@web/dev-server-core/test-helpers';
12-
>>>>>>> 9007e014 (chore: migrate tests from mocha/chai to node:test + node:assert)
135
import { spy } from 'hanbi';
146
import path from 'path';
157

0 commit comments

Comments
 (0)