4Catalyzer · golota60 · Jan 26, 2023 · Jan 28, 2023 · Jan 29, 2023 · Jan 29, 2023
diff --git a/examples/example-ts/.gitignore b/examples/example-ts/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/examples/example-ts/index.html b/examples/example-ts/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React + TS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
diff --git a/examples/example-ts/package.json b/examples/example-ts/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "example-ts",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "found": "^1.1.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.0.9",
+    "@vitejs/plugin-react": "^3.0.0",
+    "typescript": "^4.9.3",
+    "vite": "^4.0.0"
+  }
+}
diff --git a/types/example-app/AppPage.tsx → examples/example-ts/src/AppPage.tsx b/types/example-app/AppPage.tsx → examples/example-ts/src/AppPage.tsx
diff --git a/types/example-app/ComponentUsingRouter.tsx → ...s/example-ts/src/ComponentUsingRouter.tsx b/types/example-app/ComponentUsingRouter.tsx → ...s/example-ts/src/ComponentUsingRouter.tsx
@@ -8,11 +8,8 @@ interface Props {
 function ComponentUsingRouter(_props: Props) {
   const { match, router } = useRouter();
 
-  return (
-    <div>
-      {match.location.pathname}, {router}
-    </div>
-  );
+  console.log(router);
+  return <div>Pathname: {match.location.pathname}</div>;
 }
 
 export { ComponentUsingRouter };
diff --git a/types/example-app/ComponentWithRouter.tsx → ...es/example-ts/src/ComponentWithRouter.tsx b/types/example-app/ComponentWithRouter.tsx → ...es/example-ts/src/ComponentWithRouter.tsx
@@ -9,11 +9,8 @@ interface Props {
 }
 
 function ComponentWithRouter({ match, router }: Props) {
-  return (
-    <div>
-      {match.location.pathname}, {router}
-    </div>
-  );
+  console.log(router);
+  return <div>Pathname: {match.location.pathname}</div>;
 }
 
 const ComponentWithRouterContainer = withRouter(ComponentWithRouter);

diff --git a/types/example-app/CustomLink.tsx → examples/example-ts/src/CustomLink.tsx b/types/example-app/CustomLink.tsx → examples/example-ts/src/CustomLink.tsx
diff --git a/types/example-app/MainPage.tsx → examples/example-ts/src/MainPage.tsx b/types/example-app/MainPage.tsx → examples/example-ts/src/MainPage.tsx
@@ -6,6 +6,7 @@ import { ComponentWithRouter } from './ComponentWithRouter';
 export function MainPage() {
   return (
     <div>
+      MainPage!
       <ComponentWithRouter />
       <ComponentUsingRouter />
     </div>

diff --git a/types/example-app/WidgetsPage.tsx → examples/example-ts/src/WidgetsPage.tsx b/types/example-app/WidgetsPage.tsx → examples/example-ts/src/WidgetsPage.tsx
diff --git a/types/example-app/index.tsx → examples/example-ts/src/main.tsx b/types/example-app/index.tsx → examples/example-ts/src/main.tsx
@@ -6,12 +6,12 @@ import {
   createBrowserRouter,
   makeRouteConfig,
 } from 'found';
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 
 import { AppPage } from './AppPage';
 import { MainPage } from './MainPage';
 import { WidgetsPage } from './WidgetsPage';
+import { createRoot } from 'react-dom/client';
+import ReactDOM from 'react-dom';
 
 const fetchWidget = (_widgetId: any) =>
   new Promise((_resolve) => {
@@ -68,4 +68,6 @@ const BrowserRouter = createBrowserRouter({
   ),
 });
 
-ReactDOM.render(<BrowserRouter />, document.getElementById('root'));
+createRoot(document.getElementById('root') as HTMLElement).render(
+  <BrowserRouter />,
+);
diff --git a/examples/example-ts/src/vite-env.d.ts b/examples/example-ts/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/examples/example-ts/tsconfig.json b/examples/example-ts/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "useDefineForClassFields": true,
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "allowJs": false,
+    "skipLibCheck": true,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}
diff --git a/examples/example-ts/tsconfig.node.json b/examples/example-ts/tsconfig.node.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/examples/example-ts/vite.config.ts b/examples/example-ts/vite.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+})