Merge pull request #2035 from inertiajs/svelte-fix-ts

[2.x] Change TypeScript module resolution in the Svelte adapter
inertiajs · Oct 16, 2024 · e09b8f1 · e09b8f1
2 parents eba892c + f5ad53b
commit e09b8f1
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 52 deletions.
diff --git a/packages/svelte/test-app/tsconfig.json b/packages/svelte/test-app/tsconfig.json
@@ -9,8 +9,8 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext"
+    "module": "ESNext",
+    "moduleResolution": "node"
   },
   "include": ["*.d.ts", "*.ts", "*.js", "**/*.d.ts", "**/*.ts", "**/*.js", "**/*.svelte", "*.config.js", "*.config.cjs"]
 }
diff --git a/playgrounds/svelte4/resources/js/app.ts b/playgrounds/svelte4/resources/js/app.ts
@@ -1,5 +1,4 @@
-import { createInertiaApp } from '@inertiajs/svelte'
-import type { ResolvedComponent } from '@inertiajs/svelte'
+import { createInertiaApp, type ResolvedComponent } from '@inertiajs/svelte'
 
 createInertiaApp({
   resolve: (name) => {

diff --git a/playgrounds/svelte4/resources/js/ssr.ts b/playgrounds/svelte4/resources/js/ssr.ts
@@ -1,6 +1,5 @@
-import { createInertiaApp } from '@inertiajs/svelte'
+import { createInertiaApp, type ResolvedComponent } from '@inertiajs/svelte'
 import createServer from '@inertiajs/svelte/server'
-import { ResolvedComponent } from '@inertiajs/svelte'
 
 createServer((page) =>
   createInertiaApp({

diff --git a/playgrounds/svelte4/tsconfig.json b/playgrounds/svelte4/tsconfig.json
@@ -1,23 +1,26 @@
 {
-	"extends": "@tsconfig/svelte/tsconfig.json",
-	"compilerOptions": {
-		"allowJs": true,
-		"checkJs": true,
-		"esModuleInterop": true,
-		"forceConsistentCasingInFileNames": true,
-		"resolveJsonModule": true,
-		"skipLibCheck": true,
-		"sourceMap": true,
-		"strict": true,
-		"module": "NodeNext",
-		"moduleResolution": "NodeNext"
-	},
-    "include": [
-        "resources/**/*.d.ts",
-        "resources/**/*.ts",
-        "resources/**/*.js",
-        "resources/**/*.svelte",
-        "*.config.js",
-        "*.config.cjs"
-    ]
+  "extends": "@tsconfig/svelte/tsconfig.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "checkJs": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": true,
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "paths": {
+      "@inertiajs/svelte/server": ["../../node_modules/@inertiajs/svelte/dist/server"]
+    }
+  },
+  "include": [
+    "resources/**/*.d.ts",
+    "resources/**/*.ts",
+    "resources/**/*.js",
+    "resources/**/*.svelte",
+    "*.config.js",
+    "*.config.cjs"
+  ]
 }
diff --git a/playgrounds/svelte5/resources/js/app.ts b/playgrounds/svelte5/resources/js/app.ts
@@ -1,6 +1,5 @@
-import { createInertiaApp } from '@inertiajs/svelte'
+import { createInertiaApp, type ResolvedComponent } from '@inertiajs/svelte'
 import { hydrate, mount } from 'svelte'
-import type { ResolvedComponent } from '@inertiajs/svelte'
 
 createInertiaApp({
   resolve: (name) => {

diff --git a/playgrounds/svelte5/resources/js/ssr.ts b/playgrounds/svelte5/resources/js/ssr.ts
@@ -1,6 +1,5 @@
-import { createInertiaApp } from '@inertiajs/svelte'
+import { createInertiaApp, type ResolvedComponent } from '@inertiajs/svelte'
 import createServer from '@inertiajs/svelte/server'
-import { ResolvedComponent } from '@inertiajs/svelte'
 
 createServer((page) =>
   createInertiaApp({

diff --git a/playgrounds/svelte5/tsconfig.json b/playgrounds/svelte5/tsconfig.json
@@ -1,23 +1,26 @@
 {
-	"extends": "@tsconfig/svelte/tsconfig.json",
-	"compilerOptions": {
-		"allowJs": true,
-		"checkJs": true,
-		"esModuleInterop": true,
-		"forceConsistentCasingInFileNames": true,
-		"resolveJsonModule": true,
-		"skipLibCheck": true,
-		"sourceMap": true,
-		"strict": true,
-		"module": "NodeNext",
-		"moduleResolution": "NodeNext"
-	},
-    "include": [
-        "resources/**/*.d.ts",
-        "resources/**/*.ts",
-        "resources/**/*.js",
-        "resources/**/*.svelte",
-        "*.config.js",
-        "*.config.cjs"
-    ]
+  "extends": "@tsconfig/svelte/tsconfig.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "checkJs": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": true,
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "paths": {
+      "@inertiajs/svelte/server": ["../../node_modules/@inertiajs/svelte/dist/server"]
+    }
+  },
+  "include": [
+    "resources/**/*.d.ts",
+    "resources/**/*.ts",
+    "resources/**/*.js",
+    "resources/**/*.svelte",
+    "*.config.js",
+    "*.config.cjs"
+  ]
 }