single-file-core 1.2.34 → 1.2.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/modules/css-fonts-minifier.js +1 -1
  2. package/modules/css-medias-alt-minifier.js +6 -6
  3. package/package.json +1 -1
package/modules/css-fonts-minifier.js CHANGED
@@ -300,7 +300,7 @@ function getUsedFontWeight(fontInfo, fontStyle, fontWeights) {
300
300
  let fontWeight = Number(fontInfo[1]);
301
301
  if (fontWeights.length > 1) {
302
302
  if (fontWeight >= 400 && fontWeight <= 500) {
303
- foundWeight = fontWeights.find(weights => weights[0] >= fontWeight && weights[weights.length - 1] <= 500);
303
+ foundWeight = fontWeights.find(weights => weights[0] >= fontWeight && weights[0] <= 500);
304
304
  if (!foundWeight) {
305
305
  foundWeight = findDescendingFontWeight(fontWeight, fontWeights);
306
306
  }
package/modules/css-medias-alt-minifier.js CHANGED
@@ -39,7 +39,7 @@ export {
39
39
  function process(stylesheets) {
40
40
  const stats = { processed: 0, discarded: 0 };
41
41
  stylesheets.forEach((stylesheetInfo, key) => {
42
- if (matchesMediaType(stylesheetInfo.mediaText || MEDIA_ALL, MEDIA_SCREEN) && stylesheetInfo.stylesheet.children) {
42
+ if (matchesMediaType(stylesheetInfo.mediaText || MEDIA_ALL) && stylesheetInfo.stylesheet.children) {
43
43
  const removedRules = processRules(stylesheetInfo.stylesheet.children, stats);
44
44
  removedRules.forEach(({ cssRules, cssRule }) => cssRules.remove(cssRule));
45
45
  } else {
@@ -57,7 +57,7 @@ function processRules(cssRules, stats, removedRules = []) {
57
57
  const ruleData = cssRule.data;
58
58
  if (ruleData.type == "Atrule" && ruleData.name == "media" && ruleData.block && ruleData.block.children && ruleData.prelude && ruleData.prelude.children) {
59
59
  stats.processed++;
60
- if (matchesMediaType(cssTree.generate(ruleData.prelude), MEDIA_SCREEN)) {
60
+ if (matchesMediaType(cssTree.generate(ruleData.prelude))) {
61
61
  processRules(ruleData.block.children, stats, removedRules);
62
62
  } else {
63
63
  removedRules.push({ cssRules, cssRule });
@@ -68,10 +68,10 @@ function processRules(cssRules, stats, removedRules = []) {
68
68
  return removedRules;
69
69
  }
70
70
 
71
- function matchesMediaType(mediaText, mediaType) {
72
- const foundMediaTypes = helper.flatten(mediaQueryParser.parseMediaList(mediaText).map(node => getMediaTypes(node, mediaType)));
73
- return foundMediaTypes.find(mediaTypeInfo => (!mediaTypeInfo.not && (mediaTypeInfo.value == mediaType || mediaTypeInfo.value == MEDIA_ALL))
74
- || (mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_ALL || mediaTypeInfo.value != mediaType)));
71
+ function matchesMediaType(mediaText) {
72
+ const foundMediaTypes = helper.flatten(mediaQueryParser.parseMediaList(mediaText).map(node => getMediaTypes(node, MEDIA_SCREEN)));
73
+ return foundMediaTypes.find(mediaTypeInfo => (!mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_SCREEN || mediaTypeInfo.value == MEDIA_ALL))
74
+ || (mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_ALL || mediaTypeInfo.value == MEDIA_SCREEN)));
75
75
  }
76
76
 
77
77
  function getMediaTypes(parentNode, mediaType, mediaTypes = []) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "single-file-core",
3
- "version": "1.2.34",
3
+ "version": "1.2.35",
4
4
  "description": "SingleFile Core",
5
5
  "author": "Gildas Lormeau",
6
6
  "license": "AGPL-3.0-or-later",