@@ -2,7 +2,7 @@ const path = require('path')
22const { fork } = require ( 'child_process' )
33const fs = require ( 'fs-extra' )
44const hasha = require ( 'hasha' )
5- const { joinUrl, getRouteParams } = require ( '../utils' )
5+ const { joinUrl, getRouteParams, sizeName } = require ( '../utils' )
66
77module . exports = function ( pwa ) {
88 this . nuxt . hook ( 'build:before' , ( ) => run . call ( this , pwa , true ) )
@@ -19,6 +19,18 @@ async function run (pwa, _emitAssets) {
1919 const defaults = {
2020 iconFileName : 'icon.png' ,
2121 sizes : [ 64 , 120 , 144 , 152 , 192 , 384 , 512 ] ,
22+ iosSizes : [
23+ [ 1536 , 2048 , 'ipad' ] , // Ipad
24+ [ 1536 , 2048 , 'ipadpro9' ] , // Ipad Pro 9.7"
25+ [ 1668 , 2224 , 'ipadpro10' ] , // Ipad Pro 10.5"
26+ [ 2048 , 2732 , 'ipadpro12' ] , // Ipad Pro 12.9"
27+ [ 640 , 1136 , 'iphonese' ] , // Iphone SE
28+ [ 50 , 1334 , 'iphone6' ] , // Iphone 6
29+ [ 1080 , 1920 , 'iphoneplus' ] , // Iphone Plus
30+ [ 1125 , 2436 , 'iphonex' ] , // Iphone X
31+ [ 828 , 1792 , 'iphonexr' ] , // Iphone XR
32+ [ 1242 , 2688 , 'iphonexsmax' ] // Iphone XS Max
33+ ] ,
2234 targetDir : 'icons' ,
2335 accessibleIcons : true ,
2436 iconProperty : '$icon' ,
@@ -28,8 +40,9 @@ async function run (pwa, _emitAssets) {
2840
2941 _iconHash : null ,
3042 _cacheDir : null ,
31- _icons : null ,
32- _assetIcons : null
43+ _assets : null ,
44+ _manifestIcons : null ,
45+ _iosSplash : null
3346 }
3447
3548 // Merge options
@@ -91,8 +104,8 @@ async function findIcon (options) {
91104
92105function addPlugin ( options ) {
93106 const icons = { }
94- for ( const icon of options . _assetIcons ) {
95- icons [ icon . sizes ] = icon . src
107+ for ( const asset of options . _assets ) {
108+ icons [ asset . name ] = asset . target
96109 }
97110
98111 if ( options . accessibleIcons ) {
@@ -112,37 +125,53 @@ async function generateIcons (options) {
112125 if ( ! options . iconHash ) {
113126 options . iconHash = await hasha . fromFile ( options . iconSrc ) . then ( h => h . substring ( 0 , 6 ) )
114127 }
128+
129+ // Resize cache dir
115130 if ( ! options . _cacheDir ) {
116131 options . _cacheDir = path . join ( __dirname , '.cache' , options . iconHash )
117132 }
118133
119- // Generate _icons
120- options . _icons = { }
121- for ( const size of options . sizes ) {
122- options . _icons [ size ] = `${ options . targetDir } /icon_${ size } .${ options . iconHash } .png`
123- }
134+ // Icons to be emited by webpack
135+ options . _assets = [ ]
124136
125- // Generate _purpose
137+ // Manifest icons
126138 const purpose = options . purpose ? options . purpose . join ( ' ' ) : undefined
139+ options . _manifestIcons = [ ]
140+ for ( const size of options . sizes ) {
141+ const name = sizeName ( size )
142+ const target = `${ options . targetDir } /icon_${ name } .${ options . iconHash } .png`
143+ options . _assets . push ( { name, target } )
144+ options . _manifestIcons . push ( {
145+ src : joinUrl ( options . publicPath , target ) ,
146+ sizes : name ,
147+ type : 'image/png' ,
148+ purpose
149+ } )
150+ }
127151
128- // Generate _assetIcons
129- options . _assetIcons = options . sizes . map ( size => ( {
130- src : joinUrl ( options . publicPath , options . _icons [ size ] ) ,
131- sizes : `${ size } x${ size } ` ,
132- type : 'image/png' ,
133- purpose
134- } ) )
152+ // Generate _iosSplash
153+ options . _iosSplash = { }
154+ for ( const size of options . iosSizes ) {
155+ const name = sizeName ( size )
156+ const target = `${ options . targetDir } /splash_${ name } .${ options . iconHash } .png`
157+ options . _assets . push ( { name, target } )
158+ options . _iosSplash [ size [ 2 ] ] = joinUrl ( options . publicPath , target )
159+ }
135160}
136161
137162function addManifest ( options , pwa ) {
138163 if ( ! pwa . manifest ) {
139164 pwa . manifest = { }
140165 }
166+
141167 if ( ! pwa . manifest . icons ) {
142168 pwa . manifest . icons = [ ]
143169 }
170+ pwa . manifest . icons . push ( ...options . _manifestIcons )
144171
145- pwa . manifest . icons . push ( ...options . _assetIcons )
172+ pwa . _iosSplash = {
173+ ...options . _iosSplash
174+ }
146175}
147176
148177function emitAssets ( options ) {
@@ -156,11 +185,10 @@ function emitAssets (options) {
156185 apply ( compiler ) {
157186 compiler . hooks . emit . tapPromise ( 'nuxt-pwa-icon' , async ( compilation ) => {
158187 await resizePromise
159- await Promise . all ( options . sizes . map ( async ( size ) => {
160- const targetFilename = options . _icons [ size ]
161- const srcFileName = path . join ( options . _cacheDir , `${ size } .png` )
188+ await Promise . all ( options . _assets . map ( async ( { name, target } ) => {
189+ const srcFileName = path . join ( options . _cacheDir , `${ name } .png` )
162190 const src = await fs . readFile ( srcFileName )
163- compilation . assets [ targetFilename ] = { source : ( ) => src , size : ( ) => src . length }
191+ compilation . assets [ target ] = { source : ( ) => src , size : ( ) => src . length }
164192 } ) )
165193 } )
166194 }
@@ -181,7 +209,10 @@ async function resizeIcons (options) {
181209 JSON . stringify ( {
182210 input : options . iconSrc ,
183211 distDir : options . _cacheDir ,
184- sizes : options . sizes
212+ sizes : [
213+ ...options . sizes ,
214+ ...options . iosSizes
215+ ]
185216 } )
186217 ] )
187218 child . on ( 'exit' , ( code ) => {
0 commit comments