Fix server hash url parser (#141)

* Fix hash URL parser * remove import * Update ssr-example package json > move to type module * manage logs * RequestStatic props on SPA client side too. * Update ssr-example * Replace microbundle by tsup * Link @cher-ami/router to example-client * Add codesandbox * Update dependencies of examples * fix test * fix test * Update example * Modify logs * Improve logs * re add react as peer deps * update lock * fix prettier * init turbo * Re change prettier semi true
cher-ami · Oct 18, 2023 · 21b9078 · 21b9078
1 parent d59f0e6
commit 21b9078
Show file tree

Hide file tree

Showing 48 changed files with 4,132 additions and 5,748 deletions.
diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
@@ -0,0 +1,6 @@
+{
+  "buildCommand": "build",
+  "packages": ["/"],
+  "sandboxes": ["/examples/example-client", "/examples/example-ssr"],
+  "node": "18"
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
@@ -20,6 +20,6 @@ jobs:
 
       - name: build
         run: npm run build
-        
+
       - name: test
         run: npm run test
diff --git a/.prettierrc b/.prettierrc
@@ -1,3 +1,4 @@
 {
-  "printWidth": 90
+  "printWidth": 90,
+  "semi": true,
 }
diff --git a/examples/example-client/index.html b/examples/example-client/index.html
@@ -7,6 +7,6 @@
 
   <body>
     <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
+    <script type="module" src="./src/index.tsx"></script>
   </body>
 </html>
diff --git a/examples/example-client/package.json b/examples/example-client/package.json
@@ -5,17 +5,17 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@cher-ami/router": "latest",
+    "@cher-ami/router": "^3.1.2",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "gsap": "^3.12.2"
   },
   "devDependencies": {
-    "@types/node": "^20.8.2",
-    "@types/react": "^18.2.24",
-    "@types/react-dom": "^18.2.8",
+    "@types/node": "^20.8.7",
+    "@types/react": "^18.2.29",
+    "@types/react-dom": "^18.2.13",
     "@vitejs/plugin-react": "^4.1.0",
-    "gsap": "^3.12.2",
     "typescript": "^5.2.2",
-    "vite": "^4.4.10"
+    "vite": "^4.5.0"
   }
 }
diff --git a/examples/example-client/src/pages/ArticlePage.tsx b/examples/example-client/src/pages/ArticlePage.tsx
@@ -1,13 +1,16 @@
-import React, { ForwardedRef, forwardRef, useRef } from "react";
+import React, {ForwardedRef, forwardRef, useEffect, useRef} from "react"
 import { useLocation } from "@cher-ami/router";
-import { useStack }  from "@cher-ami/router";
+import { useStack } from "@cher-ami/router";
 import { transitionsHelper } from "../helper/transitionsHelper";
 import debug from "@wbe/debug";
 
 interface IProps {
   params?: {
     id: string;
   };
+  time: {
+    datetime: string
+  };
 }
 
 const componentName = "ArticlePage";
@@ -28,8 +31,14 @@ export const ArticlePage = forwardRef((props: IProps, handleRef: ForwardedRef<an
     playOut: () => transitionsHelper(rootRef.current, false, { x: -0 }, { x: 50 }),
   });
 
+  useEffect(()=>
+  {
+    log("props.time",props.time)
+  },[props.time])
   return (
     <div className={componentName} ref={rootRef}>
+      <div>fetch props datetime: {props.time?.datetime}</div>
+      <br />
       {componentName} - id: {props?.params?.id}
       <br />
       <br />

diff --git a/examples/example-client/src/pages/YoloPage.tsx b/examples/example-client/src/pages/YoloPage.tsx
@@ -3,7 +3,11 @@ import { useLocation, useStack } from "@cher-ami/router";
 import { transitionsHelper } from "../helper/transitionsHelper";
 const componentName: string = "YoloPage";
 
-interface IProps {}
+interface IProps {
+  time: {
+    datetime: string;
+  };
+}
 
 const YoloPage = forwardRef((props: IProps, handleRef: ForwardedRef<any>) => {
   const rootRef = useRef(null);
@@ -21,6 +25,7 @@ const YoloPage = forwardRef((props: IProps, handleRef: ForwardedRef<any>) => {
   return (
     <div className={componentName} ref={rootRef}>
       {componentName}
+      <div>fetch props datetime: {props.time?.datetime}</div>
 
       <br />
       <br />

diff --git a/examples/example-client/src/routes.ts b/examples/example-client/src/routes.ts
@@ -30,6 +30,11 @@ export const routesList: TRoute[] = [
           {
             path: "/yolo",
             component: YoloPage,
+            getStaticProps: async (props, currentLang) => {
+              const res = await fetch("https://worldtimeapi.org/api/ip");
+              const time = await res.json();
+              return { time };
+            },
           },
           {
             path: "/hello",
@@ -61,6 +66,11 @@ export const routesList: TRoute[] = [
     props: {
       color: "red",
     },
+    getStaticProps: async (props, currentLang) => {
+      const res = await fetch("https://worldtimeapi.org/api/ip");
+      const time = await res.json();
+      return { time };
+    },
   },
   {
     path: "/:rest",

diff --git a/examples/example-client/src/vite-env.d.ts b/examples/example-client/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/examples/example-client/tsconfig.json b/examples/example-client/tsconfig.json
@@ -1,19 +1,21 @@
 {
   "compilerOptions": {
-
-    "module": "esnext",
-    "target": "esnext",
-    "lib": ["es2015.promise", "es6", "dom", "esnext"],
-    "jsx": "react",
-    "moduleResolution": "node",
-    "types": ["node"],
-    "declaration": true,
-    "isolatedModules": false,
-    "noImplicitAny": false,
+    "target": "ESNext",
+    "useDefineForClassFields": true,
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "allowJs": false,
+    "skipLibCheck": true,
     "esModuleInterop": true,
-    "preserveConstEnums": true,
-    "strictNullChecks": false
+    "allowSyntheticDefaultImports": true,
+    "strict": false,
+    "forceConsistentCasingInFileNames": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
   },
-  "include": ["./**/*"],
-  "exclude": ["dist"]
+  "include": ["src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/examples/example-client/tsconfig.node.json b/examples/example-client/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-ssr/config/helpers/mfs.js b/examples/example-ssr/config/helpers/mfs.js