From 88c230a9dc208ef5d5eb9516ace7b2ff6af8d516 Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Fri, 15 Dec 2023 09:45:34 -0800 Subject: [PATCH] Upgrade dependencies and move throw outside try catch. --- package.json | 6 ++--- pnpm-lock.yaml | 40 +++++++++++++++--------------- src/routes/api/articles/+server.ts | 10 ++++---- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 52ef3eb..91ef624 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ "@resvg/resvg-js": "^2.6.0", "@sveltejs/adapter-static": "^2.0.3", "@sveltejs/adapter-vercel": "^1.0.6", - "@sveltejs/enhanced-img": "^0.1.5", - "@sveltejs/kit": "^1.27.7", + "@sveltejs/enhanced-img": "^0.1.6", + "@sveltejs/kit": "^1.30.3", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "@zerodevx/svelte-img": "^2.1.0", @@ -53,7 +53,7 @@ "svelte-check": "^3.6.2", "svelte-lazy-loader": "^1.0.0", "svelte-meta-tags": "^3.1.0", - "svelte-preprocess": "^5.1.1", + "svelte-preprocess": "^5.1.2", "svelte-sequential-preprocessor": "^2.0.1", "tslib": "^2.6.2", "typescript": "^5.3.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 492b175..74c09e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -45,16 +45,16 @@ devDependencies: version: 2.6.0 '@sveltejs/adapter-static': specifier: ^2.0.3 - version: 2.0.3(@sveltejs/kit@1.27.7) + version: 2.0.3(@sveltejs/kit@1.30.3) '@sveltejs/adapter-vercel': specifier: ^1.0.6 - version: 1.0.6(@sveltejs/kit@1.27.7) + version: 1.0.6(@sveltejs/kit@1.30.3) '@sveltejs/enhanced-img': - specifier: ^0.1.5 - version: 0.1.5(svelte@4.2.8) + specifier: ^0.1.6 + version: 0.1.6(svelte@4.2.8) '@sveltejs/kit': - specifier: ^1.27.7 - version: 1.27.7(svelte@4.2.8)(vite@4.5.1) + specifier: ^1.30.3 + version: 1.30.3(svelte@4.2.8)(vite@4.5.1) '@typescript-eslint/eslint-plugin': specifier: ^5.62.0 version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.55.0)(typescript@5.3.3) @@ -134,8 +134,8 @@ devDependencies: specifier: ^3.1.0 version: 3.1.0(svelte@4.2.8)(typescript@5.3.3) svelte-preprocess: - specifier: ^5.1.1 - version: 5.1.1(postcss-load-config@4.0.2)(postcss@8.4.32)(sass@1.69.5)(svelte@4.2.8)(typescript@5.3.3) + specifier: ^5.1.2 + version: 5.1.2(postcss-load-config@4.0.2)(postcss@8.4.32)(sass@1.69.5)(svelte@4.2.8)(typescript@5.3.3) svelte-sequential-preprocessor: specifier: ^2.0.1 version: 2.0.1 @@ -1573,20 +1573,20 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@sveltejs/adapter-static@2.0.3(@sveltejs/kit@1.27.7): + /@sveltejs/adapter-static@2.0.3(@sveltejs/kit@1.30.3): resolution: {integrity: sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ==} peerDependencies: '@sveltejs/kit': ^1.5.0 dependencies: - '@sveltejs/kit': 1.27.7(svelte@4.2.8)(vite@4.5.1) + '@sveltejs/kit': 1.30.3(svelte@4.2.8)(vite@4.5.1) dev: true - /@sveltejs/adapter-vercel@1.0.6(@sveltejs/kit@1.27.7): + /@sveltejs/adapter-vercel@1.0.6(@sveltejs/kit@1.30.3): resolution: {integrity: sha512-fo6aaEygPd/6B5Jms4Ff7R4jbADnppuLvKOWBNTGe5MGB7ZRUkl+gxHWMQx2av2knyEZkA6V8y5M6R3ML5yN4g==} peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.27.7(svelte@4.2.8)(vite@4.5.1) + '@sveltejs/kit': 1.30.3(svelte@4.2.8)(vite@4.5.1) '@vercel/nft': 0.22.6 esbuild: 0.16.17 transitivePeerDependencies: @@ -1594,8 +1594,8 @@ packages: - supports-color dev: true - /@sveltejs/enhanced-img@0.1.5(svelte@4.2.8): - resolution: {integrity: sha512-xwMBrs22CNoqZm+ZWEDFdnGAT91QO88s7rVq/B3KUZ2cAnSK+T5rBIF+n4Yyi+ULzf6RzidQD4zHw2LOPN4KUg==} + /@sveltejs/enhanced-img@0.1.6(svelte@4.2.8): + resolution: {integrity: sha512-6YBXGcY/Fh2dGtxNp5pg3m9TxbJc4T+lWXnZjM1o1kuDYDPERViKhnVPBcRcv0EY/66jdiLWBXA6tmstLngSJw==} dependencies: magic-string: 0.30.5 svelte-parse-markup: 0.1.2(svelte@4.2.8) @@ -1605,8 +1605,8 @@ packages: - svelte dev: true - /@sveltejs/kit@1.27.7(svelte@4.2.8)(vite@4.5.1): - resolution: {integrity: sha512-AzXYDoYt42clCBwLF9GTHsXyg2DFR31Ncyt8yxu8Aw4tgB433V+w+hcr1RTfAN9zKW2J2PY9FMQ8FoX/4Vw8CA==} + /@sveltejs/kit@1.30.3(svelte@4.2.8)(vite@4.5.1): + resolution: {integrity: sha512-0DzVXfU4h+tChFvoc8C61IqErCyskD4ydSIDjpKS2lYlEzIYrtYrY7juSqACFxqcvZAnOEXvSY+zZ8br0+ZMMg==} engines: {node: ^16.14 || >=18} hasBin: true requiresBuild: true @@ -4712,7 +4712,7 @@ packages: picocolors: 1.0.0 sade: 1.8.1 svelte: 4.2.8 - svelte-preprocess: 5.1.1(postcss-load-config@4.0.2)(postcss@8.4.32)(sass@1.69.5)(svelte@4.2.8)(typescript@5.3.3) + svelte-preprocess: 5.1.2(postcss-load-config@4.0.2)(postcss@8.4.32)(sass@1.69.5)(svelte@4.2.8)(typescript@5.3.3) typescript: 5.3.3 transitivePeerDependencies: - '@babel/core' @@ -4775,8 +4775,8 @@ packages: svelte: 4.2.8 dev: true - /svelte-preprocess@5.1.1(postcss-load-config@4.0.2)(postcss@8.4.32)(sass@1.69.5)(svelte@4.2.8)(typescript@5.3.3): - resolution: {integrity: sha512-p/Dp4hmrBW5mrCCq29lEMFpIJT2FZsRlouxEc5qpbOmXRbaFs7clLs8oKPwD3xCFyZfv1bIhvOzpQkhMEVQdMw==} + /svelte-preprocess@5.1.2(postcss-load-config@4.0.2)(postcss@8.4.32)(sass@1.69.5)(svelte@4.2.8)(typescript@5.3.3): + resolution: {integrity: sha512-XF0aliMAcYnP4hLETvB6HRAMnaL09ASYT1Z2I1Gwu0nz6xbdg/dSgAEthtFZJA4AKrNhFDFdmUDO+H9d/6xg5g==} engines: {node: '>= 14.10.0'} requiresBuild: true peerDependencies: @@ -4784,7 +4784,7 @@ packages: coffeescript: ^2.5.1 less: ^3.11.3 || ^4.0.0 postcss: ^7 || ^8 - postcss-load-config: ^2.1.0 || ^3.0.0 || ^4.0.0 + postcss-load-config: ^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 pug: ^3.0.0 sass: ^1.26.8 stylus: ^0.55.0 diff --git a/src/routes/api/articles/+server.ts b/src/routes/api/articles/+server.ts index ea8c1f0..5f887f0 100644 --- a/src/routes/api/articles/+server.ts +++ b/src/routes/api/articles/+server.ts @@ -4,11 +4,12 @@ import type { RequestHandler, RequestEvent } from './$types'; import { fetchArticlesApi } from '$root/routes/api'; export const GET: RequestHandler = async ({ setHeaders, url }: RequestEvent) => { + const page = url?.searchParams?.get('page') || '1'; + if (+page > +WALLABAG_MAX_PAGES) { + throw error(404, 'Page does not exist'); + } + try { - const page = url?.searchParams?.get('page') || '1'; - if (+page > +WALLABAG_MAX_PAGES) { - throw new Error('Page does not exist'); - } const response = await fetchArticlesApi('get', `fetchArticles`, { page, limit: url?.searchParams?.get('limit') || '6' @@ -27,7 +28,6 @@ export const GET: RequestHandler = async ({ setHeaders, url }: RequestEvent) => } } - // console.log(`API response ${JSON.stringify(response)}`); return json(response); } } catch (e) {