forked from daren.hsu/line_push
update
This commit is contained in:
+8
-12
@@ -16,10 +16,6 @@ var _svgo = require('svgo');
|
||||
|
||||
var _svgo2 = _interopRequireDefault(_svgo);
|
||||
|
||||
var _isSvg = require('is-svg');
|
||||
|
||||
var _isSvg2 = _interopRequireDefault(_isSvg);
|
||||
|
||||
var _url = require('./lib/url');
|
||||
|
||||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
||||
@@ -28,7 +24,7 @@ const PLUGIN = 'postcss-svgo';
|
||||
const dataURI = /data:image\/svg\+xml(;((charset=)?utf-8|base64))?,/i;
|
||||
const dataURIBase64 = /data:image\/svg\+xml;base64,/i;
|
||||
|
||||
function minifyPromise(decl, getSvgo, opts) {
|
||||
function minifyPromise(decl, getSvgo, opts, postcssResult) {
|
||||
const promises = [];
|
||||
const parsed = (0, _postcssValueParser2.default)(decl.value);
|
||||
|
||||
@@ -64,11 +60,11 @@ function minifyPromise(decl, getSvgo, opts) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!(0, _isSvg2.default)(svg)) {
|
||||
return;
|
||||
}
|
||||
|
||||
promises.push(getSvgo().optimize(svg).then(result => {
|
||||
if (result.error) {
|
||||
decl.warn(postcssResult, `${result.error}`);
|
||||
return;
|
||||
}
|
||||
let data, optimizedValue;
|
||||
|
||||
if (isBase64) {
|
||||
@@ -92,7 +88,7 @@ function minifyPromise(decl, getSvgo, opts) {
|
||||
after: ''
|
||||
});
|
||||
}).catch(error => {
|
||||
throw new Error(`${PLUGIN}: ${error}`);
|
||||
decl.warn(postcssResult, `${error}`);
|
||||
}));
|
||||
|
||||
return false;
|
||||
@@ -112,7 +108,7 @@ exports.default = _postcss2.default.plugin(PLUGIN, (opts = {}) => {
|
||||
return svgo;
|
||||
};
|
||||
|
||||
return css => {
|
||||
return (css, result) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
const svgoQueue = [];
|
||||
|
||||
@@ -121,7 +117,7 @@ exports.default = _postcss2.default.plugin(PLUGIN, (opts = {}) => {
|
||||
return;
|
||||
}
|
||||
|
||||
svgoQueue.push(minifyPromise(decl, getSvgo, opts));
|
||||
svgoQueue.push(minifyPromise(decl, getSvgo, opts, result));
|
||||
});
|
||||
|
||||
return Promise.all(svgoQueue).then(resolve, reject);
|
||||
|
||||
+12
-13
@@ -1,32 +1,32 @@
|
||||
{
|
||||
"_args": [
|
||||
[
|
||||
"postcss-svgo@4.0.2",
|
||||
"/mnt/Foxconn/Digitalent/Deverloper/liff-push_2series"
|
||||
"postcss-svgo@4.0.3",
|
||||
"/home/node/nuxt"
|
||||
]
|
||||
],
|
||||
"_from": "postcss-svgo@4.0.2",
|
||||
"_id": "postcss-svgo@4.0.2",
|
||||
"_from": "postcss-svgo@4.0.3",
|
||||
"_id": "postcss-svgo@4.0.3",
|
||||
"_inBundle": false,
|
||||
"_integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
|
||||
"_integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
|
||||
"_location": "/postcss-svgo",
|
||||
"_phantomChildren": {},
|
||||
"_requested": {
|
||||
"type": "version",
|
||||
"registry": true,
|
||||
"raw": "postcss-svgo@4.0.2",
|
||||
"raw": "postcss-svgo@4.0.3",
|
||||
"name": "postcss-svgo",
|
||||
"escapedName": "postcss-svgo",
|
||||
"rawSpec": "4.0.2",
|
||||
"rawSpec": "4.0.3",
|
||||
"saveSpec": null,
|
||||
"fetchSpec": "4.0.2"
|
||||
"fetchSpec": "4.0.3"
|
||||
},
|
||||
"_requiredBy": [
|
||||
"/cssnano-preset-default"
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
|
||||
"_spec": "4.0.2",
|
||||
"_where": "/mnt/Foxconn/Digitalent/Deverloper/liff-push_2series",
|
||||
"_resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
|
||||
"_spec": "4.0.3",
|
||||
"_where": "/home/node/nuxt",
|
||||
"author": {
|
||||
"name": "Ben Briggs",
|
||||
"email": "beneb.info@gmail.com",
|
||||
@@ -36,7 +36,6 @@
|
||||
"url": "https://github.com/cssnano/cssnano/issues"
|
||||
},
|
||||
"dependencies": {
|
||||
"is-svg": "^3.0.0",
|
||||
"postcss": "^7.0.0",
|
||||
"postcss-value-parser": "^3.0.0",
|
||||
"svgo": "^1.0.0"
|
||||
@@ -74,5 +73,5 @@
|
||||
"scripts": {
|
||||
"prepublish": "cross-env BABEL_ENV=publish babel src --out-dir dist --ignore /__tests__/"
|
||||
},
|
||||
"version": "4.0.2"
|
||||
"version": "4.0.3"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user