chore: tweak implementation

mbhrznr · Jul 13, 2023 · 5c0601c · 5c0601c
1 parent 835e0a1
commit 5c0601c
Show file tree

Hide file tree

Showing 9 changed files with 212 additions and 124 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,30 @@
+name: Deploy
+on: [push]
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+
+      - name: Setup Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
+
+      - name: Build site
+        run: deno run -A ./build.ts
+
+      - name: Upload to Deno Deploy
+        uses: denoland/deployctl@v1
+        with:
+          project: ultra-deno-kv-oauth-demo
+          entrypoint: server.js
+          root: .ultra
+          import-map: importMap.server.json
diff --git a/README.md b/README.md
@@ -2,16 +2,22 @@
 
 Demo of [Deno KV OAuth](https://deno.land/x/deno_kv_oauth) working in Ultra.
 
-Your new Ultra project is ready to go. You can follow the Ultra docs here: https://ultrajs.dev/
+Your new Ultra project is ready to go. You can follow the Ultra docs here:
+https://ultrajs.dev/
 
 ### Usage
 
 Make sure to install Deno: https://deno.land/manual/getting_started/installation
 
-Then start the project:
+Then start the project in dev mode:
+This will watch the project directory and restart as necessary.
 
 ```
-deno task start
+deno task dev
 ```
 
-This will watch the project directory and restart as necessary.
+Or start the project in production mode:
+
+```
+deno task build && cd .ultra && deno task start
+```
diff --git a/build.ts b/build.ts
@@ -0,0 +1,18 @@
+import { createBuilder } from "ultra/build.ts";
+
+const builder = createBuilder({
+  browserEntrypoint: import.meta.resolve("./client.tsx"),
+  serverEntrypoint: import.meta.resolve("./server.tsx"),
+});
+
+builder.ignore([
+  "./README.md",
+  "./importMap.json",
+  "./.git/**",
+  "./.vscode/**",
+  "./.github/**",
+  "./.gitignore",
+]);
+
+// deno-lint-ignore no-unused-vars
+const result = await builder.build();
diff --git a/client.tsx b/client.tsx
@@ -0,0 +1,8 @@
+import hydrate from "ultra/hydrate.js";
+import App from "./src/app.tsx";
+
+function ClientApp() {
+  return <App />;
+}
+
+hydrate(document, <ClientApp />);
diff --git a/deno.json b/deno.json
@@ -1,13 +1,20 @@
 {
+  "tasks": {
+    "dev": "deno run -A --no-check --unstable --watch ./server.tsx",
+    "test": "deno test --allow-all",
+    "build": "deno run -A ./build.ts",
+    "start": "ULTRA_MODE=production deno run -A --unstable --no-remote ./server.js"
+  },
   "compilerOptions": {
     "jsx": "react-jsxdev",
     "jsxImportSource": "react",
     "lib": ["dom", "dom.iterable", "dom.asynciterable", "deno.ns"]
   },
-  "fmt": {},
-  "lint": {},
-  "importMap": "./importMap.json",
-  "tasks": {
-    "start": "deno run -A --no-check --unstable --watch ./main.tsx"
-  }
+  "fmt": {
+    "files": { "exclude": [".ultra"] }
+  },
+  "lint": {
+    "files": { "exclude": [".ultra"] }
+  },
+  "importMap": "./importMap.json"
 }
diff --git a/deno.lock b/deno.lock
diff --git a/importMap.json b/importMap.json
@@ -1,12 +1,13 @@
 {
   "imports": {
-    "react": "https://esm.sh/[email protected]",
+    "react": "https://esm.sh/[email protected]?dev",
     "react/": "https://esm.sh/[email protected]/",
     "react-dom": "https://esm.sh/[email protected]",
-    "react-dom/server": "https://esm.sh/[email protected]/server",
+    "react-dom/server": "https://esm.sh/[email protected]/server?dev",
+    "react-dom/client": "https://esm.sh/[email protected]/client?dev",
 
     "kv_oauth": "https://deno.land/x/[email protected]/mod.ts",
-    "std/": "https://deno.land/[email protected]/",
-    "ultra/": "https://deno.land/x/[email protected]/"
+    "ultra/": "https://deno.land/x/[email protected]/",
+    "std/": "https://deno.land/[email protected]/"
   }
 }
diff --git a/main.tsx → server.tsx b/main.tsx → server.tsx
@@ -9,7 +9,7 @@ import {
   signOut,
 } from "kv_oauth";
 
-import App from "./app.tsx";
+import App from "./src/app.tsx";
 
 loadSync({ export: true });
 
@@ -19,7 +19,11 @@ const server = await createServer({
   importMapPath: import.meta.resolve("./importMap.json"),
 });
 
-console.log(Deno.version)
+function ServerApp({ accessToken, isSignedIn }: {
+  accessToken: string | null;
+  isSignedIn: boolean}) {
+    return <App {...{ accessToken, isSignedIn }} />;
+}
 
 server
   .get("/", async (ctx) => {
@@ -29,7 +33,7 @@ server
       ? await getSessionAccessToken(oauth2Client, sessionId)
       : null;
     const result = await server.render(
-      <App {...{ accessToken, isSignedIn }} />,
+      <ServerApp {...{ accessToken, isSignedIn }} />,
     );
 
     return ctx.body(result, 200, {

diff --git a/app.tsx → src/app.tsx b/app.tsx → src/app.tsx
@@ -34,4 +34,4 @@ export default function App(
       </body>
     </html>
   );
-}
+}