From 64ac28f60c0dd2d4d30dfc4ec800a836738e629f Mon Sep 17 00:00:00 2001 From: Max Richter Date: Tue, 20 Jan 2026 18:26:48 +0100 Subject: [PATCH] chore: cleanup node buildscripts --- app/src/lib/node-registry.ts | 31 +++++++++++---------- app/static/.gitignore | 1 + nodes/max/plantarium/.template/package.json | 6 ---- nodes/max/plantarium/box/Cargo.toml | 2 +- nodes/max/plantarium/box/package.json | 6 ---- nodes/max/plantarium/branch/package.json | 6 ---- nodes/max/plantarium/float/package.json | 6 ---- nodes/max/plantarium/gravity/package.json | 6 ---- nodes/max/plantarium/instance/package.json | 6 ---- nodes/max/plantarium/math/package.json | 6 ---- nodes/max/plantarium/noise/package.json | 6 ---- nodes/max/plantarium/output/package.json | 6 ---- nodes/max/plantarium/random/package.json | 6 ---- nodes/max/plantarium/rotate/package.json | 6 ---- nodes/max/plantarium/stem/package.json | 6 ---- nodes/max/plantarium/triangle/package.json | 6 ---- nodes/max/plantarium/vec3/package.json | 6 ---- package.json | 2 +- packages/utils/src/main.rs | 2 +- 19 files changed, 20 insertions(+), 102 deletions(-) create mode 100644 app/static/.gitignore delete mode 100644 nodes/max/plantarium/.template/package.json delete mode 100644 nodes/max/plantarium/box/package.json delete mode 100644 nodes/max/plantarium/branch/package.json delete mode 100644 nodes/max/plantarium/float/package.json delete mode 100644 nodes/max/plantarium/gravity/package.json delete mode 100644 nodes/max/plantarium/instance/package.json delete mode 100644 nodes/max/plantarium/math/package.json delete mode 100644 nodes/max/plantarium/noise/package.json delete mode 100644 nodes/max/plantarium/output/package.json delete mode 100644 nodes/max/plantarium/random/package.json delete mode 100644 nodes/max/plantarium/rotate/package.json delete mode 100644 nodes/max/plantarium/stem/package.json delete mode 100644 nodes/max/plantarium/triangle/package.json delete mode 100644 nodes/max/plantarium/vec3/package.json diff --git a/app/src/lib/node-registry.ts b/app/src/lib/node-registry.ts index 112818d..9594c61 100644 --- a/app/src/lib/node-registry.ts +++ b/app/src/lib/node-registry.ts @@ -1,9 +1,10 @@ -import { createWasmWrapper } from "@nodarium/utils"; -import fs from "fs/promises"; -import path from "path"; +import { createWasmWrapper } from '@nodarium/utils'; +import fs from 'fs/promises'; +import path from 'path'; export async function getWasm(id: `${string}/${string}/${string}`) { - const filePath = path.resolve(`../nodes/${id}/pkg/node.wasm`); + const filePath = path.resolve(`./static/nodes/${id}`); + console.log({ filePath }); try { await fs.access(filePath); @@ -36,12 +37,12 @@ export async function getNode(id: `${string}/${string}/${string}`) { } export async function getCollectionNodes(userId: `${string}/${string}`) { - const nodes = await fs.readdir(path.resolve(`../nodes/${userId}`)); + const nodes = await fs.readdir(path.resolve(`./static/nodes/${userId}`)); return nodes - .filter((n) => n !== "pkg" && n !== ".template") + .filter((n) => n !== 'pkg' && n !== '.template') .map((n) => { return { - id: `${userId}/${n}`, + id: `${userId}/${n}` }; }); } @@ -50,20 +51,20 @@ export async function getCollection(userId: `${string}/${string}`) { const nodes = await getCollectionNodes(userId); return { id: userId, - nodes, + nodes }; } export async function getUserCollections(userId: string) { - const collections = await fs.readdir(path.resolve(`../nodes/${userId}`)); + const collections = await fs.readdir(path.resolve(`./static/nodes/${userId}`)); return Promise.all( collections.map(async (n) => { const nodes = await getCollectionNodes(`${userId}/${n}`); return { id: `${userId}/${n}`, - nodes, + nodes }; - }), + }) ); } @@ -71,20 +72,20 @@ export async function getUser(userId: string) { const collections = await getUserCollections(userId); return { id: userId, - collections, + collections }; } export async function getUsers() { - const nodes = await fs.readdir(path.resolve("../nodes")); + const nodes = await fs.readdir(path.resolve('./static/nodes')); const users = await Promise.all( nodes.map(async (n) => { const collections = await getUserCollections(n); return { id: n, - collections, + collections }; - }), + }) ); return users; } diff --git a/app/static/.gitignore b/app/static/.gitignore new file mode 100644 index 0000000..f54b6b9 --- /dev/null +++ b/app/static/.gitignore @@ -0,0 +1 @@ +nodes/ diff --git a/nodes/max/plantarium/.template/package.json b/nodes/max/plantarium/.template/package.json deleted file mode 100644 index c066779..0000000 --- a/nodes/max/plantarium/.template/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/out.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/box/Cargo.toml b/nodes/max/plantarium/box/Cargo.toml index 3cf9bdd..8889289 100644 --- a/nodes/max/plantarium/box/Cargo.toml +++ b/nodes/max/plantarium/box/Cargo.toml @@ -8,5 +8,5 @@ edition = "2018" crate-type = ["cdylib", "rlib"] [dependencies] -nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } diff --git a/nodes/max/plantarium/box/package.json b/nodes/max/plantarium/box/package.json deleted file mode 100644 index 69679f8..0000000 --- a/nodes/max/plantarium/box/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/box.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/branch/package.json b/nodes/max/plantarium/branch/package.json deleted file mode 100644 index dd1de2c..0000000 --- a/nodes/max/plantarium/branch/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/branch.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/float/package.json b/nodes/max/plantarium/float/package.json deleted file mode 100644 index e2e1fc5..0000000 --- a/nodes/max/plantarium/float/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/float.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/gravity/package.json b/nodes/max/plantarium/gravity/package.json deleted file mode 100644 index 6ca64a2..0000000 --- a/nodes/max/plantarium/gravity/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/gravity.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/instance/package.json b/nodes/max/plantarium/instance/package.json deleted file mode 100644 index 061b805..0000000 --- a/nodes/max/plantarium/instance/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/instance.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/math/package.json b/nodes/max/plantarium/math/package.json deleted file mode 100644 index e63975b..0000000 --- a/nodes/max/plantarium/math/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/math.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/noise/package.json b/nodes/max/plantarium/noise/package.json deleted file mode 100644 index 30b7618..0000000 --- a/nodes/max/plantarium/noise/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/noise.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/output/package.json b/nodes/max/plantarium/output/package.json deleted file mode 100644 index 4cc2020..0000000 --- a/nodes/max/plantarium/output/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/output.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/random/package.json b/nodes/max/plantarium/random/package.json deleted file mode 100644 index 4fecf10..0000000 --- a/nodes/max/plantarium/random/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/random.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/rotate/package.json b/nodes/max/plantarium/rotate/package.json deleted file mode 100644 index fc6a577..0000000 --- a/nodes/max/plantarium/rotate/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/rotate.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/stem/package.json b/nodes/max/plantarium/stem/package.json deleted file mode 100644 index e22c7b9..0000000 --- a/nodes/max/plantarium/stem/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/stem.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/triangle/package.json b/nodes/max/plantarium/triangle/package.json deleted file mode 100644 index 77e9f04..0000000 --- a/nodes/max/plantarium/triangle/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/triangle.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/nodes/max/plantarium/vec3/package.json b/nodes/max/plantarium/vec3/package.json deleted file mode 100644 index d99c173..0000000 --- a/nodes/max/plantarium/vec3/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "scripts": { - "build": "cargo build --target wasm32-unknown-unknown --release && mkdir -p pkg && cp ../../../../target/wasm32-unknown-unknown/release/vec3.wasm ./pkg/node.wasm", - "dev": "cargo watch -s 'wasm-pack build --dev --out-name index --no-default-features'" - } -} diff --git a/package.json b/package.json index 11efdcd..16b4813 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "build": "pnpm build:nodes && pnpm build:app", "build:story": "pnpm -r --filter 'ui' story:build", "build:app": "BASE_PATH=/ui pnpm -r --filter 'ui' build && pnpm -r --filter 'app' build", - "build:nodes": "pnpm -r --filter './nodes/**' build", + "build:nodes": "cargo build --workspace --target wasm32-unknown-unknown --release && rm -rf ./app/static/nodes/max/plantarium/ && mkdir -p ./app/static/nodes/max/plantarium/ && cp -R ./target/wasm32-unknown-unknown/release/*.wasm ./app/static/nodes/max/plantarium/", "build:deploy": "pnpm build", "dev:all": "pnpm -r dev", "dev:nodes": "pnpm -r --parallel --filter './nodes/**' dev", diff --git a/packages/utils/src/main.rs b/packages/utils/src/main.rs index f7015ac..b628469 100644 --- a/packages/utils/src/main.rs +++ b/packages/utils/src/main.rs @@ -1,5 +1,5 @@ use nodarium_utils::{ - geometry::{create_multiple_paths, create_path, wrap_multiple_paths}, + geometry::{create_multiple_paths, wrap_multiple_paths}, split_args, };