TypeScript: migrate to 6.0x

mook-as · mook-as · commit 36827e01f695 · 2026-04-01T13:42:00.000-07:00
- `baseUrl` in `tsconfig.json` is no longer supported.
- Un-prefixed imports relative to `tsconfig.json` no longer works; map it
  to the `@` path instead.

Signed-off-by: Mark Yen &lt;mark.yen@suse.com&gt;
diff --git a/pkg/rancher-desktop/tsconfig.json b/pkg/rancher-desktop/tsconfig.json
@@ -15,7 +15,6 @@
     "strict": true,
     "noEmit": false,
     "experimentalDecorators": true,
-    "baseUrl": ".",
     "paths": {
       "@pkg/*": [
         "./*"
diff --git a/screenshots/screenshots.e2e.spec.ts b/screenshots/screenshots.e2e.spec.ts
@@ -9,16 +9,16 @@ import { imagesList } from './test-data/images';
 import { lockedSettings } from './test-data/preferences';
 import { snapshotsList } from './test-data/snapshots';
 import { volumesList } from './test-data/volumes';
-import { NavPage } from '../e2e/pages/nav-page';
-import { PreferencesPage } from '../e2e/pages/preferences';
-import { clearUserProfile } from '../e2e/utils/ProfileUtils';
+
+import { ContainerLogsPage } from '@/e2e/pages/container-logs-page';
+import { NavPage } from '@/e2e/pages/nav-page';
+import { PreferencesPage } from '@/e2e/pages/preferences';
+import { clearUserProfile } from '@/e2e/utils/ProfileUtils';
 import {
   createDefaultSettings, setUserProfile, retry, teardown, tool, startRancherDesktop, reportAsset,
-} from '../e2e/utils/TestUtils';
-
+} from '@/e2e/utils/TestUtils';
 import { ContainerEngine, CURRENT_SETTINGS_VERSION } from '@pkg/config/settings';
 import { Log } from '@pkg/utils/logging';
-import { ContainerLogsPage } from 'e2e/pages/container-logs-page';
 
 import type { ElectronApplication, Page } from '@playwright/test';
 
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -11,7 +11,7 @@ import * as path from 'path';
 
 import buildUtils from './lib/build-utils';
 
-import { simpleSpawn } from 'scripts/simple_process';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 class Builder {
   async cleanup() {
diff --git a/scripts/dependencies/go-source.ts b/scripts/dependencies/go-source.ts
@@ -1,7 +1,7 @@
 import path from 'path';
 
-import { Dependency, DownloadContext } from 'scripts/lib/dependencies';
-import { simpleSpawn } from 'scripts/simple_process';
+import { Dependency, DownloadContext } from '@/scripts/lib/dependencies';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 interface GoDependencyOptions {
   /**
diff --git a/scripts/dependencies/lima.ts b/scripts/dependencies/lima.ts
@@ -19,8 +19,8 @@ import {
   GitHubDependency,
   GitHubRelease,
   GlobalDependency,
-} from 'scripts/lib/dependencies';
-import { simpleSpawn } from 'scripts/simple_process';
+} from '@/scripts/lib/dependencies';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 export class Lima extends GlobalDependency(GitHubDependency) {
   readonly name = 'lima';
diff --git a/scripts/dependencies/moby-openapi.ts b/scripts/dependencies/moby-openapi.ts
@@ -6,8 +6,8 @@ import yaml from 'yaml';
 
 import { download } from '../lib/download';
 
-import { DownloadContext, getOctokit, VersionedDependency, GlobalDependency } from 'scripts/lib/dependencies';
-import { simpleSpawn } from 'scripts/simple_process';
+import { DownloadContext, getOctokit, VersionedDependency, GlobalDependency } from '@/scripts/lib/dependencies';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 // This downloads the moby openAPI specification (for WSL-helper) and generates
 // ./src/go/wsl-helper/pkg/dockerproxy/models/...
diff --git a/scripts/dependencies/sudo-prompt.ts b/scripts/dependencies/sudo-prompt.ts
@@ -1,7 +1,7 @@
 import path from 'path';
 
-import { Dependency, DownloadContext } from 'scripts/lib/dependencies';
-import { simpleSpawn } from 'scripts/simple_process';
+import { Dependency, DownloadContext } from '@/scripts/lib/dependencies';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 /**
  * SudoPrompt represents the sudo-prompt.app applet used by sudo-prompt on macOS.
diff --git a/scripts/dependencies/tar-archives.ts b/scripts/dependencies/tar-archives.ts
@@ -6,7 +6,7 @@ import stream from 'stream';
 
 import tar from 'tar-stream';
 
-import { Dependency, DownloadContext } from 'scripts/lib/dependencies';
+import { Dependency, DownloadContext } from '@/scripts/lib/dependencies';
 
 export class ExtensionProxyImage implements Dependency {
   readonly name = 'rdx-proxy.tar';
diff --git a/scripts/dependencies/tools.ts b/scripts/dependencies/tools.ts
@@ -2,23 +2,22 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
+import {
+  DownloadContext,
+  findChecksum,
+  getPublishedReleaseTagNames,
+  GitHubDependency,
+  GlobalDependency,
+} from '@/scripts/lib/dependencies';
 import {
   ArchiveDownloadOptions,
   download,
   DownloadOptions,
   downloadTarGZ,
   downloadZip,
   getResource,
-} from '../lib/download';
-
-import {
-  DownloadContext,
-  findChecksum,
-  getPublishedReleaseTagNames,
-  GitHubDependency,
-  GlobalDependency,
-} from 'scripts/lib/dependencies';
-import { simpleSpawn } from 'scripts/simple_process';
+} from '@/scripts/lib/download';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 function exeName(context: DownloadContext, name: string) {
   const onWindows = context.platform === 'win32';
diff --git a/scripts/dependencies/wix.ts b/scripts/dependencies/wix.ts
@@ -6,7 +6,7 @@ import semver from 'semver';
 import { DownloadContext, GitHubDependency, GlobalDependency, getOctokit } from '../lib/dependencies';
 import { download } from '../lib/download';
 
-import { simpleSpawn } from 'scripts/simple_process';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 /**
  * Wix downloads the latest build of WiX3.
diff --git a/scripts/dependencies/wsl.ts b/scripts/dependencies/wsl.ts
@@ -4,7 +4,7 @@ import path from 'path';
 import { download } from '../lib/download';
 import { simpleSpawn } from '../simple_process';
 
-import { DownloadContext, GitHubDependency, GlobalDependency } from 'scripts/lib/dependencies';
+import { DownloadContext, GitHubDependency, GlobalDependency } from '@/scripts/lib/dependencies';
 
 export class Moproxy extends GlobalDependency(GitHubDependency) {
   readonly name = 'moproxy';
diff --git a/scripts/docker-cli-monitor.ts b/scripts/docker-cli-monitor.ts
@@ -11,7 +11,7 @@ import path from 'path';
 
 import semver from 'semver';
 
-import { readDependencyVersions, getOctokit, RancherDesktopRepository, IssueOrPullRequest } from 'scripts/lib/dependencies';
+import { readDependencyVersions, getOctokit, RancherDesktopRepository, IssueOrPullRequest } from '@/scripts/lib/dependencies';
 
 const GITHUB_OWNER = process.env.GITHUB_REPOSITORY?.split('/')[0] || 'rancher-sandbox';
 const GITHUB_REPO = process.env.GITHUB_REPOSITORY?.split('/')[1] || 'rancher-desktop';
diff --git a/scripts/lib/build-utils.ts b/scripts/lib/build-utils.ts
@@ -11,7 +11,7 @@ import spawn from 'cross-spawn';
 import _ from 'lodash';
 import webpack from 'webpack';
 
-import babelConfig from 'babel.config.cjs';
+import babelConfig from '@/babel.config.cjs';
 
 /**
  * A promise that is resolved when the child exits.
diff --git a/scripts/lib/dependencies.ts b/scripts/lib/dependencies.ts
@@ -225,7 +225,7 @@ export abstract class VersionedDependency implements Dependency {
 export function GlobalDependency<T extends abstract new(...args: any[]) => VersionedDependency>(Base: T) {
   abstract class GlobalDependency extends Base {
     /** The name of this dependency; it must be a key in DEP_VERSIONS_PATH. */
-    abstract get name(): keyof DependencyVersions;
+    abstract name: keyof DependencyVersions;
     /** Cache of the loaded {@link DependencyVersions}; should not be used directly. */
     static #depVersionsCache: Promise<DependencyVersions> | undefined;
     /** Get the {@link DependencyVersions} as found on disk. */
diff --git a/scripts/lib/download.ts b/scripts/lib/download.ts
@@ -9,7 +9,7 @@ import os from 'os';
 import path from 'path';
 import stream from 'stream';
 
-import { simpleSpawn } from 'scripts/simple_process';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 type ChecksumAlgorithm = 'sha1' | 'sha256' | 'sha512';
 
diff --git a/scripts/lib/installer-win32.tsx b/scripts/lib/installer-win32.tsx
@@ -17,7 +17,7 @@ import yaml from 'yaml';
 import buildUtils from './build-utils';
 import generateFileList from './installer-win32-gen';
 
-import { simpleSpawn } from 'scripts/simple_process';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 /**
  * Return the contents of package.json embedded in the application.
diff --git a/scripts/lib/sign-win32.ts b/scripts/lib/sign-win32.ts
@@ -10,7 +10,7 @@ import defaults from 'lodash/defaultsDeep';
 import merge from 'lodash/merge';
 import yaml from 'yaml';
 
-import { simpleSpawn } from 'scripts/simple_process';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 /** signFileFn is a function that signs a single file. */
 type signFileFn = (...filePath: string[]) => Promise<void>;
diff --git a/scripts/postinstall.ts b/scripts/postinstall.ts
@@ -3,18 +3,18 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
-import * as goUtils from 'scripts/dependencies/go-source';
-import { Lima, Qemu, SocketVMNet, AlpineLimaISO } from 'scripts/dependencies/lima';
-import { MobyOpenAPISpec } from 'scripts/dependencies/moby-openapi';
-import { SudoPrompt } from 'scripts/dependencies/sudo-prompt';
-import { ExtensionProxyImage, WSLDistroImage } from 'scripts/dependencies/tar-archives';
-import * as tools from 'scripts/dependencies/tools';
-import { Wix } from 'scripts/dependencies/wix';
-import { WSLDistro, Moproxy } from 'scripts/dependencies/wsl';
+import * as goUtils from '@/scripts/dependencies/go-source';
+import { Lima, Qemu, SocketVMNet, AlpineLimaISO } from '@/scripts/dependencies/lima';
+import { MobyOpenAPISpec } from '@/scripts/dependencies/moby-openapi';
+import { SudoPrompt } from '@/scripts/dependencies/sudo-prompt';
+import { ExtensionProxyImage, WSLDistroImage } from '@/scripts/dependencies/tar-archives';
+import * as tools from '@/scripts/dependencies/tools';
+import { Wix } from '@/scripts/dependencies/wix';
+import { WSLDistro, Moproxy } from '@/scripts/dependencies/wsl';
 import {
   DependencyPlatform, DependencyVersions, readDependencyVersions, DownloadContext, Dependency,
-} from 'scripts/lib/dependencies';
-import { simpleSpawn } from 'scripts/simple_process';
+} from '@/scripts/lib/dependencies';
+import { simpleSpawn } from '@/scripts/simple_process';
 
 interface DependencyWithContext {
   dependency: Dependency;
diff --git a/scripts/rddepman.ts b/scripts/rddepman.ts
@@ -7,17 +7,17 @@ import semver from 'semver';
 
 import { getExtensions } from './lib/extension-data';
 
-import { Lima, Qemu, SocketVMNet, AlpineLimaISO } from 'scripts/dependencies/lima';
-import { MobyOpenAPISpec } from 'scripts/dependencies/moby-openapi';
-import * as tools from 'scripts/dependencies/tools';
-import { Wix } from 'scripts/dependencies/wix';
-import { WSLDistro, Moproxy } from 'scripts/dependencies/wsl';
+import { Lima, Qemu, SocketVMNet, AlpineLimaISO } from '@/scripts/dependencies/lima';
+import { MobyOpenAPISpec } from '@/scripts/dependencies/moby-openapi';
+import * as tools from '@/scripts/dependencies/tools';
+import { Wix } from '@/scripts/dependencies/wix';
+import { WSLDistro, Moproxy } from '@/scripts/dependencies/wsl';
 import {
   AlpineLimaISOVersion, getOctokit,
   iterateIterator,
   GitHubDependency,
   VersionedDependency,
-} from 'scripts/lib/dependencies';
+} from '@/scripts/lib/dependencies';
 
 const MAIN_BRANCH = 'main';
 const GITHUB_OWNER = process.env.GITHUB_REPOSITORY?.split('/')[0] || 'rancher-sandbox';
diff --git a/scripts/unreleased-change-monitor.ts b/scripts/unreleased-change-monitor.ts
@@ -1,9 +1,9 @@
 import { Octokit } from 'octokit';
 
-import { Lima, Qemu, AlpineLimaISO } from 'scripts/dependencies/lima';
-import * as tools from 'scripts/dependencies/tools';
-import { WSLDistro } from 'scripts/dependencies/wsl';
-import { GitHubDependency, HasUnreleasedChangesResult, getOctokit, RancherDesktopRepository } from 'scripts/lib/dependencies';
+import { Lima, Qemu, AlpineLimaISO } from '@/scripts/dependencies/lima';
+import * as tools from '@/scripts/dependencies/tools';
+import { WSLDistro } from '@/scripts/dependencies/wsl';
+import { GitHubDependency, HasUnreleasedChangesResult, getOctokit, RancherDesktopRepository } from '@/scripts/lib/dependencies';
 
 const GITHUB_OWNER = process.env.GITHUB_REPOSITORY?.split('/')[0] || 'rancher-sandbox';
 const GITHUB_REPO = process.env.GITHUB_REPOSITORY?.split('/')[1] || 'rancher-desktop';
diff --git a/tsconfig.json b/tsconfig.json
@@ -16,10 +16,12 @@
     "sourceMap": true,
     "strict": true,
     "experimentalDecorators": true,
-    "baseUrl": ".",
     "paths": {
+      "@/*": [
+        "./*"
+      ],
       "@pkg/*": [
-        "pkg/rancher-desktop/*"
+        "./pkg/rancher-desktop/*"
       ],
       "@shell/*": [
         "./node_modules/@rancher/shell/*"
