November 18, 2023: Merge with PS

.eslintignore

@@ -1,16 +1,16 @@
-data/*
 node_modules/
-js/*
+/play.pokemonshowdown.com/data/*
+/play.pokemonshowdown.com/js/*
 
-!/js/client-battle.js
-!/js/client-chat-tournament.js
-!/js/client-chat.js
-!/js/client-ladder.js
-!/js/client-mainmenu.js
-!/js/client-rooms.js
-!/js/client-teambuilder.js
-!/js/client-topbar.js
-!/js/client.js
-!/js/replay-embed.template.js
-!/js/search.js
-!/js/storage.js
+!/play.pokemonshowdown.com/js/client-battle.js
+!/play.pokemonshowdown.com/js/client-chat-tournament.js
+!/play.pokemonshowdown.com/js/client-chat.js
+!/play.pokemonshowdown.com/js/client-ladder.js
+!/play.pokemonshowdown.com/js/client-mainmenu.js
+!/play.pokemonshowdown.com/js/client-rooms.js
+!/play.pokemonshowdown.com/js/client-teambuilder.js
+!/play.pokemonshowdown.com/js/client-topbar.js
+!/play.pokemonshowdown.com/js/client.js
+!/play.pokemonshowdown.com/js/replay-embed.template.js
+!/play.pokemonshowdown.com/js/search.js
+!/play.pokemonshowdown.com/js/storage.js

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
       run: npm run build --if-present
     - name: start DH2 server instance
       run: |
-        node DH2/pokemon-showdown &
+        node caches/DH2/pokemon-showdown &
         while ! curl -s http://localhost:8000 -o /dev/null; do
         sleep 60
         done

.gitignore

@@ -1,39 +1,48 @@
-/sprites/
-/audio/
-/index.php
-/index.html
-/preactalpha.html
-/crossprotocol.html
-/data/*
 node_modules/
-eslint-cache/
 .DS_Store
 Thumbs.db
 npm-debug.log
 package-lock.json
+/config/
 /vendor/
+/caches/
 
-/js/server/
-/js/*.js.map
-/js/battle*.js
-/js/panel*.js
-/js/replay-embed.js
-/js/client-main.js
-/js/client-core.js
-/js/client-connection.js
+/play.pokemonshowdown.com/sprites/
+/play.pokemonshowdown.com/audio/
+/play.pokemonshowdown.com/index.php
+/play.pokemonshowdown.com/index.html
+/play.pokemonshowdown.com/preactalpha.html
+/play.pokemonshowdown.com/crossprotocol.html
+/play.pokemonshowdown.com/data/
 
-/replays/caches/
-/replays/replay-config.inc.php
-/replays/theme/wrapper.inc.php
+/play.pokemonshowdown.com/js/server/
+/play.pokemonshowdown.com/js/*.js.map
+/play.pokemonshowdown.com/js/battle*.js
+/play.pokemonshowdown.com/js/panel*.js
+/play.pokemonshowdown.com/js/replay-embed.js
+/play.pokemonshowdown.com/js/client-main.js
+/play.pokemonshowdown.com/js/client-core.js
+/play.pokemonshowdown.com/js/client-connection.js
+/play.pokemonshowdown.com/ads.txt
 
 /website/.well-known/
 /website/.pages-cached/
 /website/files/
 /website/images/
 /website/ads.txt
-
 /DH2/*
 /DH2/
 /website/replays/index.html
 /website/replays/js/
 node_modules
+/pokemonshowdown.com/.well-known/
+/pokemonshowdown.com/.pages-cached/
+/pokemonshowdown.com/files/
+/pokemonshowdown.com/images/
+/pokemonshowdown.com/ads.txt
+
+/replay.pokemonshowdown.com/index.php
+/replay.pokemonshowdown.com/js/
+/replay.pokemonshowdown.com/caches/
+/replay.pokemonshowdown.com/theme/wrapper.inc.php
+/replay.pokemonshowdown.com/ads.txt

build-tools/.eslintrc.js

@@ -35,6 +35,7 @@ module.exports = {
 		"no-confusing-arrow": 0,
 		"no-const-assign": 2,
 		"no-dupe-class-members": 2,
+		"no-restricted-syntax": "off",
 		"no-this-before-super": 2,
 		"no-var": 2,
 		"require-yield": 2,