Merge branch 'main' into fix/type-only-import-detection

Author: kalvenschraut

.github/workflows/issue-close-require.yml

@@ -0,0 +1,22 @@
+name: Issue Close Require
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+jobs:
+  close-issues:
+    if: github.repository == 'rolldown/tsdown'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write # for actions-cool/issues-helper to update issues
+      pull-requests: write # for actions-cool/issues-helper to update PRs
+    steps:
+      - name: needs reproduction
+        uses: actions-cool/issues-helper@71b62d7da76e59ff7b193904feb6e77d4dbb2777 # v3.7.6
+        with:
+          actions: close-issues
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: needs reproduction
+          inactive-day: 7

.github/workflows/lock-closed-issues.yml

@@ -0,0 +1,21 @@
+name: Lock Closed Issues
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+permissions:
+  issues: write
+
+jobs:
+  action:
+    if: github.repository == 'rolldown/tsdown'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-cool/issues-helper@71b62d7da76e59ff7b193904feb6e77d4dbb2777 # v3.7.6
+        with:
+          actions: lock-issues
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-state: closed
+          inactive-day: 14

package.json

@@ -56,7 +56,7 @@
     "@ts-macro/tsc": "^0.3.6",
     "@typescript/native-preview": ">=7.0.0-dev.20250601.1",
     "rolldown": "^1.0.0-rc.3",
-    "typescript": "^5.0.0",
+    "typescript": "^5.0.0 || ^6.0.0-beta",
     "vue-tsc": "~3.2.0"
   },
   "peerDependenciesMeta": {
@@ -104,10 +104,11 @@
     "rollup-plugin-dts": "^6.3.0",
     "tinyglobby": "^0.2.15",
     "tsdown": "^0.20.1",
-    "typescript": "^5.9.3",
+    "typescript": "6.0.0-beta",
     "vitest": "^4.0.18",
     "vue": "^3.5.27",
-    "vue-tsc": "^3.2.4"
+    "vue-tsc": "^3.2.4",
+    "zod": "^4.3.6"
   },
   "resolutions": {
     "rolldown": "^1.0.0-rc.3"

pnpm-lock.yaml

@@ -723,6 +723,8 @@ export function createFakeJsPlugin({
               start: transformedDep.start,
               end: transformedDep.end,
             }
+          } else if (isInfer(transformedDep)) {
+            transformedDep.name = '__Infer'
           }
 
           if (originalDep.replace) {
@@ -1352,6 +1354,9 @@ function isThisExpression(node: t.Node): boolean {
   )
 }
 
+function isInfer(node: t.Node): node is t.Identifier {
+  return isIdentifierOf(node, 'infer')
+}
 function TSEntityNameToRuntime(
   node: t.TSEntityName,
 ): t.MemberExpression | t.Identifier | t.ThisExpression {
@@ -1393,7 +1398,7 @@ function isHelperImport(node: t.Node) {
  * patch `.d.ts` suffix in import source to `.js`
  */
 function patchImportExport(
-  node: t.Node,
+  node: t.Statement,
   typeOnlyIds: string[],
   cjsDefault: boolean,
 ): t.Statement | false | undefined {
@@ -1407,6 +1412,14 @@ function patchImportExport(
     return false
   }
 
+  if (node.type === 'ImportDeclaration' && node.specifiers.length) {
+    for (const specifier of node.specifiers) {
+      if (isInfer(specifier.local)) {
+        specifier.local.name = '__Infer'
+      }
+    }
+  }
+
   if (
     isTypeOf(node, [
       'ImportDeclaration',

src/fake-js.ts

@@ -5,7 +5,10 @@ import type Ts from 'typescript'
 
 const debug = createDebug('rolldown-plugin-dts:volar')
 
-export function loadVueLanguageTools() {
+export function loadVueLanguageTools(): {
+  volarTs: typeof import('@volar/typescript')
+  vue: typeof import('@vue/language-core')
+} {
   debug('loading vue language tools')
   try {
     const vueTscPath = require.resolve('vue-tsc')