Skip to content

Commit dd4718c

Browse files
committed
feature(package) mellow v3.0.1
1 parent 68b3b3e commit dd4718c

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"fullstore": "^3.0.0",
5151
"inly": "^4.0.0",
5252
"jaguar": "^6.0.0",
53-
"mellow": "^2.0.0",
53+
"mellow": "^3.0.1",
5454
"onezip": "^5.0.0",
5555
"remy": "^6.0.0",
5656
"try-to-catch": "^3.0.0",

server/extract.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
const currify = require('currify');
44

55
const inly = require('inly');
6-
const mellow = require('mellow');
6+
const {webToWin} = require('mellow');
77

88
const isRootWin32 = currify(require('./is-root-win32'));
99
const WIN32_ROOT_MSG = 'Could not extract from root on windows!';
1010

1111
module.exports = (id, root, socket, from, to) => {
12-
from = mellow.pathToWin(from, root);
13-
to = mellow.pathToWin(to, root);
12+
from = webToWin(from, root);
13+
to = webToWin(to, root);
1414

1515
if (!isRootWin32(root, from))
1616
return operate(id, socket, from, to);

server/operate.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const currify = require('currify');
55
const remy = require('remy');
66
const copymitter = require('copymitter');
77
const moveFiles = require('@cloudcmd/move-files');
8-
const mellow = require('mellow');
8+
const {webToWin} = require('mellow');
99
const isString = (a) => typeof a === 'string';
1010

1111
const isRootWin32 = currify(require('./is-root-win32'));
@@ -18,16 +18,16 @@ const getPaths = (from, to) => {
1818
};
1919

2020
const getRootError = (type) => `Could not ${type} from/to root on windows!`;
21-
const pathToWin = (path, root) => {
21+
const safeWebToWin = (path, root) => {
2222
if (!isString(path))
2323
return path;
2424

25-
return mellow.pathToWin(path, root);
25+
return webToWin(path, root);
2626
};
2727

2828
module.exports = currify((type, id, root, socket, from, to, files) => {
29-
from = pathToWin(from, root);
30-
to = pathToWin(to, root);
29+
from = safeWebToWin(from, root);
30+
to = safeWebToWin(to, root);
3131

3232
if (getPaths(from, to).some(isRootWin32(root)))
3333
socket.emit(`${id}#error`, getRootError(type));

server/pack.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
const currify = require('currify');
44
const onezip = require('onezip');
55
const jaguar = require('jaguar');
6-
const mellow = require('mellow');
6+
const {webToWin} = require('mellow');
77

88
const isRootWin32 = currify(require('./is-root-win32'));
99
const WIN32_ROOT_MSG = 'Could not pack from/to root on windows!';
1010

1111
module.exports = (type, id, root, socket, from, to, files) => {
12-
from = mellow.pathToWin(from, root);
13-
to = mellow.pathToWin(to, root);
12+
from = webToWin(from, root);
13+
to = webToWin(to, root);
1414

1515
if (![from, to].some(isRootWin32(root)))
1616
return operate(type, id, socket, from, to, files);

0 commit comments

Comments
 (0)