feat(app): Bulletproof Cordova and Capacitor modes handling after a g…

…it clone

app/lib/capacitor/capacitor-config.js

@@ -7,12 +7,13 @@ const logger = require('../helpers/logger')
 const log = logger('app:capacitor-conf')
 const warn = logger('app:capacitor-conf', 'red')
 
+const ensureConsistency = require('../capacitor/ensure-consistency')
+
 class CapacitorConfig {
   prepare (cfg) {
-    this.pkg = require(appPaths.resolve.app('package.json'))
+    ensureConsistency()
 
-    // Make sure there is an index.html, otherwise Capacitor will crash
-    fse.ensureFileSync(appPaths.resolve.capacitor('www/index.html'))
+    this.pkg = require(appPaths.resolve.app('package.json'))
 
     this.__updateCapPkg(cfg, this.pkg)
     log(`Updated src-capacitor/package.json`)

app/lib/capacitor/ensure-consistency.js

@@ -0,0 +1,46 @@
+const fs = require('fs')
+const fse = require('fs-extra')
+
+const nodePackager = require('../helpers/node-packager')
+const { spawnSync } = require('../helpers/spawn')
+const appPaths = require('../app-paths')
+
+const logger = require('../helpers/logger')
+const log = logger('app:ensure-consistency')
+const warn = logger('app:ensure-consistency', 'red')
+
+function ensureWWW () {
+  const www = appPaths.resolve.capacitor('www')
+
+  fse.removeSync(www)
+  fse.copySync(
+    appPaths.resolve.cli('templates/capacitor/www'),
+    appPaths.resolve.capacitor('www')
+  )
+}
+
+function ensureDeps () {
+  if (fs.existsSync(appPaths.resolve.capacitor('node_modules'))) {
+    return
+  }
+
+  const cmdParam = nodePackager === 'npm'
+    ? ['install']
+    : []
+
+  log(`Installing Capacitor dependencies...`)
+  spawnSync(
+    nodePackager,
+    cmdParam,
+    { cwd: appPaths.capacitorDir },
+    () => warn(`⚠️  [FAIL] failed installing dependencies in /src-capacitor`)
+  )
+}
+
+module.exports = function () {
+  ensureWWW()
+  ensureDeps()
+}
+
+module.exports.ensureWWW = ensureWWW
+module.exports.ensureDeps = ensureDeps

app/lib/cordova/cordova-config.js

@@ -5,6 +5,7 @@ const appPaths = require('../app-paths')
 const logger = require('../helpers/logger')
 const log = logger('app:cordova-conf')
 const warn = logger('app:cordova-conf', 'red')
+const ensureConsistency = require('../cordova/ensure-consistency')
 
 const filePath = appPaths.resolve.cordova('config.xml')
 
@@ -38,6 +39,8 @@ function setFields (root, cfg) {
 
 class CordovaConfig {
   prepare (cfg) {
+    ensureConsistency()
+
     const doc = et.parse(fs.readFileSync(filePath, 'utf-8'))
     this.pkg = require(appPaths.resolve.app('package.json'))
     this.APP_URL = cfg.build.APP_URL

app/lib/cordova/ensure-consistency.js

@@ -0,0 +1,44 @@
+const fs = require('fs')
+const fse = require('fs-extra')
+
+const { spawnSync } = require('../helpers/spawn')
+const appPaths = require('../app-paths')
+
+const logger = require('../helpers/logger')
+const log = logger('app:ensure-consistency')
+const warn = logger('app:ensure-consistency', 'red')
+
+function ensureWWW () {
+  const www = appPaths.resolve.cordova('www')
+
+  fse.removeSync(www)
+  fse.copySync(
+    appPaths.resolve.cli('templates/cordova'),
+    appPaths.cordovaDir
+  )
+}
+
+function ensureDeps () {
+  if (fs.existsSync(appPaths.resolve.cordova('node_modules'))) {
+    return
+  }
+
+  log('Installing dependencies in /src-cordova')
+  spawnSync(
+    'npm',
+    [ 'install' ],
+    { cwd: appPaths.cordovaDir },
+    () => {
+      warn(`⚠️  [FAIL] npm failed installing dependencies in /src-cordova`)
+      process.exit(1)
+    }
+  )
+}
+
+module.exports = function () {
+  ensureWWW()
+  ensureDeps()
+}
+
+module.exports.ensureWWW = ensureWWW
+module.exports.ensureDeps = ensureDeps

app/lib/mode/mode-capacitor.js

@@ -9,24 +9,6 @@ const warn = logger('app:mode-capacitor', 'red')
 const { spawnSync } = require('../helpers/spawn')
 const nodePackager = require('../helpers/node-packager')
 
-function installDependencies () {
-  if (fs.existsSync(appPaths.resolve.capacitor('node_modules'))) {
-    return
-  }
-
-  const cmdParam = nodePackager === 'npm'
-    ? ['install']
-    : []
-
-  log(`Installing Capacitor dependencies...`)
-  spawnSync(
-    nodePackager,
-    cmdParam,
-    { cwd: appPaths.capacitorDir },
-    () => warn('Failed to install Capacitor dependencies')
-  )
-}
-
 class Mode {
   get isInstalled () {
     return fs.existsSync(appPaths.capacitorDir)
@@ -72,7 +54,8 @@ class Mode {
       fs.writeFileSync(dest, compileTemplate(content)(scope), 'utf-8')
     })
 
-    installDependencies()
+    const { ensureDeps } = require('../capacitor/ensure-consistency')
+    ensureDeps()
 
     const capacitorCliPath = require('../capacitor/capacitor-cli-path')
 
@@ -106,10 +89,10 @@ class Mode {
   }
 
   addPlatform (target) {
-    fse.ensureFileSync(appPaths.resolve.capacitor(`www/index.html`))
+    const ensureConsistency = require('../capacitor/ensure-consistency')
+    ensureConsistency()
 
     if (this.hasPlatform(target)) {
-      installDependencies()
       return
     }
 

app/lib/mode/mode-cordova.js

@@ -7,23 +7,6 @@ const log = logger('app:mode-cordova')
 const warn = logger('app:mode-cordova', 'red')
 const { spawnSync } = require('../helpers/spawn')
 
-function installDependencies () {
-  if (fs.existsSync(appPaths.resolve.cordova('node_modules'))) {
-    return
-  }
-
-  log('Installing dependencies in /src-cordova')
-  spawnSync(
-    'npm',
-    [ 'install' ],
-    { cwd: appPaths.cordovaDir },
-    () => {
-      warn(`⚠️  [FAIL] npm failed installing dependencies in /src-cordova`)
-      process.exit(1)
-    }
-  )
-}
-
 class Mode {
   get isInstalled () {
     return fs.existsSync(appPaths.cordovaDir)
@@ -58,12 +41,8 @@ class Mode {
       }
     )
 
-    const www = appPaths.resolve.cordova('www')
-    fse.removeSync(www)
-    fse.copySync(
-      appPaths.resolve.cli('templates/cordova'),
-      appPaths.cordovaDir
-    )
+    const { ensureWWW } = require('../cordova/ensure-consistency')
+    ensureWWW()
 
     log(`Cordova support was installed`)
     log(`App name was taken from package.json: "${appName}"`)
@@ -92,10 +71,10 @@ class Mode {
   }
 
   addPlatform (target) {
-    fse.ensureDirSync(appPaths.resolve.cordova(`www`))
+    const ensureConsistency = require('../cordova/ensure-consistency')
+    ensureConsistency()
 
     if (this.hasPlatform(target)) {
-      installDependencies()
       return
     }