Fix export typesy (#1397)

inertiajs · Feb 1, 2023 · 21f750b · 21f750b
1 parent 0dd3c0f
commit 21f750b
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 21 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -26,14 +26,21 @@
   "types": "types/index.d.ts",
   "exports": {
     ".": {
+      "types": "./types/index.d.ts",
       "import": "./dist/index.esm.js",
-      "require": "./dist/index.js",
-      "types": "./types/index.d.js"
+      "require": "./dist/index.js"
     },
     "./server": {
+      "types": "./types/server.d.ts",
       "import": "./dist/server.esm.js",
-      "require": "./dist/server.js",
-      "types": "./types/server.d.js"
+      "require": "./dist/server.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "server": [
+        "types/server.d.ts"
+      ]
     }
   },
   "scripts": {

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -25,14 +25,21 @@
   "types": "types/index.d.ts",
   "exports": {
     ".": {
+      "types": "./types/index.d.ts",
       "import": "./dist/index.esm.js",
-      "require": "./dist/index.js",
-      "types": "./types/index.d.js"
+      "require": "./dist/index.js"
     },
     "./server": {
+      "types": "./types/server.d.ts",
       "import": "./dist/server.esm.js",
-      "require": "./dist/server.js",
-      "types": "./types/server.d.js"
+      "require": "./dist/server.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "server": [
+        "types/server.d.ts"
+      ]
     }
   },
   "scripts": {

diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "include": ["src/index.ts"],
+  "include": ["src/index.ts", "src/server.ts"],
   "compilerOptions": {
     "rootDir": "src",
     "noEmitOnError": true,

diff --git a/packages/vue2/package.json b/packages/vue2/package.json
@@ -26,14 +26,21 @@
   "types": "types/index.d.ts",
   "exports": {
     ".": {
+      "types": "./types/index.d.ts",
       "import": "./dist/index.esm.js",
-      "require": "./dist/index.js",
-      "types": "./types/index.d.js"
+      "require": "./dist/index.js"
     },
     "./server": {
+      "types": "./types/server.d.ts",
       "import": "./dist/server.esm.js",
-      "require": "./dist/server.js",
-      "types": "./types/server.d.js"
+      "require": "./dist/server.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "server": [
+        "types/server.d.ts"
+      ]
     }
   },
   "scripts": {

diff --git a/packages/vue2/tsconfig.json b/packages/vue2/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "include": ["src/index.ts"],
+  "include": ["src/index.ts", "src/server.ts"],
   "compilerOptions": {
     "rootDir": "src",
     "noEmitOnError": true,

diff --git a/packages/vue3/package.json b/packages/vue3/package.json
@@ -24,14 +24,21 @@
   "types": "types/index.d.ts",
   "exports": {
     ".": {
+      "types": "./types/index.d.ts",
       "import": "./dist/index.esm.js",
-      "require": "./dist/index.js",
-      "types": "./types/index.d.js"
+      "require": "./dist/index.js"
     },
     "./server": {
+      "types": "./types/server.d.ts",
       "import": "./dist/server.esm.js",
-      "require": "./dist/server.js",
-      "types": "./types/server.d.js"
+      "require": "./dist/server.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "server": [
+        "types/server.d.ts"
+      ]
     }
   },
   "scripts": {

diff --git a/packages/vue3/tsconfig.json b/packages/vue3/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "include": ["src/index.ts"],
+  "include": ["src/index.ts", "src/server.ts"],
   "compilerOptions": {
     "rootDir": "src",
     "noEmitOnError": true,

diff --git a/playgrounds/vue3/resources/js/ssr.ts b/playgrounds/vue3/resources/js/ssr.ts
@@ -1,10 +1,8 @@
 import { createInertiaApp } from '@inertiajs/vue3'
-// @ts-expect-error
 import createServer from '@inertiajs/vue3/server'
 import { renderToString } from '@vue/server-renderer'
 import { createSSRApp, h, type DefineComponent } from 'vue'
 
-// @ts-expect-error
 createServer((page) =>
   createInertiaApp({
     page,