|
 |
9d1a713 |
commit 1cbb465aa92f7cb903f7900e0e43cc08294fc649
|
|
|
7630937 |
Author: Tom Hughes <tom@compton.nu>
|
|
|
7630937 |
Date: Thu Sep 20 18:55:15 2018 +0100
|
|
|
7630937 |
|
|
|
7630937 |
Update for npm(mime) version 2.x
|
|
|
7630937 |
|
|
|
9d1a713 |
diff --git a/bin/lessc b/bin/lessc
|
|
|
9d1a713 |
index 0ffe6dbc..11c11d45 100644
|
|
|
9d1a713 |
--- a/bin/lessc
|
|
|
9d1a713 |
+++ b/bin/lessc
|
|
|
9d1a713 |
@@ -180,10 +180,10 @@ var environment = {
|
|
|
9d1a713 |
return buffer.toString('base64');
|
|
|
9d1a713 |
},
|
|
|
9d1a713 |
mimeLookup: function mimeLookup(filename) {
|
|
|
9d1a713 |
- return require('mime').lookup(filename);
|
|
|
9d1a713 |
+ return require('mime').getType(filename);
|
|
|
9d1a713 |
},
|
|
|
9d1a713 |
charsetLookup: function charsetLookup(mime) {
|
|
|
9d1a713 |
- return require('mime').charsets.lookup(mime);
|
|
|
9d1a713 |
+ return (/^text\/|^application\/(javascript|json)/).test(mime) ? 'UTF-8' : null;
|
|
|
9d1a713 |
},
|
|
|
9d1a713 |
getSourceMapGenerator: function getSourceMapGenerator() {
|
|
|
9d1a713 |
return require('source-map').SourceMapGenerator;
|
|
|
9d1a713 |
diff --git a/dist/less.cjs.js b/dist/less.cjs.js
|
|
|
9d1a713 |
index 41b01742..cfc307e9 100644
|
|
|
9d1a713 |
--- a/dist/less.cjs.js
|
|
|
9d1a713 |
+++ b/dist/less.cjs.js
|
|
|
9d1a713 |
@@ -11,10 +11,10 @@ var environment = {
|
|
|
9d1a713 |
return buffer.toString('base64');
|
|
|
9d1a713 |
},
|
|
|
9d1a713 |
mimeLookup: function mimeLookup(filename) {
|
|
|
9d1a713 |
- return require('mime').lookup(filename);
|
|
|
9d1a713 |
+ return require('mime').getType(filename);
|
|
|
9d1a713 |
},
|
|
|
9d1a713 |
charsetLookup: function charsetLookup(mime) {
|
|
|
9d1a713 |
- return require('mime').charsets.lookup(mime);
|
|
|
9d1a713 |
+ return (/^text\/|^application\/(javascript|json)/).test(mime) ? 'UTF-8' : null;
|
|
|
9d1a713 |
},
|
|
|
9d1a713 |
getSourceMapGenerator: function getSourceMapGenerator() {
|
|
|
9d1a713 |
return require('source-map').SourceMapGenerator;
|
|
|
7630937 |
diff --git a/lib/less-node/environment.js b/lib/less-node/environment.js
|
|
|
9d1a713 |
index a9b790c9..a24cf481 100644
|
|
|
7630937 |
--- a/lib/less-node/environment.js
|
|
|
7630937 |
+++ b/lib/less-node/environment.js
|
|
|
9d1a713 |
@@ -5,10 +5,10 @@ export default {
|
|
|
9d1a713 |
return buffer.toString('base64');
|
|
|
7630937 |
},
|
|
|
7630937 |
mimeLookup: function (filename) {
|
|
|
7630937 |
- return require('mime').lookup(filename);
|
|
|
7630937 |
+ return require('mime').getType(filename);
|
|
|
7630937 |
},
|
|
|
7630937 |
charsetLookup: function (mime) {
|
|
|
7630937 |
- return require('mime').charsets.lookup(mime);
|
|
|
7630937 |
+ return (/^text\/|^application\/(javascript|json)/).test(mime) ? 'UTF-8' : null;
|
|
|
7630937 |
},
|
|
|
7630937 |
getSourceMapGenerator: function getSourceMapGenerator() {
|
|
|
7630937 |
return require('source-map').SourceMapGenerator;
|
|
|
7630937 |
diff --git a/package.json b/package.json
|
|
|
9d1a713 |
index b9887fcf..50599f21 100644
|
|
|
7630937 |
--- a/package.json
|
|
|
7630937 |
+++ b/package.json
|
|
|
9d1a713 |
@@ -42,7 +42,7 @@
|
|
|
7630937 |
"errno": "^0.1.1",
|
|
|
7630937 |
"graceful-fs": "^4.1.2",
|
|
|
7630937 |
"image-size": "~0.5.0",
|
|
|
7630937 |
- "mime": "^1.4.1",
|
|
|
7630937 |
+ "mime": "^2.0.0",
|
|
|
7630937 |
"mkdirp": "^0.5.0",
|
|
|
7630937 |
"promise": "^7.1.1",
|
|
|
7630937 |
"request": "^2.83.0",
|