astro 6

.github/workflows/ci.yml

@@ -13,10 +13,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Setup Node
+        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        with:
+          node-version: 24.x
 
       - name: Setup Bun
-        uses: oven-sh/setup-bun@b7a1c7ccf290d58743029c4f6903da283811b979 # v2.1.0
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
           bun-version: latest
 
@@ -28,3 +33,6 @@ jobs:
 
       - name: Lint code
         run: bun run lint
+
+      - name: Build
+        run: bun run build

.github/workflows/deploy.yml

@@ -0,0 +1,39 @@
+name: Deploy
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  test:
+    name: Test and Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Setup Node
+        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        with:
+          node-version: 24.x
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        with:
+          bun-version: latest
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Test code
+        run: bun run test
+
+      - name: Lint code
+        run: bun run lint
+
+      - name: Build
+        run: bun run build
+
+      - name: Deploy
+        run: bun run deploy

apps/2048/README.md

@@ -1 +1,3 @@
 # 2048
+
+<https://2048.rman.dev>

apps/2048/astro.config.ts

@@ -1,6 +1,5 @@
-import { defineConfig } from "astro/config";
-
 import solid from "@astrojs/solid-js";
+import { defineConfig } from "astro/config";
 
 export default defineConfig({
   output: "static",

apps/2048/src/components/Game.tsx

@@ -1,11 +1,9 @@
 import { onMount } from "solid-js";
 
 import { useGame } from "~/hooks/useGame";
-
-import MenuSection from "./MenuSection";
-import GameSection from "./GameSection";
-
 import type { Direction } from "~/types";
+import GameSection from "./GameSection";
+import MenuSection from "./MenuSection";
 
 export default function App() {
   const CONFIG = {

apps/2048/src/components/GameSection.tsx

@@ -1,6 +1,5 @@
-import { Show } from "solid-js";
-
 import type { Component } from "solid-js";
+import { Show } from "solid-js";
 
 type GameSectionProps = {
   inMenu: boolean;

apps/2048/src/components/MenuSection.tsx

@@ -1,6 +1,5 @@
-import { Show } from "solid-js";
-
 import type { Component } from "solid-js";
+import { Show } from "solid-js";
 
 type MenuSectionProps = {
   inMenu: boolean;

apps/2048/src/hooks/useGame.ts

@@ -39,7 +39,7 @@ export function useGame(gridSize: number, initialTiles: number) {
   }
 
   function pushNumbers(arr: number[], addScore: (val: number) => void) {
-    let newArr = arr.filter((x) => x !== 0);
+    const newArr = arr.filter((x) => x !== 0);
     for (let i = 0; i < newArr.length - 1; i++) {
       if (newArr[i] === newArr[i + 1]) {
         newArr[i]! *= 2;
@@ -63,8 +63,8 @@ export function useGame(gridSize: number, initialTiles: number) {
     switch (direction) {
       case "up":
         for (let j = 0; j < gridSize; j++) {
-          let column = newGrid.map((row) => row[j]!);
-          let newColumn = pushNumbers(column, addScore);
+          const column = newGrid.map((row) => row[j]!);
+          const newColumn = pushNumbers(column, addScore);
           for (let i = 0; i < gridSize; i++) {
             if (newGrid[i]![j] !== newColumn[i]) {
               moved = true;
@@ -75,8 +75,8 @@ export function useGame(gridSize: number, initialTiles: number) {
         break;
       case "down":
         for (let j = 0; j < gridSize; j++) {
-          let column = newGrid.map((row) => row[j]!).reverse();
-          let newColumn = pushNumbers(column, addScore).reverse();
+          const column = newGrid.map((row) => row[j]!).reverse();
+          const newColumn = pushNumbers(column, addScore).reverse();
           for (let i = 0; i < gridSize; i++) {
             if (newGrid[i]![j] !== newColumn[i]) {
               moved = true;
@@ -87,8 +87,8 @@ export function useGame(gridSize: number, initialTiles: number) {
         break;
       case "left":
         for (let i = 0; i < gridSize; i++) {
-          let row = newGrid[i]!;
-          let newRow = pushNumbers(row, addScore);
+          const row = newGrid[i]!;
+          const newRow = pushNumbers(row, addScore);
           for (let j = 0; j < gridSize; j++) {
             if (newGrid[i]![j] !== newRow[j]) {
               moved = true;
@@ -99,8 +99,8 @@ export function useGame(gridSize: number, initialTiles: number) {
         break;
       case "right":
         for (let i = 0; i < gridSize; i++) {
-          let row = [...newGrid[i]!].reverse();
-          let newRow = pushNumbers(row, addScore).reverse();
+          const row = [...newGrid[i]!].reverse();
+          const newRow = pushNumbers(row, addScore).reverse();
           for (let j = 0; j < gridSize; j++) {
             if (newGrid[i]![j] !== newRow[j]) {
               moved = true;

apps/2048/src/pages/index.astro

@@ -1,8 +1,8 @@
 ---
 import "~/styles/game.css";
 
-import Layout from "~/layouts/Layout.astro";
 import Game from "~/components/Game.tsx";
+import Layout from "~/layouts/Layout.astro";
 
 const id = "2048";
 const title = "2048 Game";

apps/app/astro.config.ts

@@ -1,6 +1,5 @@
-import { defineConfig } from "astro/config";
-
 import solid from "@astrojs/solid-js";
+import { defineConfig } from "astro/config";
 
 export default defineConfig({
   output: "static",

apps/app/public/_redirects

@@ -1,5 +1,8 @@
 /          https://rman.dev/games     301
 
+/nim       https://nim.rman.dev/      301
+/nim/      https://nim.rman.dev/      301
+
 /2048      https://2048.rman.dev/     301
 /2048/     https://2048.rman.dev/     301
 
@@ -14,3 +17,6 @@
 
 /bulls-and-cows    https://bulls-and-cows.rman.dev/   301
 /bulls-and-cows/   https://bulls-and-cows.rman.dev/   301
+
+/water-sort-puzzle    https://water-sort-puzzle.rman.dev/   301
+/water-sort-puzzle/   https://water-sort-puzzle.rman.dev/   301