chore: cleanup

.gitignore

@@ -41,7 +41,6 @@ Thumbs.db
 .nx/cache
 
 # Dist output
-apps/web-hello-world/netlify
 apps/web-hello-world/dist
 apps/web-hello-world/.solid
 

README.md

@@ -1,5 +1,13 @@
+Solid running on Web, iOS, Android and Vision Pro.
+
 ## Setup
 
+Prerequisites:
+- [NativeScript Environment Setup](https://docs.nativescript.org/setup/macos#setting-up-macos-for-ios)
+- [Xcode 15.2 Beta Installed for Vision Pro Simulator](https://developer.apple.com/download/applications/)
+- [Download SwiftPackages here](https://drive.google.com/file/d/17wFGXOBqeXgs7mhFZ-wfg4ogHyRYlYCR/view?usp=sharing)
+  - **Important for visionOS**: Once unzipped, place the folder at `apps/nativescript-hello-world/SwiftPackages`
+
 ```bash
 yarn setup
 ```
@@ -9,9 +17,9 @@ yarn setup
 ```bash
 yarn web
 
-yarn android
-
 yarn ios
 
 yarn vision
+
+yarn android
 ```

apps/nativescript-hello-world/package.json

@@ -11,16 +11,16 @@
   },
   "dependencies": {
     "@nativescript-community/ui-collectionview": "^5.3.2",
-    "@nativescript-community/solid-js": "^0.0.4-alpha.5",
+    "@nativescript-community/solid-js": "^0.0.5",
     "@nativescript/core": "vision",
     "@nativescript/swift-ui": "vision",
     "@nativescript/tailwind": "*",
-    "solid-navigation": "^1.0.0-alpha.8"
+    "solid-navigation": "^1.0.0-alpha.11"
   },
   "devDependencies": {
     "@nativescript/android": "~8.6.0",
     "@nativescript/ios": "~8.6.0",
     "@nativescript/visionos": "~8.6.0",
-    "typescript": "~5.2.0"
+    "typescript": "~5.3.0"
   }
 }

apps/web-hello-world/project.json

@@ -9,7 +9,7 @@
       "executor": "nx:run-commands",
       "options": {
         "cwd": "apps/web-hello-world",
-        "command": "solid-start build"
+        "command": "vinxi build"
       },
       "configurations": {
         "development": {
@@ -25,7 +25,7 @@
       "defaultConfiguration": "development",
       "options": {
         "cwd": "apps/web-hello-world",
-        "command": "solid-start dev"
+        "command": "vinxi dev"
       },
       "configurations": {
         "development": {
@@ -48,10 +48,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/web-hello-world/**/*.ts"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   }
 }

apps/web-hello-world/src/app.tsx

@@ -0,0 +1,21 @@
+// @refresh reload
+import { Router } from "@solidjs/router";
+import { FileRoutes } from "@solidjs/start";
+import { Suspense } from "solid-js";
+import Nav from "~/components/Nav";
+import "./app.css";
+
+export default function App() {
+  return (
+    <Router
+      root={(props) => (
+        <>
+          <Nav />
+          <Suspense>{props.children}</Suspense>
+        </>
+      )}
+    >
+      <FileRoutes />
+    </Router>
+  );
+}

apps/web-hello-world/src/components/Nav.tsx

@@ -0,0 +1,21 @@
+import { useLocation } from '@solidjs/router';
+
+export default function Nav() {
+  const location = useLocation();
+  const active = (path: string) =>
+    path == location.pathname
+      ? 'border-sky-600'
+      : 'border-transparent hover:border-sky-600';
+  return (
+    <nav class="bg-sky-800">
+      <ul class="container flex items-center p-3 text-gray-200">
+        <li class={`border-b-2 ${active('/')} mx-1.5 sm:mx-6`}>
+          <a href="/">Home</a>
+        </li>
+        <li class={`border-b-2 ${active('/about')} mx-1.5 sm:mx-6`}>
+          <a href="/about">About</a>
+        </li>
+      </ul>
+    </nav>
+  );
+}

apps/web-hello-world/src/entry-client.tsx

@@ -1,3 +1,3 @@
-import { mount, StartClient } from "solid-start/entry-client";
+import { mount, StartClient } from "@solidjs/start/client";
 
-mount(() => <StartClient />, document);
+mount(() => <StartClient />, document.getElementById("app"));

apps/web-hello-world/src/entry-server.tsx

@@ -1,9 +1,20 @@
-import {
-  StartServer,
-  createHandler,
-  renderAsync,
-} from "solid-start/entry-server";
+import { createHandler, StartServer } from "@solidjs/start/server";
 
-export default createHandler(
-  renderAsync((event) => <StartServer event={event} />)
-);
+export default createHandler(() => (
+  <StartServer
+    document={({ assets, children, scripts }) => (
+      <html lang="en">
+        <head>
+          <meta charset="utf-8" />
+          <meta name="viewport" content="width=device-width, initial-scale=1" />
+          <link rel="icon" href="/favicon.ico" />
+          {assets}
+        </head>
+        <body>
+          <div id="app">{children}</div>
+          {scripts}
+        </body>
+      </html>
+    )}
+  />
+));

apps/web-hello-world/src/global.d.ts

@@ -1 +1 @@
-/// <reference types="solid-start/env" />
+/// <reference types="@solidjs/start/env" />

apps/web-hello-world/src/routes/[...404].tsx

@@ -1,4 +1,4 @@
-import { A } from "solid-start";
+import { A } from "@solidjs/router";
 
 export default function NotFound() {
   return (

apps/web-hello-world/src/routes/about.tsx

@@ -1,4 +1,4 @@
-import { A } from 'solid-start';
+import { A } from "@solidjs/router";
 import { Counter } from '@solid-x-platforms/components';
 
 export default function About() {
@@ -9,21 +9,21 @@ export default function About() {
       </h1>
       <Counter />
       <p class="mt-8">
-        Visit{' '}
+        Visit{" "}
         <a
           href="https://solidjs.com"
           target="_blank"
           class="text-sky-600 hover:underline"
         >
           solidjs.com
-        </a>{' '}
+        </a>{" "}
         to learn how to build Solid apps.
       </p>
       <p class="my-4">
         <A href="/" class="text-sky-600 hover:underline">
           Home
         </A>
-        {' - '}
+        {" - "}
         <span>About Page</span>
       </p>
     </main>

apps/web-hello-world/src/routes/index.tsx

@@ -1,4 +1,4 @@
-import { A } from 'solid-start';
+import { A } from "@solidjs/router";
 import { Counter } from '@solid-x-platforms/components';
 
 export default function Home() {
@@ -9,22 +9,22 @@ export default function Home() {
       </h1>
       <Counter />
       <p class="mt-8">
-        Visit{' '}
+        Visit{" "}
         <a
           href="https://solidjs.com"
           target="_blank"
           class="text-sky-600 hover:underline"
         >
           solidjs.com
-        </a>{' '}
+        </a>{" "}
         to learn how to build Solid apps.
       </p>
       <p class="my-4">
         <span>Home</span>
-        {' - '}
+        {" - "}
         <A href="/about" class="text-sky-600 hover:underline">
           About Page
-        </A>{' '}
+        </A>{" "}
       </p>
     </main>
   );

apps/web-hello-world/tsconfig.app.json

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "types": ["node"]
+    "types": ["vinxi/client", "node"]
   },
   "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"],
   "include": ["src/**/*.ts"]

apps/web-hello-world/tsconfig.json

@@ -18,7 +18,13 @@
     "noUnusedParameters": true,
     "noImplicitReturns": true,
     "skipLibCheck": true,
-    "types": ["vite/client", "vitest"]
+    "types": ["vite/client", "vitest"],
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["src/*"],
+      "@solid-x-platforms/components": ["../../packages/components/src/index.ts"],
+      "@solid-x-platforms/utils": ["../../packages/utils/src/index.ts"]
+    }
   },
   "include": ["src"],
   "references": [

apps/web-hello-world/vite.config.mts

@@ -1,7 +1,5 @@
-import solid from 'solid-start/vite';
-import { defineConfig } from 'vite';
+import { defineConfig } from '@solidjs/start/config';
 import viteTsConfigPaths from 'vite-tsconfig-paths';
-import netlify from 'solid-start-netlify';
 
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/web-hello-world',
@@ -14,9 +12,6 @@ export default defineConfig({
   plugins: [
     viteTsConfigPaths({
       root: '../../',
-    }),
-    solid({
-      adapter: netlify({ edge: true }),
-    }),
+    })
   ],
-});
+});

nx.json

@@ -15,12 +15,9 @@
         "{workspaceRoot}/eslint.config.js"
       ]
     },
-    "test": {
+    "@nx/vite:test": {
       "cache": true,
       "inputs": ["default", "^production"]
-    },
-    "e2e": {
-      "cache": true
     }
   },
   "namedInputs": {