From 98ee9723254cd9f1cc0cf1afdd607892c3dbbe85 Mon Sep 17 00:00:00 2001 From: Gabriel Massadas <5445926+G4brym@users.noreply.github.com> Date: Sun, 8 Dec 2024 17:50:43 +0000 Subject: [PATCH] Fix builds (#68) --- .github/dependabot.yml | 17 +++++++++++++++++ .github/workflows/test.yml | 2 ++ .husky/pre-commit | 2 +- packages/dashboard/package.json | 3 ++- packages/worker/config/preparePublish.js | 2 +- .../src/modules/buckets/multipart/partUpload.ts | 4 ++-- .../worker/src/modules/buckets/putObject.ts | 4 ++-- pnpm-lock.yaml | 13 ++++++++----- 8 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..074c899 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,17 @@ +version: 2 +updates: + - package-ecosystem: "npm" + directories: + - "/packages/worker" + - "/packages/github-action" + schedule: + interval: "weekly" + groups: + prod-deps: + dependency-type: "production" + dev-deps: + dependency-type: "development" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 74b42e9..e4557ca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,5 +33,7 @@ jobs: run: npm install -g pnpm - name: Install dependencies run: pnpm install + - name: Check Lint + run: pnpm lint - name: Build everything run: pnpm build diff --git a/.husky/pre-commit b/.husky/pre-commit index b4f5892..e9884e8 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/usr/bin/env sh . "$(dirname -- "$0")/_/husky.sh" -#npm run lint +pnpm run lint diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json index 67f3eb6..be603de 100644 --- a/packages/dashboard/package.json +++ b/packages/dashboard/package.json @@ -13,10 +13,11 @@ "deploy-dev": "wrangler pages deploy --branch dev --project-name r2-explorer-dashboard dist/spa/" }, "dependencies": { - "@quasar/extras": "^1.16.9", + "@quasar/extras": "^1.16.15", "axios": "^1.2.1", "fflate": "^0.8.1", "html-to-text": "^9.0.5", + "pdfjs-dist": "2.5.207", "pdfvuer": "^2.0.1", "pinia": "^2.0.11", "postal-mime": "^2.0.1", diff --git a/packages/worker/config/preparePublish.js b/packages/worker/config/preparePublish.js index 3d09b0d..cefe924 100644 --- a/packages/worker/config/preparePublish.js +++ b/packages/worker/config/preparePublish.js @@ -2,7 +2,7 @@ const fs = require("node:fs"); // Apply version numbers const files = [ - "packages/worker/src/settings.ts", + "packages/worker/src/foundation/settings.ts", "packages/worker/package.json", ]; diff --git a/packages/worker/src/modules/buckets/multipart/partUpload.ts b/packages/worker/src/modules/buckets/multipart/partUpload.ts index 2cc8966..77e3810 100644 --- a/packages/worker/src/modules/buckets/multipart/partUpload.ts +++ b/packages/worker/src/modules/buckets/multipart/partUpload.ts @@ -11,10 +11,10 @@ export class PartUpload extends OpenAPIRoute { body: { content: { "application/octet-stream": { - schema: { + schema: z.object({}).openapi({ type: "string", format: "binary", - }, + }), }, }, }, diff --git a/packages/worker/src/modules/buckets/putObject.ts b/packages/worker/src/modules/buckets/putObject.ts index cb7702b..342949a 100644 --- a/packages/worker/src/modules/buckets/putObject.ts +++ b/packages/worker/src/modules/buckets/putObject.ts @@ -11,10 +11,10 @@ export class PutObject extends OpenAPIRoute { body: { content: { "application/octet-stream": { - schema: { + schema: z.object({}).openapi({ type: "string", format: "binary", - }, + }), }, }, }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ead22d3..834b105 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: packages/dashboard: dependencies: '@quasar/extras': - specifier: ^1.16.9 - version: 1.16.14 + specifier: ^1.16.15 + version: 1.16.15 axios: specifier: ^1.2.1 version: 1.7.8 @@ -29,6 +29,9 @@ importers: html-to-text: specifier: ^9.0.5 version: 9.0.5 + pdfjs-dist: + specifier: 2.5.207 + version: 2.5.207 pdfvuer: specifier: ^2.0.1 version: 2.0.1(pdfjs-dist@2.5.207)(vue@3.5.13(typescript@5.7.2)) @@ -677,8 +680,8 @@ packages: workbox-build: optional: true - '@quasar/extras@1.16.14': - resolution: {integrity: sha512-kXVCX9GAV2l/av9EQJFRhJ3yp/sshOvc6quo+hGJYnCYj47061sxHXP6amw1vCIlVnyCFjBPeqZP2WcKmGwsOw==} + '@quasar/extras@1.16.15': + resolution: {integrity: sha512-ZM8rUAagZ3Gm7Thu6DjKdGfkyFBv61RaCeVSIWdve6+q300yN+6aouxttf2RmxCk12RsSqEyzBnIg7BlF1s7MA==} '@quasar/render-ssr-error@1.0.3': resolution: {integrity: sha512-A8RF99q6/sOSe1Ighnh5syEIbliD3qUYEJd2HyfFyBPSMF+WYGXon5dmzg4nUoK662NgOggInevkDyBDJcZugg==} @@ -3010,7 +3013,7 @@ snapshots: - stylus - supports-color - '@quasar/extras@1.16.14': {} + '@quasar/extras@1.16.15': {} '@quasar/render-ssr-error@1.0.3': dependencies: