Update dependencies (TrySound#78)

* Use LTS Node.js in Travis

* Update dependencies

* Run Prettier

Author: hudochenkov

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - "node"
+  - "14"
+  - "12"
   - "10"
-  - "8"

lib/defaults.js

@@ -32,5 +32,5 @@ function transform(code) {
 module.exports = {
   encode,
   addXmlns,
-  transform
+  transform,
 };

lib/index.js

@@ -16,8 +16,8 @@ function applyInliner(inliner) {
     inliner.valueNode.nodes = [
       {
         type: "word",
-        value: inliner.loader.svg
-      }
+        value: inliner.loader.svg,
+      },
     ];
   }
 }
@@ -35,7 +35,7 @@ module.exports = postcss.plugin(
     const loaders = [];
     const inliners = [];
 
-    css.walk(node => {
+    css.walk((node) => {
       if (node.type === "atrule") {
         if (node.name === "svg-load") {
           try {
@@ -48,7 +48,7 @@ module.exports = postcss.plugin(
               parent: file,
               params,
               selectors,
-              node
+              node,
             };
             loaders.push(loader);
             loadersMap[name] = loader;
@@ -72,14 +72,14 @@ module.exports = postcss.plugin(
                   parent: file,
                   params,
                   selectors: {},
-                  node
+                  node,
                 };
                 loaders.push(loader);
                 inliners.push({
                   loader,
                   node,
                   valueNode,
-                  parsedValue
+                  parsedValue,
                 });
               }
             );
@@ -90,7 +90,7 @@ module.exports = postcss.plugin(
                   loader,
                   node,
                   valueNode,
-                  parsedValue
+                  parsedValue,
                 });
               } else {
                 node.warn(result, `"${name}" svg is not defined`);
@@ -103,17 +103,17 @@ module.exports = postcss.plugin(
       }
     });
 
-    const promises = loaders.map(loader => {
+    const promises = loaders.map((loader) => {
       return load(loader.id, loader.params, loader.selectors, opts)
-        .then(code => {
+        .then((code) => {
           loader.svg = code;
           result.messages.push({
             type: "dependency",
             file: loader.id,
-            parent: loader.parent
+            parent: loader.parent,
           });
         })
-        .catch(err => {
+        .catch((err) => {
           loader.error = true;
           loader.node.warn(result, err.message);
         });

lib/load.js

@@ -5,7 +5,7 @@ const {
   removeFill,
   removeStroke,
   applyRootParams,
-  applySelectedParams
+  applySelectedParams,
 } = require("./processors.js");
 
 function read(id) {
@@ -23,11 +23,11 @@ function read(id) {
 module.exports = function load(id, params, selectors, opts) {
   const processors = [
     removeFill(id, opts),
-    removeStroke(id,opts),
+    removeStroke(id, opts),
     applyRootParams(params),
-    applySelectedParams(selectors)
+    applySelectedParams(selectors),
   ];
-  return read(id).then(data => {
+  return read(id).then((data) => {
     let code = render(data, ...processors);
 
     if (opts.xmlns !== false) {

lib/parseDeclValue.js

@@ -29,7 +29,7 @@ function getUrl(nodes) {
 
   return {
     url,
-    urlEnd
+    urlEnd,
   };
 }
 
@@ -101,7 +101,7 @@ function getLoader(parsedValue, valueNode) {
     url,
     params,
     valueNode,
-    parsedValue
+    parsedValue,
   };
 }
 
@@ -114,7 +114,7 @@ function getInliner(parsedValue, valueNode) {
   return {
     name,
     valueNode,
-    parsedValue
+    parsedValue,
   };
 }
 
@@ -123,7 +123,7 @@ module.exports = function parseDeclValue(value) {
   const inliners = [];
   const parsedValue = valueParser(value);
 
-  parsedValue.walk(valueNode => {
+  parsedValue.walk((valueNode) => {
     if (valueNode.type === "function") {
       if (valueNode.value === "svg-load") {
         loaders.push(getLoader(parsedValue, valueNode));
@@ -135,6 +135,6 @@ module.exports = function parseDeclValue(value) {
 
   return {
     loaders,
-    inliners
+    inliners,
   };
 };

lib/parseRule.js

@@ -14,20 +14,20 @@ function parseRuleDefinition(params) {
   }
   return {
     name: nodes[0].value,
-    url: nodes[2].nodes[0].value
+    url: nodes[2].nodes[0].value,
   };
 }
 
 function getRuleParams(rule) {
   const params = {};
   const selectors = {};
 
-  rule.each(node => {
+  rule.each((node) => {
     if (node.type === "decl") {
       params[node.prop] = node.value;
     } else if (node.type === "rule") {
       const selector = selectors[node.selectors] || {};
-      node.each(child => {
+      node.each((child) => {
         if (child.type === "decl") {
           selector[child.prop] = child.value;
         }
@@ -38,11 +38,11 @@ function getRuleParams(rule) {
 
   return {
     params,
-    selectors
+    selectors,
   };
 }
 
 module.exports = {
   parseRuleDefinition,
-  getRuleParams
+  getRuleParams,
 };

lib/processors.js

@@ -9,7 +9,7 @@ function removeFillAttrib(element) {
 }
 
 function removeFill(id, opts) {
-  return dom => {
+  return (dom) => {
     if (matchId(opts.removeFill, id)) {
       selectAll("[fill]", dom).forEach(removeFillAttrib);
     }
@@ -21,7 +21,7 @@ function removeStrokeAttrib(element) {
 }
 
 function removeStroke(id, opts) {
-  return dom => {
+  return (dom) => {
     if (matchId(opts.removeStroke, id)) {
       selectAll("[stroke]", dom).forEach(removeStrokeAttrib);
     }
@@ -30,23 +30,23 @@ function removeStroke(id, opts) {
 
 function applyParams(params) {
   return ({ attribs }) => {
-    Object.keys(params).forEach(name => {
+    Object.keys(params).forEach((name) => {
       attribs[name] = params[name];
     });
   };
 }
 
 function applyRootParams(params) {
-  return dom => {
+  return (dom) => {
     applyParams(params)(selectOne("svg", dom));
   };
 }
 
 function applySelectedParams(selectors) {
-  return dom => {
+  return (dom) => {
     const svg = selectOne("svg", dom);
 
-    Object.keys(selectors).forEach(selector => {
+    Object.keys(selectors).forEach((selector) => {
       selectAll(selector, svg).forEach(applyParams(selectors[selector]));
     });
   };
@@ -56,5 +56,5 @@ module.exports = {
   removeFill,
   removeStroke,
   applyRootParams,
-  applySelectedParams
+  applySelectedParams,
 };

lib/render.js

@@ -1,10 +1,10 @@
 const { parseDOM } = require("htmlparser2");
-const serialize = require("dom-serializer");
+const serialize = require("dom-serializer").default;
 
 module.exports = function render(code, ...processors) {
   const dom = parseDOM(code, { xmlMode: true });
 
-  processors.forEach(processor => processor(dom));
+  processors.forEach((processor) => processor(dom));
 
   return serialize(dom);
 };

package.json

@@ -35,16 +35,16 @@
   },
   "homepage": "https://github.com/TrySound/postcss-inline-svg",
   "dependencies": {
-    "css-select": "^2.0.2",
-    "dom-serializer": "^0.1.1",
-    "htmlparser2": "^3.10.1",
+    "css-select": "^3.1.0",
+    "dom-serializer": "^1.1.0",
+    "htmlparser2": "^5.0.1",
     "postcss": "^7.0.17",
     "postcss-value-parser": "^4.0.0"
   },
   "devDependencies": {
-    "husky": "^2.4.1",
-    "jest": "^24.8.0",
-    "lint-staged": "^8.2.1",
-    "prettier": "^1.18.2"
+    "husky": "^4.3.0",
+    "jest": "^26.6.1",
+    "lint-staged": "^10.5.0",
+    "prettier": "^2.1.2"
   }
 }

test/cases.test.js

@@ -24,8 +24,8 @@ test("should stringify all values after ast transformation", () => {
     background: url("data:image/svg+xml;charset=utf-8,<svg xmlns=\'http://www.w3.org/2000/svg\' id='basic'/>");
     `,
     { from: "input.css", encode: false }
-  ).then(result => {
-    result.root.walkDecls(decl => {
+  ).then((result) => {
+    result.root.walkDecls((decl) => {
       expect(typeof decl.value).toEqual("string");
     });
   });
@@ -50,14 +50,14 @@ test("should add message about dependency", () => {
     background: url("data:image/svg+xml;charset=utf-8,<svg xmlns=\'http://www.w3.org/2000/svg\' id='basic'/>")
     `,
     { from: "input.css", encode: false }
-  ).then(result => {
+  ).then((result) => {
     const messages = result.messages
-      .filter(message => message.type === "dependency")
-      .map(message => [message.file, message.parent])
+      .filter((message) => message.type === "dependency")
+      .map((message) => [message.file, message.parent])
       .sort();
     expect(messages).toEqual([
       [path.resolve("fixtures/basic-black.svg"), path.resolve("input.css")],
-      [path.resolve("fixtures/basic.svg"), path.resolve("input.css")]
+      [path.resolve("fixtures/basic.svg"), path.resolve("input.css")],
     ]);
   });
 });
@@ -75,12 +75,12 @@ test("should not add message about not found dependency", () => {
     { from: "input.css", encode: false },
     [
       `Can't load '${path.resolve("fixtures/not-found.svg")}'`,
-      `Can't load '${path.resolve("fixtures/not-found.svg")}'`
+      `Can't load '${path.resolve("fixtures/not-found.svg")}'`,
     ]
-  ).then(result => {
+  ).then((result) => {
     const messages = result.messages
-      .filter(message => message.type === "dependency")
-      .map(message => message.file)
+      .filter((message) => message.type === "dependency")
+      .map((message) => message.file)
       .sort();
     expect(messages).toEqual([]);
   });
@@ -96,14 +96,14 @@ test("should add parent in dependency message if specified", () => {
     background: url("data:image/svg+xml;charset=utf-8,<svg xmlns=\'http://www.w3.org/2000/svg\' id='basic'/>")
     `,
     { from: "fixtures/file.css", encode: false }
-  ).then(result => {
+  ).then((result) => {
     const messages = result.messages
-      .filter(message => message.type === "dependency")
-      .map(message => message.parent)
+      .filter((message) => message.type === "dependency")
+      .map((message) => message.parent)
       .sort();
     expect(messages).toEqual([
       path.resolve("fixtures/file.css"),
-      path.resolve("fixtures/file.css")
+      path.resolve("fixtures/file.css"),
     ]);
   });
 });