merge

.eslintignore

@@ -1,5 +1,5 @@
 node_modules/
 lib/
-web/js
-web/ruffle
-web/built-games
+public_html/
+app/public/
+app/vite-env.d.ts

.github/dependabot.yml

@@ -6,6 +6,12 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
+    target-branch: "master"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    target-branch: "next"
     directory: "/"
     schedule:
       interval: "daily"

.github/workflows/ci.yml

@@ -0,0 +1,94 @@
+name: CI/CD
+
+on:
+  push:
+    branches: '**'
+  workflow_dispatch:
+
+jobs:
+
+  version:
+    name: Bump Version
+    runs-on: ubuntu-latest
+    if: github.ref != 'refs/heads/master'
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}
+
+      - run: |
+          git config --global user.name 'CI/CD'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          npm version patch -m "Bump: %s"
+          git push
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    needs: version
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}
+
+      - name: Use Node.js 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: "Lint"
+        run: |
+          git config --global user.name 'CI/CD'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          npm run lint || true
+          git commit -am "Eslint: fix all" || true
+          git push || true
+
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.ref }}
+          submodules: true
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+
+      - name: Use Node.js 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Build
+        run: |
+          npm run build
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: 'public_html'
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2
+

.github/workflows/code-quality-analysis.yml

@@ -13,9 +13,7 @@ name: "Code Quality Analysis"
 
 on:
   push:
-    branches: [master]
-  pull_request:
-    branches: []
+    branches: ["**"]
 
 jobs:
   analyze:

.gitignore

@@ -1,6 +1,26 @@
-lib/
-node_modules/
-hash
-public_html/
-web/__compile_cache/
-pnpm-lock.yaml
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+public_html
+lib
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

.gitmodules

@@ -0,0 +1,18 @@
+[submodule "app/public/built-games/cookieclicker"]
+	path = app/public/built-games/cookieclicker
+	url = https://github.com/SHSGames/cookieclicker.git
+[submodule "app/public/built-games/CSGOClicker"]
+	path = app/public/built-games/CSGOClicker
+	url = https://github.com/SHSGames/CSGOClicker.git
+[submodule "app/public/built-games/chromedino"]
+	path = app/public/built-games/chromedino
+	url = https://github.com/SHSGames/chromedino.git
+[submodule "app/public/built-games/baldis-basics"]
+	path = app/public/built-games/baldis-basics
+	url = https://github.com/SHSGames/baldis-basics.git
+[submodule "app/public/built-games/takumiraccoon"]
+	path = app/public/built-games/takumiraccoon
+	url = https://github.com/SHSGames/takumiraccoon.git
+[submodule "app/public/IodineGBA"]
+	path = app/public/IodineGBA
+	url = https://github.com/SHSGames/IodineGBA.git