From 3a2a0825fe3389a3b602c0a6b893dc2819d18155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Holl=C3=A4nder?= Date: Tue, 17 Jan 2023 12:49:20 +0100 Subject: [PATCH 1/4] Fix: export types correctly The "exports" field of the package.json was misused for the type-declarations. Also, the type-declarations of secondary entrypoint (server.ts) of the platform packages was not generated. --- packages/core/package.json | 11 +++++++---- packages/react/package.json | 11 +++++++---- packages/react/tsconfig.json | 2 +- packages/vue2/package.json | 11 +++++++---- packages/vue2/tsconfig.json | 2 +- packages/vue3/package.json | 11 +++++++---- packages/vue3/tsconfig.json | 2 +- 7 files changed, 31 insertions(+), 19 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index fcbe18bbd..8b456643b 100755 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -27,13 +27,16 @@ "exports": { ".": { "import": "./dist/index.esm.js", - "require": "./dist/index.js", - "types": "./types/index.d.js" + "require": "./dist/index.js" }, "./server": { "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..72e7288ac 100755 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -26,13 +26,16 @@ "exports": { ".": { "import": "./dist/index.esm.js", - "require": "./dist/index.js", - "types": "./types/index.d.js" + "require": "./dist/index.js" }, "./server": { "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..acaa3f405 100755 --- a/packages/vue2/package.json +++ b/packages/vue2/package.json @@ -27,13 +27,16 @@ "exports": { ".": { "import": "./dist/index.esm.js", - "require": "./dist/index.js", - "types": "./types/index.d.js" + "require": "./dist/index.js" }, "./server": { "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..5455293cd 100755 --- a/packages/vue3/package.json +++ b/packages/vue3/package.json @@ -25,13 +25,16 @@ "exports": { ".": { "import": "./dist/index.esm.js", - "require": "./dist/index.js", - "types": "./types/index.d.js" + "require": "./dist/index.js" }, "./server": { "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, From 8f7e091cdfe7b94267faf8574646d042d16ec15e Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Wed, 1 Feb 2023 15:05:14 +1000 Subject: [PATCH 2/4] Remove unused `@ts-expect-error` directives --- playgrounds/vue3/resources/js/ssr.ts | 2 -- 1 file changed, 2 deletions(-) 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, From cfc2a66bd77252d273c433cf142be926d9b4108e Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Thu, 2 Feb 2023 09:30:29 +1000 Subject: [PATCH 3/4] Restore types field --- packages/core/package.json | 2 ++ packages/react/package.json | 2 ++ packages/vue2/package.json | 2 ++ packages/vue3/package.json | 2 ++ 4 files changed, 8 insertions(+) diff --git a/packages/core/package.json b/packages/core/package.json index 8b456643b..4d04132fe 100755 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -26,10 +26,12 @@ "types": "types/index.d.ts", "exports": { ".": { + "types": "./types/index.d.ts", "import": "./dist/index.esm.js", "require": "./dist/index.js" }, "./server": { + "types": "./types/server.d.ts", "import": "./dist/server.esm.js", "require": "./dist/server.js" } diff --git a/packages/react/package.json b/packages/react/package.json index 72e7288ac..9eab46a46 100755 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -25,10 +25,12 @@ "types": "types/index.d.ts", "exports": { ".": { + "types": "./types/index.d.ts", "import": "./dist/index.esm.js", "require": "./dist/index.js" }, "./server": { + "types": "./types/server.d.ts", "import": "./dist/server.esm.js", "require": "./dist/server.js" } diff --git a/packages/vue2/package.json b/packages/vue2/package.json index acaa3f405..e053b8ad8 100755 --- a/packages/vue2/package.json +++ b/packages/vue2/package.json @@ -26,10 +26,12 @@ "types": "types/index.d.ts", "exports": { ".": { + "types": "./types/index.d.ts", "import": "./dist/index.esm.js", "require": "./dist/index.js" }, "./server": { + "types": "./types/server.d.ts", "import": "./dist/server.esm.js", "require": "./dist/server.js" } diff --git a/packages/vue3/package.json b/packages/vue3/package.json index 5455293cd..25e6db45f 100755 --- a/packages/vue3/package.json +++ b/packages/vue3/package.json @@ -24,10 +24,12 @@ "types": "types/index.d.ts", "exports": { ".": { + "types": "./types/index.d.ts", "import": "./dist/index.esm.js", "require": "./dist/index.js" }, "./server": { + "types": "./types/server.d.ts", "import": "./dist/server.esm.js", "require": "./dist/server.js" } From ffeb88147ba69da362150ce94ce87b78e441497d Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Thu, 2 Feb 2023 09:31:57 +1000 Subject: [PATCH 4/4] Apply Prettier --- packages/core/package.json | 4 +++- packages/react/package.json | 4 +++- packages/vue2/package.json | 4 +++- packages/vue3/package.json | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 4d04132fe..c076a5563 100755 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -38,7 +38,9 @@ }, "typesVersions": { "*": { - "server": ["types/server.d.ts"] + "server": [ + "types/server.d.ts" + ] } }, "scripts": { diff --git a/packages/react/package.json b/packages/react/package.json index 9eab46a46..284e7726b 100755 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -37,7 +37,9 @@ }, "typesVersions": { "*": { - "server": ["types/server.d.ts"] + "server": [ + "types/server.d.ts" + ] } }, "scripts": { diff --git a/packages/vue2/package.json b/packages/vue2/package.json index e053b8ad8..7f14d7e93 100755 --- a/packages/vue2/package.json +++ b/packages/vue2/package.json @@ -38,7 +38,9 @@ }, "typesVersions": { "*": { - "server": ["types/server.d.ts"] + "server": [ + "types/server.d.ts" + ] } }, "scripts": { diff --git a/packages/vue3/package.json b/packages/vue3/package.json index 25e6db45f..077857043 100755 --- a/packages/vue3/package.json +++ b/packages/vue3/package.json @@ -36,7 +36,9 @@ }, "typesVersions": { "*": { - "server": ["types/server.d.ts"] + "server": [ + "types/server.d.ts" + ] } }, "scripts": {