Skip to content

Commit ebfbe33

Browse files
committed
fix: resolve rebase conflicts from import-type PR
Fix missing .ts extensions and mangled imports from rebase onto node24/import-type base branch. Assisted-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 1a754a8 commit ebfbe33

17 files changed

Lines changed: 38 additions & 34 deletions

File tree

packages/dev-server-core/src/plugins/Plugin.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { FSWatcher } from 'chokidar';
22
import Koa, { Context } from 'koa';
33
import { type Server } from 'net';
44

5-
import type { DevServerCoreConfig } from '../server/DevServerCoreConfig';
6-
import type { Logger } from '../logger/Logger';
7-
import { WebSocketsManager } from '../web-sockets/WebSocketsManager';
5+
import type { DevServerCoreConfig } from '../server/DevServerCoreConfig.ts';
6+
import type { Logger } from '../logger/Logger.ts';
7+
import { WebSocketsManager } from '../web-sockets/WebSocketsManager.ts';
88
export type ServeResult =
99
| void
1010
| string

packages/dev-server-storybook/src/build/rollup/createRollupConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createRequire } from 'node:module';
1+
import { fileURLToPath } from 'node:url';
22
import { type Plugin, type RollupOptions, type RollupLog } from 'rollup';
33
import { nodeResolve as resolve } from '@rollup/plugin-node-resolve';
44
import { babel } from '@rollup/plugin-babel';

packages/dev-server/src/logger/logStartMessage.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
import { type DevServerConfig } from '../config/DevServerConfig';
1+
import { type DevServerConfig } from '../config/DevServerConfig.ts';
22
import { type Logger } from '@web/dev-server-core';
3-
import internalIp from 'internal-ip';import { bold, cyan, white } from 'nanocolors';
3+
import * as internalIpModule from 'internal-ip';
4+
5+
const _internalIp = (internalIpModule as any).default ?? internalIpModule;
6+
const { internalIpV4Sync } = _internalIp;
7+
import { bold, cyan, white } from 'nanocolors';
48

59
const createAddress = (config: DevServerConfig, host: string, path: string) =>
610
`http${config.http2 ? 's' : ''}://${host}:${config.port}${path}`;

packages/test-runner-core/src/browser-launcher/BrowserLauncher.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { CoverageMapData } from 'istanbul-lib-coverage';
2-
import { type TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig';
3-
import { type TestResultError } from '../test-session/TestSession';
2+
import { type TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.ts';
3+
import { type TestResultError } from '../test-session/TestSession.ts';
44
export interface SessionResult {
55
testCoverage?: CoverageMapData;
66
errors?: TestResultError[];

packages/test-runner-core/src/cli/BufferedLogger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type Logger, type ErrorWithLocation } from '../logger/Logger';
1+
import { type Logger, type ErrorWithLocation } from '../logger/Logger.ts';
22
export class BufferedLogger implements Logger {
33
public buffer: { method: keyof Logger; args?: any[] }[] = [];
44

packages/test-runner-core/src/cli/getManualDebugMenu.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { cyan, gray } from 'nanocolors';
22
import internalIp from 'internal-ip';
33

4-
import { type TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig';
4+
import { type TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.ts';
55
export function getManualDebugMenu(config: TestRunnerCoreConfig): string[] {
66
const localAddress = `${config.protocol}//${config.hostname}:${config.port}/`;
77
const networkAddress = `${config.protocol}//${internalIp.v4.sync()}:${config.port}/`;

packages/test-runner-core/src/cli/writeCoverageReport.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import reports from 'istanbul-reports';
22
import libReport from 'istanbul-lib-report';
33

4-
import { type CoverageConfig } from '../config/TestRunnerCoreConfig';
5-
import { type TestCoverage } from '../coverage/getTestCoverage';
4+
import { type CoverageConfig } from '../config/TestRunnerCoreConfig.ts';
5+
import { type TestCoverage } from '../coverage/getTestCoverage.ts';
66
export function writeCoverageReport(testCoverage: TestCoverage, config: CoverageConfig) {
77
// create a context for report generation
88
const context = libReport.createContext({

packages/test-runner-core/src/config/TestRunnerGroupConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type BrowserLauncher } from '../browser-launcher/BrowserLauncher';
1+
import { type BrowserLauncher } from '../browser-launcher/BrowserLauncher.ts';
22
import { type TestRunnerCoreConfig } from './TestRunnerCoreConfig.ts';
33
export interface TestRunnerGroupConfig {
44
name: string;

packages/test-runner-core/src/coverage/getTestCoverage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
type Location,
99
type Range,
1010
} from 'istanbul-lib-coverage';
11-
import { type TestSession } from '../test-session/TestSession';
12-
import { type CoverageConfig } from '../config/TestRunnerCoreConfig';
11+
import { type TestSession } from '../test-session/TestSession.ts';
12+
import { type CoverageConfig } from '../config/TestRunnerCoreConfig.ts';
1313
export const coverageTypes: (keyof CoverageSummaryData)[] = [
1414
'lines',
1515
'statements',

packages/test-runner-core/src/reporter/Reporter.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { type TestSession } from '../test-session/TestSession';
2-
import { type TestSessionManager } from '../test-session/TestSessionManager';
3-
import { type TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig';
4-
import { type TestCoverage } from '../coverage/getTestCoverage';
5-
import { type Logger } from '../logger/Logger';
6-
import { type BrowserLauncher } from '../browser-launcher/BrowserLauncher';
1+
import { type TestSession } from '../test-session/TestSession.ts';
2+
import { type TestSessionManager } from '../test-session/TestSessionManager.ts';
3+
import { type TestRunnerCoreConfig } from '../config/TestRunnerCoreConfig.ts';
4+
import { type TestCoverage } from '../coverage/getTestCoverage.ts';
5+
import { type Logger } from '../logger/Logger.ts';
6+
import { type BrowserLauncher } from '../browser-launcher/BrowserLauncher.ts';
77
export interface ReporterArgs {
88
config: TestRunnerCoreConfig;
99
sessions: TestSessionManager;

0 commit comments

Comments
 (0)