Merge branch 'main' into fix/1502-rewrite-tsconfig-types

Author: naokihaba

.github/renovate.json

@@ -11,39 +11,13 @@
   ],
   "packageRules": [
     {
-      "description": "Ignore selected npm package updates",
+      "description": "Disable all npm updates (lockfile updates fail because vite/patches/* is gitignored)",
       "matchManagers": ["npm"],
-      "matchPackageNames": [
-        "rolldown",
-        "/^oxc-.*/",
-        "@oxc-node/*",
-        "@oxc-project/*",
-        "@vitejs/devtools",
-        "oxfmt",
-        "oxlint",
-        "oxlint-tsgolint",
-        "tsdown",
-        "vite",
-        "vitest",
-        "vitest-dev"
-      ],
       "enabled": false
     },
     {
-      "description": "Ignore oxc crate updates",
+      "description": "Disable all cargo updates (lockfile updates fail because rolldown/ is gitignored)",
       "matchManagers": ["cargo"],
-      "matchPackageNames": ["/^oxc([_-].*)?$/"],
-      "enabled": false
-    },
-    {
-      "matchDepNames": [
-        "fspy",
-        "vite_glob",
-        "vite_path",
-        "vite_str",
-        "vite_task",
-        "vite_workspace"
-      ],
       "enabled": false
     }
   ]

.github/scripts/upgrade-deps.mjs .github/scripts/upgrade-deps.ts.github/scripts/upgrade-deps.mjs renamed to .github/scripts/upgrade-deps.ts

@@ -4,13 +4,79 @@ import path from 'node:path';
 const ROOT = process.cwd();
 const META_DIR = process.env.UPGRADE_DEPS_META_DIR;
 
-const isFullSha = (s) => /^[0-9a-f]{40}$/.test(s);
+type Change = {
+  old: string | null;
+  new: string;
+  tag?: string;
+};
+
+type GitHubTag = {
+  name?: unknown;
+  commit?: {
+    sha?: unknown;
+  };
+};
+
+type LatestTag = {
+  sha: string;
+  tag: string;
+};
 
-/** @type {Map<string, { old: string | null, new: string, tag?: string }>} */
-const changes = new Map();
+type NpmLatestResponse = {
+  version?: unknown;
+};
 
-function recordChange(name, oldValue, newValue, tag) {
-  const entry = { old: oldValue ?? null, new: newValue };
+type UpstreamVersions = {
+  rolldown: {
+    hash: string;
+  };
+  vite: {
+    hash: string;
+  };
+};
+
+type PnpmWorkspaceVersions = {
+  vitest: string;
+  tsdown: string;
+  oxcNodeCli: string;
+  oxcNodeCore: string;
+  oxfmt: string;
+  oxlint: string;
+  oxlintTsgolint: string;
+  oxcProjectRuntime: string;
+  oxcProjectTypes: string;
+  oxcMinify: string;
+  oxcParser: string;
+  oxcTransform: string;
+};
+
+type PnpmWorkspaceEntry = {
+  name: string;
+  pattern: RegExp;
+  replacement: string;
+  newVersion: string;
+};
+
+type PackageJson = {
+  devDependencies?: Record<string, string>;
+  peerDependencies?: Record<string, string>;
+};
+
+const isFullSha = (s: string): boolean => /^[0-9a-f]{40}$/.test(s);
+
+const changes = new Map<string, Change>();
+
+function readJsonFile(filePath: string) {
+  return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+}
+
+function recordChange(
+  name: string,
+  oldValue: string | null | undefined,
+  newValue: string,
+  tag?: string,
+) {
+  const entry: Change = { old: oldValue ?? null, new: newValue };
   if (tag) {
     entry.tag = tag;
   }
@@ -23,7 +89,7 @@ function recordChange(name, oldValue, newValue, tag) {
 }
 
 // ============ GitHub API ============
-async function getLatestTag(owner, repo) {
+async function getLatestTag(owner: string, repo: string): Promise<LatestTag> {
   const res = await fetch(`https://api.github.com/repos/${owner}/${repo}/tags?per_page=1`, {
     headers: {
       Authorization: `token ${process.env.GITHUB_TOKEN}`,
@@ -33,45 +99,46 @@ async function getLatestTag(owner, repo) {
   if (!res.ok) {
     throw new Error(`Failed to fetch tags for ${owner}/${repo}: ${res.status} ${res.statusText}`);
   }
-  const tags = await res.json();
+  const tags = (await res.json()) as GitHubTag[];
   if (!Array.isArray(tags) || !tags.length) {
     throw new Error(`No tags found for ${owner}/${repo}`);
   }
-  if (!tags[0]?.commit?.sha || !tags[0]?.name) {
+  const [latest] = tags;
+  if (typeof latest?.commit?.sha !== 'string' || typeof latest.name !== 'string') {
     throw new Error(`Invalid tag structure for ${owner}/${repo}: missing SHA or name`);
   }
-  console.log(`${repo} -> ${tags[0].name} (${tags[0].commit.sha.slice(0, 7)})`);
-  return { sha: tags[0].commit.sha, tag: tags[0].name };
+  console.log(`${repo} -> ${latest.name} (${latest.commit.sha.slice(0, 7)})`);
+  return { sha: latest.commit.sha, tag: latest.name };
 }
 
 // ============ npm Registry ============
-async function getLatestNpmVersion(packageName) {
+async function getLatestNpmVersion(packageName: string): Promise<string> {
   const res = await fetch(`https://registry.npmjs.org/${packageName}/latest`);
   if (!res.ok) {
     throw new Error(
       `Failed to fetch npm version for ${packageName}: ${res.status} ${res.statusText}`,
     );
   }
-  const data = await res.json();
-  if (!data?.version) {
+  const data = (await res.json()) as NpmLatestResponse;
+  if (typeof data.version !== 'string') {
     throw new Error(`Invalid npm response for ${packageName}: missing version field`);
   }
   return data.version;
 }
 
 // ============ Update .upstream-versions.json ============
-async function updateUpstreamVersions() {
+async function updateUpstreamVersions(): Promise<void> {
   const filePath = path.join(ROOT, 'packages/tools/.upstream-versions.json');
-  const data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+  const data: UpstreamVersions = readJsonFile(filePath);
 
   const oldRolldownHash = data.rolldown.hash;
-  const oldViteHash = data['vite'].hash;
+  const oldViteHash = data.vite.hash;
   const [rolldown, vite] = await Promise.all([
     getLatestTag('rolldown', 'rolldown'),
     getLatestTag('vitejs', 'vite'),
   ]);
   data.rolldown.hash = rolldown.sha;
-  data['vite'].hash = vite.sha;
+  data.vite.hash = vite.sha;
   recordChange('rolldown', oldRolldownHash, rolldown.sha, rolldown.tag);
   recordChange('vite', oldViteHash, vite.sha, vite.tag);
 
@@ -80,12 +147,12 @@ async function updateUpstreamVersions() {
 }
 
 // ============ Update pnpm-workspace.yaml ============
-async function updatePnpmWorkspace(versions) {
+async function updatePnpmWorkspace(versions: PnpmWorkspaceVersions): Promise<void> {
   const filePath = path.join(ROOT, 'pnpm-workspace.yaml');
   let content = fs.readFileSync(filePath, 'utf8');
 
   // oxlint's trailing \n in the pattern disambiguates from oxlint-tsgolint.
-  const entries = [
+  const entries: PnpmWorkspaceEntry[] = [
     {
       name: 'vitest',
       pattern: /vitest-dev: npm:vitest@\^([\d.]+(?:-[\w.]+)?)/,
@@ -161,15 +228,15 @@ async function updatePnpmWorkspace(versions) {
   ];
 
   for (const { name, pattern, replacement, newVersion } of entries) {
-    let oldVersion;
-    content = content.replace(pattern, (_match, captured) => {
+    let oldVersion: string | undefined;
+    content = content.replace(pattern, (_match: string, captured: string) => {
       oldVersion = captured;
       return replacement;
     });
     if (oldVersion === undefined) {
       throw new Error(
         `Failed to match ${name} in pnpm-workspace.yaml — the pattern ${pattern} is stale, ` +
-          `please update it in .github/scripts/upgrade-deps.mjs`,
+          `please update it in .github/scripts/upgrade-deps.ts`,
       );
     }
     recordChange(name, oldVersion, newVersion);
@@ -180,20 +247,24 @@ async function updatePnpmWorkspace(versions) {
 }
 
 // ============ Update packages/test/package.json ============
-async function updateTestPackage(vitestVersion) {
+async function updateTestPackage(vitestVersion: string): Promise<void> {
   const filePath = path.join(ROOT, 'packages/test/package.json');
-  const pkg = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+  const pkg: PackageJson = readJsonFile(filePath);
+  const devDependencies = pkg.devDependencies;
+  if (!devDependencies) {
+    throw new Error('packages/test/package.json is missing devDependencies');
+  }
 
   // Update all @vitest/* devDependencies
-  for (const dep of Object.keys(pkg.devDependencies)) {
+  for (const dep of Object.keys(devDependencies)) {
     if (dep.startsWith('@vitest/')) {
-      pkg.devDependencies[dep] = vitestVersion;
+      devDependencies[dep] = vitestVersion;
     }
   }
 
   // Update vitest-dev devDependency
-  if (pkg.devDependencies['vitest-dev']) {
-    pkg.devDependencies['vitest-dev'] = `^${vitestVersion}`;
+  if (devDependencies['vitest-dev']) {
+    devDependencies['vitest-dev'] = `^${vitestVersion}`;
   }
 
   // Update @vitest/ui peerDependency if present
@@ -206,23 +277,24 @@ async function updateTestPackage(vitestVersion) {
 }
 
 // ============ Update packages/core/package.json ============
-async function updateCorePackage(devtoolsVersion) {
+async function updateCorePackage(devtoolsVersion: string): Promise<void> {
   const filePath = path.join(ROOT, 'packages/core/package.json');
-  const pkg = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+  const pkg: PackageJson = readJsonFile(filePath);
 
-  const currentDevtools = pkg.devDependencies?.['@vitejs/devtools'];
+  const devDependencies = pkg.devDependencies;
+  const currentDevtools = devDependencies?.['@vitejs/devtools'];
   if (!currentDevtools) {
     return;
   }
-  pkg.devDependencies['@vitejs/devtools'] = `^${devtoolsVersion}`;
+  devDependencies['@vitejs/devtools'] = `^${devtoolsVersion}`;
   recordChange('@vitejs/devtools', currentDevtools.replace(/^[\^~]/, ''), devtoolsVersion);
 
   fs.writeFileSync(filePath, JSON.stringify(pkg, null, 2) + '\n');
   console.log('Updated packages/core/package.json');
 }
 
 // ============ Write metadata files for PR description ============
-function writeMetaFiles() {
+function writeMetaFiles(): void {
   if (!META_DIR) {
     return;
   }
@@ -238,7 +310,7 @@ function writeMetaFiles() {
   const changed = [...changes.entries()].filter(([, v]) => v.old !== v.new);
   const unchanged = [...changes.entries()].filter(([, v]) => v.old === v.new);
 
-  const formatVersion = (v) => {
+  const formatVersion = (v: Change): string => {
     if (v.tag) {
       return `${v.tag} (${v.new.slice(0, 7)})`;
     }
@@ -247,7 +319,7 @@ function writeMetaFiles() {
     }
     return v.new;
   };
-  const formatOld = (v) => {
+  const formatOld = (v: Change): string => {
     if (!v.old) {
       return '(unset)';
     }

.github/workflows/ci.yml

@@ -175,7 +175,7 @@ jobs:
           # cargo clippy --all-targets --all-features -- -D warnings
           # RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --document-private-items
 
-      - uses: crate-ci/typos@7c572958218557a3272c2d6719629443b5cc26fd # v1.45.2
+      - uses: crate-ci/typos@bbaefadf97b0ec5fdc942684b647f1a6ab250274 # v1.46.0
         with:
           files: .
 
@@ -663,9 +663,29 @@ jobs:
         with:
           drive-size: 12GB
           drive-format: ReFS
+          # Route TEMP/TMP onto the Dev Drive (ReFS) so `tmpdir()` from
+          # `packages/tools/src/snap-test.ts` lives on a filesystem that
+          # cleanly resolves pnpm's junction reparse points. NTFS-on-C:
+          # preserves the junction-target backslashes during resolution,
+          # which produces mixed `\` / `/` paths that break Node's ESM
+          # subpath-import walk-up (`#module-sync-enabled` inside
+          # `@voidzero-dev/vite-plus-core` → `ERR_PACKAGE_IMPORT_NOT_DEFINED`
+          # during `vp fmt --write` in the
+          # `new-create-vite-migrates-eslint-prettier` snap test).
           env-mapping: |
             CARGO_HOME,{{ DEV_DRIVE }}/.cargo
             RUSTUP_HOME,{{ DEV_DRIVE }}/.rustup
+            TEMP,{{ DEV_DRIVE }}/Temp
+            TMP,{{ DEV_DRIVE }}/Temp
+
+      - name: Create TEMP/TMP on Dev Drive
+        if: runner.os == 'Windows'
+        # `setup-dev-drive` only mounts the drive; it doesn't create the
+        # dir we point TEMP/TMP at. Anything that calls `os.tmpdir()` /
+        # `lstat($TEMP)` before this dir exists fails (e.g. the bootstrap
+        # CLI installer's `lstat 'E:\Temp'` ENOENT).
+        shell: bash
+        run: mkdir -p "$TEMP" "$TMP"
 
       - uses: oxc-project/setup-rust@23f38cfb0c04af97a055f76acee94d5be71c7c82 # v1.0.16
         with:

.github/workflows/e2e-test.yml

@@ -265,8 +265,14 @@ jobs:
             node-version: 24
             command: |
               vp run build
-              vp check --fix
-              vp run check
+              # Report-only: oxlint 1.63 drops the `eslint-` prefix from plugin names
+              # (https://github.com/oxc-project/oxc/pull/21806), invalidating vinext's existing
+              # `oxlint-disable-next-line eslint-plugin-react-hooks/...` directive, and tightens
+              # a couple of unused-import checks. vinext can only update its source after a
+              # vite-plus release ships these oxlint changes, so don't fail the matrix on the
+              # surfaced errors yet.
+              vp check --fix || true
+              vp run check || true
               vp run test
           - name: reactive-resume
             node-version: 24