Comparing version 1.2.1 to 1.3.0
# WebDAV-client changelog | ||
## 1.2.1 | ||
_2018-02-26_ | ||
* Downgrade `deepmerge` to 1.5.2 to fix Webpack bug | ||
## 1.2.0 | ||
@@ -4,0 +9,0 @@ _2018-02-24_ |
@@ -8,3 +8,3 @@ "use strict"; | ||
module.exports = { | ||
generateBasicAuthHeader: generateBasicAuthHeader | ||
generateBasicAuthHeader | ||
}; |
"use strict"; | ||
var deepmerge = require("deepmerge"); | ||
var authTools = require("./auth.js"); | ||
var urlTools = require("./url.js"); | ||
var _require = require("./merge.js"), | ||
merge = _require.merge; | ||
var directoryContents = require("./interface/directoryContents.js"); | ||
@@ -70,3 +71,3 @@ var createDir = require("./interface/createDirectory.js"); | ||
createDirectory: function createDirectory(dirPath, options) { | ||
var createOptions = deepmerge(baseOptions, options || {}); | ||
var createOptions = merge(baseOptions, options || {}); | ||
return createDir.createDirectory(dirPath, createOptions); | ||
@@ -83,3 +84,3 @@ }, | ||
createReadStream: function createReadStream(remoteFilename, options) { | ||
var createOptions = deepmerge(baseOptions, options || {}); | ||
var createOptions = merge(baseOptions, options || {}); | ||
return createStream.createReadStream(remoteFilename, createOptions); | ||
@@ -96,3 +97,3 @@ }, | ||
createWriteStream: function createWriteStream(remoteFilename, options) { | ||
var createOptions = deepmerge(baseOptions, options || {}); | ||
var createOptions = merge(baseOptions, options || {}); | ||
return createStream.createWriteStream(remoteFilename, createOptions); | ||
@@ -109,3 +110,3 @@ }, | ||
deleteFile: function deleteFile(remotePath, options) { | ||
var deleteOptions = deepmerge(baseOptions, options || {}); | ||
var deleteOptions = merge(baseOptions, options || {}); | ||
return deletion.deleteFile(remotePath, deleteOptions); | ||
@@ -122,3 +123,3 @@ }, | ||
getDirectoryContents: function getDirectoryContents(remotePath, options) { | ||
var getOptions = deepmerge(baseOptions, options || {}); | ||
var getOptions = merge(baseOptions, options || {}); | ||
return directoryContents.getDirectoryContents(remotePath, getOptions); | ||
@@ -135,3 +136,3 @@ }, | ||
getFileContents: function getFileContents(remoteFilename, options) { | ||
var getOptions = deepmerge(baseOptions, options || {}); | ||
var getOptions = merge(baseOptions, options || {}); | ||
getOptions.format = getOptions.format || "binary"; | ||
@@ -151,3 +152,3 @@ if (["binary", "text"].indexOf(getOptions.format) < 0) { | ||
getQuota: function getQuota(options) { | ||
var getOptions = deepmerge(baseOptions, options || {}); | ||
var getOptions = merge(baseOptions, options || {}); | ||
return quota.getQuota(getOptions); | ||
@@ -165,3 +166,3 @@ }, | ||
moveFile: function moveFile(remotePath, targetRemotePath, options) { | ||
var moveOptions = deepmerge(baseOptions, options || {}); | ||
var moveOptions = merge(baseOptions, options || {}); | ||
return move.moveFile(remotePath, targetRemotePath, moveOptions); | ||
@@ -179,3 +180,3 @@ }, | ||
putFileContents: function putFileContents(remoteFilename, data, options) { | ||
var putOptions = deepmerge(baseOptions, options || {}); | ||
var putOptions = merge(baseOptions, options || {}); | ||
return putFile.putFileContents(remoteFilename, data, putOptions); | ||
@@ -192,3 +193,3 @@ }, | ||
stat: function stat(remotePath, options) { | ||
var getOptions = deepmerge(baseOptions, options || {}); | ||
var getOptions = merge(baseOptions, options || {}); | ||
return stats.getStat(remotePath, getOptions); | ||
@@ -200,3 +201,3 @@ } | ||
module.exports = { | ||
createClient: createClient | ||
createClient | ||
}; |
"use strict"; | ||
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; | ||
var Stream = require("stream"); | ||
var joinURL = require("url-join"); | ||
var deepmerge = require("deepmerge"); | ||
var _require = require("../merge.js"), | ||
merge = _require.merge; | ||
var responseHandlers = require("../response.js"); | ||
@@ -27,3 +28,3 @@ var request = require("../request.js"); | ||
var writeStream = new PassThroughStream(); | ||
var headers = deepmerge({}, options.headers); | ||
var headers = merge({}, options.headers); | ||
// if (typeof options.range === "object" && typeof options.range.start === "number") { | ||
@@ -51,3 +52,3 @@ // var rangeHeader = "bytes=" + options.range.start + "-"; | ||
var rangeHeader = void 0; | ||
if (_typeof(options.range) === "object" && typeof options.range.start === "number") { | ||
if (typeof options.range === "object" && typeof options.range.start === "number") { | ||
rangeHeader = "bytes=" + options.range.start + "-"; | ||
@@ -70,4 +71,4 @@ if (typeof options.range.end === "number") { | ||
module.exports = { | ||
createReadStream: createReadStream, | ||
createWriteStream: createWriteStream | ||
createReadStream, | ||
createWriteStream | ||
}; |
"use strict"; | ||
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; | ||
var path = require("path"); | ||
@@ -24,3 +22,3 @@ var xml2js = require("xml2js"); | ||
keyCount = void 0; | ||
if ((typeof obj === "undefined" ? "undefined" : _typeof(obj)) === "object") { | ||
if (typeof obj === "object") { | ||
keys = generateKeysForName(key); | ||
@@ -27,0 +25,0 @@ for (i = 0, keyCount = keys.length; i < keyCount; i += 1) { |
@@ -6,3 +6,6 @@ "use strict"; | ||
var joinURL = require("url-join"); | ||
var deepmerge = require("deepmerge"); | ||
var _require = require("../merge.js"), | ||
merge = _require.merge; | ||
var responseHandlers = require("../response.js"); | ||
@@ -22,3 +25,3 @@ var urlTools = require("../url.js"); | ||
method: "PROPFIND", | ||
headers: deepmerge({ | ||
headers: merge({ | ||
Depth: 1 | ||
@@ -65,3 +68,3 @@ }, options.headers) | ||
module.exports = { | ||
getDirectoryContents: getDirectoryContents | ||
getDirectoryContents | ||
}; |
@@ -11,3 +11,3 @@ "use strict"; | ||
return makeFileRequest(filePath, options).then(function (res) { | ||
return res.arrayBuffer(); | ||
return typeof res.buffer === "function" ? res.buffer() : res.arrayBuffer(); | ||
}); | ||
@@ -14,0 +14,0 @@ } |
"use strict"; | ||
var joinURL = require("url-join"); | ||
var deepmerge = require("deepmerge"); | ||
var _require = require("../merge.js"), | ||
merge = _require.merge; | ||
var responseHandlers = require("../response.js"); | ||
@@ -14,3 +17,3 @@ var request = require("../request.js"); | ||
method: "MOVE", | ||
headers: deepmerge({ | ||
headers: merge({ | ||
Destination: joinURL(options.remoteURL, destination) | ||
@@ -17,0 +20,0 @@ }, options.headers) |
"use strict"; | ||
var deepmerge = require("deepmerge"); | ||
var joinURL = require("url-join"); | ||
var _require = require("../merge.js"), | ||
merge = _require.merge; | ||
var responseHandlers = require("../response.js"); | ||
@@ -20,3 +23,3 @@ var request = require("../request.js"); | ||
function putFileContents(filePath, data, options) { | ||
var putOptions = deepmerge.all([getPutContentsDefaults(), { headers: { "Content-Length": data.length } }, options || {}]); | ||
var putOptions = merge(getPutContentsDefaults(), { headers: { "Content-Length": data.length } }, options || {}); | ||
if (putOptions.overwrite === false) { | ||
@@ -23,0 +26,0 @@ putOptions.headers["If-None-Match"] = "*"; |
"use strict"; | ||
var deepmerge = require("deepmerge"); | ||
var responseHandlers = require("../response.js"); | ||
var responseHandlers = require("../response.js"); | ||
var _require = require("../merge.js"), | ||
merge = _require.merge; | ||
var fetch = require("../request.js").fetch; | ||
@@ -18,3 +20,3 @@ var davTools = require("./dav.js"); | ||
method: "PROPFIND", | ||
headers: deepmerge({ Depth: 0 }, options.headers) | ||
headers: merge({ Depth: 0 }, options.headers) | ||
}; | ||
@@ -21,0 +23,0 @@ fetchURL = fetchURL.replace(/\/+$/g, "/"); |
"use strict"; | ||
var joinURL = require("url-join"); | ||
var deepmerge = require("deepmerge"); | ||
var _require = require("../merge.js"), | ||
merge = _require.merge; | ||
var responseHandlers = require("../response.js"); | ||
@@ -21,3 +23,3 @@ var davTools = require("./dav.js"); | ||
method: "PROPFIND", | ||
headers: deepmerge({ Depth: 0 }, options.headers) | ||
headers: merge({ Depth: 0 }, options.headers) | ||
}; | ||
@@ -24,0 +26,0 @@ return fetch(fetchURL, fetchOptions).then(responseHandlers.handleResponseCode).then(function __convertToText(res) { |
{ | ||
"name": "webdav", | ||
"version": "1.2.1", | ||
"version": "1.3.0", | ||
"description": "WebDAV client for NodeJS", | ||
@@ -15,3 +15,4 @@ "main": "dist/index.js", | ||
"test:format": "prettier-check '{source,test}/**/*.js'", | ||
"test:unit": "npm run build && mocha -r test/specs/index.js test/specs/**/*.spec.js" | ||
"test:unit": "npm run build && mocha -r test/specs/index.js test/specs/**/*.spec.js", | ||
"test:unit:watch": "nodemon --exec 'npm run test:unit' --ignore 'dist/'" | ||
}, | ||
@@ -46,3 +47,3 @@ "files": [ | ||
"dependencies": { | ||
"deepmerge": "~1.5.2", | ||
"merge": "~1.2.0", | ||
"node-fetch": "~2.0.0", | ||
@@ -54,5 +55,4 @@ "url-join": "~4.0.0", | ||
"devDependencies": { | ||
"arraybuffer-equal": "~1.0.4", | ||
"arraybuffer-to-buffer": "0.0.4", | ||
"babel-cli": "~6.26.0", | ||
"babel-core": "~6.26.0", | ||
"babel-preset-env": "~1.6.1", | ||
@@ -69,2 +69,3 @@ "buffer-equals": "~1.0.4", | ||
"mocha": "^5.0.1", | ||
"nodemon": "~1.15.1", | ||
"np": "~2.20.1", | ||
@@ -71,0 +72,0 @@ "npm-run-all": "~4.1.2", |
@@ -98,2 +98,4 @@  | ||
**Important**: When running on Node, `node-fetch` is used as the default fetch library. `node-fetch` provides the `.buffer()` method for responses, which returns a `Buffer` instance, but other libraries (and standard `fetch`) do not. When the `buffer` method is not available, this library will attempt to use `.arrayBuffer`. It is your responsibility to handle the output and any required conversion. The [`arraybuffer-to-buffer`](https://www.npmjs.com/package/arraybuffer-to-buffer) library makes it easy to convert back to a `Buffer` if you require it. | ||
#### getFileStream(remotePath _[, options]_) | ||
@@ -100,0 +102,0 @@ Get a readable stream on a remote file. Returns a Promise that resolves with a readable stream instance. |
50969
23
708
246
+ Addedmerge@~1.2.0
+ Addedmerge@1.2.1(transitive)
- Removeddeepmerge@~1.5.2
- Removeddeepmerge@1.5.2(transitive)