Skip to content

Commit b1884bf

Browse files
committed
Don't build bundles twice and be more Windows-friendly
1 parent eee4cc3 commit b1884bf

5 files changed

Lines changed: 1995 additions & 82 deletions

File tree

crawl-ref/source/Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,16 +1363,12 @@ $(NPMNODEMODULES): $(NPMPACKAGELOCKS)
13631363
@touch -m ../../node_modules/.modified
13641364

13651365
$(WEBSERVERGAME): $(GENERATEDJS) webserver/client/game/src/*.js $(NPMNODEMODULES)
1366-
cd webserver/client/game
1367-
echo Build GAME
1368-
npm run build
1366+
npm run build --workspace=crawl-game
13691367

13701368
$(WEBSERVERLOBBY): webserver/client/lobby/src/*.js $(NPMNODEMODULES)
13711369
@rm -f webserver/static/index-*.js
13721370
@rm -f webserver/static/index-*.css
1373-
cd webserver/client/lobby
1374-
echo Build LOBBY
1375-
npm run build
1371+
npm run build --workspace=crawl-lobby
13761372

13771373
clean-webserver:
13781374
$(RM) $(STATICFILES) webserver/*.pyc

crawl-ref/source/webserver/client/game/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build && npm run copy",
8+
"build": "npm-run-all build copy",
9+
"build:vite": "vite build",
910
"lint": "biome lint ./src/*",
1011
"lint:fix": "biome lint ./src/* --write --unsafe",
1112
"format": "biome format ./src/*",

crawl-ref/source/webserver/client/lobby/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build && npm run copy",
8+
"build": "npm-run-all build copy",
9+
"build:vite": "vite build",
910
"lint": "biome lint",
1011
"lint:fix": "biome lint --write --unsafe",
1112
"format": "biome format",

0 commit comments

Comments
 (0)