@quasar/icongenie 2.5.3 → 3.0.0

package/lib/modes/quasar-app-v1/cordova.js

@@ -1,13 +1,14 @@
+
 const iosIconRegex = /icon-(\d+\.?\d?)@?(\d+)?x?\.png/
 
 function getAndroidIcon (entry) {
   return {
     generator: 'png',
-    name: `${entry[0]}.png`,
+    name: `${ entry[ 0 ] }.png`,
     folder: 'src-cordova/res/android',
-    sizes: [ entry[1] ],
+    sizes: [ entry[ 1 ] ],
     platform: 'cordova-android',
-    density: entry[0]
+    density: entry[ 0 ]
   }
 }
 
@@ -17,24 +18,24 @@ function getAndroidSplashscreens (entries) {
   entries.forEach(entry => {
     list.push({
       generator: 'splashscreen',
-      name: `splash-land-${entry[0]}.png`,
+      name: `splash-land-${ entry[ 0 ] }.png`,
       folder: 'src-cordova/res/screen/android',
       sizes: [
-        [ entry[1], entry[2] ]
+        [ entry[ 1 ], entry[ 2 ] ]
       ],
       platform: 'cordova-android',
-      density: `land-${entry[0]}`
+      density: `land-${ entry[ 0 ] }`
     })
 
     list.push({
       generator: 'splashscreen',
-      name: `splash-port-${entry[0]}.png`,
+      name: `splash-port-${ entry[ 0 ] }.png`,
       folder: 'src-cordova/res/screen/android',
       sizes: [
-        [ entry[2], entry[1] ]
+        [ entry[ 2 ], entry[ 1 ] ]
       ],
       platform: 'cordova-android',
-      density: `port-${entry[0]}`
+      density: `port-${ entry[ 0 ] }`
     })
   })
 
@@ -42,7 +43,7 @@ function getAndroidSplashscreens (entries) {
 }
 
 function getIosIcon (name) {
-  const [,size,multiplier] = name.match(iosIconRegex)
+  const [ ,size,multiplier ] = name.match(iosIconRegex)
 
   return {
     generator: 'png',
@@ -61,16 +62,16 @@ function getIosIcon (name) {
 function getIosSplashscreen (entry) {
   return {
     generator: 'splashscreen',
-    name: entry[0],
+    name: entry[ 0 ],
     folder: 'src-cordova/res/screen/ios',
     sizes: [
-      [ entry[1], entry[2] ]
+      [ entry[ 1 ], entry[ 2 ] ]
     ],
     platform: 'cordova-ios'
   }
 }
 
-module.exports = [
+export default [
   /***************
    *** Android ***
    ***************/

package/lib/modes/quasar-app-v1/electron.js

@@ -1,4 +1,5 @@
-module.exports = [
+
+export default [
   {
     // macos (embedded icons)
     generator: 'icns',

package/lib/modes/quasar-app-v1/index.js

@@ -1,37 +1,45 @@
 
-module.exports = {
+import spaAssets from './spa.js'
+import pwaAssets from './pwa.js'
+import ssrAssets from './ssr.js'
+import bexAssets from './bex.js'
+import cordovaAssets from './cordova.js'
+import capacitorAssets from './capacitor.js'
+import electronAssets from './electron.js'
+
+export const modes = {
   spa: {
     folder: '/src',
-    assets: require('./spa')
+    assets: spaAssets
   },
 
   pwa: {
     folder: '/src-pwa',
-    assets: require('./pwa')
+    assets: pwaAssets
   },
 
   ssr: {
     folder: '/src-ssr',
-    assets: require('./ssr')
+    assets: ssrAssets
   },
 
   bex: {
     folder: '/src-bex',
-    assets: require('./bex')
+    assets: bexAssets
   },
 
   cordova: {
     folder: '/src-cordova',
-    assets: require('./cordova')
+    assets: cordovaAssets
   },
 
   capacitor: {
     folder: '/src-capacitor',
-    assets: require('./capacitor')
+    assets: capacitorAssets
   },
 
   electron: {
     folder: '/src-electron',
-    assets: require('./electron')
+    assets: electronAssets
   }
 }

package/lib/modes/quasar-app-v1/pwa.js

@@ -1,21 +1,22 @@
-const spaEntries = require('./spa')
+
+import spaEntries from './spa.js'
 
 /* def: width, height, pixel-ratio */
 function getAppleLaunch (def) {
-  const media = `(device-width: ${def[0] / def[2]}px) and (device-height: ${def[1] / def[2]}px) and (-webkit-device-pixel-ratio: ${def[2]})`
+  const media = `(device-width: ${ def[ 0 ] / def[ 2 ] }px) and (device-height: ${ def[ 1 ] / def[ 2 ] }px) and (-webkit-device-pixel-ratio: ${ def[ 2 ] })`
 
   return {
     generator: 'splashscreen',
     name: 'apple-launch-{size}.png',
     folder: 'src/statics/icons',
     sizes: [
-      [ def[0], def[1] ]
+      [ def[ 0 ], def[ 1 ] ]
     ],
-    tag: `${def[3]}\n<link rel="apple-touch-startup-image" media="${media}" href="statics/icons/{name}">`
+    tag: `${ def[ 3 ] }\n<link rel="apple-touch-startup-image" media="${ media }" href="statics/icons/{name}">`
   }
 }
 
-module.exports = [
+export default [
   ...spaEntries,
 
   {

package/lib/modes/quasar-app-v1/spa.js

@@ -1,4 +1,5 @@
-module.exports = [
+
+export default [
   {
     generator: 'png',
     name: 'favicon-{size}x{size}.png',

package/lib/modes/quasar-app-v1/ssr.js

@@ -1,3 +1,4 @@
-const spaEntries = require('./spa')
 
-module.exports = [ ...spaEntries ]
+import spaEntries from './spa.js'
+
+export default [ ...spaEntries ]

package/lib/modes/quasar-app-v2/bex.js

@@ -1,4 +1,5 @@
-module.exports = [
+
+export default [
   {
     generator: 'png',
     name: 'icon-{size}x{size}.png',

package/lib/modes/quasar-app-v2/capacitor.js

@@ -1,3 +1,4 @@
+
 const iosIconRegex = /AppIcon-(\d+\.?\d?)x?(\d+\.?\d?)?@?(\d+)?x?-?\d?\.png/
 
 function getAndroidIcons (entries) {
@@ -6,25 +7,25 @@ function getAndroidIcons (entries) {
   entries.forEach(entry => {
     const icon = {
       generator: 'png',
-      folder: `src-capacitor/android/app/src/main/res/mipmap-${entry[0]}`
+      folder: `src-capacitor/android/app/src/main/res/mipmap-${ entry[ 0 ] }`
     }
 
     list.push({
       ...icon,
       name: 'ic_launcher_foreground.png',
-      sizes: [ entry[2] ]
+      sizes: [ entry[ 2 ] ]
     })
 
     list.push({
       ...icon,
       name: 'ic_launcher_round.png',
-      sizes: [ entry[1] ]
+      sizes: [ entry[ 1 ] ]
     })
 
     list.push({
       ...icon,
       name: 'ic_launcher.png',
-      sizes: [ entry[1] ]
+      sizes: [ entry[ 1 ] ]
     })
   })
 
@@ -42,17 +43,17 @@ function getAndroidSplashscreen (entries) {
 
     list.push({
       ...icon,
-      folder: `src-capacitor/android/app/src/main/res/drawable-land-${entry[0]}`,
+      folder: `src-capacitor/android/app/src/main/res/drawable-land-${ entry[ 0 ] }`,
       sizes: [
-        [ entry[1], entry[2] ]
+        [ entry[ 1 ], entry[ 2 ] ]
       ]
     })
 
     list.push({
       ...icon,
-      folder: `src-capacitor/android/app/src/main/res/drawable-port-${entry[0]}`,
+      folder: `src-capacitor/android/app/src/main/res/drawable-port-${ entry[ 0 ] }`,
       sizes: [
-        [ entry[2], entry[1] ]
+        [ entry[ 2 ], entry[ 1 ] ]
       ]
     })
   })
@@ -61,7 +62,7 @@ function getAndroidSplashscreen (entries) {
 }
 
 function getIosIcon (name) {
-  const [,size,,multiplier] = name.match(iosIconRegex)
+  const [ ,size,,multiplier ] = name.match(iosIconRegex)
 
   return {
     generator: 'png',
@@ -76,7 +77,7 @@ function getIosIcon (name) {
   }
 }
 
-module.exports = [
+export default [
   /***************
    *** Android ***
    ***************/

package/lib/modes/quasar-app-v2/cordova.js

@@ -1,13 +1,14 @@
+
 const iosIconRegex = /icon-(\d+\.?\d?)@?(\d+)?x?\.png/
 
 function getAndroidIcon (entry) {
   return {
     generator: 'png',
-    name: `${entry[0]}.png`,
+    name: `${ entry[ 0 ] }.png`,
     folder: 'src-cordova/res/android',
-    sizes: [ entry[1] ],
+    sizes: [ entry[ 1 ] ],
     platform: 'cordova-android',
-    density: entry[0]
+    density: entry[ 0 ]
   }
 }
 
@@ -17,24 +18,24 @@ function getAndroidSplashscreens (entries) {
   entries.forEach(entry => {
     list.push({
       generator: 'splashscreen',
-      name: `splash-land-${entry[0]}.png`,
+      name: `splash-land-${ entry[ 0 ] }.png`,
       folder: 'src-cordova/res/screen/android',
       sizes: [
-        [ entry[1], entry[2] ]
+        [ entry[ 1 ], entry[ 2 ] ]
       ],
       platform: 'cordova-android',
-      density: `land-${entry[0]}`
+      density: `land-${ entry[ 0 ] }`
     })
 
     list.push({
       generator: 'splashscreen',
-      name: `splash-port-${entry[0]}.png`,
+      name: `splash-port-${ entry[ 0 ] }.png`,
       folder: 'src-cordova/res/screen/android',
       sizes: [
-        [ entry[2], entry[1] ]
+        [ entry[ 2 ], entry[ 1 ] ]
       ],
       platform: 'cordova-android',
-      density: `port-${entry[0]}`
+      density: `port-${ entry[ 0 ] }`
     })
   })
 
@@ -42,7 +43,7 @@ function getAndroidSplashscreens (entries) {
 }
 
 function getIosIcon (name) {
-  const [,size,multiplier] = name.match(iosIconRegex)
+  const [ ,size,multiplier ] = name.match(iosIconRegex)
 
   return {
     generator: 'png',
@@ -61,16 +62,16 @@ function getIosIcon (name) {
 function getIosSplashscreen (entry) {
   return {
     generator: 'splashscreen',
-    name: entry[0],
+    name: entry[ 0 ],
     folder: 'src-cordova/res/screen/ios',
     sizes: [
-      [ entry[1], entry[2] ]
+      [ entry[ 1 ], entry[ 2 ] ]
     ],
     platform: 'cordova-ios'
   }
 }
 
-module.exports = [
+export default [
   /***************
    *** Android ***
    ***************/

package/lib/modes/quasar-app-v2/electron.js

@@ -1,4 +1,5 @@
-module.exports = [
+
+export default [
   {
     // macos (embedded icons)
     generator: 'icns',

package/lib/modes/quasar-app-v2/index.js

@@ -1,37 +1,45 @@
 
-module.exports = {
+import spaAssets from './spa.js'
+import pwaAssets from './pwa.js'
+import ssrAssets from './ssr.js'
+import bexAssets from './bex.js'
+import cordovaAssets from './cordova.js'
+import capacitorAssets from './capacitor.js'
+import electronAssets from './electron.js'
+
+export const modes = {
   spa: {
     folder: '/src',
-    assets: require('./spa')
+    assets: spaAssets
   },
 
   pwa: {
     folder: '/src-pwa',
-    assets: require('./pwa')
+    assets: pwaAssets
   },
 
   ssr: {
     folder: '/src-ssr',
-    assets: require('./ssr')
+    assets: ssrAssets
   },
 
   bex: {
     folder: '/src-bex',
-    assets: require('./bex')
+    assets: bexAssets
   },
 
   cordova: {
     folder: '/src-cordova',
-    assets: require('./cordova')
+    assets: cordovaAssets
   },
 
   capacitor: {
     folder: '/src-capacitor',
-    assets: require('./capacitor')
+    assets: capacitorAssets
   },
 
   electron: {
     folder: '/src-electron',
-    assets: require('./electron')
+    assets: electronAssets
   }
 }

package/lib/modes/quasar-app-v2/pwa.js

@@ -1,21 +1,22 @@
-const spaEntries = require('./spa')
+
+import spaEntries from './spa.js'
 
 /* def: width, height, pixel-ratio */
 function getAppleLaunch (def) {
-  const media = `(device-width: ${def[0] / def[2]}px) and (device-height: ${def[1] / def[2]}px) and (-webkit-device-pixel-ratio: ${def[2]})`
+  const media = `(device-width: ${ def[ 0 ] / def[ 2 ] }px) and (device-height: ${ def[ 1 ] / def[ 2 ] }px) and (-webkit-device-pixel-ratio: ${ def[ 2 ] })`
 
   return {
     generator: 'splashscreen',
     name: 'apple-launch-{size}.png',
     folder: 'public/icons',
     sizes: [
-      [ def[0], def[1] ]
+      [ def[ 0 ], def[ 1 ] ]
     ],
-    tag: `${def[3]}\n<link rel="apple-touch-startup-image" media="${media}" href="icons/{name}">`
+    tag: `${ def[ 3 ] }\n<link rel="apple-touch-startup-image" media="${ media }" href="icons/{name}">`
   }
 }
 
-module.exports = [
+export default [
   ...spaEntries,
 
   {

package/lib/modes/quasar-app-v2/spa.js

@@ -1,4 +1,5 @@
-module.exports = [
+
+export default [
   {
     generator: 'png',
     name: 'favicon-{size}x{size}.png',

package/lib/modes/quasar-app-v2/ssr.js

@@ -1,3 +1,4 @@
-const spaEntries = require('./spa')
 
-module.exports = [ ...spaEntries ]
+import spaEntries from './spa.js'
+
+export default [ ...spaEntries ]

package/lib/mount/index.js

@@ -1,12 +1,13 @@
-const { mountCordova, isCordovaFile, verifyCordova } = require('./mount-cordova')
-const { mountTag } = require('./mount-tag')
 
-module.exports.mount = function mount (files) {
+import { mountCordova, isCordovaFile, verifyCordova } from './mount-cordova.js'
+import { mountTag } from './mount-tag.js'
+
+export function mount (files) {
   mountCordova(files)
   mountTag(files)
 }
 
-module.exports.verifyMount = function verifyMount (file) {
+export function verifyMount (file) {
   return isCordovaFile(file)
     ? verifyCordova(file)
     : ''

package/lib/mount/mount-cordova.js

@@ -1,11 +1,12 @@
-const { readFileSync, writeFileSync, existsSync } = require('fs')
-const elementTree = require('elementtree')
-const { relative } = require('path')
-const { red, green } = require('kolorist')
 
-const { resolveDir } = require('../utils/app-paths')
-const { log, warn } = require('../utils/logger')
-const spawnSync = require('../utils/spawn-sync')
+import { readFileSync, writeFileSync, existsSync } from 'node:fs'
+import elementTree from 'elementtree'
+import { relative } from 'node:path'
+import { red, green } from 'kolorist'
+
+import { resolveDir } from '../utils/app-paths.js'
+import { log, warn } from '../utils/logger.js'
+import { spawnSync } from '../utils/spawn-sync.js'
 
 const cordovaConfigXml = resolveDir('src-cordova/config.xml')
 const srcCordovaDir = resolveDir('src-cordova')
@@ -15,18 +16,18 @@ const generatorList = [ 'png', 'splashscreen' ]
 
 function getNode (root, tag, selector) {
   return (
-    root.find(`${tag}${selector}`) ||
-    elementTree.SubElement(root, tag)
+    root.find(`${ tag }${ selector }`)
+    || elementTree.SubElement(root, tag)
   )
 }
 
 function hasNode (root, tag, selector) {
-  return root.find(`${tag}${selector}`)
+  return root.find(`${ tag }${ selector }`)
 }
 
-function isCordovaFile (file) {
-  return platformList.includes(file.platform) &&
-    generatorList.includes(file.generator)
+export function isCordovaFile (file) {
+  return platformList.includes(file.platform)
+    && generatorList.includes(file.generator)
 }
 
 function getCordovaFiles (files) {
@@ -52,7 +53,14 @@ function updateConfigXml (cordovaFiles, hasSplashscreen) {
   }
 
   const androidNode = getNode(rootNode, 'platform', '[@name="android"]')
+  if (androidNode.get('name') === void 0) {
+    androidNode.set('name', 'android')
+  }
+
   const iosNode = getNode(rootNode, 'platform', '[@name="ios"]')
+  if (iosNode.get('name') === void 0) {
+    iosNode.set('name', 'ios')
+  }
 
   cordovaFiles.forEach(file => {
     const isAndroid = file.platform === 'cordova-android'
@@ -67,7 +75,7 @@ function updateConfigXml (cordovaFiles, hasSplashscreen) {
       const entry = getNode(
         node,
         'splash',
-        isAndroid ? `[@density="${file.density}"]` : `[@src="${src}"]`
+        isAndroid ? `[@density="${ file.density }"]` : `[@src="${ src }"]`
       )
 
       entry.set('src', src)
@@ -84,8 +92,8 @@ function updateConfigXml (cordovaFiles, hasSplashscreen) {
         node,
         'icon',
         isAndroid
-          ? `[@density="${file.density}"]`
-          : `[@width="${file.width}"][@height="${file.height}"]`
+          ? `[@density="${ file.density }"]`
+          : `[@width="${ file.width }"][@height="${ file.height }"]`
       )
 
       entry.set('src', src)
@@ -108,8 +116,8 @@ function hasDeepProp (target /* , param1, param2, ... */) {
   let obj = target
 
   for (let i = 1; i < arguments.length; i++) {
-    const prop = arguments[i]
-    obj = obj[prop]
+    const prop = arguments[ i ]
+    obj = obj[ prop ]
 
     if (obj === void 0) {
       return false
@@ -127,11 +135,13 @@ function installSplashscreenPlugin () {
     return
   }
 
-  const pkg = require(pkgPath)
+  const pkg = JSON.parse(
+    readFileSync(pkgPath, 'utf8')
+  )
 
   if (
-    hasDeepProp(pkg, 'dependencies', 'cordova-plugin-splashscreen') ||
-    hasDeepProp(pkg, 'cordova', 'plugins', 'cordova-plugin-splashscreen')
+    hasDeepProp(pkg, 'dependencies', 'cordova-plugin-splashscreen')
+    || hasDeepProp(pkg, 'cordova', 'plugins', 'cordova-plugin-splashscreen')
   ) {
     // it's already installed, so nothing to do
     return
@@ -150,7 +160,7 @@ function installSplashscreenPlugin () {
   console.log()
 }
 
-module.exports.mountCordova = function mountCordova (files) {
+export function mountCordova (files) {
   if (existsSync(cordovaConfigXml)) {
     const cordovaFiles = getCordovaFiles(files)
 
@@ -166,15 +176,13 @@ module.exports.mountCordova = function mountCordova (files) {
   }
 }
 
-module.exports.isCordovaFile = isCordovaFile
-
-module.exports.verifyCordova = function verifyCordova (file) {
+export function verifyCordova (file) {
   if (isCordovaFile(file) && existsSync(cordovaConfigXml)) {
     const doc = elementTree.parse(readFileSync(cordovaConfigXml, 'utf-8'))
     const isAndroid = file.platform === 'cordova-android'
 
     const node = doc.getroot()
-      .find(`platform[@name="${isAndroid ? 'android' : 'ios'}"]`)
+      .find(`platform[@name="${ isAndroid ? 'android' : 'ios' }"]`)
 
     // verify that the platform is installed
     if (!node) {
@@ -185,8 +193,8 @@ module.exports.verifyCordova = function verifyCordova (file) {
 
     if (file.generator === 'splashscreen') {
       const selector = isAndroid
-        ? `[@density="${file.density}"]`
-        : `[@src="${src}"]`
+        ? `[@density="${ file.density }"]`
+        : `[@src="${ src }"]`
 
       if (!hasNode(node, 'splash', selector)) {
         return red('ERROR: no entry for it in src-cordova/config.xml')
@@ -194,8 +202,8 @@ module.exports.verifyCordova = function verifyCordova (file) {
     }
     else {
       const selector = isAndroid
-        ? `[@density="${file.density}"]`
-        : `[@width="${file.width}"][@height="${file.height}"]`
+        ? `[@density="${ file.density }"]`
+        : `[@width="${ file.width }"][@height="${ file.height }"]`
 
       if (!hasNode(node, 'icon', selector)) {
         return red('ERROR: no entry for it in src-cordova/config.xml')

package/lib/mount/mount-tag.js

@@ -1,6 +1,7 @@
-const { log } = require('../utils/logger')
 
-module.exports.mountTag = function mountTag (files) {
+import { log } from '../utils/logger.js'
+
+export function mountTag (files) {
   const tagFiles = files.filter(file => file.tag)
 
   if (tagFiles.length === 0) {