diff --git a/api-server/src/server/boot/challenge.js b/api-server/src/server/boot/challenge.js index 13fb3f7c35e..1817d4f47af 100644 --- a/api-server/src/server/boot/challenge.js +++ b/api-server/src/server/boot/challenge.js @@ -44,9 +44,8 @@ export default async function bootChallenge(app, done) { const send200toNonUser = ifNoUserSend(true); const api = app.loopback.Router(); const router = app.loopback.Router(); - const challengeUrlResolver = await createChallengeUrlResolver( - getChallenges() - ); + const challengeUrlResolver = + await createChallengeUrlResolver(getChallenges()); const redirectToCurrentChallenge = createRedirectToCurrentChallenge( challengeUrlResolver, normalizeParams, diff --git a/client/src/components/Donation/donate-completion.tsx b/client/src/components/Donation/donate-completion.tsx index 242674f5a6b..efec025c1be 100644 --- a/client/src/components/Donation/donate-completion.tsx +++ b/client/src/components/Donation/donate-completion.tsx @@ -29,10 +29,10 @@ function DonateCompletion({ const heading = redirecting ? `${t('donate.redirecting')}` : processing - ? `${t('donate.processing')}` - : success - ? `${t('donate.thank-you')}` - : `${t('donate.error')}`; + ? `${t('donate.processing')}` + : success + ? `${t('donate.thank-you')}` + : `${t('donate.error')}`; return ( diff --git a/client/src/templates/Challenges/classic/editor.tsx b/client/src/templates/Challenges/classic/editor.tsx index ae1e7d5b515..e11b47d89b6 100644 --- a/client/src/templates/Challenges/classic/editor.tsx +++ b/client/src/templates/Challenges/classic/editor.tsx @@ -1263,8 +1263,8 @@ const Editor = (props: EditorProps): JSX.Element => { theme === Themes.Night ? 'vs-dark-custom' : theme === Themes.Default - ? 'vs-custom' - : editorSystemTheme; + ? 'vs-custom' + : editorSystemTheme; return ( }> diff --git a/package.json b/package.json index e4e3f5b040c..0c2a8255598 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "lodash": "4.17.21", "markdownlint": "0.31.0", "npm-run-all": "4.1.5", - "prettier": "3.0.3", + "prettier": "3.1.0", "prismjs": "1.29.0", "process": "0.11.10", "start-server-and-test": "1.15.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 97c1d84a922..8a1157a33e3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -139,8 +139,8 @@ importers: specifier: 4.1.5 version: 4.1.5 prettier: - specifier: 3.0.3 - version: 3.0.3 + specifier: 3.1.0 + version: 3.1.0 prismjs: specifier: 1.29.0 version: 1.29.0 @@ -1164,8 +1164,8 @@ importers: specifier: 8.2.6 version: 8.2.6 prettier: - specifier: 3.0.3 - version: 3.0.3 + specifier: 3.1.0 + version: 3.1.0 ts-node: specifier: 10.9.1 version: 10.9.1(@types/node@20.8.2)(typescript@5.2.2) @@ -12321,6 +12321,7 @@ packages: /arr-union@3.1.0: resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==} engines: {node: '>=0.10.0'} + requiresBuild: true /array-buffer-byte-length@1.0.0: resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==} @@ -12508,6 +12509,7 @@ packages: /assign-symbols@1.0.0: resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==} engines: {node: '>=0.10.0'} + requiresBuild: true /ast-types-flow@0.0.7: resolution: {integrity: sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==} @@ -15288,6 +15290,7 @@ packages: /copy-descriptor@0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} + requiresBuild: true /copy-webpack-plugin@9.1.0(webpack@5.89.0): resolution: {integrity: sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA==} @@ -18616,6 +18619,7 @@ packages: /for-in@1.0.2: resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==} engines: {node: '>=0.10.0'} + requiresBuild: true /foreground-child@2.0.0: resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==} @@ -20141,6 +20145,7 @@ packages: /has-value@0.3.1: resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: get-value: 2.0.6 has-values: 0.1.4 @@ -20157,10 +20162,12 @@ packages: /has-values@0.1.4: resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==} engines: {node: '>=0.10.0'} + requiresBuild: true /has-values@1.0.0: resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: is-number: 3.0.0 kind-of: 4.0.0 @@ -20989,6 +20996,7 @@ packages: /is-accessor-descriptor@1.0.0: resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: kind-of: 6.0.3 @@ -21118,6 +21126,7 @@ packages: /is-data-descriptor@1.0.0: resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: kind-of: 6.0.3 @@ -21173,6 +21182,7 @@ packages: /is-extendable@1.0.1: resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: is-plain-object: 2.0.4 @@ -21321,6 +21331,7 @@ packages: /is-number@3.0.0: resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: kind-of: 3.2.2 @@ -21546,6 +21557,7 @@ packages: /isobject@2.1.0: resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: isarray: 1.0.0 @@ -22653,6 +22665,7 @@ packages: /kind-of@4.0.0: resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: is-buffer: 1.1.6 @@ -25309,6 +25322,7 @@ packages: /object-copy@0.1.0: resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: copy-descriptor: 0.1.1 define-property: 0.2.5 @@ -26828,8 +26842,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - /prettier@3.0.3: - resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} + /prettier@3.1.0: + resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==} engines: {node: '>=14'} hasBin: true dev: true @@ -28527,6 +28541,7 @@ packages: /resolve-url@0.2.1: resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==} deprecated: https://github.com/lydell/resolve-url#deprecated + requiresBuild: true /resolve.exports@2.0.2: resolution: {integrity: sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==} @@ -29303,6 +29318,7 @@ packages: /snapdragon-util@3.0.1: resolution: {integrity: sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: kind-of: 3.2.2 @@ -29428,6 +29444,7 @@ packages: /source-map-url@0.4.1: resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==} deprecated: See https://github.com/lydell/source-map-url#deprecated + requiresBuild: true /source-map@0.5.7: resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==} @@ -29611,6 +29628,7 @@ packages: /static-extend@0.1.2: resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: define-property: 0.2.5 object-copy: 0.1.0 @@ -30627,6 +30645,7 @@ packages: /to-regex-range@2.1.1: resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: is-number: 3.0.0 repeat-string: 1.6.1 @@ -31558,6 +31577,7 @@ packages: /urix@0.1.0: resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==} deprecated: Please see https://github.com/lydell/urix#deprecated + requiresBuild: true /url-loader@4.1.1(file-loader@6.2.0)(webpack@4.47.0): resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} diff --git a/tools/challenge-helper-scripts/package.json b/tools/challenge-helper-scripts/package.json index 0e3c4add0cb..639bc715b83 100644 --- a/tools/challenge-helper-scripts/package.json +++ b/tools/challenge-helper-scripts/package.json @@ -30,7 +30,7 @@ "glob": "^8.1.0", "gray-matter": "4.0.3", "inquirer": "8.2.6", - "prettier": "3.0.3", + "prettier": "3.1.0", "ts-node": "10.9.1", "typescript": "5.2.2" }