Skip to content

Commit

Permalink
Merge pull request #11338 from wellcomecollection/upgrade-typescript-…
Browse files Browse the repository at this point in the history 
…types

Upgrade typescript and types packages, fix whatever it found
  • Loading branch information
@rcantin-w
rcantin-w authored Oct 30, 2024
2 parents b15d9e5 + cf2ac5f commit f549c6c
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 62 deletions.
4 changes: 3 additions & 1 deletion common/views/components/TransitionLink/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import { useToggles } from '@weco/common/server-data/Context';

declare global {
interface Document {
startViewTransition: (cb: () => void) => void;
startViewTransition: (
callbackOptions?: UpdateCallback | undefined
) => ViewTransition;
}
}

Expand Down
2 changes: 1 addition & 1 deletion content/webapp/components/IIIFViewer/GridViewer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const GridViewer: FunctionComponent = () => {
const columnCount = Math.round(mainAreaWidth / itemWidth);
const columnWidth = mainAreaWidth / columnCount;
const grid = useRef<FixedSizeGrid>(null);
const { canvases } = { ...transformedManifest } || [];
const canvases = transformedManifest?.canvases;

useEffect(() => {
const rowIndex = Math.floor(
Expand Down
2 changes: 1 addition & 1 deletion content/webapp/services/prismic/fetch/stories-rss.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import prismic from '@prismicio/client';
import * as prismic from '@prismicio/client';

import { GetServerSidePropsPrismicClient } from '.';

Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
"@testing-library/user-event": "14.4.3",
"@types/gtag.js": "^0.0.12",
"@types/jest": "^29.5.0",
"@types/jsonwebtoken": "^8.5.8",
"@types/koa": "^2.11.0",
"@types/jsonwebtoken": "^9.0.7",
"@types/koa": "^2.15.0",
"@types/koa-json": "^2.0.18",
"@types/koa-logger": "^3.1.1",
"@types/koa-router": "^7.4.4",
"@types/koa__router": "^8.0.2",
"@types/koa__router": "^12.0.4",
"@types/lodash.debounce": "^4.0.7",
"@types/node": "^20.2.3",
"@types/node": "^22.8.1",
"@types/prompts": "^2.4.4",
"@types/react": "18.2.7",
"@types/react-window": "^1.8.5",
Expand Down Expand Up @@ -93,10 +93,10 @@
"prettier": "^3.3.3",
"prop-types": "15.8.1",
"rimraf": "^4.4.1",
"stylelint": "^16.9.0",
"stylelint": "^16.10.0",
"stylelint-config-standard": "^36.0.1",
"ts-jest": "29.2.3",
"typescript": "5.3.3",
"typescript": "5.6.3",
"whatwg-fetch": "^3.6.2"
},
"resolutions": {
Expand Down
107 changes: 54 additions & 53 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5177,10 +5177,10 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==

"@types/jsonwebtoken@^8.5.8":
version "8.5.9"
resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz#2c064ecb0b3128d837d2764aa0b117b0ff6e4586"
integrity sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==
"@types/jsonwebtoken@^9.0.7":
version "9.0.7"
resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.7.tgz#e49b96c2b29356ed462e9708fc73b833014727d2"
integrity sha512-ugo316mmTYBl2g81zDFnZ7cfxlut3o+/EQdaP7J8QN2kY6lJ22hmQYCK5EHcJHbrW+dkCGSCPgbG8JtYj6qSrg==
dependencies:
"@types/node" "*"

Expand Down Expand Up @@ -5217,7 +5217,7 @@
dependencies:
"@types/koa" "*"

"@types/koa@*", "@types/koa@^2.11.0":
"@types/koa@*", "@types/koa@^2.15.0":
version "2.15.0"
resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.15.0.tgz#eca43d76f527c803b491731f95df575636e7b6f2"
integrity sha512-7QFsywoE5URbuVnG3loe03QXuGajrnotr3gQkXcEBShORai23MePfFYdhz90FEtBBpkyIYQbVD+evKtloCgX3g==
Expand All @@ -5231,10 +5231,10 @@
"@types/koa-compose" "*"
"@types/node" "*"

"@types/koa__router@^8.0.2":
version "8.0.11"
resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-8.0.11.tgz#d7b37e6db934fc072ea1baa2ab92bc8ac4564f3e"
integrity sha512-WXgKWpBsbS14kzmzD9LeFapOIa678h7zvUHxDwXwSx4ETKXhXLVUAToX6jZ/U7EihM7qwyD9W/BZvB0MRu7MTQ==
"@types/koa__router@^12.0.4":
version "12.0.4"
resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-12.0.4.tgz#a1f9afec9dc7e7d9fa1252d1938c44b403e19a28"
integrity sha512-Y7YBbSmfXZpa/m5UGGzb7XadJIRBRnwNY9cdAojZGp65Cpe5MAP3mOZE7e3bImt8dfKS4UFcR16SLH8L/z7PBw==
dependencies:
"@types/koa" "*"

Expand Down Expand Up @@ -5286,6 +5286,13 @@
dependencies:
undici-types "~6.19.2"

"@types/node@^22.8.1":
version "22.8.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.8.1.tgz#b39d4b98165e2ae792ce213f610c7c6108ccfa16"
integrity sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==
dependencies:
undici-types "~6.19.8"

"@types/parse-json@^4.0.0":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
Expand Down Expand Up @@ -7362,10 +7369,10 @@ css-color-keywords@^1.0.0:
resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==

css-functions-list@^3.2.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.2.tgz#9a54c6dd8416ed25c1079cd88234e927526c1922"
integrity sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==
css-functions-list@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.3.tgz#95652b0c24f0f59b291a9fc386041a19d4f40dbe"
integrity sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==

css-loader@^6.7.1, css-loader@^6.7.3:
version "6.11.0"
Expand Down Expand Up @@ -7401,12 +7408,12 @@ [email protected]:
css-color-keywords "^1.0.0"
postcss-value-parser "^4.0.2"

css-tree@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
css-tree@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-3.0.0.tgz#079c7b87e465a28cedbc826502f9a227213db0f3"
integrity sha512-o88DVQ6GzsABn1+6+zo2ct801dBO5OASVyxbbvA2W20ue2puSh/VOuqUj90eUeMSX/xqGqBmOKiRQN7tJOuBXw==
dependencies:
mdn-data "2.0.30"
mdn-data "2.10.0"
source-map-js "^1.0.1"

css-what@^6.0.1:
Expand Down Expand Up @@ -7520,7 +7527,7 @@ debug@^3.1.0, debug@^3.2.7:
dependencies:
ms "^2.1.1"

debug@^4.3.6:
debug@^4.3.7:
version "4.3.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
Expand Down Expand Up @@ -8788,7 +8795,7 @@ file-entry-cache@^6.0.1:
dependencies:
flat-cache "^3.0.4"

file-entry-cache@^9.0.0:
file-entry-cache@^9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-9.1.0.tgz#2e66ad98ce93f49aed1b178c57b0b5741591e075"
integrity sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==
Expand Down Expand Up @@ -9682,10 +9689,10 @@ ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==

ignore@^5.3.2:
version "5.3.2"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
ignore@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-6.0.2.tgz#77cccb72a55796af1b6d2f9eb14fa326d24f4283"
integrity sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==

image-size@^1.0.0:
version "1.1.1"
Expand Down Expand Up @@ -11286,10 +11293,10 @@ md5.js@^1.3.4:
inherits "^2.0.1"
safe-buffer "^5.1.2"

mdn-data@2.0.30:
version "2.0.30"
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
mdn-data@2.10.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.10.0.tgz#701da407f8fbc7a42aa0ba0c149ec897daef8986"
integrity sha512-qq7C3EtK3yJXMwz1zAab65pjl+UhohqMOctTgcqjLOWABqmwj+me02LSsCuEUxnst9X1lCBpoE0WArGKgdGDzw==

measured-core@^1.51.1:
version "1.51.1"
Expand Down Expand Up @@ -12480,7 +12487,7 @@ postcss-resolve-nested-selector@^0.1.6:
resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz#3d84dec809f34de020372c41b039956966896686"
integrity sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==

postcss-safe-parser@^7.0.0:
postcss-safe-parser@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz#36e4f7e608111a0ca940fd9712ce034718c40ec0"
integrity sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==
Expand Down Expand Up @@ -12540,7 +12547,7 @@ [email protected]:
picocolors "^1.0.0"
source-map-js "^1.2.0"

postcss@^8.2.14, postcss@^8.4.38, postcss@^8.4.41:
postcss@^8.2.14, postcss@^8.4.38, postcss@^8.4.47:
version "8.4.47"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
Expand Down Expand Up @@ -13979,7 +13986,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^7.0.1, strip-ansi@^7.1.0:
strip-ansi@^7.0.1:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
Expand Down Expand Up @@ -14084,10 +14091,10 @@ stylelint-config-standard@^36.0.1:
dependencies:
stylelint-config-recommended "^14.0.1"

stylelint@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.9.0.tgz#81615c0608b9dc645486e08e35c6c9206e1ba132"
integrity sha512-31Nm3WjxGOBGpQqF43o3wO9L5AC36TPIe6030Lnm13H3vDMTcS21DrLh69bMX+DBilKqMMVLian4iG6ybBoNRQ==
stylelint@^16.10.0:
version "16.10.0"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.10.0.tgz#452b42a5d82f2ad910954eb2ba2b3a2ec583cd75"
integrity sha512-z/8X2rZ52dt2c0stVwI9QL2AFJhLhbPkyfpDFcizs200V/g7v+UYY6SNcB9hKOLcDDX/yGLDsY/pX08sLkz9xQ==
dependencies:
"@csstools/css-parser-algorithms" "^3.0.1"
"@csstools/css-tokenizer" "^3.0.1"
Expand All @@ -14097,17 +14104,17 @@ stylelint@^16.9.0:
balanced-match "^2.0.0"
colord "^2.9.3"
cosmiconfig "^9.0.0"
css-functions-list "^3.2.2"
css-tree "^2.3.1"
debug "^4.3.6"
css-functions-list "^3.2.3"
css-tree "^3.0.0"
debug "^4.3.7"
fast-glob "^3.3.2"
fastest-levenshtein "^1.0.16"
file-entry-cache "^9.0.0"
file-entry-cache "^9.1.0"
global-modules "^2.0.0"
globby "^11.1.0"
globjoin "^0.1.4"
html-tags "^3.3.1"
ignore "^5.3.2"
ignore "^6.0.2"
imurmurhash "^0.1.4"
is-plain-object "^5.0.0"
known-css-properties "^0.34.0"
Expand All @@ -14116,14 +14123,13 @@ stylelint@^16.9.0:
micromatch "^4.0.8"
normalize-path "^3.0.0"
picocolors "^1.0.1"
postcss "^8.4.41"
postcss "^8.4.47"
postcss-resolve-nested-selector "^0.1.6"
postcss-safe-parser "^7.0.0"
postcss-safe-parser "^7.0.1"
postcss-selector-parser "^6.1.2"
postcss-value-parser "^4.2.0"
resolve-from "^5.0.0"
string-width "^4.2.3"
strip-ansi "^7.1.0"
supports-hyperlinks "^3.1.0"
svg-tags "^1.0.0"
table "^6.8.2"
Expand Down Expand Up @@ -14601,21 +14607,16 @@ typed-array-length@^1.0.6:
is-typed-array "^1.1.13"
possible-typed-array-names "^1.0.0"

typescript@5.3.3:
version "5.3.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
typescript@5.6.3, typescript@^5.6.2:
version "5.6.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==

typescript@^5.3.3:
version "5.5.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==

typescript@^5.6.2:
version "5.6.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==

ufo@^1.5.3, ufo@^1.5.4:
version "1.5.4"
resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.4.tgz#16d6949674ca0c9e0fbbae1fa20a71d7b1ded754"
Expand Down Expand Up @@ -14651,7 +14652,7 @@ undici-types@~6.13.0:
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5"
integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==

undici-types@~6.19.2:
undici-types@~6.19.2, undici-types@~6.19.8:
version "6.19.8"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
Expand Down

0 comments on commit f549c6c

Please sign in to comment.