MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10323 from Budibase/chore/remove_old_zlib_ref 

Chore - Remove zlib npm references
This commit is contained in:
Adria Navarro 2023-04-17 12:38:19 +02:00 committed by GitHub
parent 757bec11f7 33c3b67f8c
commit 6ee0702316
5 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/backend-core/package.json
View File

@ -54,8 +54,7 @@
"sanitize-s3-objectkey": "0.0.1", "sanitize-s3-objectkey": "0.0.1",
"semver": "7.3.7", "semver": "7.3.7",
"tar-fs": "2.1.1", "tar-fs": "2.1.1",
"uuid": "8.3.2", "uuid": "8.3.2"
"zlib": "1.0.5"
}, },
"devDependencies": { "devDependencies": {
"@jest/test-sequencer": "29.5.0", "@jest/test-sequencer": "29.5.0",

6
packages/backend-core/src/objectStore/objectStore.ts
View File

@ -3,7 +3,7 @@ import AWS from "aws-sdk"
import stream from "stream" import stream from "stream"
import fetch from "node-fetch" import fetch from "node-fetch"
import tar from "tar-fs" import tar from "tar-fs"
const zlib = require("zlib") import zlib from "zlib"
import { promisify } from "util" import { promisify } from "util"
import { join } from "path" import { join } from "path"
import fs from "fs" import fs from "fs"
@ -415,7 +415,7 @@ export const downloadTarballDirect = async (
throw new Error(`unexpected response ${response.statusText}`) throw new Error(`unexpected response ${response.statusText}`)
} }
await streamPipeline(response.body, zlib.Unzip(), tar.extract(path)) await streamPipeline(response.body, zlib.createUnzip(), tar.extract(path))
} }
export const downloadTarball = async ( export const downloadTarball = async (
@ -431,7 +431,7 @@ export const downloadTarball = async (
} }
const tmpPath = join(budibaseTempDir(), path) const tmpPath = join(budibaseTempDir(), path)
await streamPipeline(response.body, zlib.Unzip(), tar.extract(tmpPath)) await streamPipeline(response.body, zlib.createUnzip(), tar.extract(tmpPath))
if (!env.isTest() && env.SELF_HOSTED) { if (!env.isTest() && env.SELF_HOSTED) {
await uploadDirectory(bucketName, tmpPath, path) await uploadDirectory(bucketName, tmpPath, path)
} }

3
packages/server/package.json
View File

@ -118,8 +118,7 @@
"vm2": "3.9.16", "vm2": "3.9.16",
"worker-farm": "1.7.0", "worker-farm": "1.7.0",
"xml2js": "0.5.0", "xml2js": "0.5.0",
"yargs": "13.2.4", "yargs": "13.2.4"
"zlib": "1.0.5"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.17.4", "@babel/core": "7.17.4",

2
packages/worker/src/api/index.ts
View File

@ -1,6 +1,6 @@
import Router from "@koa/router" import Router from "@koa/router"
const compress = require("koa-compress") const compress = require("koa-compress")
const zlib = require("zlib") import zlib from "zlib"
import { routes } from "./routes" import { routes } from "./routes"
import { middleware as pro } from "@budibase/pro" import { middleware as pro } from "@budibase/pro"
import { auth, middleware } from "@budibase/backend-core" import { auth, middleware } from "@budibase/backend-core"

17
yarn.lock
View File

@ -1486,15 +1486,15 @@
pouchdb-promise "^6.0.4" pouchdb-promise "^6.0.4"
through2 "^2.0.0" through2 "^2.0.0"
"@budibase/pro@2.5.5-alpha.1": "@budibase/pro@2.5.5-alpha.2":
version "2.5.5-alpha.1" version "2.5.5-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.1.tgz#6d9476ce724bd3e405cb2e0198c4b83b168e65bc" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.2.tgz#dd3ec237997f1be5064ab931569c3621b7836b8b"
integrity sha512-fEuropk/0aH1+lELX6wdFa8UUpE+SMtlvBbsgNR2ulvLgLLPEYhI2gINlhiItMWWgTtxNtele3hOs1VWhn0o2A== integrity sha512-pXB2BTA0/uXkZ3aCHjF06u/kxSx/mZ55T06nUAQR+64eXJ1D2BRKAqrkqjBnzXne9RGV/qEJtCu+xp8wNXII5A==
dependencies: dependencies:
"@budibase/backend-core" "2.5.5-alpha.1" "@budibase/backend-core" "2.5.5-alpha.2"
"@budibase/shared-core" "2.4.44-alpha.1" "@budibase/shared-core" "2.4.44-alpha.1"
"@budibase/string-templates" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1"
"@budibase/types" "2.5.5-alpha.1" "@budibase/types" "2.5.5-alpha.2"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"
@ -24705,8 +24705,3 @@ z-schema@^5.0.1:
validator "^13.7.0" validator "^13.7.0"
optionalDependencies: optionalDependencies:
commander "^10.0.0" commander "^10.0.0"
zlib@1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0"
integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w==