Skip to content

Commit

Permalink
feat: update mime, use mime/lite replace mime and use shims/debug.js …
Browse files Browse the repository at this point in the history
…replace debug in browser (#802)
  • Loading branch information
weiyie committed Jun 4, 2020
1 parent 6f4ae51 commit b4d1c56
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ proto.createRequest = function createRequest(params) {
if (params.mime && params.mime.indexOf('/') > 0) {
headers['Content-Type'] = params.mime;
} else {
headers['Content-Type'] = mime.lookup(params.mime || path.extname(params.object || ''));
headers['Content-Type'] = mime.getType(params.mime || path.extname(params.object || ''));
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/managed-upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ proto.multipartUpload = async function multipartUpload(name, file, options) {

const minPartSize = 100 * 1024;
const filename = isFile(file) ? file.name : file;
options.mime = options.mime || mime.lookup(path.extname(filename));
options.mime = options.mime || mime.getType(path.extname(filename));
options.headers = options.headers || {};
this._convertMetaToHeaders(options.meta, options.headers);

Expand Down
2 changes: 1 addition & 1 deletion lib/object.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ proto.put = async function put(name, file, options) {
if (is.buffer(file)) {
content = file;
} else if (is.string(file)) {
options.mime = options.mime || mime.lookup(path.extname(file));
options.mime = options.mime || mime.getType(path.extname(file));
const stream = fs.createReadStream(file);
options.contentLength = await this._getFileSize(file);
return await this.putStream(name, stream, options);
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
],
"browser": {
"lib/client.js": "./dist/aliyun-oss-sdk.js",
"mime": "./shims/mime.js",
"mime": "mime/lite",
"urllib": "./shims/xhr.js",
"utility": "./shims/utility.js",
"crypto": "./shims/crypto/crypto.js",
"debug": "./shims/debug",
"fs": false,
"child_process": false,
"is-type-of": "./shims/is-type-of.js"
Expand Down Expand Up @@ -124,7 +125,7 @@
"js-base64": "^2.5.2",
"jstoxml": "^0.2.3",
"merge-descriptors": "^1.0.1",
"mime": "^1.3.4",
"mime": "^2.4.5",
"mz-modules": "^2.1.0",
"platform": "^1.3.1",
"sdk-base": "^2.0.1",
Expand Down
3 changes: 3 additions & 0 deletions shims/debug.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = () => {
return () => {}
}

0 comments on commit b4d1c56

Please sign in to comment.