Merge branch 'sync-with-main-ps' of https://github.com/KirbyRider1337…

…/dh2-client into sync-with-main-ps

.eslintrc.js

@@ -28,6 +28,7 @@ module.exports = {
 
 		// Generic global variables
 		"Config": false, "BattleSearch": false, "Storage": false, "Dex": false, "DexSearch": false,
+		"ModConfig": false, "ModSprites": false,
 		"app": false, "toID": false, "toRoomid": false, "toUserid": false, "toName": false, "PSUtils": false, "MD5": false,
 		"ChatHistory": false, "Topbar": false, "UserList": false,
 

.github/workflows/test.yml

@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -16,15 +16,24 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: Zarel/setup-node@patch-1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install
-    - run: npm run test
+    - run: npm run build --if-present
+    - run: node build full
+    - name: Build DH2
+      run: npm run build --if-present
+    - name: start DH2 server instance
+      run: |
+        node caches/DH2/pokemon-showdown &
+        while ! curl -s http://localhost:8000 -o /dev/null; do
+        sleep 60
+        done
       env:
         CI: true

.gitignore

@@ -26,6 +26,16 @@ npm-debug.log
 /play.pokemonshowdown.com/js/miniedit.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/