arthurbergmz · rtercias · Jul 20, 2020 · Jul 20, 2020 · Jul 20, 2020 · Jul 22, 2020
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
  "license": "MIT",
  "dependencies": {
  "css-color-names": "^1.0.0",
- "jimp": "^0.6.0",
+ "jimp": "^0.14.0",
  "mime": "^2.4.0"
  },
  "devDependencies": {

diff --git a/src/icons/index.js b/src/icons/index.js
@@ -16,7 +16,11 @@ function sanitizeIcon (iconSnippet) {
  const arr = parseArray(iconSnippet.size || iconSnippet.sizes)
  if (!arr) throw new IconError('Unknown icon sizes.')
  const sizes = []
- for (let size of arr) sizes.push(+size || parseInt(size))
+
+ for (let size of arr) {
+ typeof arr[0] === 'number' ? sizes.push(+size || parseInt(size)) : sizes.push(size)
+ }
+
  return {
  src: iconSnippet.src,
  sizes,
@@ -28,7 +32,12 @@ function sanitizeIcon (iconSnippet) {
 }
 
 function processIcon (currentSize, icon, buffer, mimeType, publicPath, shouldFingerprint) {
- const dimensions = `${currentSize}x${currentSize}`
+ const dimensions = typeof currentSize === 'number' ? `${currentSize}x${currentSize}` : currentSize
+
+ if (dimensions.split('x').length === 0) {
+ throw new IconError(`Unexpected size format: ${currentSize}. Must be a number or string "WxH"'`)
+ }
+
  const fileName = shouldFingerprint ? `icon_${dimensions}.${generateFingerprint(buffer)}.${mime.getExtension(mimeType)}` : `icon_${dimensions}.${mime.getExtension(mimeType)}`
  const iconOutputDir = icon.destination ? joinURI(icon.destination, fileName) : fileName
  const iconPublicUrl = joinURI(publicPath, iconOutputDir)
@@ -63,7 +72,7 @@ function process (sizes, icon, cachedIconsCopy, icons, assets, fingerprint, publ
  }
 
  const size = sizes.pop()
- if (size > 0) {
+ if (size > 0 || typeof size === 'string') {
  const mimeType = mime.getType(icon.src)
  if (!supportedMimeTypes.includes(mimeType)) {
  let buffer
@@ -80,7 +89,17 @@ function process (sizes, icon, cachedIconsCopy, icons, assets, fingerprint, publ
 
  jimp.read(icon.src, (err, img) => {
  if (err) throw new IconError(`It was not possible to read '${icon.src}'.`)
- img.resize(size, size).getBuffer(mimeType, (err, buffer) => {
+
+ let x = size, y = size, tmp
+
+ if (typeof size === 'string'){
+ tmp = size.split('x')
+ x = Number(tmp[0])
+ y = Number(tmp[1])
+ }
+
+ img.background(img.getPixelColor(1,1))
+ img.contain(x, y, jimp.HORIZONTAL_ALIGN_CENTER | jimp.VERTICAL_ALIGN_MIDDLE).getBuffer(mimeType, (err, buffer) => {
  if (err) throw new IconError(`It was not possible to retrieve buffer of '${icon.src}'.`)
  const processedIcon = processIcon(size, icon, buffer, mimeType, publicPath, fingerprint)
  icons.push(processedIcon.manifestIcon)

diff --git a/tests/basic/test/index.html b/tests/basic/test/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-icon sizes=1024x1024 href=/icons/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=manifest href=/manifest.b71cbf253213cc7cedb8b846c4e8ea0a.json><link rel=mask-icon href=/icons/icon_512x512.dd60b11e9762b6e25f6d4ce981a1eeae.svg color=#ffffff></head><body><script type=text/javascript src=/main.c2a880b33508651abef9.bundle.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-icon sizes=1024x1024 href=/icons/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=manifest href=/manifest.b71cbf253213cc7cedb8b846c4e8ea0a.json><link rel=mask-icon href=/icons/icon_512x512.dd60b11e9762b6e25f6d4ce981a1eeae.svg color=#ffffff></head><body><script type=text/javascript src=/main.1883bc7755d680d6d162.bundle.js></script></body></html>
diff --git a/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js b/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js
diff --git a/tests/complex/test/index.html b/tests/complex/test/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-startup-image sizes=1024x1024 href=/icons/ios/startup/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=apple-touch-icon sizes=1024x1024 href=/icons/ios/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=apple-touch-icon sizes=180x180 href=/icons/ios/icon_180x180.ff39561a8e4bf67913868a5caa412712.png><link rel=apple-touch-icon sizes=167x167 href=/icons/ios/icon_167x167.26d2d10196ca0a32493134fb5a4510ba.png><link rel=apple-touch-icon sizes=152x152 href=/icons/ios/icon_152x152.8f7dadbad509ff949e7da5488f44b686.png><link rel=apple-touch-icon sizes=120x120 href=/icons/ios/icon_120x120.463a6f38bcc879bee49facdf208464c4.png><link rel=manifest href=/manifest.aa33c28d24e1121925cfa150e2ec52a9.json crossorigin=use-credentials></head><body><script type=text/javascript src=/main.c2a880b33508651abef9.bundle.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-startup-image sizes=1024x1024 href=/icons/ios/startup/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=apple-touch-icon sizes=1024x1024 href=/icons/ios/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=apple-touch-icon sizes=180x180 href=/icons/ios/icon_180x180.ff39561a8e4bf67913868a5caa412712.png><link rel=apple-touch-icon sizes=167x167 href=/icons/ios/icon_167x167.26d2d10196ca0a32493134fb5a4510ba.png><link rel=apple-touch-icon sizes=152x152 href=/icons/ios/icon_152x152.8f7dadbad509ff949e7da5488f44b686.png><link rel=apple-touch-icon sizes=120x120 href=/icons/ios/icon_120x120.463a6f38bcc879bee49facdf208464c4.png><link rel=manifest href=/manifest.aa33c28d24e1121925cfa150e2ec52a9.json crossorigin=use-credentials></head><body><script type=text/javascript src=/main.1883bc7755d680d6d162.bundle.js></script></body></html>
diff --git a/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js b/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js
diff --git a/tests/issue-84/test/index.html b/tests/issue-84/test/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-icon sizes=1024x1024 href=/icons/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=manifest href=/manifest.81200e1d24c270411245b5a63a4b91e7.json><link rel=mask-icon href=/icons/icon_512x512.dd60b11e9762b6e25f6d4ce981a1eeae.svg color=#ffffff></head><body><script type=text/javascript src=/main.c2a880b33508651abef9.bundle.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-icon sizes=1024x1024 href=/icons/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=manifest href=/manifest.81200e1d24c270411245b5a63a4b91e7.json><link rel=mask-icon href=/icons/icon_512x512.dd60b11e9762b6e25f6d4ce981a1eeae.svg color=#ffffff></head><body><script type=text/javascript src=/main.1883bc7755d680d6d162.bundle.js></script></body></html>
diff --git a/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js b/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js
diff --git a/tests/issue-87/test/icons/icon_640x1136.f1e18738dea948159627c5df01731830.png b/tests/issue-87/test/icons/icon_640x1136.f1e18738dea948159627c5df01731830.png
diff --git a/tests/issue-87/test/icons/icon_640x640.3e80720306149c1cca44f6fa41d3dffd.png b/tests/issue-87/test/icons/icon_640x640.3e80720306149c1cca44f6fa41d3dffd.png
diff --git a/tests/issue-87/test/icons/icon_750x1334.63fbc0bb0bc6036b480cde5d3fb93701.png b/tests/issue-87/test/icons/icon_750x1334.63fbc0bb0bc6036b480cde5d3fb93701.png
diff --git a/tests/issue-87/test/icons/icon_750x750.6d93014782b03254bb1f640a67ed0590.png b/tests/issue-87/test/icons/icon_750x750.6d93014782b03254bb1f640a67ed0590.png
diff --git a/tests/issue-87/test/icons/icon_768x1024.9d45001b732385e2214068e3865acb9a.png b/tests/issue-87/test/icons/icon_768x1024.9d45001b732385e2214068e3865acb9a.png
diff --git a/tests/issue-87/test/icons/icon_768x768.f85b060e02c421c52e530e23fe1df50e.png b/tests/issue-87/test/icons/icon_768x768.f85b060e02c421c52e530e23fe1df50e.png
diff --git a/tests/issue-87/test/index.html b/tests/issue-87/test/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-startup-image sizes=768x768 href=/icons/icon_768x768.f85b060e02c421c52e530e23fe1df50e.png><link rel=apple-touch-startup-image sizes=750x750 href=/icons/icon_750x750.6d93014782b03254bb1f640a67ed0590.png><link rel=apple-touch-startup-image sizes=640x640 href=/icons/icon_640x640.3e80720306149c1cca44f6fa41d3dffd.png><link rel=manifest href=/manifest.24abfacd4846fab249f8fe94967260b9.json></head><body><script type=text/javascript src=/main.c2a880b33508651abef9.bundle.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-startup-image sizes=768x1024 href=/icons/icon_768x1024.9d45001b732385e2214068e3865acb9a.png><link rel=apple-touch-startup-image sizes=750x1334 href=/icons/icon_750x1334.63fbc0bb0bc6036b480cde5d3fb93701.png><link rel=apple-touch-startup-image sizes=640x1136 href=/icons/icon_640x1136.f1e18738dea948159627c5df01731830.png><link rel=manifest href=/manifest.9b84f25c3f21e630a942dd5d41ed5d77.json></head><body><script type=text/javascript src=/main.1883bc7755d680d6d162.bundle.js></script></body></html>
diff --git a/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js b/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js
diff --git a/...est.24abfacd4846fab249f8fe94967260b9.json → ...est.9b84f25c3f21e630a942dd5d41ed5d77.json b/...est.24abfacd4846fab249f8fe94967260b9.json → ...est.9b84f25c3f21e630a942dd5d41ed5d77.json
@@ -1,18 +1,18 @@
 {
  "icons": [
  {
- "src": "/icons/icon_768x768.f85b060e02c421c52e530e23fe1df50e.png",
- "sizes": "768x768",
+ "src": "/icons/icon_768x1024.9d45001b732385e2214068e3865acb9a.png",
+ "sizes": "768x1024",
  "type": "image/png"
  },
  {
- "src": "/icons/icon_750x750.6d93014782b03254bb1f640a67ed0590.png",
- "sizes": "750x750",
+ "src": "/icons/icon_750x1334.63fbc0bb0bc6036b480cde5d3fb93701.png",
+ "sizes": "750x1334",
  "type": "image/png"
  },
  {
- "src": "/icons/icon_640x640.3e80720306149c1cca44f6fa41d3dffd.png",
- "sizes": "640x640",
+ "src": "/icons/icon_640x1136.f1e18738dea948159627c5df01731830.png",
+ "sizes": "640x1136",
  "type": "image/png"
  }
  ],

diff --git a/tests/rgb-background/test/index.html b/tests/rgb-background/test/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-icon sizes=1024x1024 href=/icons/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=manifest href=/manifest.836308dd4105e7779e96d575bbcb3984.json><link rel=mask-icon href=/icons/icon_512x512.dd60b11e9762b6e25f6d4ce981a1eeae.svg color=#ffffff></head><body><script type=text/javascript src=/main.c2a880b33508651abef9.bundle.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-icon sizes=1024x1024 href=/icons/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=manifest href=/manifest.836308dd4105e7779e96d575bbcb3984.json><link rel=mask-icon href=/icons/icon_512x512.dd60b11e9762b6e25f6d4ce981a1eeae.svg color=#ffffff></head><body><script type=text/javascript src=/main.1883bc7755d680d6d162.bundle.js></script></body></html>
diff --git a/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js b/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js
diff --git a/tests/rgba-background/test/index.html b/tests/rgba-background/test/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-icon sizes=1024x1024 href=/icons/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=manifest href=/manifest.82c3c467821f8c1b613bc6f741480697.json><link rel=mask-icon href=/icons/icon_512x512.dd60b11e9762b6e25f6d4ce981a1eeae.svg color=#ffffff></head><body><script type=text/javascript src=/main.c2a880b33508651abef9.bundle.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><title>Webpack App</title><meta name=apple-mobile-web-app-title content="My Progressive Web App"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=default><link rel=apple-touch-icon sizes=1024x1024 href=/icons/icon_1024x1024.35f4891d98af6eb0c3dee2853ea0f190.png><link rel=manifest href=/manifest.82c3c467821f8c1b613bc6f741480697.json><link rel=mask-icon href=/icons/icon_512x512.dd60b11e9762b6e25f6d4ce981a1eeae.svg color=#ffffff></head><body><script type=text/javascript src=/main.1883bc7755d680d6d162.bundle.js></script></body></html>
diff --git a/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js b/.../test/main.c2a880b33508651abef9.bundle.js → .../test/main.1883bc7755d680d6d162.bundle.js
diff --git a/tests/runTest.js b/tests/runTest.js
@@ -42,7 +42,8 @@ function run (name, next) {
  const outputFilename = outputToTest.substring(outputPathLength)
  const testAgainst = testContent.indexOf(outputFilename)
 
- const success = testAgainst > -1 && fs.readFileSync(outputToTest).equals(fs.readFileSync(testTree[testAgainst]))
+ const isDirectory = fs.existsSync(outputToTest) && fs.lstatSync(outputToTest).isDirectory()
+ const success = isDirectory || testAgainst > -1 && fs.readFileSync(outputToTest).equals(fs.readFileSync(testTree[testAgainst]))
 
  // if (!success) {
  // console.log(`FAILED: "${outputFilename}" AGAINST "${testTree[testAgainst]}..."`)