savanni
/
monorepo
1
0
Fork 0
Code Issues 68 Pull Requests Projects 6 Releases Wiki Activity

Set up the Kifu PWA project with decent Makefiles #41

Merged
savanni merged 14 commits from kifu-pwa into main 2023-05-13 16:48:42 +00:00
Conversation 0 Commits 14 Files Changed 35 +75 -261
10 changed files with 75 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ef396f3bfb - Show all commits

28
kifu/ffi/wasm/src/lib.rs
View File

@ -1,6 +1,5 @@
use wasm_bindgen::prelude::*;
// use serde::{Serialize, Deserialize};
use kifu_core::{CoreRequest, CoreResponse}; use kifu_core::{CoreRequest, CoreResponse};
use wasm_bindgen::prelude::*;
#[wasm_bindgen] #[wasm_bindgen]
extern "C" { extern "C" {
@ -8,31 +7,6 @@ extern "C" {
pub fn log(s: &str); pub fn log(s: &str);
} }
/*
#[wasm_bindgen]
#[derive(Serialize, Deserialize)]
pub struct CoreRequest(kifu_core::Request);
*/
/*
#[wasm_bindgen]
impl CoreRequest {
#[wasm_bindgen(constructor)]
pub fn new(request: kifu_core::Request) -> Self {
Self(request)
}
}
*/
/* Somehow uncommenting this code actually causes the module to not load. Maybe a name conflict?
* Don't know.
*/
/*
#[wasm_bindgen]
#[derive(Serialize, Deserialize)]
pub struct CoreResponse(kifu_core::Response);
*/
#[wasm_bindgen] #[wasm_bindgen]
#[derive(Debug)] #[derive(Debug)]
pub struct CoreApp(kifu_core::CoreApp); pub struct CoreApp(kifu_core::CoreApp);
savanni marked this conversation as resolved Outdated
savanni commented 2023-05-13 16:20:25 +00:00
Outdated
Review
Copy Link

Remove

Remove

158
kifu/hello-wasm/Cargo.lock generated
View File

@ -1,158 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "bumpalo"
version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "hello-wasm"
version = "0.1.0"
dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
]
[[package]]
name = "js-sys"
version = "0.3.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "log"
version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if",
]
[[package]]
name = "once_cell"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "proc-macro2"
version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "unicode-ident"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
[[package]]
name = "wasm-bindgen"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
dependencies = [
"cfg-if",
"js-sys",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
name = "web-sys"
version = "0.3.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
dependencies = [
"js-sys",
"wasm-bindgen",
]

13
kifu/hello-wasm/Cargo.toml
View File

@ -1,13 +0,0 @@
[package]
name = "hello-wasm"
version = "0.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"

15
kifu/hello-wasm/index.html
View File

@ -1,15 +0,0 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<meta charset="utf-8" />
<title>hello-wasm example</title>
</head>
<body>
<script type="module">
import init, { greet } from "./pkg/hello_wasm.js";
init().then(() => {
greet("WebAssembly");
});
</script>
</body>
</html>

29
kifu/hello-wasm/src/lib.rs
View File

@ -1,29 +0,0 @@
use wasm_bindgen::prelude::*;
#[wasm_bindgen]
extern "C" {
pub fn alert(s: &str);
#[wasm_bindgen(js_namespace = console)]
pub fn log(s: &str);
}
#[wasm_bindgen]
pub async fn greet(name: &str) {
log(&format!("Hello, {}! This is an async function.", name));
}
#[wasm_bindgen]
pub fn add(left: usize, right: usize) -> usize {
left + right
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn it_works() {
let result = add(2, 2);
assert_eq!(result, 4);
}
}

1
kifu/kifu-core/.gitignore vendored
View File

@ -1 +0,0 @@
typeshare

12
kifu/kifu-core/build.rs
View File

@ -1,12 +0,0 @@
use std::process::Command;
fn main() {
Command::new("typeshare")
.args(&[
".",
"--lang=typescript",
"--output-file=typeshare/core.d.ts",
])
.status()
.unwrap();
}

70
kifu/kifu-core/typeshare/core.d.ts vendored Normal file
View File

@ -0,0 +1,70 @@
/*
Generated by typeshare 1.5.1
*/
export interface PlayStoneRequest {
column: number;
row: number;
}
export interface Size {
width: number;
height: number;
}
export type IntersectionElement =
| { type: "Unplayable", content?: undefined }
| { type: "Empty", content: CoreRequest }
| { type: "Filled", content: StoneElement };
export interface BoardElement {
size: Size;
spaces: IntersectionElement[];
}
export enum Color {
Black = "Black",
White = "White",
}
export interface PlayerCardElement {
color: Color;
name: string;
rank: string;
clock: string;
}
export interface ChatElement {
messages: string[];
}
export interface TextFieldElement {
}
export interface PlayingFieldView {
board: BoardElement;
player_card_black: PlayerCardElement;
player_card_white: PlayerCardElement;
chat: ChatElement;
message: TextFieldElement;
current_player: Color;
}
export interface Jitter {
x: number;
y: number;
}
export interface StoneElement {
color: Color;
jitter: Jitter;
liberties?: number;
}
export type CoreRequest =
| { type: "PlayingField", content?: undefined }
| { type: "PlayStoneRequest", content: PlayStoneRequest };
export type CoreResponse =
| { type: "PlayingFieldView", content: PlayingFieldView };

6
kifu/kifu-pwa/src/manifest.json
View File

@ -1,8 +1,8 @@
{ {
"lang": "en-us", "lang": "en-us",
"name": "Temperature converter app", "name": "Kifu",
savanni marked this conversation as resolved Outdated
savanni commented 2023-05-13 16:24:38 +00:00
Outdated
Review
Copy Link

This was part of the tutorial project. Update these fields.

This was part of the tutorial project. Update these fields.
"short_name": "Temperature converter", "short_name": "Kifu",
"description": "A basic temperature converter application", "description": "An app for playing Go",
"start_url": "/", "start_url": "/",
"background_color": "#2f3d58", "background_color": "#2f3d58",
"theme_color": "#2f3d58", "theme_color": "#2f3d58",

4
kifu/kifu-pwa/src/sw.js
View File

@ -6,9 +6,7 @@ self.addEventListener('install', event => {
cache.addAll([ cache.addAll([
'/', '/',
savanni marked this conversation as resolved
savanni commented 2023-05-13 16:25:13 +00:00
Review
Copy Link

This is likely incorrect

This is likely incorrect
'/kifu-bundle.js', '/kifu-bundle.js',
'/converter.css', '/kifu.css',
savanni marked this conversation as resolved Outdated
savanni commented 2023-05-13 16:24:49 +00:00
Outdated
Review
Copy Link

Rename converter.css

Rename converter.css
'/kifu_wasm.js',
'/kifu_wasm_bg.wasm',
]); ]);
})()); })());
}); });