From 324e4a87178f2a180b669893407258677aadb069 Mon Sep 17 00:00:00 2001 From: mbaharip <62494292+mbahArip@users.noreply.github.com> Date: Tue, 23 Apr 2024 12:19:24 +0700 Subject: [PATCH] Add @types/nprogress to dev deps, since it's causing build error --- package.json | 1 + src/app/[...rest]/page.tsx | 4 +++- src/app/actions.ts | 29 ++++++++++++++++++----------- yarn.lock | 3 ++- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 723b166..c9a1a5c 100644 --- a/package.json +++ b/package.json @@ -87,6 +87,7 @@ "@types/jsonwebtoken": "^9.0.1", "@types/mime-types": "^2.1.1", "@types/node": "^20", + "@types/nprogress": "^0.2.3", "@types/react": "^18", "@types/react-dom": "^18", "@types/three": "^0.150.2", diff --git a/src/app/[...rest]/page.tsx b/src/app/[...rest]/page.tsx index ad3f6e9..8415381 100644 --- a/src/app/[...rest]/page.tsx +++ b/src/app/[...rest]/page.tsx @@ -86,7 +86,9 @@ export default async function RestPage({ params: { rest } }: Props) { if (!unlocked.success) { if (!unlocked.path) - throw new Error("No path returned from password checking"); + throw new Error( + `No path returned from password checking, ${unlocked.message}`, + ); return ( `'${id}' in parents`).join(" or ")})`, // Filter by paths id ]; - const { data: password } = await gdrive.files.list({ - q: query.join(" and "), - fields: "files(id, name, mimeType, parents)", - pageSize: 1000, - ...(decryptedSharedDrive && { - supportsAllDrives: true, - includeItemsFromAllDrives: true, - driveId: decryptedSharedDrive, - corpora: "drive", - }), - }); + const { data: password } = await gdrive.files + .list({ + q: query.join(" and "), + fields: "files(id, name, mimeType, parents)", + pageSize: 1000, + ...(decryptedSharedDrive && { + supportsAllDrives: true, + includeItemsFromAllDrives: true, + driveId: decryptedSharedDrive, + corpora: "drive", + }), + }) + .catch((error) => { + console.error(error); + throw new Error("Failed to get password file"); + }); + + console.log(password); // To save processing time, skip if password file not found if (!password.files?.length) return { success: true }; diff --git a/yarn.lock b/yarn.lock index a459694..e6dc034 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1924,7 +1924,7 @@ __metadata: languageName: node linkType: hard -"@types/nprogress@npm:^0.2.2": +"@types/nprogress@npm:^0.2.2, @types/nprogress@npm:^0.2.3": version: 0.2.3 resolution: "@types/nprogress@npm:0.2.3" checksum: 10c0/cac0fe73aca79bc1472a1556f56303df72026f2fcd8dbe311fe84b1f46e454b9040c1e69223d94e3bf156a5986382170c52ebda19aa70f555f1b6855d8f744a6 @@ -6160,6 +6160,7 @@ __metadata: "@types/jsonwebtoken": "npm:^9.0.1" "@types/mime-types": "npm:^2.1.1" "@types/node": "npm:^20" + "@types/nprogress": "npm:^0.2.3" "@types/react": "npm:^18" "@types/react-dom": "npm:^18" "@types/three": "npm:^0.150.2"