Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Deno Tasks/Fresh #236

Merged
merged 9 commits into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions examples/deno-fresh/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# fresh project

### Usage

Start the project:

```
deno task start
```

This will watch the project directory and restart as necessary.
7 changes: 7 additions & 0 deletions examples/deno-fresh/deno.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"tasks": {
"dev": "deno run -A --watch=static/,routes/ dev.ts",
"start": "deno run --allow-all src/index.ts"
},
"importMap": "./import_map.json"
}
5 changes: 5 additions & 0 deletions examples/deno-fresh/dev.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env -S deno run -A --watch=static/,routes/

import dev from "$fresh/dev.ts";

await dev(import.meta.url, "./main.ts");
22 changes: 22 additions & 0 deletions examples/deno-fresh/fresh.gen.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// DO NOT EDIT. This file is generated by fresh.
// This file SHOULD be checked into source version control.
// This file is automatically updated during development when running `dev.ts`.

import * as $0 from "./routes/[name].tsx";
import * as $1 from "./routes/api/joke.ts";
import * as $2 from "./routes/index.tsx";
import * as $$0 from "./islands/Counter.tsx";

const manifest = {
routes: {
"./routes/[name].tsx": $0,
"./routes/api/joke.ts": $1,
"./routes/index.tsx": $2,
},
islands: {
"./islands/Counter.tsx": $$0,
},
baseUrl: import.meta.url,
};

export default manifest;
11 changes: 11 additions & 0 deletions examples/deno-fresh/import_map.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"imports": {
"$fresh/": "https://deno.land/x/fresh@1.0.0/",
"preact": "https://esm.sh/preact@10.8.1",
"preact/": "https://esm.sh/preact@10.8.1/",
"preact-render-to-string": "https://esm.sh/preact-render-to-string@5.2.0?deps=preact@10.8.1",
"@twind": "./utils/twind.ts",
"twind": "https://esm.sh/twind@0.16.17",
"twind/": "https://esm.sh/twind@0.16.17/"
}
}
35 changes: 35 additions & 0 deletions examples/deno-fresh/islands/Counter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/** @jsx h */
import { h } from "preact";
import { useState } from "preact/hooks";
import { IS_BROWSER } from "$fresh/runtime.ts";
import { tw } from "@twind";

interface CounterProps {
start: number;
}

export default function Counter(props: CounterProps) {
const [count, setCount] = useState(props.start);
const [bount, setBount] = useState("Fart");
const btn = tw`px-2 py-1 border(gray-100 1) hover:bg-gray-200`;
return (
<div class={tw`flex gap-2 w-full`}>
<p class={tw`flex-grow-1 font-bold text-xl`}>{count}</p>
<button
class={btn}
onClick={() => setCount(count - 1)}
disabled={!IS_BROWSER}
>
-1
</button>
<button
class={btn}
onClick={() => setCount(count + 1)}
disabled={!IS_BROWSER}
>
+1
</button>
<div>{bount}</div>
</div>
);
}
26 changes: 26 additions & 0 deletions examples/deno-fresh/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/// <reference no-default-lib="true" />
/// <reference lib="dom" />
/// <reference lib="dom.asynciterable" />
/// <reference lib="deno.ns" />
/// <reference lib="deno.unstable" />

import { InnerRenderFunction, RenderContext, start } from "$fresh/server.ts";
import manifest from "./fresh.gen.ts";

import { config, setup } from "@twind";
import { virtualSheet } from "twind/sheets";

const sheet = virtualSheet();
sheet.reset();
setup({ ...config, sheet });

function render(ctx: RenderContext, render: InnerRenderFunction) {
const snapshot = ctx.state.get("twind") as unknown[] | null;
sheet.reset(snapshot || undefined);
render();
ctx.styles.splice(0, ctx.styles.length, ...(sheet).target);
const newSnapshot = sheet.reset();
ctx.state.set("twind", newSnapshot);
}

await start(manifest, { render });
7 changes: 7 additions & 0 deletions examples/deno-fresh/routes/[name].tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/** @jsx h */
import { h } from "preact";
import { PageProps } from "$fresh/server.ts";

export default function Greet(props: PageProps) {
return <div>Hello {props.params.name}</div>;
}
21 changes: 21 additions & 0 deletions examples/deno-fresh/routes/api/joke.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { HandlerContext } from "$fresh/server.ts";

// Jokes courtesy of https://punsandoneliners.com/randomness/programmer-jokes/
const JOKES = [
"Why do Java developers often wear glasses? They can't C#.",
"A SQL query walks into a bar, goes up to two tables and says “can I join you?”",
"Wasn't hard to crack Forrest Gump's password. 1forrest1.",
"I love pressing the F5 key. It's refreshing.",
"Called IT support and a chap from Australia came to fix my network connection. I asked “Do you come from a LAN down under?”",
"There are 10 types of people in the world. Those who understand binary and those who don't.",
"Why are assembly programmers often wet? They work below C level.",
"My favourite computer based band is the Black IPs.",
"What programme do you use to predict the music tastes of former US presidential candidates? An Al Gore Rhythm.",
"An SEO expert walked into a bar, pub, inn, tavern, hostelry, public house.",
];

export const handler = (_req: Request, _ctx: HandlerContext): Response => {
const randomIndex = Math.floor(Math.random() * 10);
const body = JOKES[randomIndex];
return new Response(body);
};
21 changes: 21 additions & 0 deletions examples/deno-fresh/routes/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/** @jsx h */
import { h } from "preact";
import { tw } from "@twind";
import Counter from "../islands/Counter.tsx";

export default function Home() {
return (
<div class={tw`p-4 mx-auto max-w-screen-md`}>
<img
src="/logo.svg"
height="100px"
alt="the fresh logo: a sliced lemon dripping with juice"
/>
<p class={tw`my-6`}>
Welcome to `fresh`. Try update this message in the ./routes/index.tsx
file, and refresh.
</p>
<Counter start={3} />
</div>
);
}
Binary file added examples/deno-fresh/static/favicon.ico
Binary file not shown.
6 changes: 6 additions & 0 deletions examples/deno-fresh/static/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions examples/deno-fresh/utils/twind.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { IS_BROWSER } from "$fresh/runtime.ts";
import { Configuration, setup } from "twind";
export * from "twind";
export const config: Configuration = {
darkMode: "class",
mode: "silent",
};
if (IS_BROWSER) setup(config);
24 changes: 24 additions & 0 deletions src/providers/deno.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ use crate::nixpacks::{
};
use anyhow::{Context, Result};
use regex::Regex;
use serde::{Deserialize, Serialize};

#[derive(Serialize, Deserialize, Default, Debug)]

JakeCooper marked this conversation as resolved.
Show resolved Hide resolved
pub struct DenoTasks {
pub start: Option<String>,
JakeCooper marked this conversation as resolved.
Show resolved Hide resolved
}

#[derive(Serialize, Deserialize, Default, Debug)]
pub struct DenoJson {
pub tasks: Option<DenoTasks>,
JakeCooper marked this conversation as resolved.
Show resolved Hide resolved
}

pub struct DenoProvider {}

Expand Down Expand Up @@ -41,6 +53,18 @@ impl Provider for DenoProvider {
}

fn start(&self, app: &App, _env: &Environment) -> Result<Option<StartPhase>> {
// First check for a deno.json and see if we can rip the start command from there
if app.includes_file("deno.json") {
let deno_json: DenoJson = app.read_json("deno.json")?;

if let Some(tasks) = deno_json.tasks {
if let Some(start) = tasks.start {
JakeCooper marked this conversation as resolved.
Show resolved Hide resolved
return Ok(Some(StartPhase::new(start)));
}
}
}

// Barring that, just try and start the index with sane defaults
match DenoProvider::get_start_file(app)? {
Some(start_file) => Ok(Some(StartPhase::new(format!(
"deno run --allow-all {}",
Expand Down
12 changes: 12 additions & 0 deletions tests/generate_plan_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,18 @@ fn test_deno() -> Result<()> {
Ok(())
}

#[test]
fn test_deno_fresh() -> Result<()> {
let plan = simple_gen_plan("./examples/deno-fresh");
assert_eq!(plan.build.unwrap().cmds, None);
assert_eq!(
plan.start.unwrap().cmd,
Some("deno run --allow-all src/index.ts".to_string())
);

Ok(())
}

#[test]
fn test_csharp_api() -> Result<()> {
let plan = simple_gen_plan("./examples/csharp-api");
Expand Down