Merge dev into main

.github/workflows/test.yaml

@@ -17,9 +17,9 @@ jobs:
           - local-dev
           - production
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.2.1
 
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].4
         with:
           node-version-file: '.nvmrc'
 
@@ -31,7 +31,7 @@ jobs:
         run: script/bootstrap
 
       - name: Build ${{ matrix.environment }} worker
-        uses: cloudflare/wrangler-action@v3.3.2
+        uses: cloudflare/wrangler-action@v3.9.0
         with:
           workingDirectory: "worker"
           packageManager: yarn
@@ -42,9 +42,9 @@ jobs:
     runs-on: ubuntu-latest
     name: Build site
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.2.1
 
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].4
         with:
           node-version-file: '.nvmrc'
 
@@ -58,9 +58,9 @@ jobs:
     runs-on: ubuntu-latest
     name: Test worker
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.2.1
 
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].4
         with:
           node-version-file: '.nvmrc'
 

.github/workflows/worker.yaml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     name: Publish
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.2.1
 
-      - uses: actions/[email protected].2
+      - uses: actions/[email protected].4
         with:
           node-version-file: '.nvmrc'
 
@@ -36,7 +36,7 @@ jobs:
           echo "environment=${environment}" >> "$GITHUB_OUTPUT"
 
       - name: Publish ${{ steps.environment.outputs.environment }} worker
-        uses: cloudflare/wrangler-action@v3.3.2
+        uses: cloudflare/wrangler-action@v3.9.0
         with:
           apiToken: ${{ secrets.CF_WORKER_API_TOKEN }}
           workingDirectory: "worker"

package.json

@@ -1,26 +1,26 @@
 {
   "dependencies": {
-    "chart.js": "^4.4.1",
+    "chart.js": "^4.4.4",
     "chartjs-adapter-date-fns": "^2.0.1",
     "svg-pan-zoom": "^3.6.1",
-    "svgmap": "^2.10.1",
-    "superstruct": "1.0.3",
-    "toucan-js": "^3.3.1"
+    "svgmap": "^2.11.1",
+    "superstruct": "2.0.2",
+    "toucan-js": "^4.0.0"
   },
   "devDependencies": {
-    "@11ty/eleventy": "^2.0.1",
+    "@11ty/eleventy": "^3.0.0",
     "@cloudflare/workers-types": "^3.17.0",
     "@types/jest": "^27.5.0",
     "@types/node": "^18.15.10",
     "jest": "^26.6.3",
     "memoize-one": "^6.0.0",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "ts-jest": "^26.5.6",
     "ts-loader": "^9.5.1",
     "typescript": "^4.9.5",
-    "webpack": "^5.90.2",
+    "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4",
-    "wrangler": "^3.19.0"
+    "wrangler": "^3.80.4"
   },
   "jest": {
     "transform": {

worker/src/utils/validate.ts

@@ -81,7 +81,7 @@ export const IncomingPayloadStruct = object({
   certificate: optional(boolean()),
   user_count: optional(number()),
   uuid: size(string(), 32, 32),
-  version: size(string(), 7, 22),
+  version: size(string(), 7, 25),
 });
 
 export const createIncomingPayload = (data: unknown): IncomingPayload => {

worker/tests/utils/validate.spec.ts

@@ -1,4 +1,3 @@
-import { string } from "superstruct";
 import { createIncomingPayload } from "../../src/utils/validate";
 
 describe("createIncomingPayload", function () {
@@ -112,4 +111,29 @@ describe("createIncomingPayload", function () {
     });
     expect(payload.addons![0].auto_update).toBe(false);
   });
+
+  it("Valid versions", function () {
+    for (const version of [
+      "YYYY.MM.P",
+      "YYYY.MM.P.devYYYYMMDDHHMM",
+      "YYYY.M.P.devYYYYMMDDHHMM",
+    ]) {
+      const payload = createIncomingPayload({ ...BASE_PAYLOAD, version });
+      expect(payload.version).toBe(version);
+    }
+  });
+
+  it("Invalid versions", function () {
+    for (const version of [
+      "9999.9",
+      "YYYY.MM.P.devYYYYMMDDHHMMX",
+      "9999.99.9.dev9999999999999",
+    ]) {
+      expect(() => {
+        createIncomingPayload({ ...BASE_PAYLOAD, version });
+      }).toThrow(
+        `At path: version -- Expected a string with a length between \`7\` and \`25\` but received one with a length of \`${version.length}\``
+      );
+    }
+  });
 });