From 714f65f2c50970f527161bc28d38324351ade70b Mon Sep 17 00:00:00 2001
From: Yohan Lasorsa <yohanlasorsa.thales@gmail.com>
Date: Mon, 24 Jul 2017 18:08:44 +0200
Subject: [PATCH] Added support for multiple targets (closes #105)

---
 generators/app/index.js                       |  2 +-
 generators/app/prompts.js                     | 57 +++++++++++++++++++
 generators/app/prompts.json                   | 47 ---------------
 generators/app/templates/_.angular-cli.json   |  4 +-
 ...bile._config.xml => __cordova._config.xml} |  0
 generators/app/templates/_browserslist        |  2 +-
 generators/app/templates/_package.json        |  6 +-
 generators/app/templates/src/_index.html      |  6 +-
 .../templates/src/app/_app.component.spec.ts  |  4 +-
 .../app/templates/src/app/_app.component.ts   | 12 ++--
 .../app/templates/src/app/_app.module.ts      |  4 +-
 package.json                                  |  2 +-
 .../ionic-authentication.json                 |  2 +-
 scripts/tests/{mobile => cordova}/ionic.json  |  2 +-
 .../tests/web/bootstrap-authentication.json   |  2 +-
 scripts/tests/web/bootstrap.json              |  2 +-
 16 files changed, 82 insertions(+), 72 deletions(-)
 create mode 100755 generators/app/prompts.js
 delete mode 100755 generators/app/prompts.json
 rename generators/app/templates/{__mobile._config.xml => __cordova._config.xml} (100%)
 rename scripts/tests/{mobile => cordova}/ionic-authentication.json (59%)
 rename scripts/tests/{mobile => cordova}/ionic.json (59%)

diff --git a/generators/app/index.js b/generators/app/index.js
index 22235b1e..b5a2f46e 100755
--- a/generators/app/index.js
+++ b/generators/app/index.js
@@ -5,8 +5,8 @@ const Insight = require('insight');
 const Generator = require('@ngx-rocket/core');
 const asciiLogo = require('@ngx-rocket/ascii-logo');
 
+const prompts = require('./prompts');
 const options = require('./options.json');
-const prompts = require('./prompts.json');
 const pkg = require('../../package.json');
 
 class NgxGenerator extends Generator {
diff --git a/generators/app/prompts.js b/generators/app/prompts.js
new file mode 100755
index 00000000..9d23c9ce
--- /dev/null
+++ b/generators/app/prompts.js
@@ -0,0 +1,57 @@
+'use strict';
+
+module.exports = [
+  {
+    type: 'input',
+    name: 'appName',
+    message: 'What\'s the name of your app?'
+  },
+  {
+    type: 'checkbox',
+    name: 'target',
+    message: 'What kind of app do you want to create?',
+    choices: [
+      {
+        value: 'web',
+        name: 'Responsive web app',
+        checked: true
+      },
+      {
+        value: 'mobile',
+        name: 'Mobile app (using Cordova)'
+      }
+      // {
+      //   value: 'electron',
+      //   name: 'Desktop app (using Cordova)'
+      // }
+    ]
+  },
+  // {
+  //   type: 'confirm',
+  //   name: 'pwa',
+  //   message: 'Do you want progressive web app support? (manifest and service worker)',
+  //   default: true,
+  //   when: props => props.target.includes('web')
+  // },
+  {
+    type: 'list',
+    name: 'ui',
+    message: 'Which UI framework do you want?',
+    choices: [
+      {
+        value: 'bootstrap',
+        name: 'Bootstrap (more website-oriented)'
+      },
+      {
+        value: 'ionic',
+        name: 'Ionic (more mobile-oriented)'
+      }
+    ]
+  },
+  {
+    type: 'confirm',
+    name: 'auth',
+    message: 'Do you want authentication?',
+    default: true
+  }
+];
diff --git a/generators/app/prompts.json b/generators/app/prompts.json
deleted file mode 100755
index d01d93d7..00000000
--- a/generators/app/prompts.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-  {
-    "type": "input",
-    "name": "appName",
-    "message": "What's the name of your app?"
-  },
-  {
-    "type": "list",
-    "name": "target",
-    "message": "What kind of app do you want to create?",
-    "choices": [
-      {
-        "value": "web",
-        "name": "Web"
-      },
-      {
-        "value": "mobile",
-        "name": "Mobile"
-      },
-      {
-        "value": "both",
-        "name": "Web + mobile"
-      }
-    ]
-  },
-  {
-    "type": "list",
-    "name": "ui",
-    "message": "Which UI framework do you want?",
-    "choices": [
-      {
-        "value": "bootstrap",
-        "name": "Bootstrap (more website-oriented)"
-      },
-      {
-        "value": "ionic",
-        "name": "Ionic (more mobile-oriented)"
-      }
-    ]
-  },
-  {
-    "type": "confirm",
-    "name": "auth",
-    "message": "Do you want authentication?",
-    "default": true
-  }
-]
diff --git a/generators/app/templates/_.angular-cli.json b/generators/app/templates/_.angular-cli.json
index 7aab3e80..78331c50 100644
--- a/generators/app/templates/_.angular-cli.json
+++ b/generators/app/templates/_.angular-cli.json
@@ -6,11 +6,11 @@
   "apps": [
     {
       "root": "src",
-      "outDir": "<%= props.target === 'mobile' ? 'www' : 'dist' %>",
+      "outDir": "<%= props.target.includes('cordova') ? 'www' : 'dist' %>",
       "assets": [
         "assets",
         "favicon.ico",
-<% if (props.target === 'pwa') { -%>
+<% if (props.pwa) { -%>
         "manifest.json",
 <% } -%>
         "robots.txt"
diff --git a/generators/app/templates/__mobile._config.xml b/generators/app/templates/__cordova._config.xml
similarity index 100%
rename from generators/app/templates/__mobile._config.xml
rename to generators/app/templates/__cordova._config.xml
diff --git a/generators/app/templates/_browserslist b/generators/app/templates/_browserslist
index b29066da..297da254 100644
--- a/generators/app/templates/_browserslist
+++ b/generators/app/templates/_browserslist
@@ -2,7 +2,7 @@
 # See https://github.com/ai/browserslist
 
 Last 2 versions
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
 iOS >= 8
 Android >= 4.4
 Explorer >= 11
diff --git a/generators/app/templates/_package.json b/generators/app/templates/_package.json
index 9b72806c..6761938d 100644
--- a/generators/app/templates/_package.json
+++ b/generators/app/templates/_package.json
@@ -13,7 +13,7 @@
     "translations:extract": "ngx-translate-extract --input ./src --output ./src/translations/template.json --format=json --clean -sort --marker extract",
     "docs": "hads ./docs -o",
     "env": "ngx-scripts env2json npm_package_version",
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
     "prepare": "ngx-scripts unpin-ionic-dependencies",
     "cordova:prepare": "ngx-scripts cordova prepare",
     "cordova:package": "ngx-scripts cordova build --device --release --copy dist",
@@ -34,7 +34,7 @@
     "@angular/platform-browser-dynamic": "^4.2.6",
     "@angular/router": "^4.2.6",
     "@ngx-translate/core": "^7.0.0",
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
     "@ionic-native/core": "^4.0.0",
     "@ionic-native/keyboard": "^4.0.0",
     "@ionic-native/splash-screen": "^4.0.0",
@@ -55,7 +55,7 @@
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
     "cordova": "^7.0.0",
 <% } -%>
     "@angular/cli": "^1.2.3",
diff --git a/generators/app/templates/src/_index.html b/generators/app/templates/src/_index.html
index 00a5ff6f..24df1604 100644
--- a/generators/app/templates/src/_index.html
+++ b/generators/app/templates/src/_index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8"/>
   <title><%= props.appName %></title>
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
   <base href="./"/>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
   <meta name="msapplication-tap-highlight" content="no"/>
@@ -16,7 +16,7 @@
   <link rel="icon" type="image/x-icon" href="favicon.ico"/>
 </head>
 <body>
-<% if (props.target === 'web') { -%>
+<% if (props.target.includes('web')) { -%>
   <!--[if lt IE 10]>
   <p>
     You are using an <strong>outdated</strong> browser.
@@ -24,7 +24,7 @@
   </p>
   <![endif]-->
 <% } -%>
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
   <!-- Include Cordova script only when needed -->
   <script>
     if (!/^http/.test(location.protocol)) {
diff --git a/generators/app/templates/src/app/_app.component.spec.ts b/generators/app/templates/src/app/_app.component.spec.ts
index 2fd3b45b..3f908d2a 100644
--- a/generators/app/templates/src/app/_app.component.spec.ts
+++ b/generators/app/templates/src/app/_app.component.spec.ts
@@ -4,7 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 <% if (props.ui === 'ionic') { -%>
 import { IonicModule } from 'ionic-angular';
 <% } -%>
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
 import { Keyboard } from '@ionic-native/keyboard';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
@@ -25,7 +25,7 @@ describe('AppComponent', () => {
         CoreModule
       ],
       declarations: [AppComponent],
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
       providers: [
         Keyboard,
         StatusBar,
diff --git a/generators/app/templates/src/app/_app.component.ts b/generators/app/templates/src/app/_app.component.ts
index ddb93ceb..6d081f1b 100644
--- a/generators/app/templates/src/app/_app.component.ts
+++ b/generators/app/templates/src/app/_app.component.ts
@@ -14,13 +14,13 @@ import { Title } from '@angular/platform-browser';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs/Observable';
 <% if (props.ui === 'ionic') { -%>
-  <% if (props.target === 'mobile') { -%>
+  <% if (props.target.includes('cordova')) { -%>
 import { IonicApp, Nav, Platform } from 'ionic-angular';
   <% } else { -%>
 import { IonicApp, Nav } from 'ionic-angular';
   <% } -%>
 <% } -%>
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
 import { Keyboard } from '@ionic-native/keyboard';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
@@ -47,7 +47,7 @@ export class AppComponent implements OnInit {
               private activatedRoute: ActivatedRoute,
               private titleService: Title,
               private translateService: TranslateService,
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
   <% if (props.ui === 'ionic') { -%>
               private platform: Platform,
   <% } else { %>
@@ -93,19 +93,19 @@ export class AppComponent implements OnInit {
 
     // Bind Ionic navigation to Angular router events
     onNavigationEnd.subscribe(() => this.updateNav(this.activatedRoute));
-  <% if (props.target === 'mobile') { -%>
+  <% if (props.target.includes('cordova')) { -%>
 
     // Cordova platform and plugins initialization
     this.platform.ready().then(() => this.onCordovaReady());
   <% } -%>
-<% } else if (props.target === 'mobile') { -%>
+<% } else if (props.target.includes('cordova')) { -%>
     // Cordova platform and plugins initialization
     document.addEventListener('deviceready', () => {
       this.zone.run(() => this.onCordovaReady());
     }, false);
 <% } -%>
     }
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
 
   private onCordovaReady() {
     if (window['cordova']) {
diff --git a/generators/app/templates/src/app/_app.module.ts b/generators/app/templates/src/app/_app.module.ts
index 8f3715e4..f77f092e 100644
--- a/generators/app/templates/src/app/_app.module.ts
+++ b/generators/app/templates/src/app/_app.module.ts
@@ -9,7 +9,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { IonicModule } from 'ionic-angular';
 import { LocationStrategy, PathLocationStrategy } from '@angular/common';
 <% } -%>
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
 import { Keyboard } from '@ionic-native/keyboard';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
@@ -48,7 +48,7 @@ import { LoginModule } from './login/login.module';
   ],
   declarations: [AppComponent],
   providers: [
-<% if (props.target === 'mobile') { -%>
+<% if (props.target.includes('cordova')) { -%>
     Keyboard,
     StatusBar,
   <% if (props.ui === 'ionic') { -%>
diff --git a/package.json b/package.json
index 8b47ca27..665d8c2b 100755
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@ngx-rocket/ascii-logo": "^1.0.0",
-    "@ngx-rocket/core": "^1.2.1",
+    "@ngx-rocket/core": "^2.0.0",
     "chalk": "^2.0.1",
     "insight": "^0.8.4"
   },
diff --git a/scripts/tests/mobile/ionic-authentication.json b/scripts/tests/cordova/ionic-authentication.json
similarity index 59%
rename from scripts/tests/mobile/ionic-authentication.json
rename to scripts/tests/cordova/ionic-authentication.json
index 1a645650..4878a3fc 100644
--- a/scripts/tests/mobile/ionic-authentication.json
+++ b/scripts/tests/cordova/ionic-authentication.json
@@ -1,5 +1,5 @@
 {
-  "target": "mobile",
+  "target": ["cordova"],
   "ui": "ionic",
   "auth": true
 }
diff --git a/scripts/tests/mobile/ionic.json b/scripts/tests/cordova/ionic.json
similarity index 59%
rename from scripts/tests/mobile/ionic.json
rename to scripts/tests/cordova/ionic.json
index 6b6d7fb5..f6010a3d 100644
--- a/scripts/tests/mobile/ionic.json
+++ b/scripts/tests/cordova/ionic.json
@@ -1,5 +1,5 @@
 {
-  "target": "mobile",
+  "target": ["cordova"],
   "ui": "ionic",
   "auth": false
 }
diff --git a/scripts/tests/web/bootstrap-authentication.json b/scripts/tests/web/bootstrap-authentication.json
index 89c52170..de5ebff3 100644
--- a/scripts/tests/web/bootstrap-authentication.json
+++ b/scripts/tests/web/bootstrap-authentication.json
@@ -1,5 +1,5 @@
 {
-  "target": "web",
+  "target": ["web"],
   "ui": "bootstrap",
   "auth": true
 }
diff --git a/scripts/tests/web/bootstrap.json b/scripts/tests/web/bootstrap.json
index 079d66da..4ca824f1 100755
--- a/scripts/tests/web/bootstrap.json
+++ b/scripts/tests/web/bootstrap.json
@@ -1,5 +1,5 @@
 {
-  "target": "web",
+  "target": ["web"],
   "ui": "bootstrap",
   "auth": false
 }