Merge branch 'main' into dependabot/npm_and_yarn/micromatch-4.0.8

osrs-wiki · Sep 3, 2024 · cca6e27 · cca6e27
2 parents 5818aa9 + 458c1a1
commit cca6e27
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 24 deletions.
diff --git a/.changeset/cool-bikes-brush.md b/.changeset/cool-bikes-brush.md
@@ -0,0 +1,5 @@
+---
+"@osrs-wiki/cache-mediawiki": patch
+---
+
+Set release and update template params from context in clue pages
diff --git a/.changeset/stale-feet-whisper.md b/.changeset/stale-feet-whisper.md
@@ -0,0 +1,5 @@
+---
+"@osrs-wiki/cache-mediawiki": patch
+---
+
+Update @osrs-wiki/mediawiki-builder to 1.6.1
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/osrs-wiki/cache-mediawiki#readme",
   "dependencies": {
-    "@osrs-wiki/mediawiki-builder": "^1.2.3",
+    "@osrs-wiki/mediawiki-builder": "^1.6.1",
     "base64-arraybuffer-es6": "^3.0.1",
     "diff": "^5.2.0",
     "dotenv": "^16.4.1",

diff --git a/src/scripts/clues/builder.ts b/src/scripts/clues/builder.ts
@@ -3,6 +3,7 @@ import {
   InfoboxTemplate,
   MediaWikiBreak,
   MediaWikiBuilder,
+  MediaWikiDate,
   MediaWikiFile,
   MediaWikiHeader,
   MediaWikiText,
@@ -12,6 +13,7 @@ import _ from "underscore";
 
 import { ITEM_EXAMINES } from "./clues";
 import { formatAnswers, getDirections } from "./utils";
+import Context from "../../context";
 import { Item } from "../../utils/cache2";
 import { vowel } from "../../utils/string";
 
@@ -82,9 +84,11 @@ const cluePageBuilder = ({
     new InfoboxTemplate<InfoboxItem>("Item", {
       name: itemName,
       image: new MediaWikiFile(`${itemName}.png`),
+      release: Context.updateDate
+        ? new MediaWikiDate(new Date(Context.updateDate))
+        : "",
+      update: Context.update ?? "",
       members: true,
-      release: "",
-      update: "",
       quest: "No",
       tradeable: false,
       equipable: false,

diff --git a/src/scripts/differences/builder/__tests__/__snapshots__/builder.utils.test.ts.snap b/src/scripts/differences/builder/__tests__/__snapshots__/builder.utils.test.ts.snap
@@ -6,27 +6,24 @@ Object {
     Object {
       "content": Array [
         MediaWikiText {
-          "children": undefined,
+          "children": "test",
           "styling": undefined,
-          "value": "test",
         },
       ],
     },
     Object {
       "content": Array [
         MediaWikiText {
-          "children": undefined,
+          "children": "test <span style=\\"color: #ee4231\\">removed</span> <span style=\\"color: #ee4231\\">first</span>",
           "styling": undefined,
-          "value": "test <span style=\\"color: #ee4231\\">removed</span> <span style=\\"color: #ee4231\\">first</span>",
         },
       ],
     },
     Object {
       "content": Array [
         MediaWikiText {
-          "children": undefined,
+          "children": "test <span style=\\"color: #6bc71f\\">added</span> <span style=\\"color: #6bc71f\\">second</span>",
           "styling": undefined,
-          "value": "test <span style=\\"color: #6bc71f\\">added</span> <span style=\\"color: #6bc71f\\">second</span>",
         },
       ],
     },
@@ -41,27 +38,24 @@ Object {
     Object {
       "content": Array [
         MediaWikiText {
-          "children": undefined,
+          "children": "test",
           "styling": undefined,
-          "value": "test",
         },
       ],
     },
     Object {
       "content": Array [
         MediaWikiText {
-          "children": undefined,
+          "children": "test <span style=\\"color: #ee4231\\">removed</span>",
           "styling": undefined,
-          "value": "test <span style=\\"color: #ee4231\\">removed</span>",
         },
       ],
     },
     Object {
       "content": Array [
         MediaWikiText {
-          "children": undefined,
+          "children": "test <span style=\\"color: #6bc71f\\">added</span>",
           "styling": undefined,
-          "value": "test <span style=\\"color: #6bc71f\\">added</span>",
         },
       ],
     },

diff --git a/yarn.lock b/yarn.lock
@@ -1028,12 +1028,12 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@osrs-wiki/mediawiki-builder@^1.2.3":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@osrs-wiki/mediawiki-builder/-/mediawiki-builder-1.2.3.tgz#cd6f151a51bf8137898e720d0dddcfb8737a1cef"
-  integrity sha512-p47n8xBQwAlbmA3rX0xaByV4IwoaumieT/0fcGmiK7zeWjjQ7YYvz8Y/HfP/0SIhHWHwSQiaQaDNw9NZqISDuA==
+"@osrs-wiki/mediawiki-builder@^1.6.1":
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/@osrs-wiki/mediawiki-builder/-/mediawiki-builder-1.6.1.tgz#14c23bfc5330bb767c9692ce6a82103b56080add"
+  integrity sha512-bJk4Bbr8CPIlTHOIj8d/p8PALnJQLREIEOv19r0zlC0w8H8sjDSALpqcoyFB5YUHs4/UyOw3RSk8pJY1US4YPg==
   dependencies:
-    tslib "^2.6.2"
+    tslib "^2.6.3"
 
 "@sinclair/typebox@^0.23.3":
   version "0.23.5"
@@ -4985,10 +4985,10 @@ tslib@^2.1.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
-tslib@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+tslib@^2.6.3:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
+  integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
 
 tsutils@^3.21.0:
   version "3.21.0"