Merge branch 'master' of github.com:Budibase/budibase into version-complibrary

6 years ago · 905cbc00e3
9 changed files with 700 additions and 274 deletions
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.2.5",
+  "version": "0.2.6",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "0.2.5",
+  "version": "0.2.6",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -64,7 +64,7 @@
  },
  "dependencies": {
    "@budibase/bbui": "^1.44.1",
-    "@budibase/client": "^0.2.5",
+    "@budibase/client": "^0.2.6",
    "@budibase/colorpicker": "^1.0.1",
    "@fortawesome/fontawesome-free": "^5.14.0",
    "@sentry/browser": "5.19.1",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "budibase",
-  "version": "0.2.5",
+  "version": "0.2.6",
  "description": "Budibase CLI",
  "repository": "https://github.com/Budibase/Budibase",
  "homepage": "https://www.budibase.com",
@ -17,7 +17,7 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/server": "^0.2.5",
+    "@budibase/server": "^0.2.6",
    "@inquirer/password": "^0.0.6-alpha.0",
    "chalk": "^2.4.2",
    "dotenv": "^8.2.0",
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "0.2.5",
+  "version": "0.2.6",
  "license": "MPL-2.0",
  "main": "dist/budibase-client.js",
  "module": "dist/budibase-client.esm.mjs",
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/server",
-  "version": "0.2.5",
+  "version": "0.2.6",
  "description": "Budibase Web Server",
  "main": "src/electron.js",
  "repository": {
@ -42,7 +42,7 @@
  "author": "Michael Shanks",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/client": "^0.2.5",
+    "@budibase/client": "^0.2.6",
    "@koa/router": "^8.0.0",
    "@sendgrid/mail": "^7.1.1",
    "@sentry/node": "^5.19.2",
@ -57,6 +57,7 @@
    "electron-updater": "^4.3.1",
    "fix-path": "^3.0.0",
    "fs-extra": "^8.1.0",
+    "jimp": "^0.16.1",
    "joi": "^17.2.1",
    "jsonwebtoken": "^8.5.1",
    "koa": "^2.7.0",
@ -74,7 +75,6 @@
    "pouchdb-all-dbs": "^1.0.2",
    "pouchdb-replication-stream": "^1.2.9",
    "sanitize-s3-objectkey": "^0.0.1",
-    "sharp": "^0.26.0",
    "squirrelly": "^7.5.0",
    "tar-fs": "^2.1.0",
    "uuid": "^3.3.2",
--- a/packages/server/src/api/controllers/static.js
+++ b/packages/server/src/api/controllers/static.js
@ -165,15 +165,14 @@ exports.serveApp = async function(ctx) {

 exports.serveAttachment = async function(ctx) {
  const appId = ctx.user.appId
-
  const attachmentsPath = resolve(budibaseAppsDir(), appId, "attachments")

  // Serve from CloudFront
  if (process.env.CLOUD) {
    const S3_URL = `https://cdn.app.budi.live/assets/${appId}/attachments/${ctx.file}`
-
    const response = await fetch(S3_URL)
    const body = await response.text()
+    ctx.set("Content-Type", response.headers.get("Content-Type"))
    ctx.body = body
    return
  }
--- a/packages/server/src/utilities/fileProcessor.js
+++ b/packages/server/src/utilities/fileProcessor.js
@ -1,24 +1,21 @@
 const fs = require("fs")
-const sharp = require("sharp")
+const jimp = require("jimp")
 const fsPromises = fs.promises

 const FORMATS = {
-  IMAGES: ["png", "jpg", "jpeg", "gif", "svg", "tiff", "raw"],
+  IMAGES: ["png", "jpg", "jpeg", "gif", "bmp", "tiff"],
 }

-async function processImage(file) {
-  const imgMeta = await sharp(file.path)
-    .resize(300)
-    .toFile(file.outputPath)
-  return {
-    ...file,
-    ...imgMeta,
-  }
+function processImage(file) {
+  return jimp.read(file.path).then(img => {
+    return img.resize(300, jimp.AUTO).write(file.outputPath)
+  })
 }

 async function process(file) {
  if (FORMATS.IMAGES.includes(file.extension.toLowerCase())) {
-    return await processImage(file)
+    await processImage(file)
+    return file
  }

  // No processing required
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@ -13,7 +13,7 @@
    "dev:builder": "rollup -cw"
  },
  "devDependencies": {
-    "@budibase/client": "^0.2.5",
+    "@budibase/client": "^0.2.6",
    "@rollup/plugin-commonjs": "^11.1.0",
    "lodash": "^4.17.15",
    "rollup": "^2.11.2",
@ -32,7 +32,7 @@
  "keywords": [
    "svelte"
  ],
-  "version": "0.2.5",
+  "version": "0.2.6",
  "license": "MIT",
  "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
  "dependencies": {