Fix tests

Author: brenelz

apps/tests/package.json

@@ -18,6 +18,7 @@
     "@solidjs/router": "0.17.0-next.1",
     "@solidjs/start": "workspace:*",
     "@solidjs/testing-library": "^0.8.10",
+    "@solidjs/signals": "0.13.3",
     "@solidjs/web": "2.0.0-beta.3",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/user-event": "^14.6.1",

apps/tests/src/routes/treeshaking/(no-side-effects).tsx

@@ -1,4 +1,4 @@
-import { createAsync } from "@solidjs/router";
+import { createMemo } from "solid-js";
 
 const a = 1;
 
@@ -13,6 +13,6 @@ async function getGetA() {
 }
 
 export default function Treeshaking() {
-  const s = createAsync(() => getGetA());
+  const s = createMemo(() => getGetA());
   return <h1>hello: {s()}</h1>;
 }

apps/tests/src/routes/treeshaking/side-effects.tsx

@@ -1,4 +1,4 @@
-import { createAsync } from "@solidjs/router";
+import { createMemo } from "solid-js";
 
 export const a = 1;
 
@@ -13,7 +13,7 @@ async function getGetA() {
 }
 
 export default function TreeshakingSideEffects() {
-  const s = createAsync(() => getGetA());
+  const s = createMemo(() => getGetA());
   return (
     <h1>
       hello:{a} {s()}

apps/tests/vitest.config.ts

@@ -1,9 +1,53 @@
+import { createRequire } from "node:module";
 import solid from "vite-plugin-solid";
 import { defineConfig } from "vitest/config";
 import { playwright } from "@vitest/browser-playwright";
 
+const require = createRequire(import.meta.url);
+
 export default defineConfig({
   plugins: [solid()],
+  resolve: {
+    alias: {
+      "solid-js/web": "@solidjs/web",
+      "solid-js/store": "solid-js",
+    },
+    conditions: ["solid", "development", "browser"],
+  },
+  optimizeDeps: {
+    include: ["@solidjs/testing-library"],
+    esbuildOptions: {
+      plugins: [
+        {
+          name: "solid-compat",
+          setup(build) {
+            // Let Vite resolve @solidjs/web at runtime with proper conditions
+            build.onResolve({ filter: /^solid-js\/web$/ }, () => ({
+              path: "@solidjs/web",
+              external: true,
+            }));
+            build.onResolve({ filter: /^solid-js\/store$/ }, () => ({
+              path: require.resolve("solid-js"),
+            }));
+            // Shim onMount/onError removed in Solid v2 for @solidjs/testing-library compat
+            build.onResolve({ filter: /^solid-js$/ }, (args) => {
+              if (args.importer?.includes("@solidjs/testing-library")) {
+                return { path: args.path, namespace: "solid-compat" };
+              }
+            });
+            build.onLoad({ filter: /.*/, namespace: "solid-compat" }, () => ({
+              contents: `
+                export * from ${JSON.stringify(require.resolve("solid-js"))};
+                export function onMount(fn) { queueMicrotask(fn); }
+                export function onError() {}
+              `,
+              resolveDir: ".",
+            }));
+          },
+        },
+      ],
+    },
+  },
   test: {
     mockReset: true,
     globals: true,