feat: support vite

NathanWalker · NathanWalker · commit 5598804759b9 · 2026-03-08T16:15:01.000-07:00
diff --git a/packages/tanstack-router/README.md b/packages/tanstack-router/README.md
@@ -225,15 +225,6 @@ Enable them explicitly:
 />
 ```
 
-## NativeScript Webpack Integration
-
-This package ships a `nativescript.webpack.js` extension so the `solid-js/web`
-alias shim is applied automatically in NativeScript projects during final
-webpack config merge.
-
-You should not need to manually add `solid-js/web` alias overrides in your app
-webpack config when using this package.
-
 ## API Overview
 
 ### Root (`@nativescript/tanstack-router`)
diff --git a/packages/tanstack-router/nativescript.vite.mjs b/packages/tanstack-router/nativescript.vite.mjs
@@ -0,0 +1,59 @@
+import { createRequire } from 'node:module';
+import { dirname, join } from 'node:path';
+import { existsSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+const require = createRequire(import.meta.url);
+
+let solidJsRuntimePath;
+let solidJsHPath;
+const solidWebShimPath = fileURLToPath(new URL('./solid-web-shim.js', import.meta.url));
+const jsxRuntimeShimPath = fileURLToPath(new URL('./solid-js-jsx-runtime-shim.js', import.meta.url));
+
+try {
+  const solidJsPackagePath = require.resolve('solid-js/package.json');
+  const solidJsRoot = dirname(solidJsPackagePath);
+
+  const candidateRuntimePath = join(solidJsRoot, 'h', 'jsx-runtime', 'dist', 'jsx.js');
+  const candidateHPath = join(solidJsRoot, 'h', 'dist', 'h.js');
+
+  if (existsSync(candidateRuntimePath)) {
+    solidJsRuntimePath = candidateRuntimePath;
+  }
+
+  if (existsSync(candidateHPath)) {
+    solidJsHPath = candidateHPath;
+  }
+
+  if (!solidJsRuntimePath || !solidJsHPath) {
+    console.warn(
+      '[nativescript/tanstack-router] Could not resolve one or more SolidJS runtime alias paths for Vite.',
+      {
+        runtimeFound: !!solidJsRuntimePath,
+        hFound: !!solidJsHPath,
+        solidJsRoot,
+      },
+    );
+  }
+} catch (error) {
+  console.warn(
+    '[nativescript/tanstack-router] Failed to resolve SolidJS package location for Vite aliases.',
+    error instanceof Error ? error.message : error,
+  );
+}
+
+export default () => ({
+  resolve: {
+    alias: {
+      // Keep Vite behavior aligned with nativescript.webpack.js integration.
+      'solid-js/web': solidWebShimPath,
+      'solid-js/jsx-runtime': jsxRuntimeShimPath,
+      'solid-js/jsx-dev-runtime': jsxRuntimeShimPath,
+      ...(solidJsHPath
+        ? {
+            'solid-js/h': solidJsHPath,
+          }
+        : {}),
+    },
+  },
+});
diff --git a/packages/tanstack-router/project.json b/packages/tanstack-router/project.json
@@ -7,7 +7,18 @@
     "build": {
       "executor": "nx:run-commands",
       "options": {
-        "commands": ["rm -rf dist/packages/tanstack-router", "tsc -p packages/tanstack-router/tsconfig.json --noEmit", "tsup --config packages/tanstack-router/tsup.config.ts", "cp packages/tanstack-router/package.json dist/packages/tanstack-router/package.json", "cp packages/tanstack-router/README.md dist/packages/tanstack-router/README.md", "cp packages/tanstack-router/nativescript.webpack.js dist/packages/tanstack-router/nativescript.webpack.js", "cp packages/tanstack-router/solid-web-shim.js dist/packages/tanstack-router/solid-web-shim.js", "cp packages/tanstack-router/solid-js-jsx-runtime-shim.js dist/packages/tanstack-router/solid-js-jsx-runtime-shim.js", "cp LICENSE dist/packages/tanstack-router/LICENSE"],
+        "commands": [
+          "rm -rf dist/packages/tanstack-router",
+          "tsc -p packages/tanstack-router/tsconfig.json --noEmit",
+          "tsup --config packages/tanstack-router/tsup.config.ts",
+          "cp packages/tanstack-router/package.json dist/packages/tanstack-router/package.json",
+          "cp packages/tanstack-router/README.md dist/packages/tanstack-router/README.md",
+          "cp packages/tanstack-router/nativescript.vite.mjs dist/packages/tanstack-router/nativescript.vite.mjs",
+          "cp packages/tanstack-router/nativescript.webpack.js dist/packages/tanstack-router/nativescript.webpack.js",
+          "cp packages/tanstack-router/solid-web-shim.js dist/packages/tanstack-router/solid-web-shim.js",
+          "cp packages/tanstack-router/solid-js-jsx-runtime-shim.js dist/packages/tanstack-router/solid-js-jsx-runtime-shim.js",
+          "cp LICENSE dist/packages/tanstack-router/LICENSE"
+        ],
         "parallel": false
       },
       "outputs": ["{workspaceRoot}/dist/packages/tanstack-router"]
diff --git a/packages/tanstack-router/vitest.config.ts b/packages/tanstack-router/vitest.config.ts
@@ -2,6 +2,10 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   root: __dirname,
+  esbuild: {
+    jsx: 'automatic',
+    jsxImportSource: 'solid-js',
+  },
   test: {
     environment: 'node',
     include: ['test/**/*.test.ts'],
