Merge pull request #67 from NicolaiVdS/master

Change old solid-app-router to the new @solidjs/router

ts-router/README.md

@@ -13,7 +13,7 @@ $ npm install # or pnpm install or yarn install
 This template's goal is to showcase the routing features of Solid.
 It also showcase how the router and Suspense work together to parallelize data fetching tied to a route via the `.data.ts` pattern.
 
-You can learn more about it on the [`solid-app-router` repository](https://github.com/solidjs/solid-app-router)
+You can learn more about it on the [`@solidjs/router` repository](https://github.com/solidjs/solid-router)
 
 ### Learn more on the [Solid Website](https://solidjs.com) and come chat with us on our [Discord](https://discord.com/invite/solidjs)
 

ts-router/package.json

@@ -14,7 +14,7 @@
     "vite-plugin-windicss": "^1.8.7"
   },
   "dependencies": {
-    "solid-app-router": "^0.4.2",
+    "@solidjs/router": "^0.4.3",
     "solid-js": "^1.5.1"
   }
 }

ts-router/pnpm-lock.yaml

@@ -1,14 +1,14 @@
 lockfileVersion: 5.4
 
 specifiers:
-  solid-app-router: ^0.4.2
+  '@solidjs/router': ^0.4.3
   solid-js: ^1.5.1
   vite: ^3.0.9
   vite-plugin-solid: ^2.3.0
   vite-plugin-windicss: ^1.8.7
 
 dependencies:
-  solid-app-router: 0.4.2_solid-js@1.5.1
+  '@solidjs/router': 0.4.3_solid-js@1.5.1
   solid-js: 1.5.1
 
 devDependencies:
@@ -397,6 +397,14 @@ packages:
       fastq: 1.13.0
     dev: true
 
+  /@solidjs/router/0.4.3_solid-js@1.5.1:
+    resolution: {integrity: sha512-mYpd4HxpH/3UZjHGTr2dhvPGXu034Ktxd05CJGA6nRjRGYCgUfhCQHRdEivyqJyb4LhHyDht4ny5xmwEOkUTaQ==}
+    peerDependencies:
+      solid-js: ^1.3.5
+    dependencies:
+      solid-js: 1.5.1
+    dev: false
+
   /@windicss/config/1.8.7:
     resolution: {integrity: sha512-8n+/Y36j5L3rw2tgMdLjeGRuNV7VYfKoHoraLK6Bk9OJ1MTPd5vv7pekof/uOPWVV7WWjVeZ6CTO8SDbDDW3iw==}
     dependencies:
@@ -961,14 +969,6 @@ packages:
     hasBin: true
     dev: true
 
-  /solid-app-router/0.4.2_solid-js@1.5.1:
-    resolution: {integrity: sha512-+NrLcmqYssx8DcbpcLBaYPqfTRtS+rkfbxMhLH8MHfTcTkdZfrkWQK7lsUvuPCebGEzfaPZJvHqBwhPrCXAmxg==}
-    peerDependencies:
-      solid-js: ^1.3.5
-    dependencies:
-      solid-js: 1.5.1
-    dev: false
-
   /solid-js/1.5.1:
     resolution: {integrity: sha512-Y6aKystIxnrB0quV5nhqNuJV+l2Fk3/PQy1mMya/bzxlGiMHAym7v1NaqEgqDIvctbkxOi5dBj0ER/ewrH060g==}
     dependencies:

ts-router/src/app.tsx

@@ -1,5 +1,5 @@
 import type { Component } from 'solid-js';
-import { Link, useRoutes, useLocation } from 'solid-app-router';
+import { Link, useRoutes, useLocation } from '@solidjs/router';
 
 import { routes } from './routes';
 

ts-router/src/index.tsx

@@ -2,7 +2,7 @@
 import 'windi.css';
 
 import { render } from 'solid-js/web';
-import { Router } from 'solid-app-router';
+import { Router } from '@solidjs/router';
 import App from './app';
 
 render(

ts-router/src/pages/about.data.ts

@@ -1,4 +1,4 @@
-import type { RouteDataFunc } from 'solid-app-router';
+import type { RouteDataFunc } from '@solidjs/router';
 import { createResource } from 'solid-js';
 
 function wait<T>(ms: number, data: T): Promise<T> {

ts-router/src/pages/about.tsx

@@ -1,5 +1,5 @@
 import { Component, createEffect, Suspense } from 'solid-js';
-import { useRouteData } from 'solid-app-router';
+import { useRouteData } from '@solidjs/router';
 
 export default function About() {
   const name = useRouteData<() => string>();

ts-router/src/routes.ts

@@ -1,5 +1,5 @@
 import { lazy } from 'solid-js';
-import type { RouteDefinition } from 'solid-app-router';
+import type { RouteDefinition } from '@solidjs/router';
 
 import Home from './pages/home';
 import AboutData from './pages/about.data';