summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/chat.rs24
-rw-r--r--src/files.rs6
-rw-r--r--src/main.rs1
3 files changed, 26 insertions, 5 deletions
diff --git a/src/chat.rs b/src/chat.rs
index be852d5..0739f22 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -50,6 +50,7 @@ pub(crate) fn environment(
}
pub(crate) fn build(project: &Project) -> Result<()> {
+ process::run(project.command("sh")?.arg("infra/chat/build-typescript.sh"))?;
process::run(project.command("sh")?.arg("infra/chat/build-native.sh"))?;
let wasm_build = if project
.root
@@ -79,7 +80,18 @@ pub(crate) fn package(project: &Project) -> Result<()> {
),
("var/build/chat-source.tar.gz", "SOURCE.tar.gz"),
("infra/containers/chat/Containerfile", "Containerfile"),
- ("crates/chat-crypto/browser/wasi.mjs", "wasi.mjs"),
+ (
+ "var/build/typescript/crates/chat-crypto/browser/wasi.js",
+ "wasi.mjs",
+ ),
+ (
+ "var/build/typescript/crates/chat-server/web/app.js",
+ "web/app.js",
+ ),
+ (
+ "var/build/typescript/crates/chat-server/web/worker.js",
+ "web/worker.js",
+ ),
("web/THIRD-PARTY-LICENSES.html", "THIRD-PARTY-LICENSES.html"),
("docs/CHAT-APPLICATION.txt", "CHAT-APPLICATION.txt"),
("docs/CHAT-PRODUCTION.txt", "CHAT-PRODUCTION.txt"),
@@ -87,10 +99,12 @@ pub(crate) fn package(project: &Project) -> Result<()> {
] {
files::copy_tree(&project.root.join(source), &directory.join(target))?;
}
- files::copy_tree(
- &project.root.join("crates/chat-server/web"),
- &directory.join("web"),
- )?;
+ for name in ["index.html", "style.css", "javascript.html"] {
+ files::copy_tree(
+ &project.root.join("crates/chat-server/web").join(name),
+ &directory.join("web").join(name),
+ )?;
+ }
Ok(())
}
diff --git a/src/files.rs b/src/files.rs
index fa441f0..81c57b0 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -30,6 +30,12 @@ use walkdir::WalkDir;
pub(crate) const SOURCE: &[&str] = &[
"Cargo.toml",
"Cargo.lock",
+ "package.json",
+ "package-lock.json",
+ "tsconfig.json",
+ "tsconfig.browser.json",
+ "tsconfig.worker.json",
+ "tsconfig.tests.json",
"rust-toolchain.toml",
".cargo",
".gitignore",
diff --git a/src/main.rs b/src/main.rs
index 5ee1f9e..e6323e2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -293,6 +293,7 @@ fn licenses(project: &Project) -> Result<()> {
}
fn check(project: &Project) -> Result<()> {
+ process::run(project.command("sh")?.arg("infra/chat/build-typescript.sh"))?;
process::run(
project
.command("cargo")?