From dd050db5cc145470f9e579875666dace23e15a74 Mon Sep 17 00:00:00 2001 From: Exelo Date: Sun, 7 Dec 2025 16:09:31 +0100 Subject: [PATCH 1/3] fix(ecs): change ecs tests build --- packages/ecs-client/Makefile | 7 ++++--- packages/ecs-client/package.json | 2 +- packages/ecs-lib/Makefile | 12 ++++++------ packages/ecs-server/Makefile | 7 ++++--- packages/ecs-server/package.json | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/ecs-client/Makefile b/packages/ecs-client/Makefile index 19421a2..26362cf 100644 --- a/packages/ecs-client/Makefile +++ b/packages/ecs-client/Makefile @@ -22,10 +22,10 @@ OBJ = $(SRC:.cpp=.o) %.o: %.cpp $(CC) -c $< -o $@ $(CFLAGS) -all: $(JS_NAME) +all: $(TS_NAME) $(JS_NAME) $(WASM_NAME) -$(JS_NAME): LDFLAGS += -s MODULARIZE=1 -s EXPORT_ES6=1 -s ENVIRONMENT=web -$(JS_NAME): $(OBJ) +$(TS_NAME) $(JS_NAME) $(WASM_NAME): LDFLAGS += -s MODULARIZE=1 -s EXPORT_ES6=1 -s ENVIRONMENT=web +$(TS_NAME) $(JS_NAME) $(WASM_NAME) &: $(OBJ) @mkdir -p $(OUT_DIR) $(CC) $(OBJ) $(LDFLAGS) -o $(JS_NAME) cp $(BASE_DIR)/$(TS_NAME) $(TS_NAME) @@ -40,6 +40,7 @@ tests: LDFLAGS += -s MODULARIZE=1 -s EXPORT_ES6=1 tests: $(OBJ) @mkdir -p $(OUT_DIR) $(CC) $(OBJ) $(LDFLAGS) -o $(JS_NAME) + cp $(BASE_DIR)/$(TS_NAME) $(TS_NAME) re: fclean all diff --git a/packages/ecs-client/package.json b/packages/ecs-client/package.json index a777714..ac2c623 100644 --- a/packages/ecs-client/package.json +++ b/packages/ecs-client/package.json @@ -55,7 +55,7 @@ "clean": "make fclean", "lint": "prettier --check . && eslint --format=pretty src", "format": "prettier --write . && eslint --fix --format=pretty src", - "test:unit": "make fclean && make tests -j 16 && vitest run --config ../../vitest.config.ts", + "test:unit": "make fclean && make tests -j 16 && vitest run --config ../../vitest.config.ts && make fclean", "prepack": "pnpm run build && pnpm run lint", "changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/ecs-client/*'", "release": "cliff-jumper" diff --git a/packages/ecs-lib/Makefile b/packages/ecs-lib/Makefile index 03e8b7e..8efa87c 100644 --- a/packages/ecs-lib/Makefile +++ b/packages/ecs-lib/Makefile @@ -8,7 +8,7 @@ NAME := libecs OUT_DIR = lib JS_NAME = $(OUT_DIR)/$(NAME).js WASM_NAME = $(OUT_DIR)/$(NAME).wasm -TS_NAME = $(NAME).d.ts +TS_NAME = $(OUT_DIR)/$(NAME).d.ts CFLAGS = -std=c++20 LDFLAGS = -O3 --no-entry --bind -sNO_DISABLE_EXCEPTION_CATCHING -sEXPORT_EXCEPTION_HANDLING_HELPERS @@ -20,14 +20,14 @@ OBJ = $(SRC:.cpp=.o) %.o: %.cpp $(CC) -c $< -o $@ $(CFLAGS) -all: $(TS_NAME) +all: $(TS_NAME) $(JS_NAME) $(WASM_NAME) -$(TS_NAME): LDFLAGS += -s MODULARIZE=1 -$(TS_NAME): $(OBJ) +$(TS_NAME) $(JS_NAME) $(WASM_NAME): LDFLAGS += -s MODULARIZE=1 +$(TS_NAME) $(JS_NAME) $(WASM_NAME) &: $(OBJ) @mkdir -p $(OUT_DIR) $(CC) $(OBJ) $(LDFLAGS) --emit-tsd libecs-tmp.d.ts -o $(JS_NAME) - cat build/pre.ts > $(OUT_DIR)/$(TS_NAME) - cat $(OUT_DIR)/libecs-tmp.d.ts >> $(OUT_DIR)/$(TS_NAME) + cat build/pre.ts > $(TS_NAME) + cat $(OUT_DIR)/libecs-tmp.d.ts >> $(TS_NAME) $(RM) $(OUT_DIR)/libecs-tmp.d.ts diff --git a/packages/ecs-server/Makefile b/packages/ecs-server/Makefile index 8abc88e..4b31107 100644 --- a/packages/ecs-server/Makefile +++ b/packages/ecs-server/Makefile @@ -22,10 +22,10 @@ OBJ = $(SRC:.cpp=.o) %.o: %.cpp $(CC) -c $< -o $@ $(CFLAGS) -all: $(JS_NAME) +all: $(TS_NAME) $(JS_NAME) $(WASM_NAME) -$(JS_NAME): LDFLAGS += -s MODULARIZE=1 -s EXPORT_ES6=1 -s ENVIRONMENT=node -$(JS_NAME): $(OBJ) +$(TS_NAME) $(JS_NAME) $(WASM_NAME): LDFLAGS += -s MODULARIZE=1 -s EXPORT_ES6=1 -s ENVIRONMENT=node +$(TS_NAME) $(JS_NAME) $(WASM_NAME) &: $(OBJ) @mkdir -p $(OUT_DIR) $(CC) $(OBJ) $(LDFLAGS) -o $(JS_NAME) cp $(BASE_DIR)/$(TS_NAME) $(TS_NAME) @@ -40,6 +40,7 @@ tests: LDFLAGS += -s MODULARIZE=1 -s EXPORT_ES6=1 tests: $(OBJ) @mkdir -p $(OUT_DIR) $(CC) $(OBJ) $(LDFLAGS) -o $(JS_NAME) + cp $(BASE_DIR)/$(TS_NAME) $(TS_NAME) re: fclean all diff --git a/packages/ecs-server/package.json b/packages/ecs-server/package.json index c151259..5b29841 100644 --- a/packages/ecs-server/package.json +++ b/packages/ecs-server/package.json @@ -55,7 +55,7 @@ "clean": "make fclean", "lint": "prettier --check . && eslint --format=pretty src", "format": "prettier --write . && eslint --fix --format=pretty src", - "test:unit": "make fclean && make tests -j 16 && vitest run --config ../../vitest.config.ts", + "test:unit": "make fclean && make tests -j 16 && vitest run --config ../../vitest.config.ts && make fclean", "prepack": "pnpm run build && pnpm run lint", "changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/ecs-server/*'", "release": "cliff-jumper" From 8eb4a1dc620aa04e808c562690219664ba25bfc8 Mon Sep 17 00:00:00 2001 From: Exelo Date: Sun, 7 Dec 2025 16:09:52 +0100 Subject: [PATCH 2/3] ci: update PR triage workflow permissions --- .github/workflows/pr-triage.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pr-triage.yml b/.github/workflows/pr-triage.yml index 7e815c4..581d0cd 100644 --- a/.github/workflows/pr-triage.yml +++ b/.github/workflows/pr-triage.yml @@ -8,6 +8,10 @@ on: - synchronize jobs: label: + permissions: + contents: read + pull-requests: write + issues: write name: Label if: github.event.action != 'edited' runs-on: ubuntu-latest From 3cedb9b7691e9e02555bc3234d5010856d8ac670 Mon Sep 17 00:00:00 2001 From: Exelo Date: Sun, 7 Dec 2025 16:28:42 +0100 Subject: [PATCH 3/3] chore: add "module" type to package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index fa72910..44a448f 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "Fexkoser ", "Tchips " ], + "type": "module", "repository": { "type": "git", "url": "git+https://github.com/NanoForge-dev/Engine.git",