juice - npm Package Compare versions

Comparing version 6.0.0 to 7.0.0

CHANGELOG.md

@@ -0,1 +1,10 @@
+# 7.0.0 / 2019-11-27
+
+* Breaking: requires node 10+
+* Please see changes in web-resource-inliner@6 for other details
+
+# 6.0.0 / 2019-11-27
+
+* Drop support for Node.js 4
+
 # 5.2.0 / 2019-03-18
@@ -2,0 +11,0 @@

index.js

@@ -62,3 +62,3 @@ 'use strict';
 function inlineExternal(html, inlineOptions, callback) {
-  var options = utils.extend({fileContent: html}, inlineOptions);
+  var options = Object.assign({fileContent: html}, inlineOptions);
   inline.html(options, callback);
@@ -65,0 +65,0 @@ }

juice.d.ts

@@ -63,5 +63,4 @@ // Type definitions for Juice 3.0.0
     rebaseRelativeTo?: string;
-    cssmin?: boolean;
     strict?: boolean;
   }
 }

lib/cheerio.js

@@ -10,5 +10,5 @@ 'use strict';
 var cheerioLoad = function(html, options, encodeEntities) {
-  options = utils.extend({decodeEntities: false}, options || {});
+  options = Object.assign({decodeEntities: false, _useHtmlParser2:true}, options);
   html = encodeEntities(html);
-  return cheerio.load(html,options);
+  return cheerio.load(html, options);
 };
@@ -15,0 +15,0 @@

lib/cli.js

@@ -112,12 +112,2 @@ 'use strict';
     def: 'see docs for web-resource-inliner rebaseRelativeTo' },
-  'web-resources-cssmin': {
-    pMap: 'webResourcesCssmin',
-    map: 'cssmin',
-    def: 'see docs for web-resource-inliner cssmin',
-    coercion: JSON.parse },
-  'web-resources-uglify': {
-    pMap: 'webResourcesUglify',
-    map: 'uglify',
-    def: 'see docs for web-resource-inliner uglify',
-    coercion: JSON.parse },
   'web-resources-strict': {
@@ -124,0 +114,0 @@ pMap: 'webResourcesStrict',

lib/inline.js

@@ -82,2 +82,7 @@ 'use strict';
     var parsedSelector = selector.parsed();
+
+    if (!parsedSelector) {
+      return;
+    }
+
     var pseudoElementType = getPseudoElementType(parsedSelector);
@@ -343,4 +348,10 @@
     styleElement = this;
-    styleDataList = styleElement.childNodes;
+    // the API for Cheerio using parse5 (default) and htmlparser2 are slightly different
+    // detect this by checking if .childNodes exist (as opposed to .children)
+    var usingParse5 = !!styleElement.childNodes;
+    styleDataList = usingParse5 ? styleElement.childNodes : styleElement.children;
     if (styleDataList.length !== 1) {
+      if (options.removeStyleTags) {
+        $(styleElement).remove();
+      }
       return;
@@ -353,3 +364,4 @@ }
     if (options.removeStyleTags && $(styleElement).attr('data-embed') === undefined) {
-      var preservedText = utils.getPreservedText(styleElement.childNodes[0].nodeValue, {
+      var text = usingParse5 ? styleElement.childNodes[0].nodeValue : styleElement.children[0].data;
+      var preservedText = utils.getPreservedText(text, {
         mediaQueries: options.preserveMediaQueries,
@@ -361,3 +373,7 @@ fontFaces: options.preserveFontFaces,
       if (preservedText) {
-        styleElement.childNodes[0].nodeValue = preservedText;
+        if (usingParse5) {
+          styleElement.childNodes[0].nodeValue = preservedText;
+        } else {
+          styleElement.children[0].data = preservedText;
+        }
       } else {
@@ -364,0 +380,0 @@ $(styleElement).remove();

lib/utils.js

@@ -8,3 +8,2 @@ 'use strict';
 var mensch = require('mensch');
-var own = {}.hasOwnProperty;
 var Selector = require('./selector');
@@ -150,13 +149,4 @@ var Property = require('./property');
 
-exports.extend = function(obj, src) {
-  for (var key in src) {
-    if (own.call(src, key)) {
-      obj[key] = src[key];
-    }
-  }
-  return obj;
-};
-
 exports.getDefaultOptions = function(options) {
-  var result = exports.extend({
+  var result = Object.assign({
     extraCss: '',
@@ -163,0 +153,0 @@ insertPreservedExtraCss: true,

package.json

 {
   "name": "juice",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "description": "Inlines css into html source",
@@ -8,2 +8,10 @@ "bin": "bin/juice",
   "browser": "client.js",
+  "types": "juice.d.ts",
+  "files": [
+    "bin",
+    "lib",
+    "client.js",
+    "index.js",
+    "juice.d.ts"
+  ],
   "scripts": {
@@ -28,13 +36,10 @@ "test": "mocha --reporter spec && npm run test-typescript",
   "engines": {
-    "node": ">=6.17.1"
+    "node": ">=10.0.0"
   },
-  "types": "juice.d.ts",
   "dependencies": {
-    "cheerio": "^0.22.0",
-    "commander": "^2.15.1",
-    "cross-spawn": "^6.0.5",
-    "deep-extend": "^0.6.0",
+    "cheerio": "^1.0.0-rc.3",
+    "commander": "^5.1.0",
     "mensch": "^0.3.4",
     "slick": "^1.12.2",
-    "web-resource-inliner": "^4.3.3"
+    "web-resource-inliner": "^5.0.0"
   },
@@ -44,5 +49,6 @@ "devDependencies": {
     "browserify": "^16.2.3",
+    "cross-spawn": "^6.0.5",
     "mocha": "^5.2.0",
     "should": "^11.1.1",
-    "typescript": "^2.9.1"
+    "typescript": "^3.9.6"
   },
@@ -49,0 +55,0 @@ "repository": {

No alert changes

Improved metrics

Dependency count

5

-28.57%

Worsened metrics

Total package byte prevSize

52655

-6.14%

Dev dependency count

6

20%

Number of package files

13

-27.78%

Lines of code

943

-0.63%

Dependency changes

• + Added

  ansi-colors@4.1.3
  (transitive)

• + Added

  cheerio@1.1.0
  (transitive)

• + Added

  cheerio-select@2.1.0
  (transitive)

• + Added

  commander@5.1.0
  (transitive)

• + Added

  css-select@5.2.2
  (transitive)

• + Added

  css-what@6.2.2
  (transitive)

• + Added

  dom-serializer@2.0.0
  (transitive)

• + Added

  domhandler@5.0.3
  (transitive)

• + Added

  domutils@3.2.2
  (transitive)

• + Added

  encoding-sniffer@0.2.1
  (transitive)

• + Added

  entities@4.5.06.0.1
  (transitive)

• + Added

  escape-goat@3.0.0
  (transitive)

• + Added

  htmlparser2@10.0.0
  (transitive)

• + Added

  iconv-lite@0.6.3
  (transitive)

• + Added

  mime@2.6.0
  (transitive)

• + Added

  node-fetch@2.7.0
  (transitive)

• + Added

  nth-check@2.1.1
  (transitive)

• + Added

  parse5@7.3.0
  (transitive)

• + Added

  parse5-htmlparser2-tree-adapter@7.1.0
  (transitive)

• + Added

  parse5-parser-stream@7.1.2
  (transitive)

• + Added

  tr46@0.0.3
  (transitive)

• + Added

  undici@7.11.0
  (transitive)

• + Added

  valid-data-url@3.0.1
  (transitive)

• + Added

  web-resource-inliner@5.0.0
  (transitive)

• + Added

  webidl-conversions@3.0.1
  (transitive)

• + Added

  whatwg-encoding@3.1.1
  (transitive)

• + Added

  whatwg-mimetype@4.0.0
  (transitive)

• + Added

  whatwg-url@5.0.0
  (transitive)

• - Removed

  cross-spawn@^6.0.5

• - Removed

  deep-extend@^0.6.0

• - Removed

  ajv@6.12.6
  (transitive)

• - Removed

  ansi-styles@3.2.1
  (transitive)

• - Removed

  asn1@0.2.6
  (transitive)

• - Removed

  assert-plus@1.0.0
  (transitive)

• - Removed

  async@3.2.6
  (transitive)

• - Removed

  asynckit@0.4.0
  (transitive)

• - Removed

  aws-sign2@0.7.0
  (transitive)

• - Removed

  aws4@1.13.2
  (transitive)

• - Removed

  bcrypt-pbkdf@1.0.2
  (transitive)

• - Removed

  caseless@0.12.0
  (transitive)

• - Removed

  chalk@2.4.2
  (transitive)

• - Removed

  cheerio@0.22.0
  (transitive)

• - Removed

  color-convert@1.9.3
  (transitive)

• - Removed

  color-name@1.1.3
  (transitive)

• - Removed

  combined-stream@1.0.8
  (transitive)

• - Removed

  commander@2.20.3
  (transitive)

• - Removed

  core-util-is@1.0.2
  (transitive)

• - Removed

  cross-spawn@6.0.6
  (transitive)

• - Removed

  css-select@1.2.0
  (transitive)

• - Removed

  css-what@2.1.3
  (transitive)

• - Removed

  dashdash@1.14.1
  (transitive)

• - Removed

  datauri@2.0.0
  (transitive)

• - Removed

  deep-extend@0.6.0
  (transitive)

• - Removed

  delayed-stream@1.0.0
  (transitive)

• - Removed

  dom-serializer@0.1.1
  (transitive)

• - Removed

  domelementtype@1.3.1
  (transitive)

• - Removed

  domhandler@2.4.2
  (transitive)

• - Removed

  domutils@1.5.1
  (transitive)

• - Removed

  ecc-jsbn@0.1.2
  (transitive)

• - Removed

  entities@1.1.2
  (transitive)

• - Removed

  escape-string-regexp@1.0.5
  (transitive)

• - Removed

  extend@3.0.2
  (transitive)

• - Removed

  extsprintf@1.3.0
  (transitive)

• - Removed

  fast-deep-equal@3.1.3
  (transitive)

• - Removed

  fast-json-stable-stringify@2.1.0
  (transitive)

• - Removed

  forever-agent@0.6.1
  (transitive)

• - Removed

  form-data@2.3.3
  (transitive)

• - Removed

  getpass@0.1.7
  (transitive)

• - Removed

  har-schema@2.0.0
  (transitive)

• - Removed

  har-validator@5.1.5
  (transitive)

• - Removed

  has-flag@3.0.0
  (transitive)

• - Removed

  htmlparser2@3.10.1
  (transitive)

• - Removed

  http-signature@1.2.0
  (transitive)

• - Removed

  image-size@0.7.5
  (transitive)

• - Removed

  inherits@2.0.4
  (transitive)

• - Removed

  is-typedarray@1.0.0
  (transitive)

• - Removed

  isexe@2.0.0
  (transitive)

• - Removed

  isstream@0.1.2
  (transitive)

• - Removed

  jsbn@0.1.1
  (transitive)

• - Removed

  json-schema@0.4.0
  (transitive)

• - Removed

  json-schema-traverse@0.4.1
  (transitive)

• - Removed

  json-stringify-safe@5.0.1
  (transitive)

• - Removed

  jsprim@1.4.2
  (transitive)

• - Removed

  lodash.assignin@4.2.0
  (transitive)

• - Removed

  lodash.bind@4.2.1
  (transitive)

• - Removed

  lodash.defaults@4.2.0
  (transitive)

• - Removed

  lodash.filter@4.6.0
  (transitive)

• - Removed

  lodash.flatten@4.4.0
  (transitive)

• - Removed

  lodash.foreach@4.5.0
  (transitive)

• - Removed

  lodash.map@4.6.0
  (transitive)

• - Removed

  lodash.merge@4.6.2
  (transitive)

• - Removed

  lodash.pick@4.4.0
  (transitive)

• - Removed

  lodash.reduce@4.6.0
  (transitive)

• - Removed

  lodash.reject@4.6.0
  (transitive)

• - Removed

  lodash.some@4.6.0
  (transitive)

• - Removed

  lodash.unescape@4.0.1
  (transitive)

• - Removed

  mime-db@1.52.0
  (transitive)

• - Removed

  mime-types@2.1.35
  (transitive)

• - Removed

  mimer@1.1.1
  (transitive)

• - Removed

  nice-try@1.0.5
  (transitive)

• - Removed

  nth-check@1.0.2
  (transitive)

• - Removed

  oauth-sign@0.9.0
  (transitive)

• - Removed

  path-key@2.0.1
  (transitive)

• - Removed

  performance-now@2.1.0
  (transitive)

• - Removed

  psl@1.15.0
  (transitive)

• - Removed

  punycode@2.3.1
  (transitive)

• - Removed

  qs@6.5.3
  (transitive)

• - Removed

  readable-stream@3.6.2
  (transitive)

• - Removed

  request@2.88.2
  (transitive)

• - Removed

  safe-buffer@5.2.1
  (transitive)

• - Removed

  semver@5.7.2
  (transitive)

• - Removed

  shebang-command@1.2.0
  (transitive)

• - Removed

  shebang-regex@1.0.0
  (transitive)

• - Removed

  sshpk@1.18.0
  (transitive)

• - Removed

  string_decoder@1.3.0
  (transitive)

• - Removed

  supports-color@5.5.0
  (transitive)

• - Removed

  tough-cookie@2.5.0
  (transitive)

• - Removed

  tunnel-agent@0.6.0
  (transitive)

• - Removed

  tweetnacl@0.14.5
  (transitive)

• - Removed

  uri-js@4.4.1
  (transitive)

• - Removed

  util-deprecate@1.0.2
  (transitive)

• - Removed

  uuid@3.4.0
  (transitive)

• - Removed

  valid-data-url@2.0.0
  (transitive)

• - Removed

  verror@1.10.0
  (transitive)

• - Removed

  web-resource-inliner@4.3.4
  (transitive)

• - Removed

  which@1.3.1
  (transitive)

• - Removed

  xtend@4.0.2
  (transitive)

• Updated

  cheerio@^1.0.0-rc.3

• Updated

  commander@^5.1.0

• Updated

  web-resource-inliner@^5.0.0