diff options
author | Stefan <stefan@meetfranz.com> | 2017-10-24 10:31:18 +0200 |
---|---|---|
committer | Stefan <stefan@meetfranz.com> | 2017-10-24 10:31:18 +0200 |
commit | 01318efeb89a51d9d84b99943f7e4f0c83a41917 (patch) | |
tree | 5609a1bd67fbd1530b6b6851cc97ed144d96eb33 | |
parent | Merge pull request #80 from apo-mak/develop (diff) | |
download | ferdium-app-01318efeb89a51d9d84b99943f7e4f0c83a41917.tar.gz ferdium-app-01318efeb89a51d9d84b99943f7e4f0c83a41917.tar.zst ferdium-app-01318efeb89a51d9d84b99943f7e4f0c83a41917.zip |
replace tar.gz dependency (deprecated) with tar
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/api/server/ServerApi.js | 8 | ||||
-rw-r--r-- | yarn.lock | 42 |
3 files changed, 39 insertions, 13 deletions
diff --git a/package.json b/package.json index ab93f455b..2457c05a9 100644 --- a/package.json +++ b/package.json | |||
@@ -64,7 +64,7 @@ | |||
64 | "react-tooltip": "^3.2.7", | 64 | "react-tooltip": "^3.2.7", |
65 | "route-parser": "^0.0.5", | 65 | "route-parser": "^0.0.5", |
66 | "smoothscroll-polyfill": "^0.3.4", | 66 | "smoothscroll-polyfill": "^0.3.4", |
67 | "tar.gz": "^1.0.5", | 67 | "tar": "^4.0.2", |
68 | "uuid": "^3.0.1" | 68 | "uuid": "^3.0.1" |
69 | }, | 69 | }, |
70 | "devDependencies": { | 70 | "devDependencies": { |
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index 86f4c99e7..8581beef7 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js | |||
@@ -1,6 +1,6 @@ | |||
1 | import os from 'os'; | 1 | import os from 'os'; |
2 | import path from 'path'; | 2 | import path from 'path'; |
3 | import targz from 'tar.gz'; | 3 | import tar from 'tar'; |
4 | import fs from 'fs-extra'; | 4 | import fs from 'fs-extra'; |
5 | import { remote } from 'electron'; | 5 | import { remote } from 'electron'; |
6 | 6 | ||
@@ -293,7 +293,11 @@ export default class ServerApi { | |||
293 | const buffer = await res.buffer(); | 293 | const buffer = await res.buffer(); |
294 | fs.writeFileSync(archivePath, buffer); | 294 | fs.writeFileSync(archivePath, buffer); |
295 | 295 | ||
296 | await targz().extract(archivePath, recipeTempDirectory); | 296 | tar.x({ |
297 | file: archivePath, | ||
298 | cwd: recipeTempDirectory, | ||
299 | sync: true, | ||
300 | }); | ||
297 | 301 | ||
298 | const { id } = fs.readJsonSync(path.join(recipeTempDirectory, 'package.json')); | 302 | const { id } = fs.readJsonSync(path.join(recipeTempDirectory, 'package.json')); |
299 | const recipeDirectory = path.join(recipesDirectory, id); | 303 | const recipeDirectory = path.join(recipesDirectory, id); |
@@ -1322,6 +1322,10 @@ chokidar@^1.4.3: | |||
1322 | optionalDependencies: | 1322 | optionalDependencies: |
1323 | fsevents "^1.0.0" | 1323 | fsevents "^1.0.0" |
1324 | 1324 | ||
1325 | chownr@^1.0.1: | ||
1326 | version "1.0.1" | ||
1327 | resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" | ||
1328 | |||
1325 | chromium-pickle-js@^0.2.0: | 1329 | chromium-pickle-js@^0.2.0: |
1326 | version "0.2.0" | 1330 | version "0.2.0" |
1327 | resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" | 1331 | resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" |
@@ -3174,11 +3178,7 @@ hyperquest@~1.2.0: | |||
3174 | duplexer2 "~0.0.2" | 3178 | duplexer2 "~0.0.2" |
3175 | through2 "~0.6.3" | 3179 | through2 "~0.6.3" |
3176 | 3180 | ||
3177 | iconv-lite@^0.4.17: | 3181 | iconv-lite@^0.4.17, iconv-lite@~0.4.13: |
3178 | version "0.4.19" | ||
3179 | resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" | ||
3180 | |||
3181 | iconv-lite@~0.4.13: | ||
3182 | version "0.4.18" | 3182 | version "0.4.18" |
3183 | resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2" | 3183 | resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2" |
3184 | 3184 | ||
@@ -4135,6 +4135,18 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: | |||
4135 | version "1.2.0" | 4135 | version "1.2.0" |
4136 | resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" | 4136 | resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" |
4137 | 4137 | ||
4138 | minipass@^2.2.1: | ||
4139 | version "2.2.1" | ||
4140 | resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.1.tgz#5ada97538b1027b4cf7213432428578cb564011f" | ||
4141 | dependencies: | ||
4142 | yallist "^3.0.0" | ||
4143 | |||
4144 | minizlib@^1.0.4: | ||
4145 | version "1.0.4" | ||
4146 | resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.0.4.tgz#8ebb51dd8bbe40b0126b5633dbb36b284a2f523c" | ||
4147 | dependencies: | ||
4148 | minipass "^2.2.1" | ||
4149 | |||
4138 | mkdirp@0.5.0: | 4150 | mkdirp@0.5.0: |
4139 | version "0.5.0" | 4151 | version "0.5.0" |
4140 | resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" | 4152 | resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" |
@@ -4217,14 +4229,10 @@ mute-stream@0.0.4: | |||
4217 | version "0.0.4" | 4229 | version "0.0.4" |
4218 | resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.4.tgz#a9219960a6d5d5d046597aee51252c6655f7177e" | 4230 | resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.4.tgz#a9219960a6d5d5d046597aee51252c6655f7177e" |
4219 | 4231 | ||
4220 | mute-stream@0.0.7: | 4232 | mute-stream@0.0.7, mute-stream@~0.0.4: |
4221 | version "0.0.7" | 4233 | version "0.0.7" |
4222 | resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" | 4234 | resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" |
4223 | 4235 | ||
4224 | mute-stream@~0.0.4: | ||
4225 | version "0.0.5" | ||
4226 | resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" | ||
4227 | |||
4228 | nan@^2.0.0, nan@^2.0.5, nan@^2.3.0, nan@^2.3.2: | 4236 | nan@^2.0.0, nan@^2.0.5, nan@^2.3.0, nan@^2.3.2: |
4229 | version "2.7.0" | 4237 | version "2.7.0" |
4230 | resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" | 4238 | resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" |
@@ -5734,6 +5742,16 @@ tar@^2.0.0, tar@^2.1.1, tar@^2.2.1: | |||
5734 | fstream "^1.0.2" | 5742 | fstream "^1.0.2" |
5735 | inherits "2" | 5743 | inherits "2" |
5736 | 5744 | ||
5745 | tar@^4.0.2: | ||
5746 | version "4.0.2" | ||
5747 | resolved "https://registry.yarnpkg.com/tar/-/tar-4.0.2.tgz#e8e22bf3eec330e5c616d415a698395e294e8fad" | ||
5748 | dependencies: | ||
5749 | chownr "^1.0.1" | ||
5750 | minipass "^2.2.1" | ||
5751 | minizlib "^1.0.4" | ||
5752 | mkdirp "^0.5.0" | ||
5753 | yallist "^3.0.2" | ||
5754 | |||
5737 | tempfile@^1.1.1: | 5755 | tempfile@^1.1.1: |
5738 | version "1.1.1" | 5756 | version "1.1.1" |
5739 | resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2" | 5757 | resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2" |
@@ -6239,6 +6257,10 @@ yallist@^2.1.2: | |||
6239 | version "2.1.2" | 6257 | version "2.1.2" |
6240 | resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" | 6258 | resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" |
6241 | 6259 | ||
6260 | yallist@^3.0.0, yallist@^3.0.2: | ||
6261 | version "3.0.2" | ||
6262 | resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" | ||
6263 | |||
6242 | yargs-parser@^5.0.0: | 6264 | yargs-parser@^5.0.0: |
6243 | version "5.0.0" | 6265 | version "5.0.0" |
6244 | resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" | 6266 | resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" |