From 8eb6fba89755c8081f6c1202bccde13859893cc1 Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Sun, 7 Apr 2024 03:50:03 -1000 Subject: [PATCH] More Sharp fixes --- .gitignore | 3 ++- build.ts | 5 ++--- bun.lockb | Bin 297652 -> 297628 bytes package.json | 1 - packages/media-manager/package.json | 3 ++- prisma.ts | 1 - 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 38109eac..f028f274 100644 --- a/.gitignore +++ b/.gitignore @@ -172,4 +172,5 @@ config/config.internal.toml uploads/ pages/dist log.txt -*.log \ No newline at end of file +*.log +build \ No newline at end of file diff --git a/build.ts b/build.ts index 7a35c5c2..a112835f 100644 --- a/build.ts +++ b/build.ts @@ -26,7 +26,7 @@ await Bun.build({ target: "bun", splitting: true, minify: false, - external: ["bullmq", "@prisma/client", "sharp"], + external: ["bullmq", "@prisma/client"], }).then((output) => { if (!output.success) { console.log(output.logs); @@ -46,8 +46,7 @@ await $`cp -r ${process.cwd()}/node_modules/.bin/prisma dist/node_modules/.bin`; await $`cp -r ${process.cwd()}/node_modules/prisma dist/node_modules/`; // Copy Sharp to dist -// await $`cp -r ${process.cwd()}/node_modules/@img dist/node_modules/`; -await $`cp -r ${process.cwd()}/node_modules/sharp dist/node_modules/`; +await $`cp -r ${process.cwd()}/node_modules/sharp/build/ .`; // Create pages directory await $`mkdir -p dist/pages/dist`; diff --git a/bun.lockb b/bun.lockb index f2f808f12bd5a7d21a8580eb63908f52bdb630e2..971804ba84bc786b9c811f6b2119b75891fdd9bb 100755 GIT binary patch delta 9570 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 QX_0zaSN+84HKxOV2O*!dwEzGB delta 9803 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 diff --git a/package.json b/package.json index 72c381de..b6efc1c8 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,6 @@ "prisma-redis-middleware": "^4.8.0", "request-parser": "workspace:*", "semver": "^7.5.4", - "sharp": "^0.32.6", "strip-ansi": "^7.1.0" } } diff --git a/packages/media-manager/package.json b/packages/media-manager/package.json index 2c8a7337..620b91df 100644 --- a/packages/media-manager/package.json +++ b/packages/media-manager/package.json @@ -4,6 +4,7 @@ "main": "index.ts", "dependencies": { "@jsr/bradenmacdonald__s3-lite-client": "npm:@jsr/bradenmacdonald__s3-lite-client", - "config-manager": "workspace:*" + "config-manager": "workspace:*", + "sharp": "^0.32.6" } } diff --git a/prisma.ts b/prisma.ts index b2b1782f..00e75c40 100644 --- a/prisma.ts +++ b/prisma.ts @@ -6,5 +6,4 @@ process.stdout.write( `postgresql://${config.database.username}:${config.database.password}@${config.database.host}:${config.database.port}/${config.database.database}\n`, ); -// Ends process.exit(0);