From 21f750b96cc64280e0767e24384c0f9f26f1273c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Holl=C3=A4nder?= Date: Thu, 2 Feb 2023 00:50:31 +0100 Subject: [PATCH] Fix export typesy (#1397) --- packages/core/package.json | 15 +++++++++++---- packages/react/package.json | 15 +++++++++++---- packages/react/tsconfig.json | 2 +- packages/vue2/package.json | 15 +++++++++++---- packages/vue2/tsconfig.json | 2 +- packages/vue3/package.json | 15 +++++++++++---- packages/vue3/tsconfig.json | 2 +- playgrounds/vue3/resources/js/ssr.ts | 2 -- 8 files changed, 47 insertions(+), 21 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index fcbe18bbd..c076a5563 100755 --- 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 index c019c7428..284e7726b 100755 --- 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 index 44e546395..86b971275 100644 --- 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 index 05f567b32..7f14d7e93 100755 --- 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 index 44e546395..86b971275 100644 --- 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 index a70c2393d..077857043 100755 --- 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 index f5ad7f823..9e88921b9 100644 --- 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 index f1edb9327..8bfa68cae 100644 --- 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,