Skip to content

Commit 91f2896

Browse files
Adopt Node-native TypeScript across desktop and server
- Switch desktop and server entrypoints to run under Node ESM/TS - Update imports, type-only imports, and build scripts for .ts resolution - Refresh config and tests to match the new module/runtime setup
1 parent 6891c77 commit 91f2896

133 files changed

Lines changed: 1195 additions & 622 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.

‎apps/desktop/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
"name": "@t3tools/desktop",
33
"version": "0.0.17",
44
"private": true,
5+
"type": "module",
56
"main": "dist-electron/main.js",
67
"scripts": {
78
"dev": "bun run --parallel dev:bundle dev:electron",
89
"dev:bundle": "tsdown --watch",
9-
"dev:electron": "bun run scripts/dev-electron.mjs",
10+
"dev:electron": "node scripts/dev-electron.mjs",
1011
"build": "tsdown",
11-
"start": "bun run scripts/start-electron.mjs",
12+
"start": "node scripts/start-electron.mjs",
1213
"typecheck": "tsc --noEmit",
1314
"test": "vitest run --passWithNoTests",
1415
"smoke-test": "node scripts/smoke-test.mjs"

‎apps/desktop/src/appBranding.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { describe, expect, it } from "vitest";
22

3-
import { resolveDesktopAppBranding, resolveDesktopAppStageLabel } from "./appBranding";
3+
import { resolveDesktopAppBranding, resolveDesktopAppStageLabel } from "./appBranding.ts";
44

55
describe("resolveDesktopAppStageLabel", () => {
66
it("uses Dev in desktop development", () => {

‎apps/desktop/src/appBranding.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { DesktopAppBranding, DesktopAppStageLabel } from "@t3tools/contracts";
22

3-
import { isNightlyDesktopVersion } from "./updateChannels";
3+
import { isNightlyDesktopVersion } from "./updateChannels.ts";
44

55
const APP_BASE_NAME = "T3 Code";
66

‎apps/desktop/src/backendPort.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { describe, expect, it, vi } from "vitest";
22

3-
import { resolveDesktopBackendPort } from "./backendPort";
3+
import { resolveDesktopBackendPort } from "./backendPort.ts";
44

55
describe("resolveDesktopBackendPort", () => {
66
it("returns the starting port when it is available", async () => {

‎apps/desktop/src/backendReadiness.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
BackendReadinessAbortedError,
55
isBackendReadinessAborted,
66
waitForHttpReady,
7-
} from "./backendReadiness";
7+
} from "./backendReadiness.ts";
88

99
describe("waitForHttpReady", () => {
1010
it("returns once the backend serves the requested readiness path", async () => {

‎apps/desktop/src/clientPersistence.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
writeSavedEnvironmentRegistry,
1919
writeSavedEnvironmentSecret,
2020
type DesktopSecretStorage,
21-
} from "./clientPersistence";
21+
} from "./clientPersistence.ts";
2222

2323
const tempDirectories: string[] = [];
2424

‎apps/desktop/src/confirmDialog.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ vi.mock("electron", () => ({
1111
},
1212
}));
1313

14-
import { showDesktopConfirmDialog } from "./confirmDialog";
14+
import { showDesktopConfirmDialog } from "./confirmDialog.ts";
1515

1616
describe("showDesktopConfirmDialog", () => {
1717
beforeEach(() => {

‎apps/desktop/src/desktopSettings.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
setDesktopServerExposurePreference,
1212
setDesktopUpdateChannelPreference,
1313
writeDesktopSettings,
14-
} from "./desktopSettings";
14+
} from "./desktopSettings.ts";
1515

1616
const tempDirectories: string[] = [];
1717

‎apps/desktop/src/desktopSettings.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as FS from "node:fs";
22
import * as Path from "node:path";
33
import type { DesktopServerExposureMode, DesktopUpdateChannel } from "@t3tools/contracts";
44

5-
import { resolveDefaultDesktopUpdateChannel } from "./updateChannels";
5+
import { resolveDefaultDesktopUpdateChannel } from "./updateChannels.ts";
66

77
export interface DesktopSettings {
88
readonly serverExposureMode: DesktopServerExposureMode;

‎apps/desktop/src/main.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ import { autoUpdater } from "electron-updater";
3636
import type { ContextMenuItem } from "@t3tools/contracts";
3737
import { RotatingFileSink } from "@t3tools/shared/logging";
3838
import { parsePersistedServerObservabilitySettings } from "@t3tools/shared/serverSettings";
39-
import { DEFAULT_DESKTOP_BACKEND_PORT, resolveDesktopBackendPort } from "./backendPort";
39+
import { DEFAULT_DESKTOP_BACKEND_PORT, resolveDesktopBackendPort } from "./backendPort.ts";
4040
import {
4141
DEFAULT_DESKTOP_SETTINGS,
4242
readDesktopSettings,
4343
setDesktopServerExposurePreference,
4444
setDesktopUpdateChannelPreference,
4545
writeDesktopSettings,
46-
} from "./desktopSettings";
46+
} from "./desktopSettings.ts";
4747
import {
4848
readClientSettings,
4949
readSavedEnvironmentRegistry,
@@ -52,14 +52,14 @@ import {
5252
writeClientSettings,
5353
writeSavedEnvironmentRegistry,
5454
writeSavedEnvironmentSecret,
55-
} from "./clientPersistence";
56-
import { isBackendReadinessAborted, waitForHttpReady } from "./backendReadiness";
57-
import { showDesktopConfirmDialog } from "./confirmDialog";
58-
import { resolveDesktopServerExposure } from "./serverExposure";
59-
import { syncShellEnvironment } from "./syncShellEnvironment";
60-
import { getAutoUpdateDisabledReason, shouldBroadcastDownloadProgress } from "./updateState";
61-
import { doesVersionMatchDesktopUpdateChannel } from "./updateChannels";
62-
import { ServerListeningDetector } from "./serverListeningDetector";
55+
} from "./clientPersistence.ts";
56+
import { isBackendReadinessAborted, waitForHttpReady } from "./backendReadiness.ts";
57+
import { showDesktopConfirmDialog } from "./confirmDialog.ts";
58+
import { resolveDesktopServerExposure } from "./serverExposure.ts";
59+
import { syncShellEnvironment } from "./syncShellEnvironment.ts";
60+
import { getAutoUpdateDisabledReason, shouldBroadcastDownloadProgress } from "./updateState.ts";
61+
import { doesVersionMatchDesktopUpdateChannel } from "./updateChannels.ts";
62+
import { ServerListeningDetector } from "./serverListeningDetector.ts";
6363
import {
6464
createInitialDesktopUpdateState,
6565
reduceDesktopUpdateStateOnCheckFailure,
@@ -71,9 +71,9 @@ import {
7171
reduceDesktopUpdateStateOnInstallFailure,
7272
reduceDesktopUpdateStateOnNoUpdate,
7373
reduceDesktopUpdateStateOnUpdateAvailable,
74-
} from "./updateMachine";
75-
import { isArm64HostRunningIntelBuild, resolveDesktopRuntimeInfo } from "./runtimeArch";
76-
import { resolveDesktopAppBranding } from "./appBranding";
74+
} from "./updateMachine.ts";
75+
import { isArm64HostRunningIntelBuild, resolveDesktopRuntimeInfo } from "./runtimeArch.ts";
76+
import { resolveDesktopAppBranding } from "./appBranding.ts";
7777

7878
syncShellEnvironment();
7979

0 commit comments

Comments
 (0)